|
@@ -388,7 +388,6 @@ export default {
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
beforeCommitOrder() {
|
|
beforeCommitOrder() {
|
|
|
-
|
|
|
|
|
if (!this.userInfo.phone) {
|
|
if (!this.userInfo.phone) {
|
|
|
uni.showModal({
|
|
uni.showModal({
|
|
|
title: '温馨提示',
|
|
title: '温馨提示',
|
|
@@ -454,14 +453,26 @@ export default {
|
|
|
console.log('++++++++++++++++++订单提交+++++++++++', res)
|
|
console.log('++++++++++++++++++订单提交+++++++++++', res)
|
|
|
uni.hideLoading();
|
|
uni.hideLoading();
|
|
|
this.subOrderNo = res.data.data.orderNo
|
|
this.subOrderNo = res.data.data.orderNo
|
|
|
- if (this.activity.salePrice * 1 > 0) {
|
|
|
|
|
- this.$refs.myPay.openPopup()
|
|
|
|
|
- } else {
|
|
|
|
|
- uni.showToast({
|
|
|
|
|
- duration: 2000,
|
|
|
|
|
- title: '活动参与成功!'
|
|
|
|
|
- });
|
|
|
|
|
- this.isActivityCheck = true
|
|
|
|
|
|
|
+ if(this.isShare){
|
|
|
|
|
+ if (this.activity.sharePrice * 1 > 0 ) {
|
|
|
|
|
+ this.$refs.myPay.openPopup()
|
|
|
|
|
+ } else {
|
|
|
|
|
+ uni.showToast({
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ title: '活动参与成功!'
|
|
|
|
|
+ });
|
|
|
|
|
+ this.isActivityCheck = true
|
|
|
|
|
+ }
|
|
|
|
|
+ }else {
|
|
|
|
|
+ if (this.activity.salePrice * 1 > 0 ) {
|
|
|
|
|
+ this.$refs.myPay.openPopup()
|
|
|
|
|
+ } else {
|
|
|
|
|
+ uni.showToast({
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ title: '活动参与成功!'
|
|
|
|
|
+ });
|
|
|
|
|
+ this.isActivityCheck = true
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
this.requestStatus = false
|
|
this.requestStatus = false
|
|
|
}).catch(err => {
|
|
}).catch(err => {
|