Merge branch 'need-pool#659'

src/views/custom_manage/compontents/ProductReadInfo.vue

@@ -11,13 +11,9 @@
     <div class="dialog-container">
       <div class="table-info-wrap">
         <div class="table-info">
-          <p  v-if="tableName!=='Total'">{{typeName}}</p>
+          <p>{{typeName}}</p>
           <p>共{{clickToal}}个点击量</p>
         </div>
-        <!-- <div class="btn">
-          <el-button size="mini" type="primary" 
-            v-if="tableName!=='Total'"
-            @click="changeTable({type:'Total'})">返回</el-button></div> -->
       </div>
       <el-table
         :data="tableData"
@@ -34,7 +30,7 @@
             :sortable="item.propName==='VisitCount'"
         >
         <template slot-scope="{row}">
-          <span v-if="item.propName==='VisitCount'" :class="tableName==='Total'&&row[item.propName]>0?'editsty':''">{{row[item.propName]||'0'}}</span>
+          <span v-if="item.propName==='VisitCount'" class="editsty">{{row[item.propName]||'0'}}</span>
           <span v-else-if="item.propName==='Source'">{{row[item.propName]===1?'小程序':'PC端'}}</span>
           <span v-else>{{row[item.propName]||'--'}}</span>
         </template>
@@ -61,10 +57,17 @@ const totalColumn = [
   {
     label:'产品名称',
     propName:'ProductName',
+  },{
+    label:'标题',
+    propName:'Title',
   },{
     label:'点击量',
     propName:'VisitCount',
     widthsty:100
+  },{
+    label:'来源',
+    propName:'Source',
+    widthsty:100
   },{
     label:'最近一次点击时间',
     propName:'RecentTime'
@@ -174,7 +177,8 @@ export default {
         const typeMap = {
           1:'VoicePlay',
           2:'Video',
-          3:'Question'
+          3:'Question',
+          99:'Total',
         }
         this.choosedItem = {
           ProductType: Number(subProductArr[0]),
@@ -191,11 +195,7 @@ export default {
       this.tableName = tableName
       this.tableColumn = columnMap[tableName]
       this.pageNo = 1
-      // if(tableName==='Total'){
-      //   this.getTotalReadInfo()
-      // }else{
-        this.getReadInfoDetail()
-      // }
+      this.getReadInfoDetail()
     },
     //关闭弹窗
     cancelHandle(){
@@ -223,11 +223,7 @@ export default {
     //点击页码
     handleCurrentChange(pageNo){
       this.pageNo = pageNo
-      if(this.tableName==='Total'){
-        this.getTotalReadInfo()
-      }else{
-        this.getReadInfoDetail()
-      }
+      this.getReadInfoDetail()
     },
     //获取总的阅读统计
     async getTotalReadInfo(orderType){
@@ -275,11 +271,7 @@ export default {
     sortChangeHandle({ prop,order }){
       const orderType = order==='ascending'?1:order==='descending'?2:0
       this.pageNo = 1
-      if(this.tableName==='Total'){
-        this.getTotalReadInfo(orderType)
-      }else{
-        this.getReadInfoDetail(orderType)
-      }
+      this.getReadInfoDetail(orderType)
     }
   },
   mounted(){}

src/views/custom_manage/customList/customDetail.vue

@@ -627,9 +627,9 @@
 		<product-read-info
 		:productReadInfoShow="productReadInfoShow"
 		:productReadId="productReadId"
-				:subProductId="platform_type"
-				:subProductName="subProductName"
-				:clickToal="clickToal"
+		:subProductId="platform_type"
+		:subProductName="subProductName"
+		:clickToal="clickToal"
 		:productReadTitle="productReadTitle"
 		@close="productReadInfoShow=false"
 		></product-read-info>
@@ -1508,7 +1508,7 @@ export default {
 
 		/* 获取分产品的几种类型 */
 		getSubProductList() {
-			customInterence.getSubProduct().then(res => {
+			customInterence.getSubProduct({StatisticFlag:true}).then(res => {
 				if(res.Ret !== 200) return
 				
 				res.Data.forEach(item => {