chuangte/easypay-app
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
Sliverber 2024-04-08 09:42:25 +08:00
parent 76ed492c09
commit 08fce8125d
14 changed files with 1994 additions and 1821 deletions
api
order.js
components
payment
index.vue
productWindow
index.vue
config
app.js
libs
order.js
pages.json
pages
goods_details
index.vue
users
alipay_return
alipay_return.vue
alipay_returns
alipay_return.vue
order_confirm
index.vue
order_confirms
index.vue
order_list
index.vue
user_address
index.vue
user_address_list
index.vue

1
api/order.js
View File

@ -121,6 +121,7 @@ export function orderDel(uni) {
* @param string uni * @param string uni
*/ */
export function getOrderDetail(uni) { export function getOrderDetail(uni) {
console.log(uni,'uniuni');
return request.get('order/detail/' + uni); return request.get('order/detail/' + uni);
} }

380
components/payment/index.vue
View File

@ -50,24 +50,25 @@
}, },
data() { data() {
return { return {
formContent:'', formContent: '',
payChannel:'', payChannel: '',
//支付方式 //支付方式
payMode: [{ payMode: [
"name": "微信支付", // {
"icon": "icon-weixin2", // "name": "微信支付",
value: 'weixin', // "icon": "icon-weixin2",
title: '微信快捷支付', // value: 'weixin',
payStatus: 1, // title: '微信快捷支付',
}, // payStatus: 1,
{ // },
"name": "余额支付", // {
"icon": "icon-yuezhifu", // "name": "余额支付",
value: 'yue', // "icon": "icon-yuezhifu",
title: '可用余额:', // value: 'yue',
payStatus: 1, // title: '可用余额:',
number: 0 // payStatus: 1,
}, // number: 0
// },
// #ifndef MP // #ifndef MP
{ {
"name": "支付宝支付", "name": "支付宝支付",
@ -78,12 +79,19 @@
} }
// #endif // #endif
], ],
openId: '',
checkid: '',
isAli: false,
}; };
}, },
computed: mapGetters(['systemPlatform','userInfo','productType']), computed: mapGetters(['systemPlatform', 'userInfo', 'productType']),
created(){ created() {
this.payConfig(); this.payConfig();
this.payMode[1].number = this.userInfo.nowMoney; this.payMode[1].number = this.userInfo.nowMoney;
},
mounted() {
this.importAliPayScript(); // 导入支付宝脚本
}, },
methods: { methods: {
close: function() { close: function() {
@ -91,12 +99,105 @@
action: 'payClose' action: 'payClose'
}); });
}, },
payConfig(){ payConfig() {
getPayConfig().then(res=>{ getPayConfig().then(res => {
this.payMode[1].payStatus = parseInt(res.data.yuePayStatus) === 1 ? 1 : 2; this.payMode[1].payStatus = parseInt(res.data.yuePayStatus) === 1 ? 1 : 2;
this.payMode[0].payStatus = parseInt(res.data.payWeixinOpen) === 1 ? 1 : 0; this.payMode[0].payStatus = parseInt(res.data.payWeixinOpen) === 1 ? 1 : 0;
}) })
}, },
// 导入 my 对象所需的脚本
importAliPayScript() {
if (navigator.userAgent.indexOf('AliApp') > -1) {
this.isAli = true
const scriptElement = document.createElement('script');
scriptElement.src = 'https://appx/web-view.min.js';
document.head.appendChild(scriptElement);
// this.listenMessageFromMiniProgram(); // 监听来自小程序的消息
}
},
// 发送消息给小程序
sendMessageToMiniProgram() {
my.postMessage({
name: "测试支付"
});
},
// 监听来自小程序的消息
listenMessageFromMiniProgram() {
my.onMessage = (e) => {
if (e.type == 'authorizeResult') {
this.openId = e.data.data.alipaySystemOauthTokenResponse.openId
}
// console.log(e.data.data.alipaySystemOauthTokenResponse, 'aaaa'); // 在这里处理来自小程序的消息
};
},
aliPay(id) {
console.log('支付宝小程序支付');
let that = this
console.log(that.order_id, 'idididiid');
my.tradePay({
tradeNO: that.order_id,
success: (res) => {
uni.hideLoading();
this.alipayQueryPay()
// my.alert({
// content: JSON.stringify(res),
// });
// setTimeout(res => {
// that.$emit('onChangeFun', {
// action: 'pay_complete'
// });
// }, 2000)
},
fail: (error) => {
uni.hideLoading();
// that.stopPolling()
uni.showModal({
content: "支付失败",
showCancel: false,
success: function(res) {
if (res.confirm) {
//点击确认的操作
that.$emit('onChangeFun', {
action: 'pay_fail'
});
} else if (res.cancel) {
// ji
}
}
})
// console.error('调用 my.tradePay 失败: ', JSON.stringify(error));
},
});
},
alipayQueryPay() {
let id = this.checkid
alipayQueryPayResult(id).then(res => {
if (res.data == true) {
uni.navigateTo({
url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
id +
'&payChannel=' +
'appAlipay'
})
} else {
setTimeout(() => {
this.alipayQueryPay()
}, 1000);
}
if (res.data == null) {
setTimeout(() => {
this.alipayQueryPay()
}, 1000);
}
}).catch(err => {
})
},
goPay: function(number, paytype) { goPay: function(number, paytype) {
let that = this; let that = this;
let goPages = '/pages/order_pay_status/index?order_id=' + that.order_id; let goPages = '/pages/order_pay_status/index?order_id=' + that.order_id;
@ -110,18 +211,18 @@
title: '支付中' title: '支付中'
}); });
// #ifdef H5 // #ifdef H5
if(paytype == 'alipay'){ if (paytype == 'alipay') {
that.payChannel = 'alipay'; that.payChannel = 'alipay';
}else if(paytype == 'weixin' && this.$wechat.isWeixin()){ } else if (paytype == 'weixin' && this.$wechat.isWeixin()) {
that.payChannel = 'public'; that.payChannel = 'public';
}else{ } else {
that.payChannel = 'weixinh5'; that.payChannel = 'weixinh5';
} }
// #endif // #endif
// #ifdef APP-PLUS // #ifdef APP-PLUS
if(paytype == 'alipay'){ if (paytype == 'alipay') {
that.payChannel = 'appAliPay'; that.payChannel = 'appAliPay';
}else if(paytype == 'weixin'){ } else if (paytype == 'weixin') {
that.payChannel = that.systemPlatform === 'ios' ? 'weixinAppIos' : 'weixinAppAndroid'; that.payChannel = that.systemPlatform === 'ios' ? 'weixinAppIos' : 'weixinAppAndroid';
} }
// #endif // #endif
@ -131,16 +232,19 @@
payChannel: 'routine', payChannel: 'routine',
// #endif // #endif
// #ifndef MP // #ifndef MP
payChannel:that.payChannel, payChannel: that.payChannel,
// #endif // #endif
payType: paytype, payType: paytype,
scene: that.productType === 'normal' ? 0 : 1177 //下单时小程序的场景值 isAli: that.isAli,
// scene: that.productType === 'normal' ? 0 : 1177 //下单时小程序的场景值
}).then(res => { }).then(res => {
let jsConfig = res.data.jsConfig; let jsConfig = res.data.jsConfig;
that.order_id = res.data.orderNo; that.order_id = res.data.orderNo;
that.order_id = res.data.tradeNo;
that.checkid = res.data.orderNo
switch (res.data.payType) { switch (res.data.payType) {
case 'weixin': case 'weixin':
that.weixinPay(jsConfig); that.weixinPay(jsConfig);
break; break;
case 'yue': case 'yue':
uni.hideLoading(); uni.hideLoading();
@ -167,55 +271,75 @@
}); });
break; break;
case 'alipay': case 'alipay':
//#ifdef H5 if (that.isAli == false) {
if (this.$wechat.isWeixin()) { if (this.$wechat.isWeixin()) {
//微信公众号内支付 //微信公众号内支付
} else { } else {
//h5支付 //h5支付
uni.hideLoading(); console.log('进入h5支付宝');
that.formContent = res.data.alipayRequest;
uni.setStorage({key: 'orderNo', data:that.order_id});
that.$nextTick(() => {
document.forms['punchout_form'].submit();
})
}
//#endif
// #ifdef APP-PLUS
let alipayRequest = res.data.alipayRequest;
uni.requestPayment({
provider: 'alipay',
orderInfo: alipayRequest,
success: (e) => {
uni.showToast({
title: "支付成功"
})
setTimeout(res => {
that.$emit('onChangeFun', {
action: 'pay_complete'
});
}, 2000)
},
fail: (e) => {
uni.showModal({
content: "支付失败",
showCancel: false,
success: function(res) {
if (res.confirm) {
//点击确认的操作
that.$emit('onChangeFun', {
action: 'pay_fail'
});
} else if (res.cancel) {
}
}
})
},
complete: () => {
uni.hideLoading(); uni.hideLoading();
}, that.formContent = res.data.alipayRequest;
}); uni.setStorage({
// #endif key: 'orderNo',
data: that.order_id
});
that.$nextTick(() => {
document.forms['punchout_form'].submit();
})
this.alipayQueryPay()
}
} else {
this.aliPay(that.order_id)
}
// //#ifdef H5
// if (this.$wechat.isWeixin()) {
// //微信公众号内支付
// } else {
// //h5支付
// uni.hideLoading();
// that.formContent = res.data.alipayRequest;
// uni.setStorage({key: 'orderNo', data:that.order_id});
// that.$nextTick(() => {
// document.forms['punchout_form'].submit();
// })
// }
// //#endif
// // #ifdef APP-PLUS
// let alipayRequest = res.data.alipayRequest;
// uni.requestPayment({
// provider: 'alipay',
// orderInfo: alipayRequest,
// success: (e) => {
// uni.showToast({
// title: "支付成功"
// })
// setTimeout(res => {
// that.$emit('onChangeFun', {
// action: 'pay_complete'
// });
// }, 2000)
// },
// fail: (e) => {
// uni.showModal({
// content: "支付失败",
// showCancel: false,
// success: function(res) {
// if (res.confirm) {
// //点击确认的操作
// that.$emit('onChangeFun', {
// action: 'pay_fail'
// });
// } else if (res.cancel) {
// }
// }
// })
// },
// complete: () => {
// uni.hideLoading();
// },
// });
// // #endif
break; break;
} }
}).catch(err => { }).catch(err => {
@ -229,57 +353,57 @@
}); });
}) })
}, },
weixinPay(jsConfig){ weixinPay(jsConfig) {
let that = this; let that = this;
// #ifdef MP // #ifdef MP
uni.requestOrderPayment({ uni.requestOrderPayment({
timeStamp: jsConfig.timeStamp, timeStamp: jsConfig.timeStamp,
nonceStr: jsConfig.nonceStr, nonceStr: jsConfig.nonceStr,
package: jsConfig.packages, package: jsConfig.packages,
signType: jsConfig.signType, signType: jsConfig.signType,
paySign: jsConfig.paySign, paySign: jsConfig.paySign,
ticket: jsConfig.ticket, ticket: jsConfig.ticket,
success: function(ress) { success: function(ress) {
uni.hideLoading(); uni.hideLoading();
wechatQueryPayResult(that.order_id).then(res => { wechatQueryPayResult(that.order_id).then(res => {
uni.hideLoading(); uni.hideLoading();
return that.$util.Tips({ return that.$util.Tips({
title: "支付成功", title: "支付成功",
icon: 'success' icon: 'success'
}, () => { }, () => {
that.$emit('onChangeFun', { that.$emit('onChangeFun', {
action: 'pay_complete' action: 'pay_complete'
}); });
}); });
}).cache(err => { }).cache(err => {
uni.hideLoading(); uni.hideLoading();
return that.$util.Tips({ return that.$util.Tips({
title: err title: err
}); });
}) })
}, },
fail: function(e) { fail: function(e) {
uni.hideLoading(); uni.hideLoading();
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付' title: '取消支付'
}, () => { }, () => {
that.$emit('onChangeFun', { that.$emit('onChangeFun', {
action: 'pay_fail' action: 'pay_fail'
}); });
}); });
}, },
complete: function(e) { complete: function(e) {
uni.hideLoading(); uni.hideLoading();
if (e.errMsg == 'requestPayment:cancel') return that.$util if (e.errMsg == 'requestPayment:cancel') return that.$util
.Tips({ .Tips({
title: '取消支付' title: '取消支付'
}, () => { }, () => {
that.$emit('onChangeFun', { that.$emit('onChangeFun', {
action: 'pay_fail' action: 'pay_fail'
}); });
}); });
}, },
}) })
// #endif // #endif
// #ifdef H5 // #ifdef H5
let datas = { let datas = {
@ -313,7 +437,7 @@
}); });
}) })
} }
}).cache(errW => { }).cache(errW => {
uni.hideLoading(); uni.hideLoading();
return that.$util.Tips({ return that.$util.Tips({
@ -462,4 +586,4 @@
font-size: 0.3rpx; font-size: 0.3rpx;
color: #999; color: #999;
} }
</style> </style>

2
components/productWindow/index.vue
View File

@ -41,7 +41,7 @@
</view> </view>
</view> </view>
<!-- 分期方案 --> <!-- 分期方案 -->
<view class="periodization"> <view class="periodization" v-if='false'>
<text class="fangan">分期方案</text> <text class="fangan">分期方案</text>
<view class="returnthedate" v-for="(item,index) in fenqlist" :key="index"> <view class="returnthedate" v-for="(item,index) in fenqlist" :key="index">
<a href="javascript:;" :v-model="indexs" :class="indexs === index ? 'actives' : ''" <a href="javascript:;" :v-model="indexs" :class="indexs === index ? 'actives' : ''"

2
config/app.js
View File

@ -1,7 +1,7 @@
//移动端商城API //移动端商城API
// let domain = 'http://117.50.163.143:20410' // let domain = 'http://117.50.163.143:20410'
// let domain = 'http://117.50.215.20:20410' // let domain = 'http://117.50.215.20:20410'
// let domain = 'http://192.168.2.26:20411' // let domain = 'http://192.168.2.35:20411'
// let domain = 'http://106.75.49.247:20410' // let domain = 'http://106.75.49.247:20410'
let domain = 'https://yruibao.com/prod' let domain = 'https://yruibao.com/prod'
module.exports = { module.exports = {

17
libs/order.js
View File

@ -29,15 +29,24 @@ export function goShopDetail(item, uid) {
/** /**
* 活动商品、普通商品、购物车、再次购买预下单 * 活动商品、普通商品、购物车、再次购买预下单
*/ */
export function getPreOrder(preOrderType, orderDetails) { export function getPreOrder(preOrderType, orderDetails,type) {
console.log(type,'preOrderTypepreOrderType');
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
preOrderApi({ preOrderApi({
"preOrderType": preOrderType, "preOrderType": preOrderType,
"orderDetails": orderDetails "orderDetails": orderDetails
}).then(res => { }).then(res => {
uni.navigateTo({ if(type==0){
url: '/pages/users/order_confirm/index?preOrderNo=' + res.data.preOrderNo uni.navigateTo({
}); url: '/pages/users/order_confirm/index?preOrderNo=' + res.data.preOrderNo
});
}else if(type==1){
console.log('判断2');
uni.navigateTo({
url: '/pages/users/order_confirms/index?preOrderNo=' + res.data.preOrderNo
});
}
}).catch(err => { }).catch(err => {
return util.Tips({ return util.Tips({
title: err title: err

14
pages.json
View File

@ -541,6 +541,20 @@
} }
} }
}, },
{
"path": "order_confirms/index",
"style": {
"navigationBarTitleText": "提交订单",
// "navigationStyle": "custom",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{ {
"path": "order_improves/index", "path": "order_improves/index",
"style": { "style": {

13
pages/goods_details/index.vue
View File

@ -228,9 +228,12 @@
<view class="bnt acea-row skeleton-rect" v-else> <view class="bnt acea-row skeleton-rect" v-else>
<form @submit="joinCart" report-submit="true"><button class="joinCart bnts" <form @submit="joinCart" report-submit="true"><button class="joinCart bnts"
form-type="submit"></button></form> form-type="submit"></button></form>
<form @submit="goBuy" report-submit="true"><button class="buy bnts" <form @submit="goBuy(1)" report-submit="true"><button class="buy bnts" style="width: 200rpx;margin-right: 20rpx;"
form-type="submit">先享后付</button> form-type="submit">先享后付</button>
</form> </form>
<form @submit="goBuys(0)" report-submit="true"><button class="buy bnts" style="width: 200rpx;"
form-type="submit">立即购买</button>
</form>
</view> </view>
</block> </block>
<view class="bnt bntVideo acea-row skeleton-rect" <view class="bnt bntVideo acea-row skeleton-rect"
@ -540,6 +543,7 @@
fenqlist:[],//分期 fenqlist:[],//分期
isshim:false, isshim:false,
stause:false, stause:false,
types:0,
}; };
}, },
computed: mapGetters(['isLogin', 'uid', 'chatUrl', 'productType']), computed: mapGetters(['isLogin', 'uid', 'chatUrl', 'productType']),
@ -1391,6 +1395,7 @@
title: '您有正在进行的订单，请还款后再继续' title: '您有正在进行的订单，请还款后再继续'
}); });
}else{ }else{
this.types=0
this.goCat(0); this.goCat(0);
} }
@ -1408,6 +1413,10 @@
} }
}), }),
goBuys(){
this.types=1
this.goCat(0);
},
/** /**
* 预下单 * 预下单
*/ */
@ -1416,7 +1425,7 @@
"attrValueId": parseFloat(this.attr.productSelect.unique), "attrValueId": parseFloat(this.attr.productSelect.unique),
"productId": parseFloat(this.id), "productId": parseFloat(this.id),
"productNum": parseFloat(this.attr.productSelect.cart_num) "productNum": parseFloat(this.attr.productSelect.cart_num)
}]); }],this.types);
// console.log(JSON.stringify(this.$Order)) // console.log(JSON.stringify(this.$Order))
this.isOpen = false; this.isOpen = false;
}, },

