Browse Source

merge from master

Karsa 3 years ago
parent
commit
305fcf7168
3 changed files with 12 additions and 4 deletions
  1. 1 1
      src/main.js
  2. 3 1
      src/views/cygx/index.scss
  3. 8 2
      src/views/cygx/raiReportDtl.vue

+ 1 - 1
src/main.js

@@ -5,6 +5,6 @@ import store from './store'
 import 'normalize.css'
 import './style/common.scss'
 import '@vant/touch-emulator';//vant 
-import 'vant/lib/index.css'
+import 'vant/lib/index.css';
 
 createApp(App).use(router).use(store).mount('#app')

+ 3 - 1
src/views/cygx/index.scss

@@ -14,7 +14,10 @@
     z-index: 5;
   }
   .host-collect {
+    margin-top: 20px;
     padding-bottom: 100px;
+    padding-bottom: calc(100px + constant(safe-area-inset-bottom));
+    padding-bottom: calc(100px + env(safe-area-inset-bottom));
     h4 {
       font-size: 28px;
       @media screen and (min-width:790px) {
@@ -53,7 +56,6 @@
         display:flex;
         align-items: center;
         justify-content: space-between;
-        width: 30%;
         img {
           width: 21px;
           height: 21px;

+ 8 - 2
src/views/cygx/raiReportDtl.vue

@@ -24,9 +24,9 @@
           <template v-else>
             <div class="report-research">
               <div style="display: flex">
-                <img :src="reportInfo.DepartmentImgUrl" />
+                <img :src="reportInfo.DepartmentImgUrl" @click="goAuthorPages" />
                 <div class="research-author">
-                  <p>{{ reportInfo.SellerAndMobile }}</p>
+                  <p @click="goAuthorPages" >{{ reportInfo.SellerAndMobile }}</p>
                   <p class="time">{{ reportInfo.PublishDate }}</p>
                 </div>
               </div>
@@ -150,6 +150,12 @@ const userIsShowFreeButton = async () => {
     isShowFreeBtn.value = res.Data.IsShow
   }
 }
+// 跳转到作者页面
+const goAuthorPages =  () => {
+    wx.miniProgram.navigateTo({
+      url: "/reportPages/authorPages/authorPages?id=" + state.reportInfo.DepartmentId,
+    });
+}
 const downloadFile = async () => {
   Toast.loading({
     message: "下载中...",