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

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

@@ -42,7 +42,7 @@ export default {
     async nextStep() {
       let valid = await this.$validator.validate()
       if (true === valid) {
-        await saveShareTrack()
+        await this.saveShareTrack()
         this.share()
       } else {
         return this.$toast(this.$validator.errors.all()[0])
@@ -76,10 +76,11 @@ export default {
     },
     //分享轨迹保存
     saveShareTrack() {
+      let data = {
+        mallId: this.mallId
+      }
+      console.log('--------', data)
       return new Promise((resolve, reject) => {
-        let data = {
-          mallId: this.mallId
-        }
         saveShareTrack(data).then(
           res => {
             if (res.result == '0') {

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

@@ -67,11 +67,11 @@ export default {
       this.loginInfo.password = this.$route.query.password
       this.shareId = this.$route.query.shareId
       this.name = this.$route.query.name
-      this.saveShareTrack()
+      this.saveShareTrack({ id: this.shareId, mallId: this.mallId })
     }
-    // this.getShopList({ id: this.mallId })
+    this.getShopList({ id: this.mallId })
     //TEST
-    this.setDetail()
+    // this.setDetail()
     // window['appCallBack'] = this.appCallBack
   },
   mounted() {
@@ -116,10 +116,7 @@ export default {
       })
     },
     //分享轨迹保存
-    saveShareTrack() {
-      let data = {
-        mallId: this.mallId
-      }
+    saveShareTrack(data) {
       saveShareTrack(data).then(res => {
         if (res.result == '0') {
         } else {

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

@@ -7,14 +7,6 @@
           <van-image :src="item.iconUrl" />
           <van-grid-item :text="item.name" />
         </van-grid-item>
-        <van-grid-item>
-          <van-image :src="item.iconUrl" />
-          <van-grid-item :text="item.name" />
-        </van-grid-item>
-        <van-grid-item>
-          <van-image :src="item.iconUrl" />
-          <van-grid-item :text="item.name" />
-        </van-grid-item>
       </van-grid>
     </div>
   </div>
@@ -38,8 +30,8 @@ export default {
   },
   mounted() {
     //TEST
-    this.setList()
-    // this.getShopList()
+    // this.setList()
+    this.getShopList()
   },
   methods: {
     //TEST