采购下单

hdApp/src/admin/billing/affirmGhs.vue

@@ -431,13 +431,8 @@ export default {
 					if (res.confirm) {
 						createOrder(parameter).then(res => {
 							self.resetSelectInfoByType(self.pageType);
-							const {data: { id, orderSn }} = res;
-							// 如果是客户跳转到客户成功页pagesClient/official/clientApply   供货员工下单到 /admin/billing/result
-							let url =
-								self.getLoginInfo.identity == "1"
-									? "pagesClient/official/clientApply"
-									: `/admin/billing/result?orderId=${id}&orderSn=${orderSn}`;
-							uni.redirectTo({url: url,});
+							const {data: { orderSn,actPrice }} = res;
+							uni.navigateTo({url: `/pagesPurchase/wechatPay?type=2&orderSn=${orderSn}&actPrice=${actPrice}`})
 						});
 					}
 				}

hdApp/src/pagesPurchase/wechatPay.vue

@@ -16,9 +16,9 @@
         <block>
           <div class="price">
             <span>￥</span>
-            <span class="app-size-36 app-bold">{{ options.actPrice || ''}}</span>
+            <span class="app-size-36 app-bold">{{ actPrice || ''}}</span>
           </div>
-          <div class="order-num app-color-3">订单号: {{ options.orderSn || ''}}</div>
+          <div class="order-num app-color-3">订单号: {{ orderSn || ''}}</div>
         </block>
         <block>
           <div class="call-one-btn">
@@ -87,12 +87,15 @@ export default {
       },
       psdKey: '',
       orderSn: '',
-      setPassModal: false,
+					actPrice: '',
+					setPassModal: false,
       _type: '1'
     };
   },
   onLoad (options) {
-    this.getWeChat(options.id)
+  	this.orderSn = options.orderSn;
+  	this.actPrice = options.actPrice;
+    // this.getWeChat(options.orderSn)
     this.type = options.type
   },
   computed: {
@@ -108,12 +111,12 @@ export default {
         })
       }).catch(err => { console.log(err) })
     },
-    getWeChat (id) {
-      purchaseClearCreateOrder({ id }).then(res => {
-        this.options = res.data
-        this.orderSn = res.data.orderSn
-      }).catch(err => { console.log(err) })
-    },
+    // getWeChat (id) {
+    //   purchaseClearCreateOrder({ id }).then(res => {
+    //     this.options = res.data
+    //     this.orderSn = res.data.orderSn
+    //   }).catch(err => { console.log(err) })
+    // },
     _wxPay () {
       let Fn = this.type === '1' ? purchaseClearWxPay({ orderSn: this.orderSn }) : this.type === '2' ? purchaseWxPay({ orderSn: this.orderSn }) : null
       Fn.then(res => {