Merge branch 'product_dev' of http://code.mayi888.com/chengmo/mayi-mp-shop into product_dev

src/pages/index/index.vue

 <template>
   <div>
-    <web-view :src="link+page+params" @message="getMessage" @error="handleError" @load="handleLoad"></web-view>
+    <web-view v-if="withoutScene" :src="pageUrl" @message="getMessage" @error="handleError" @load="handleLoad"></web-view>
   </div>
 </template>
 
@@ -39,6 +39,7 @@ export default {
       shareOrderSn: "",
       shareTid: "",
       newWindowHref : '',
+      withoutScene: true,
       sharePageList: [
         "goods/",
         "receivingGift",
@@ -47,6 +48,11 @@ export default {
       ] //分享白名单
     };
   },
+  computed: {
+    pageUrl() {
+      return this.link+this.page+this.params
+    }
+  },
   onLoad(options) {
     Object.assign(this.$data, this.$options.data());
     console.log(
@@ -136,8 +142,10 @@ export default {
       console.log(options)
       console.log(222222)
       if(options.scene.indexOf('_') == -1){
+        this.withoutScene = false;
         //新二维码扫码进入
           indexApi.getShareSceneRecord(options.scene).then(res=>{
+            this.withoutScene = true;
             if(res.data.code == '200'){
               this.page = res.data.data.pageUri;
               let paramsObj = JSON.parse(res.data.data.scene);
@@ -164,6 +172,8 @@ export default {
               }
               this.params += params
             }
+          }).catch((err)=>{
+            this.withoutScene = true;
           })
       }else {
         //来自扫码

src/pages/wxPay/index.vue

@@ -81,7 +81,7 @@ export default {
             console.log('wxPay',res.data)
             payData.success = res => {
               console.log("支付成功", res, this.options);
-
+              this.message = "支付成功";
               const orderSn = this.options.orderSn;
               let vm = this
               
@@ -110,6 +110,7 @@ export default {
                         console.log("message success response: ", res);
                       },
                       fail(res) {
+                        fn(vm)
                         console.log("message fail response: ", res)
                       }
                     })
@@ -125,7 +126,7 @@ export default {
                 console.error("subscribeMessage-err", err);
               }
               function fn(_this){
-                _this.message = "支付成功";
+                // _this.message = "支付成功";
                 if(!_this.options_isCard){
                   let query;
                   if(_this.batchNumber){