shenjj 7 жил өмнө
parent
commit
99da28b3a5

+ 2 - 2
components/mobile/Home.vue

@@ -213,8 +213,8 @@
         // 如果本地有缓存 则证明存在openid
         info = info && JSON.parse(info)
         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://pre.usoftmall.com&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=wxb3274b676737a319&redirect_uri=https://pre.usoftmall.com&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://cuy53h.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) {

+ 9 - 6
pages/mobile/order/details.vue

@@ -10,10 +10,10 @@
         <div class="clearfix top-t-wrap">
           <div class="pull-left">
             <template v-if="orderList.status === 404 && vendorType === 'buyer'">待收货</template>
-            <template v-else-if="orderList.status === 404 || orderList.status === 520 || orderList.status === 405 || orderList.status === 503 || orderList.status === 514">
+            <template v-if="vendorType !== 'buyer' && (orderList.status === 404 || orderList.status === 520 || orderList.status === 405 || orderList.status === 503 || orderList.status === 514)">
               请耐心等待买家确认收货
             </template>
-            <span v-if="vendorType === 'buyer'">{{restTime()}}</span>
+            <span v-if="vendorType === 'buyer' && orderList.status === 404">{{restTime()}}</span>
           </div>
           <div class="pull-right" v-if="vendorType !== 'buyer'">
             <div class="concat" @click="cancatAlert()">
@@ -167,14 +167,14 @@
           <div class="name pull-left">付款方式</div>
           <div class="pull-right">
             <!--{{orderList.paytype}}-->
-            {{orderList.paytype === '1103' ? '线下付款' : '网上支付'}}
+            {{orderList.paytype === '1103' ? '线下付款' : '线下付款'}}
           </div>
         </div>
         <div class="clearfix">
           <div class="name pull-left">发票信息</div>
-          <div class="pull-right" @click="(orderList.invoicetype === 1205 || orderList.invoicetype === 1206) ? showinvoiceType = true : ''">
+          <div class="pull-right" @click="(orderList.invoicetype === 1205 || orderList.invoicetype === 1206) ? showinvoiceType = !showinvoiceType : ''">
             {{(orderList.invoicetype === 1205 || orderList.invoicetype === 1206) ? '查看更多信息' : '暂不开票'}}
-            <img src="/images/mobile/user/icon-right.png"  v-if="orderList.invoicetype === 1205 || orderList.invoicetype === 1206"/>
+            <img src="/images/mobile/user/icon-right.png"  v-if="orderList.invoicetype === 1205 || orderList.invoicetype === 1206" :class="showinvoiceType ? 'dropList' : '' "/>
           </div>
         </div>
       </div>
@@ -1046,7 +1046,7 @@
             border-radius: 3px;
             &.sendGoods {
               color: #f43938;
-              border: 0.01rem solid #f43938;
+              border: 1px solid #f43938;
             }
           }
         }
@@ -1122,6 +1122,9 @@
             margin-top: 0.3rem;
             margin-left: 0.1rem;
             margin-right: 0.1rem;
+            &.dropList {
+              transform: rotate(270deg);
+            }
           }
           padding: 0 0.2rem;
           font-size: 0.28rem;

+ 1 - 1
pages/mobile/order/index.vue

@@ -931,7 +931,7 @@
         border-radius: 3px;
         &.sendGoods {
           color: #f43938;
-          border: 0.01rem solid #f43938;
+          border: 1px solid #f43938;
         }
         &.cancat {
           height: 0.56rem;

+ 4 - 4
pages/mobile/wechat/index.vue

@@ -72,16 +72,16 @@
         localStorage.setItem('RETURNURL', this.$route.query.url || '')
       }
       if (!info && !this.$route.query.code) {
-        window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://pre.usoftmall.com/mobile/wechat&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/mobile/wechat&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://pre.usoftmall.com/mobile/wechat&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/mobile/wechat&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/mobile/wechat&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
       } else if (info) {
         info = JSON.parse(info)
         if (info.openid) {
           this.$store.dispatch('GerWechatInfo', {code: '', openId: info.openid})
         } else {
-          window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://pre.usoftmall.com/mobile/wechat&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/mobile/wechat&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://pre.usoftmall.com/mobile/wechat&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/mobile/wechat&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
         }
       } else {
         this.$store.dispatch('GerWechatInfo', {code: this.$route.query.code})