diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index bb03cd94..5a7e5d30 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -3,10 +3,11 @@
-
+
{{item.status=='0'?'待付款':item.status=='1'?'待收货':item.status=='2'?'已完成':item.status=='3'?'已取消':'异常订单'}} {{orderstatus}}
+
{{ trackingstates}} @@ -19,23 +20,17 @@
-
- {{ datddress.recipient }} - {{ datddress.recipientPhone }} + {{ item.addressUserName }} + {{ item.addressPhoneNumber }}
- {{ datddress.provinceName }}{{datddress.cityName}}{{datddress.districtName}}{{datddress.detailAddress}} + {{ item.addressProvinceName }}{{item.addressCityName}}{{item.addressCountyName}}
- - -
@@ -124,8 +119,8 @@ 合计金额: ¥{{usersalesAmount}}
-
- 再次购买 +
+ {{payorsucess}}
@@ -159,6 +154,7 @@ export default { goldmedal:[], userproductId:'', logisticsDate:'', + addressPhoneNumber:'', userphone:'', logisticsNumber:'', customer:'',//联系客服或者取消订单 @@ -168,6 +164,7 @@ export default { logisticsCompany:'',//物流公司 orderstatus: '', goldastates:'', + userisdelivery:'待收货', userdelivery: "派送中", isshow:true, @@ -241,11 +238,11 @@ userpay(){ } }, //订单支付和再次购买 - onceagain(){ + onceagain(item){ console.log(this.payorsucess); if(this.payorsucess=='立即支付'){ console.log('----') - this.getwei(); + this.getwei(item); }else{ this.$router.push({ @@ -268,6 +265,7 @@ if(data){ console.log(this.goldmedal); for(let i=0;i{{item.validFrom}}至 {{item.validTo}}
- +
立即使用
diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index ec4d4a9b..c040c485 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -320,7 +320,7 @@ export default { this.useralllist[i].orderNumber = this.goldmedal[i].orderNumber; this.useralllist[i].status = this.goldmedal[i].status; this.useralllist[i].addressUserName = this.goldmedal[i].addressUserName; - this.useralllist[i].phoneNumber = this.goldmedal[i].phoneNumber; + this.useralllist[i].phoneNumber = this.goldmedal[i].addressPhoneNumber; this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount; // this.useralllist[i].picFile = this.goldmedal[i].picFile; //图片路径 // this.useralllist[i].productName=this.goldmedal[i].productName;//商品名称 diff --git a/rc-busness/pages/userlogin/edit.vue b/rc-busness/pages/userlogin/edit.vue index fb692516..82a4ec31 100644 --- a/rc-busness/pages/userlogin/edit.vue +++ b/rc-busness/pages/userlogin/edit.vue @@ -256,10 +256,14 @@ export default { else{ //let user= JSON.parse(localStorage.getItem("userInfo")); let data = await this.vadmsg(); - if(data.code=="1") + console.log(data.code) + if(data.code=1) { + console.log('---'); data=await useredit(this.tel); - if(data.code=='1'){ + console.log(this.tel); + console.log(data); + if(data.code=1){ let couponId='0000000123'; this.serdiscount(this.tel,couponId); setTimeout(() => {