Merge branch 'dev' of 47.94.45.65:angelo/web-zk-h5 into dev

pages/pay/index.vue

@@ -470,20 +470,22 @@
           </div>
         </div>
         <div v-show="specialArea == UPGRADE_AREA.id">
-          <div class="tit4">{{ '升级会员信息' }}</div>
+          <div class="tit4">{{ '会员信息' }}</div>
           <div class="quan">
             <div class="kuang_i">
-              <div>{{ '升级编号' }}</div>
+              <div>{{ '会员编号' }}</div>
               <div>{{ orderData.memberCode }}</div>
             </div>
             <div class="kuang_i">
-              <div>{{ '升级姓名' }}</div>
+              <div>{{ '会员姓名' }}</div>
               <div>{{ orderData.memberName }}</div>
             </div>
+            <!--
             <div class="kuang_i">
               <div>{{ '升级级别' }}</div>
               <div>{{ orderData.pkGradeVal }}</div>
             </div>
+            -->
             <div class="kuang_i">
               <div>{{ '发货方式' }}</div>
               <div>{{ orderData.deliveryWayVal }}</div>
@@ -950,7 +952,7 @@ export default {
           url =
             this.specialArea == REGIEST_AREA.id
               ? api.payRegOrder
-              : api.upgradePay
+              : api.payOthOrder //api.upgradePay
         } else {
           url = api.payOthOrder
         }

pages/upgrade/index.vue

@@ -969,26 +969,51 @@ export default {
             shoppingId: item,
           })
         })
-        upgradeOrder(
+
-          Object.assign({}, this.form, this.allGoodsData, {
+        api
-            deleteList: deleteList,
+          .confirmOthOrder(
-            shopList: deleteList,
+            Object.assign({}, this.form, this.allGoodsData, {
-            parentCode: this.form.parent,
+              deleteList: deleteList,
-            upgradeMemberCode: this.form.memberCode,
+              shopList: deleteList,
-          })
+              buyMemberCode: this.userInfo.memberCode,
-        ).then(res => {
-          this.isLoading = false
-          if (res.code == 200) {
-            uni.redirectTo({
-              url:
-                '/pages/pay/index?paramsPost=' +
-                JSON.stringify(
-                  Object.assign({ specialArea: this.specialArea }, res.data)
-                ) +
-                '&businessType=1',
             })
-          }
+          )
-        })
+          .then(res => {
+            this.isLoading = false
+
+            if (res.code == 200) {
+              const params = {
+                ...res.data,
+                specialArea: this.specialArea,
+              }
+              uni.redirectTo({
+                url:
+                  '/pages/pay/index?paramsPost=' +
+                  JSON.stringify(params) +
+                  '&businessType=1',
+              })
+            }
+          })
+        // upgradeOrder(
+        //   Object.assign({}, this.form, this.allGoodsData, {
+        //     deleteList: deleteList,
+        //     shopList: deleteList,
+        //     parentCode: this.form.parent,
+        //     upgradeMemberCode: this.form.memberCode,
+        //   })
+        // ).then(res => {
+        //   this.isLoading = false
+        //   if (res.code == 200) {
+        //     uni.redirectTo({
+        //       url:
+        //         '/pages/pay/index?paramsPost=' +
+        //         JSON.stringify(
+        //           Object.assign({ specialArea: this.specialArea }, res.data)
+        //         ) +
+        //         '&businessType=1',
+        //     })
+        //   }
+        // })
       })
     },
     getDiqu() {

util/specialAreaMap.js

@@ -5,7 +5,8 @@ export const REGIEST_AREA = {
 
 export const UPGRADE_AREA = {
   id: 42,
-  name: '升级专区',
+  // name: '升级专区',
+  name: '甄选专区',
 }
 
 export const REISSUE_AREA = {