1874
pages/users/alipay_return/alipay_return.vue
View File

File diff suppressed because it is too large Load Diff

1
pages/users/alipay_returns/alipay_return.vue
View File

@ -68,6 +68,7 @@
// this.orderId='installment236' // this.orderId='installment236'
this.order_pay_info.payPrice=e.total_amount this.order_pay_info.payPrice=e.total_amount
this.time=e.timestamp this.time=e.timestamp
// this.orderId='order92934171248038859056274'
this.alipayQueryPay(); this.alipayQueryPay();
// // #ifdef H5 // // #ifdef H5
// var url = window.location.search; // var url = window.location.search;

18
pages/users/order_confirm/index.vue
View File

@ -316,13 +316,13 @@
title: '微信快捷支付', title: '微信快捷支付',
payStatus: 1, payStatus: 1,
}, },
{ // {
"name": "余额支付", // "name": "余额支付",
"icon": "icon-yuezhifu", // "icon": "icon-yuezhifu",
value: 'yue', // value: 'yue',
title: '可用余额:', // title: '可用余额:',
payStatus: 1, // payStatus: 1,
}, // },
// #ifndef MP // #ifndef MP
{ {
"name": "支付宝支付", "name": "支付宝支付",
@ -443,6 +443,7 @@
// }); // });
this.preOrderNo = options.preOrderNo || 0; this.preOrderNo = options.preOrderNo || 0;
this.addressChangeId = options.addressId || 0; this.addressChangeId = options.addressId || 0;
this.addressId= options.addressId
this.is_address = options.is_address ? true : false; this.is_address = options.is_address ? true : false;
if (this.isLogin) { if (this.isLogin) {
this.getloadPreOrder(); this.getloadPreOrder();
@ -697,6 +698,7 @@
* 获取默认收货地址或者获取某条地址信息 * 获取默认收货地址或者获取某条地址信息
*/ */
getaddressInfo: function() { getaddressInfo: function() {
console.log(this.addressId,'this.addressIdthis.addressIdthis.addressId');
if (this.addressId) { if (this.addressId) {
getAddressDetail(this.addressId).then(res => { getAddressDetail(this.addressId).then(res => {
if (res.data) { if (res.data) {
@ -746,7 +748,7 @@
onAddress: function() { onAddress: function() {
uni.redirectTo({ uni.redirectTo({
url: '/pages/users/user_address_list/index?preOrderNo=' + this.preOrderNo url: '/pages/users/user_address_list/index?preOrderNo=' + this.preOrderNo+'&type='+0
}); });
}, },
realName: function(e) { realName: function(e) {

1456
pages/users/order_confirms/index.vue Normal file
View File

File diff suppressed because it is too large Load Diff

13
pages/users/order_list/index.vue
View File

@ -17,14 +17,19 @@
</view> </view>
</view> </view>
<view class='nav acea-row row-around'> <view class='nav acea-row row-around'>
<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)"> <view class='item' :class='orderStatus==10 ? "on": ""' @click="statusClick(10)">
<view>全部</view> <view>全部</view>
<view class='num'>{{orderData.orderCount || 0}}</view> <view class='num'>{{orderData.orderCount || 0}}</view>
</view> </view>
<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)">
<view>未支付</view>
<view class='num'>{{orderData.unPaidCount || 0}}</view>
</view>
<view class='item' :class='orderStatus==6 ? "on": ""' @click="statusClick(6)"> <view class='item' :class='orderStatus==6 ? "on": ""' @click="statusClick(6)">
<view>待审核</view> <view>待审核</view>
<view class='num'>{{orderData.notAuditCount || 0}}</view> <view class='num'>{{orderData.notAuditCount || 0}}</view>
</view> </view>
<view class='item' :class='orderStatus==7 ? "on": ""' @click="statusClick(7)"> <view class='item' :class='orderStatus==7 ? "on": ""' @click="statusClick(7)">
<view>待签约</view> <view>待签约</view>
<view class='num '>{{orderData.unsignedCount || 0}}</view> <view class='num '>{{orderData.unsignedCount || 0}}</view>
@ -76,8 +81,8 @@
</view> </view>
<view class='bottom acea-row row-right row-middle'> <view class='bottom acea-row row-right row-middle'>
<view class="bohui" v-if="item.status == -4">驳回原因:&nbsp;{{item.auditRejectReason}}</view> <view class="bohui" v-if="item.status == -4">驳回原因:&nbsp;{{item.auditRejectReason}}</view>
<!-- <view class='bnt bg_color' @click='goPay(item.payPrice,item.orderId)'>立即付款</view> --> <view class='bnt bg_color' v-if="item.orderStatus=='未支付'" @click='goPay(item.payPrice,item.orderId)'>立即付款</view>
<!-- <view class='bnt cancelBnt' v-if="item.status == 6 || item.status== 7" @click='cancelOrder(index,item.id)'>取消订单</view> --> <view class='bnt cancelBnt' v-if="item.status == 6 || item.status== 7" @click='cancelOrder(index,item.id)'>取消订单</view>
<view class='bnt bg_color' v-if="item.status==7" @click='lijiqy(item.orderId,item.id)'>立即签约 <view class='bnt bg_color' v-if="item.status==7" @click='lijiqy(item.orderId,item.id)'>立即签约
<!-- <view class='bnt bg_color' v-if="item.status==7" @click='lijiali()'>立即签约 --> <!-- <view class='bnt bg_color' v-if="item.status==7" @click='lijiali()'>立即签约 -->
</view> </view>
@ -151,7 +156,7 @@
loadTitle: '加载更多', //提示语 loadTitle: '加载更多', //提示语
orderList: [], //订单数组 orderList: [], //订单数组
orderData: {}, //订单详细统计 orderData: {}, //订单详细统计
orderStatus: 0, //订单状态 orderStatus: 10, //订单状态
page: 1, page: 1,
limit: 20, limit: 20,
payMode: [{ payMode: [{

3
pages/users/user_address/index.vue
View File

@ -433,7 +433,8 @@
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({ if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
title: '请输入正确的手机号码' title: '请输入正确的手机号码'
}); });
if (that.region == '省-市-区') return that.$util.Tips({ // console.log(that.region.toString(),'that.regionthat.region');
if (that.region.toString() == '省,市,区') return that.$util.Tips({
title: '请选择所在地区' title: '请选择所在地区'
}); });
if (!value.detail) return that.$util.Tips({ if (!value.detail) return that.$util.Tips({

21
pages/users/user_address_list/index.vue
View File

@ -99,7 +99,8 @@
secKill: false, //是否是秒杀 secKill: false, //是否是秒杀
theme: app.globalData.theme, theme: app.globalData.theme,
locationContent: '授权位置信息，提供完整服务', locationContent: '授权位置信息，提供完整服务',
locationStatus: false locationStatus: false,
type:0,
}; };
}, },
computed: mapGetters(['isLogin']), computed: mapGetters(['isLogin']),
@ -114,6 +115,8 @@
} }
}, },
onLoad(options) { onLoad(options) {
console.log(options,'optionsoptions');
this.type=options.type
if (this.isLogin) { if (this.isLogin) {
this.preOrderNo = options.preOrderNo || 0; this.preOrderNo = options.preOrderNo || 0;
this.getAddressList(true); this.getAddressList(true);
@ -378,10 +381,18 @@
}, },
goOrder: function(item) { goOrder: function(item) {
if (this.preOrderNo) { if (this.preOrderNo) {
uni.redirectTo({ if(this.type==0){
url: '/pages/users/order_confirm/index?is_address=1&preOrderNo=' + this.preOrderNo + uni.redirectTo({
'&addressId=' + item.id url: '/pages/users/order_confirm/index?is_address=1&preOrderNo=' + this.preOrderNo +
}) '&addressId=' + item.id
})
}else {
uni.redirectTo({
url: '/pages/users/order_confirms/index?is_address=1&preOrderNo=' + this.preOrderNo +
'&addressId=' + item.id
})
}
} }
}, },
}, },