diff --git a/App.vue b/App.vue
index 3f53fb7..5fe62cd 100644
--- a/App.vue
+++ b/App.vue
@@ -20,7 +20,7 @@
setTimeout(() => {
if(e.referrerInfo.extraData) {
- uni.$emit('payState',{msg:e.referrerInfo.extraData.backPayState})
+ uni.$emit('payState',{msg:e.referrerInfo.extraData.backPayState,payorder_id:e.referrerInfo.extraData.payorder_id})
uni.$emit('order_id',{msg:e.referrerInfo.extraData.order_id})
console.log('订单状态',e.referrerInfo.extraData.backPayState)
diff --git a/pages.json b/pages.json
index c7a92dd..49b4014 100644
--- a/pages.json
+++ b/pages.json
@@ -70,6 +70,12 @@
"navigationBarTitleText": "确认订单"
}
},
+ {
+ "path": "pages/order/confirm_fromorder",
+ "style": {
+ "navigationBarTitleText": "确认订单"
+ }
+ },
{
"path": "pages/order/order_details",
"style": {
diff --git a/pages/order/confirm_atonce.vue b/pages/order/confirm_atonce.vue
index 62f4286..2d1a1df 100644
--- a/pages/order/confirm_atonce.vue
+++ b/pages/order/confirm_atonce.vue
@@ -1,13 +1,14 @@
-
-
-
+
+
+
diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue
index 51138c5..588859d 100644
--- a/pages/order/confirm_order.vue
+++ b/pages/order/confirm_order.vue
@@ -119,7 +119,8 @@
ifPay: true,
order_id: 0,
enter_type: 0,
- payState: true
+ payState: true,
+ pay_order_id: 0
}
},
onLoad(e) {
@@ -131,37 +132,21 @@
this.getGoodsData(this.pay_type);
}
if(this.order_id && this.enter_type == 1) {
- this.$http(this.API.API_CREATEORDER,{id: this.goods_id,num: 1,pay_type: this.pay_type,name:this.contact,mobile:this.phone}).then(res => {
- this.order_id = res.data.id
- wx.navigateToMiniProgram({
- appId: res.data.jump_appid,
- path: '/pages/order/confirm_atonce',
- envVersion: 'release',
- extraData: {
- order_id: res.data.id
- },
- success(res) {
- console.log('---res---')
- console.log(res)
- },
- fail(err) {
- console.log('---err---')
- console.log(err)
- }
- })
- }).catch(err => {
- })
+ console.log('con列表执行')
+ this.payOnce()
}
},
onShow(e) {
// this.backPayState = uni.getStorageSync('backPayState')
let that = this
uni.$on('payState',(data) => {
- that.payState = data.msg
+ that.payState = data.msg;
+ that.pay_order_id = data.payorder_id;
+ console.log('传来的订单id',that.pay_order_id)
if(that.payState == true) {
- that.$url('/pages/payState/paystate?ifSuccess=1&order_id='+that.order_id,{type: 'redirect'})
+ that.$url('/pages/payState/paystate?ifSuccess=1&order_id='+that.pay_order_id,{type: 'redirect'})
}else {
- that.$url('/pages/payState/paystate?ifSuccess=2&order_id='+that.order_id,{type: 'redirect'})
+ that.$url('/pages/payState/paystate?ifSuccess=2&order_id='+that.pay_order_id,{type: 'redirect'})
}
})
@@ -183,6 +168,10 @@
})
},
submit() {
+ if(this.order_id && this.enter_type == 1) {
+ this.payOnce()
+ return
+ }
if(!this.contact) {
this.$msg('请输入联系人!');
return;
@@ -195,12 +184,13 @@
if(!this.ifPay) return;
this.ifPay = false;
this.$http(this.API.API_CREATEORDER,{id: this.goods_id,num: 1,pay_type: this.pay_type,name:this.contact,mobile:this.phone}).then(res => {
- this.order_id = res.data.id
+ this.pay_order_id = res.data.id
if(this.pay_type == 1) {
this.ifPay = true
- this.$url('/pages/payState/paystate?ifSuccess=1&order_id='+this.order_id,{type: 'redirect'})
+ this.$url('/pages/payState/paystate?ifSuccess=1&order_id='+res.data.id,{type: 'redirect'})
}else if(res.data.jump == true) {
+ let that = this;
wx.navigateToMiniProgram({
appId: res.data.jump_appid,
path: '/pages/order/confirm_atonce',
@@ -209,12 +199,14 @@
order_id: res.data.id
},
success(res) {
- console.log('---res---')
- console.log(res)
+ console.log('---res---');
+ that.ifPay = true;
+ console.log(res);
},
fail(err) {
- console.log('---err---')
- console.log(err)
+ console.log('---err---');
+ console.log(err);
+ that.ifPay = true;
}
})
}
@@ -225,20 +217,24 @@
},
payOnce() {
this.$http(this.API.API_ORDERPAY,{id: this.order_id}).then(res => {
- uni.requestPayment({
- orderInfo: res.data.order_num,
- timeStamp: res.data.timeStamp,
- nonceStr: res.data.nonceStr,
- package: res.data.package,
- signType: res.data.signType,
- paySign: res.data.paySign,
- success: (res) => {
- this.$url('/pages/payState/paystate?ifSuccess=1&order_id='+this.order_id,{type: 'redirect'})
- },
- fail: (err) => {
- this.$url('/pages/payState/paystate?ifSuccess=2&order_id='+this.order_id,{type: 'redirect'})
- },
- })
+ if(res.data.jump) {
+ wx.navigateToMiniProgram({
+ appId: res.data.jump_appid,
+ path: '/pages/order/confirm_atonce',
+ envVersion: 'release',
+ extraData: {
+ order_id: res.data.id
+ },
+ success(res) {
+ console.log('---res---')
+ console.log(res)
+ },
+ fail(err) {
+ console.log('---err---')
+ console.log(err)
+ }
+ })
+ }
}).catch(err => {})
}
}
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 324ad41..3756c36 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -22,8 +22,8 @@
-
-
+
+
diff --git a/pages/order/order_details.vue b/pages/order/order_details.vue
index 173b2ce..5844d48 100644
--- a/pages/order/order_details.vue
+++ b/pages/order/order_details.vue
@@ -192,20 +192,25 @@
},
payAtonce() {
this.$http(this.API.API_ORDERPAY,{id: this.order_id}).then(res => {
- uni.requestPayment({
- orderInfo: res.data.order_num,
- timeStamp: res.data.timeStamp,
- nonceStr: res.data.nonceStr,
- package: res.data.package,
- signType: res.data.signType,
- paySign: res.data.paySign,
- success: (res) => {
- this.$url('/pages/payState/paystate?ifSuccess=1&order_id='+this.order_id,{type: 'redirect'})
- },
- fail: (err) => {
- this.$url('/pages/payState/paystate?ifSuccess=2&order_id='+this.order_id,{type: 'redirect'})
- },
- })
+ console.log('从订单列表进入')
+ if(res.data.jump) {
+ wx.navigateToMiniProgram({
+ appId: res.data.jump_appid,
+ path: '/pages/order/confirm_atonce',
+ envVersion: 'release',
+ extraData: {
+ order_id: res.data.id
+ },
+ success(res) {
+ console.log('---res---')
+ console.log(res)
+ },
+ fail(err) {
+ console.log('---err---')
+ console.log(err)
+ }
+ })
+ }
}).catch(err => {})
},
//二维码回调