|
@@ -302,10 +302,28 @@ export default {
|
|
|
userinfo({}).then(({ data }) => {
|
|
|
let ob = this;
|
|
|
ob.integralAll = data.integral;
|
|
|
- // 保存默认提货人姓名
|
|
|
- ob.pickUpInfo.real_name = data.nickname;
|
|
|
- // 保存默认提货人手机号
|
|
|
- ob.pickUpInfo.phone = data.phone;
|
|
|
+ // 保存默认提货人姓名
|
|
|
+ // #ifdef MP-WEIXIN
|
|
|
+ let fsm = wx.getFileSystemManager();
|
|
|
+ fsm.readFile({
|
|
|
+ filePath: wx.env.USER_DATA_PATH + '/zt.json',
|
|
|
+ encoding: 'utf8',
|
|
|
+ success:(res)=> {
|
|
|
+ let user = JSON.parse(res.data)
|
|
|
+ ob.pickUpInfo.real_name = user.name
|
|
|
+ ob.pickUpInfo.phone = user.phone
|
|
|
+ },
|
|
|
+ fail:(err)=> {
|
|
|
+ if(data.nickname) {
|
|
|
+ ob.pickUpInfo.real_name = data.nickname;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ // #endif
|
|
|
+ // #ifdef H5
|
|
|
+ ob.pickUpInfo.real_name = uni.getStorageSync('real_name') || data.nickname
|
|
|
+ ob.pickUpInfo.phone = uni.getStorageSync('phone') || ''
|
|
|
+ // #endif
|
|
|
});
|
|
|
},
|
|
|
// 计算支付金额
|
|
@@ -367,17 +385,18 @@ export default {
|
|
|
let obj = this;
|
|
|
confirm({ cartId: obj.cartId+'' }).then(({ data }) => {
|
|
|
console.log(data,'123456');
|
|
|
- obj.addressData = data.addressInfo || {};
|
|
|
+ obj.addressData = data.addressInfo || {};
|
|
|
obj.shopList = data.cartInfo; //商品列表
|
|
|
obj.moneyAll = data.priceGroup; //金额数据
|
|
|
obj.orderKey = data.orderKey; //订单key
|
|
|
// (obj.system_store = data.system_store), //到店自提列表
|
|
|
obj.shopAddress = data.system_store //选中的地址
|
|
|
obj.desc = data.desc
|
|
|
- // 计算金额
|
|
|
+ // 计算金额
|
|
|
this.payMoneyNub();
|
|
|
// 加载优惠券
|
|
|
- obj.couponsOrder(data.priceGroup.totalPrice);
|
|
|
+ obj.couponsOrder(data.priceGroup.totalPrice);
|
|
|
+
|
|
|
});
|
|
|
},
|
|
|
// 购买数量变化
|
|
@@ -410,7 +429,29 @@ export default {
|
|
|
}
|
|
|
obj.addressData.real_name = obj.pickUpInfo.real_name;
|
|
|
obj.addressData.phone = obj.pickUpInfo.phone;
|
|
|
- }
|
|
|
+ }
|
|
|
+ // #ifdef MP-WEIXIN
|
|
|
+ let fsm = wx.getFileSystemManager();
|
|
|
+ let bb = {
|
|
|
+ phone: obj.addressData.phone,
|
|
|
+ name: obj.addressData.real_name,
|
|
|
+ }
|
|
|
+ fsm.writeFile({
|
|
|
+ filePath: wx.env.USER_DATA_PATH + '/zt.json',
|
|
|
+ data: JSON.stringify(bb),
|
|
|
+ encoding: 'utf8',
|
|
|
+ success:(res)=> {
|
|
|
+ console.log(res);
|
|
|
+ },
|
|
|
+ fail:(err) => {
|
|
|
+ console.log(err)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ // #endif
|
|
|
+ // #ifdef H5
|
|
|
+ uni.setStorageSync('real_name',obj.addressData.real_name)
|
|
|
+ uni.setStorageSync('phone',obj.addressData.phone)
|
|
|
+ // #endif
|
|
|
let url = '/pages/money/pay?key='+ this.orderKey + '&isVip=' + this.isVip
|
|
|
if(this.pinkid){
|
|
|
url += '&pinkid='+this.pinkid
|