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

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

@@ -54,15 +54,16 @@ export default {
         '/#/productStore/storeDetail?token=' +
         localStorage.getItem('token') +
         '&aname=' +
-        this.loginInfo.aname +
+        encodeURI(this.loginInfo.aname) +
         '&password=' +
-        this.loginInfo.password +
+        encodeURI(this.loginInfo.password) +
         '&shareId=' +
         this.shareId +
-        '&mallId' +
+        '&mallId=' +
         this.mallId +
-        '&name' +
-        this.name
+        '&name=' +
+        encodeURI(this.name)
+      console.log('--------', url)
       // eslint-disable-next-line no-undef
       EWebBridge.webCallAppInJs('bridge', {
         flag: 'share',

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

@@ -63,16 +63,13 @@ export default {
     this.mallId = this.$route.query.mallId
     if (this.isWeixin) {
       window.localStorage.setItem('token', this.$route.query.token)
-      this.loginInfo.aname = this.$route.query.aname
-      this.loginInfo.password = this.$route.query.password
+      this.loginInfo.aname = decodeURI(this.$route.query.aname)
+      this.loginInfo.password = decodeURI(this.$route.query.password)
       this.shareId = this.$route.query.shareId
-      this.name = this.$route.query.name
+      this.name = decodeURI(this.$route.query.name)
       this.saveShareTrack({ id: this.shareId, mallId: this.mallId })
     }
     this.getShopList({ id: this.mallId })
-    //TEST
-    // this.setDetail()
-    // window['appCallBack'] = this.appCallBack
   },
   mounted() {
     window['appCallBack'] = this.appCallBack
@@ -81,13 +78,6 @@ export default {
     document.getElementsByTagName('body')[0].classList.remove('bg-white')
   },
   methods: {
-    //TEST
-    setDetail() {
-      this.detail = {
-        imgUrl: 'https://img.yzcdn.cn/vant/apple-3.jpg',
-        linkUrl: 'https://img.yzcdn.cn/vant/apple-2.jpg'
-      }
-    },
     //获取商城详情
     getShopList(data) {
       getShopList(data).then(res => {