Эх сурвалжийг харах

feat:报告下载记录文案相关

yangfeng 6 өдөр өмнө
parent
commit
579727824f

+ 0 - 1
apps/bigmember_pc/src/components/zhima/report-guide-banner.vue

@@ -136,7 +136,6 @@ const discountText = computed(() => {
       return `<div class="highlight-text">${discountMsg.value}</div>`
       return `<div class="highlight-text">${discountMsg.value}</div>`
     }
     }
   }
   }
-  return ''
 })
 })
 
 
 const getReportId = (type, entName) => {
 const getReportId = (type, entName) => {

+ 9 - 2
apps/bigmember_pc/src/views/reportDownload/balance.vue

@@ -32,7 +32,12 @@
             <span class="highlight" v-else>+{{ scope.row.number }}</span>
             <span class="highlight" v-else>+{{ scope.row.number }}</span>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column label="原因描述" min-width="230" align="center">
+        <el-table-column label="变化后余额(份)" v-if="Number(id) === 5">
+          <template slot-scope="scope">
+            <span>{{ scope.row.deductionNumb }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="原因描述" min-width="200" align="center">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <div v-if="scope.row.remarks">
             <div v-if="scope.row.remarks">
               <div v-if="scope.row.userType === 1">
               <div v-if="scope.row.userType === 1">
@@ -100,7 +105,8 @@ export default {
         pageSize: 10, // 每页多少条数据
         pageSize: 10, // 每页多少条数据
         total: 0, // 一共多少条数据
         total: 0, // 一共多少条数据
         list: [] // 查询请求返回的数据
         list: [] // 查询请求返回的数据
-      }
+      },
+      id: 0
     }
     }
   },
   },
   filters: {
   filters: {
@@ -157,6 +163,7 @@ export default {
     }
     }
   },
   },
   created() {
   created() {
+    this.id = this.$route.query.id
     this.getList()
     this.getList()
   },
   },
   methods: {
   methods: {

+ 11 - 4
apps/bigmember_pc/src/views/reportDownload/record.vue

@@ -41,15 +41,16 @@
           />
           />
           <p class="flex items-center justify-between">
           <p class="flex items-center justify-between">
             <span class="zhi-ma-title">芝麻信用共建分析报告</span>
             <span class="zhi-ma-title">芝麻信用共建分析报告</span>
-            <!-- <template>
-              <span v-if="zhiMaReportInfo.isFree" class="free-buy-btn">去开通</span>
-            </template> -->
+
             <span
             <span
               v-if="zhiMaReportInfo.packType"
               v-if="zhiMaReportInfo.packType"
               class="member-type"
               class="member-type"
               :class="packageClassName"
               :class="packageClassName"
               >{{ packageText }}<i class="vip-icon">VIP</i></span
               >{{ packageText }}<i class="vip-icon">VIP</i></span
             >
             >
+            <!-- <template v-else-if="!zhiMaReportInfo.firstText && zhiMaReportInfo.packType === 0">
+              <span class="free-buy-btn" @click="goBuyAnalysisReport">去开通</span>
+            </template> -->
             <span v-else class="free-buy-btn" @click="goBuyAnalysisReport"
             <span v-else class="free-buy-btn" @click="goBuyAnalysisReport"
               >去购买</span
               >去购买</span
             >
             >
@@ -77,7 +78,13 @@
               <span v-if="zhiMaReportInfo.firstText" class="highlight-text">{{
               <span v-if="zhiMaReportInfo.firstText" class="highlight-text">{{
                 zhiMaReportInfo.firstText
                 zhiMaReportInfo.firstText
               }}</span>
               }}</span>
-              <!-- <span v-if="zhiMaReportInfo.isFree" class="highlight-text">开通权益卡更优惠</span> -->
+              <span
+                v-if="
+                  !zhiMaReportInfo.firstText && zhiMaReportInfo.packType === 0
+                "
+                class="highlight-text"
+                >开通权益卡更优惠</span
+              >
               <span
               <span
                 v-if="zhiMaReportInfo.packType > 0 && zhiMaReportInfo.endTime"
                 v-if="zhiMaReportInfo.packType > 0 && zhiMaReportInfo.endTime"
                 class="light-gray-text"
                 class="light-gray-text"

+ 4 - 1
apps/mobile/src/views/reportAnalysis/reportDownload.vue

@@ -90,6 +90,7 @@
             }}</span>
             }}</span>
             <span class="member-vip">VIP</span>
             <span class="member-vip">VIP</span>
           </div>
           </div>
+          <!-- <div v-else-if="zhiMaInfo.pack_type === 0 && !zhiMaInfo.firstMsg" class="credit_report_btn" @click="goBuy('analysis')">去开通</div> -->
           <div v-else class="credit_report_btn" @click="goBuy('analysis')">
           <div v-else class="credit_report_btn" @click="goBuy('analysis')">
             去购买
             去购买
           </div>
           </div>
@@ -107,8 +108,9 @@
             <span v-if="zhiMaInfo.firstMsg" class="report-first">{{
             <span v-if="zhiMaInfo.firstMsg" class="report-first">{{
               zhiMaInfo.firstMsg
               zhiMaInfo.firstMsg
             }}</span>
             }}</span>
+            <!-- <span v-if="!zhiMaInfo.firstMsg && zhiMaInfo.pack_type === 0" class="report-first">开通权益卡更优惠</span> -->
             <div
             <div
-              v-if="zhiMaInfo.firstMsg"
+              v-if="zhiMaInfo.firstMsg || zhiMaInfo.pack_type === 0"
               class="flex-1 justify-between credit_report_action"
               class="flex-1 justify-between credit_report_action"
             >
             >
               <select-report-example>
               <select-report-example>
@@ -813,6 +815,7 @@ export default {
         flex-shrink: 0;
         flex-shrink: 0;
       }
       }
       .report-first {
       .report-first {
+        margin-left: 8px;
         color: $color_main;
         color: $color_main;
         font-size: 12px;
         font-size: 12px;
         line-height: 18px;
         line-height: 18px;