Browse Source

Merge branch 'cygx6.8.1'

hbchen 2 years ago
parent
commit
d64b88f2dd
2 changed files with 16 additions and 5 deletions
  1. 1 0
      src/views/cygx/dlg.vue
  2. 15 5
      src/views/cygxPc/report.vue

+ 1 - 0
src/views/cygx/dlg.vue

@@ -96,6 +96,7 @@ const isHide = () => {
       color: #2680eb;
       text-align: center;
       border-top: 1px solid #eaeaea;
+      cursor: pointer;
     @media screen and (min-width:790px) {
       margin-top: 10PX;
       font-size: 14PX;

+ 15 - 5
src/views/cygxPc/report.vue

@@ -62,13 +62,22 @@ const { reportInfo, reportResearch } = toRefs(state);
         <div class="report-title">{{ reportInfo.Title }}</div>
         <div class="report-text">
           <template v-if="!reportInfo.IsResearch">
-            <div class="report_desc">
+            <!-- <div class="report_desc">
               <span class="author">{{ reportInfo.Department }}</span>
               <span>{{ reportInfo.PublishDate }}</span>
-            </div>
-            <div class="seller-list">
-              <span>联系人:</span>
-              <span v-for="(item, index) in reportInfo.SellerList" :key="index"> {{ item.SellerName }}({{ item.SellerMobile }})&nbsp;&nbsp; </span>
+            </div> -->
+            <!-- <div class="seller-list"> -->
+              <!-- <span>联系人:</span>
+              <span v-for="(item, index) in reportInfo.SellerList" :key="index"> {{ item.SellerName }}({{ item.SellerMobile }})&nbsp;&nbsp; </span> -->
+            <!-- </div> -->
+            <div class="report-research">
+              <div style="display: flex">
+                <img :src="reportInfo.DepartmentImgUrl" v-if="reportInfo.DepartmentImgUrl" />
+                <div class="research-author">
+                  <p >{{ reportInfo.NickName }}</p> 
+                  <p class="time">{{ reportInfo.PublishDate }}</p>
+                </div>
+              </div>
             </div>
           </template>
           <template v-else>
@@ -237,6 +246,7 @@ const { reportInfo, reportResearch } = toRefs(state);
       }
       .tip {
         color: #3385ff;
+        cursor: pointer;
       }
       .container-abstract {
         margin: 20px 0 10px;