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

src/App.vue

@@ -11,9 +11,9 @@ export default {
       process.env.NODE_ENV == "production" ||
       JSON.stringify(extConfig) == "{}"
     ) {
-      // extConfig = { mixid: "jordan", shopid: 471 };
-      extConfig = { "mixid":"antgood",
-      "shopid":67 };
+      extConfig = { mixid: "antgood", shopid: 67 };
+      // extConfig = { "mixid":"xyyx",
+      // "shopid":133 };
     }
     console.log("1444444444", extConfig);
     this.$store.commit("setExtConfig", extConfig.mixid);

src/pages/index/index.vue

@@ -82,13 +82,16 @@ export default {
     
     this.options = options;
     Object.assign(this.$data, this.$options.data());
+    let op=wx.getStorageSync("openid")
+    if (op) {
+      this.params += '&open_id='+wx.getStorageSync("openid");
       this.withoutScene = true;
+    }else{
       //获取openId
        wx.login({
         success: res => {
           this.code = res.code;
           login.miniLogin({ code: this.code}).then(res1 => {
-            console.log(res1,555555)
               if (res1.data.code == 200) {
                   wx.setStorage({
                       key: "openid",
@@ -96,10 +99,11 @@ export default {
                   });
               }
               this.params += '&open_id='+wx.getStorageSync("openid");
-            console.log(this.code,77777,this.params)
+              this.withoutScene = true;
           })
         },
       }) 
+    }
     // 移除重复参数
     if (options.params) {
       let params=decodeURIComponent(options.params)