修改bug

26d9bd73 · pengxiaohui · 298af303 · 26d9bd73 · 26d9bd73
--- a/src/index.html
+++ b/src/index.html
@@ -9,7 +9,7 @@
  <meta http-equiv="Expires" content="0" />
  <title>紫荆商城</title>
  <meta name="viewport" id="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no, viewport-fit=cover">
-  <!-- <script src="https://cdn.jsdelivr.net/npm/vconsole@3.3.4/dist/vconsole.min.js"></script> -->
+  <script src="https://cdn.jsdelivr.net/npm/vconsole@3.3.4/dist/vconsole.min.js"></script>
 </head>
 <body>
  <div id="app"></div>
@@ -18,7 +18,7 @@
 </body>
 <script>
  // init vConsole
-  // var vConsole = new VConsole();
-  // console.log('Hello world');
+  var vConsole = new VConsole();
+  console.log('Hello world');
 </script>
 </html>
--- a/src/pages/buy/index.vue
+++ b/src/pages/buy/index.vue
@@ -42,7 +42,7 @@
      <van-button type="primary" round block color="#C01540" size="small" @click="handleBuy">立即购买</van-button>
    </div>
    <buy-popup v-model="popupVisiable" :options="popupOptions" @placeOrder="handlePlaceOrder"/>
-    <phone-code-login-popup v-model="loginPopupVisiable" @loginSuccess="handleHasLogin"/>
+    <phone-code-login-popup v-model="loginPopupVisiable" @loginSuccess="popupVisiable = true"/>
  </div>
 </template>
 <script>
@@ -66,8 +66,7 @@ export default {
      popupOptions: {},
      payment_order_id: '',
      payment_method: '4',
-      order_params: '',
-      openId: ''
+      order_params: ''
    }
  },
  computed: {
@@ -75,8 +74,8 @@ export default {
    query() {
      return this.$route.query
    },
-    goods_id () {
-      return this.query.goods_id || '6805043172159258624'
+    spu_id () {
+      return this.query.spu_id || '6805043172159258624'
    },
    shop_id () {
      return this.query.shop_id || '6800681447305773056'
@@ -101,9 +100,10 @@ export default {
      })
      window.sessionStorage.removeItem('isBackFormWxH5Pay')
    }
-    if (!this.openId) {
+    if (this.isWxBrowser && !this.openId) {
      const { code } = this.$route.query
      if (code) this.fetchOpenId(code)
+      else this.getCode()
    }
  },
  methods: {
@@ -122,7 +122,12 @@ export default {
    async handleBuy() {
      const isLogin = store.state.isLogin || (await store.dispatch('checkLogin'))
      if (isLogin) {
-        this.handleHasLogin()
+        if (this.isWxBrowser) {
+          this.payment_method = '3'
+        } else {
+          this.payment_method = '4'
+        }
+        this.popupVisiable = true
      } else {
        this.loginPopupVisiable = true
      }
@@ -139,17 +144,6 @@ export default {
      }
      this.fetchPlaceOrder(params)
    },
-    handleHasLogin() {
-      console.log(navigator.userAgent)
-      if (this.isWxBrowser) {
-        this.payment_method = '3'
-        this.getCode()
-      } else {
-        this.payment_method = '4'
-        this.popupVisiable = true
-        // this.fetchPlaceOrder(params)
-      }
-    },
    getCode() {
      const redirectURI = `https://pages.ezijing.com/given/auth.html?redirect_uri=${encodeURIComponent(window.location.href)}`
      window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx451c01d40d090d7a&redirect_uri=${redirectURI}&response_type=code&scope=snsapi_base#wechat_redirect`
@@ -168,7 +162,7 @@ export default {
    fetchGoodsDetails() {
      const params = {
        shop_id: this.shop_id,
-        spu_id: this.goods_id
+        spu_id: this.spu_id
      }
      getGoodsList(params).then(res => {
        if (res.code === 0 && res.msg === '成功') {