Merge remote-tracking branch 'origin/feature/yc-mobile_maimai-0525' into feature/yc-mobile_maimai-0525

components/applyPurchase/SayPrice.vue

@@ -11,7 +11,7 @@
         <div class="content">
           <div class="content-line">
             <div class="form-item form-left text-line">
-              <span>类目：</span><span class="text" :title="purchaseManList.content[currentSayPriceIndex].prodTitle">{{purchaseManList.content[currentSayPriceIndex].prodTitle || '-'}}</span>
+              <span>类目(产品名称)：</span><span class="text" :title="purchaseManList.content[currentSayPriceIndex].prodTitle">{{purchaseManList.content[currentSayPriceIndex].prodTitle || '-'}}</span>
             </div>
           </div>
           <div class="content-line">

components/supplier/details.vue

@@ -63,17 +63,17 @@
       <div class="form_dialog">
         <ul class="list-inline">
           <li class="form-item">
-            <span>型号：</span>
-            <p v-text="detail.cmpCode ? spliceString(detail.cmpCode, 90) : '-'">3</p>
+            <span>品牌：</span>
+            <p v-text="detail.standard !== 1 ? spliceString(detail.brand, 90) : spliceString(detail.pbranden, 90)">2</p>
           </li>
           <li class="form-item">
-            <span>类目：</span>
+            <span>类目(产品名称)：</span>
             <p v-if="detail.standard === 1" v-text="detail.kind ? spliceString(detail.kind, 90) : '-'">1</p>
             <p v-if="detail.standard !== 1" v-text="detail.prodName ? spliceString(detail.prodName, 90) : '-'">1</p>
           </li>
           <li class="form-item">
-            <span>品牌：</span>
-            <p v-text="detail.standard !== 1 ? spliceString(detail.brand, 90) : spliceString(detail.pbranden, 90)">2</p>
+            <span>型号：</span>
+            <p v-text="detail.cmpCode ? spliceString(detail.cmpCode, 90) : '-'">3</p>
           </li>
           <li class="form-item">
             <span>规格：</span>
@@ -337,7 +337,7 @@
           }
           span {
             float:left;
-            width: 80px;
+            width: 112px;
             text-align: right;
             display: inline-block;
             color:#3c7cf5;
@@ -388,11 +388,11 @@
             }
           }
           .el-input {
-            width: 230px;
+            width: 198px;
           }
           input {
             font-size: 14px;
-            width: 230px;
+            width: 198px;
             height: 20px;
             line-height: 20px;
             border-radius: 2px;

components/supplier/resource.vue

@@ -110,16 +110,16 @@
       <div class="form_dialog">
         <ul class="list-inline">
           <li class="form-item">
-            <span>型号：</span>
-            <p v-text="applyObj.cmpCode ? spliceString(applyObj.cmpCode, 90) : '-'">32432</p>
+            <span>品牌：</span>
+            <p v-text="applyObj.brand ? spliceString(applyObj.brand, 90) : '-'">32432</p>
           </li>
           <li class="form-item">
-            <span>类目：</span>
+            <span>类目(产品名称)：</span>
             <p v-text="applyObj.prodName ? spliceString(applyObj.prodName, 90) : '-'">32</p>
           </li>
           <li class="form-item">
-            <span>品牌：</span>
-            <p v-text="applyObj.brand ? spliceString(applyObj.brand, 90) : '-'">32432</p>
+            <span>型号：</span>
+            <p v-text="applyObj.cmpCode ? spliceString(applyObj.cmpCode, 90) : '-'">32432</p>
           </li>
           <li class="form-item">
             <span>规格：</span>
@@ -418,7 +418,7 @@
           }
           span {
             float:left;
-            width: 80px;
+            width: 112px;
             text-align: right;
             display: inline-block;
             color:#3c7cf5;
@@ -469,11 +469,11 @@
             }
           }
           .el-input {
-            width: 230px;
+            width: 198px;
           }
           input {
             font-size: 14px;
-            width: 230px;
+            width: 198px;
             height: 20px;
             line-height: 20px;
             border-radius: 2px;

pages/mobile/wechat/toggle.vue

@@ -8,7 +8,7 @@
     mounted() {
       this.$nextTick(() => {
         // this.$route.query.url
-        window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd29bbca61728b189&redirect_uri=http://gmxwni.natappfree.cc${this.$route.query.url}&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${this.$route.query.url}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
       })
     }
   }