Merge remote-tracking branch 'origin/master'

components/mobile/Home.vue

@@ -209,8 +209,8 @@
         let info = localStorage.getItem('USOFTMALLWECHATINFO')
         // 如果本地有缓存 则证明存在openid
         if (ua.match(/micromessenger/i) && ua.match(/micromessenger/i)[0] === 'micromessenger' && !this.$route.query.code && !info) {
-          // window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://www.usoftmall.com&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
-          window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd29bbca61728b189&redirect_uri=http://gwzcfb.natappfree.cc&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+          window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://www.usoftmall.com&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+          // window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd29bbca61728b189&redirect_uri=http://gwzcfb.natappfree.cc&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
         } else if (ua.match(/micromessenger/i) && ua.match(/micromessenger/i)[0] === 'micromessenger') {
           if (info) {
             this.$store.commit('option/REQUEST_WECHATINFO_STATUS_SUCCESS', JSON.parse(info))

pages/mobile/center/vendor/product.vue

@@ -1050,6 +1050,7 @@
       text-align: center;
     }
     .list {
+      height: 0.46rem;
       .left {
         float: left;
         overflow: hidden;
@@ -1061,11 +1062,9 @@
         font-size: 0.3rem;
       }
       .button {
-        font-size: 0.3rem;
+        font-size: 0.28rem;
         color: #1a58dd;
         width: 0.92rem;
-        height: 0.42rem;
-        line-height: 0.42rem;
         text-align: center;
         border-radius: 5px;
         border:1px solid #1a58dd;