Merge branch 'feature/GFRS-1523【待确定】商品商城' into dev

# Conflicts:
#	src/assets/js/utils/request.js

src/assets/js/utils/request.js

@@ -71,6 +71,10 @@ let survey = [
 let manpower = [
   '/customer/answer/queryList' //DISC性格分析
 ]
+let productStore = [
+  '/customer/shop/getShopList', //获取商城列表/详情
+  '/customer/shop/getShareList' //查询分享轨迹(转发记录)
+]
 // 卡单
 let cardList = []
 //续期管理
@@ -85,9 +89,18 @@ let preserve = [
   '/edor/edor/queryEdorList' //保全进度查询
 ]
 
-let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims, ...survey, ...manpower, ...renewalManage, ...preserve]
-
-// let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale]
+let whiteList = [
+  '/customer/agent/getCustomersList',
+  ...proposal,
+  ...sale,
+  ...agentEnter,
+  ...claims,
+  ...survey,
+  ...manpower,
+  ...renewalManage,
+  ...preserve,
+  ...productStore
+]
 
 // 创建axios实例
 const service = axios.create({

src/views/ebiz/product-store/ForwardRecord.vue

@@ -4,9 +4,9 @@
     <van-sticky>
       <div class="top-table" sticky>
         <van-row type="flex" align="center">
-          <van-col class="order" span="6">序号</van-col>
-          <van-col class="subTime" span="12">转发时间</van-col>
-          <van-col class="name" span="6">打开次数</van-col>
+          <van-col class="order" span="5">序号</van-col>
+          <van-col class="subTime" span="14">转发时间</van-col>
+          <van-col class="name" span="5">打开次数</van-col>
         </van-row>
       </div>
     </van-sticky>
@@ -23,9 +23,9 @@
         <div v-if="answerList.length > 0" class="pb80">
           <div class="main-table" v-for="(item, index) in answerList" :key="index">
             <van-row type="flex" align="center">
-              <van-col class="order" span="6">{{ index + 1 }}</van-col>
-              <van-col class="subTime" span="12">{{ item.shareTime | format }}</van-col>
-              <van-col class="name" span="6">{{ item.enterCount }}</van-col>
+              <van-col class="order" span="5">{{ index + 1 }}</van-col>
+              <van-col class="subTime" span="14">{{ item.createTime }}</van-col>
+              <van-col class="name" span="5">{{ item.enterCount }}</van-col>
             </van-row>
           </div>
         </div>
@@ -84,6 +84,7 @@ export default {
         mallId: this.mallId
       }
       getShareList(params).then(res => {
+        this.$toast.clear()
         if (res.result == '0') {
           this.isSuccess = true
           this.currentPage++
@@ -117,15 +118,15 @@ export default {
         }
       })
     }
-  },
-  filters: {
-    format: function(shareTime) {
-      if (shareTime) {
-        shareTime = shareTime.substr(0, 10)
-      }
-      return shareTime
-    }
   }
+  // filters: {
+  //   format: function(shareTime) {
+  //     if (shareTime) {
+  //       shareTime = shareTime.substr(0, 10)
+  //     }
+  //     return shareTime
+  //   }
+  // }
 }
 </script>
 

src/views/ebiz/product-store/StoreDetail.vue

@@ -81,8 +81,10 @@ export default {
     //获取商城详情
     getShopList(data) {
       getShopList(data).then(res => {
+        this.$toast.clear()
         if (res.result == '0') {
           this.detail = res.content[0]
+          this.isCanCheck = false
         } else {
           this.$toast(res.resultMessage)
         }

src/views/ebiz/product-store/StoreList.vue

@@ -35,6 +35,7 @@ export default {
     //获取商品商城列表
     getShopList() {
       getShopList({}).then(res => {
+        this.$toast.clear()
         if (res.result == '0') {
           this.list = res.content
         } else {