From c64561457a9babbf90c59be119ad328e08441087 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Mon, 24 Jan 2022 16:50:55 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=98=E6=83=A0=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/myorder/usertion.vue | 37 ++++++++++------------- rc-busness/pages/personal/useraddress.vue | 2 +- rc-busness/pages/userlogin/edit.vue | 8 +++-- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index bb03cd94..ec033a2c 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}}
- - -
@@ -125,7 +120,7 @@ ￥{{usersalesAmount}}
- 再次购买 + 再次购买
@@ -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 { From 438f85e39828533d020a91c184958a6fb6d0c48a Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Mon, 24 Jan 2022 17:26:32 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=8F=AA=E8=AE=A9=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E6=9C=AA=E4=BD=BF=E7=94=A8=E5=87=BA=E7=8E=B0=E7=AB=8B?= =?UTF-8?q?=E5=8D=B3=E4=BD=BF=E7=94=A8=E7=9A=84=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/personal/discount.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue index cbf93649..21bcba0d 100644 --- a/rc-busness/pages/personal/discount.vue +++ b/rc-busness/pages/personal/discount.vue @@ -48,7 +48,7 @@ {{item.validFrom}}至 {{item.validTo}}
- +
立即使用
From 69c2664e21e96728882427f5e9b67fa1abb34da4 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Mon, 24 Jan 2022 17:41:52 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/myorder/usertion.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index ec033a2c..5a7e5d30 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -119,8 +119,8 @@ 合计金额: ￥{{usersalesAmount}}
-
- 再次购买 +
+ {{payorsucess}}
@@ -284,7 +284,6 @@ if(data){ this.usersalesAmount=this.goldmedal[i].salesAmount; this.addressUserName=this.goldmedal[i].addressUserName; this.addressPhoneNumber=this.goldmedal[i].addressPhoneNumber; - } console.log(this.goldmedal,this.userproductId,this.usersalesAmount); } @@ -295,7 +294,7 @@ if(data){ async getwei(user) { console.log(user); let userPayData = { - + userprice: this.usersalesAmount, orderId:this.orderNumber, userinformation:this.addressUserName + From de8d67fc511698d9cb8bf4050707db7ae70c27d0 Mon Sep 17 00:00:00 2001 From: Vion Date: Mon, 24 Jan 2022 18:01:51 +0800 Subject: [PATCH 04/14] Coupon flow refined --- rc-busness/assets/css/global.less | 13 +- rc-busness/assets/css/producted.less | 1 - rc-busness/assets/css/settlement.less | 5 + rc-busness/pages/personal/discount.vue | 1 - rc-busness/pages/personal/settlement.less | 23 ++- rc-busness/pages/personal/settlement.vue | 157 ++++++++++++++---- rc-busness/pages/personal/userpay.vue | 2 +- rc-busness/pages/productdetails/producted.vue | 88 ++++++---- 8 files changed, 215 insertions(+), 75 deletions(-) diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index 2e98aeac..27580841 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -4,12 +4,6 @@ body { line-height: 1.5; color: #666; } -div[data-js-modal-menu] { - display:none; -} -aside div[data-js-modal-menu] { - display:block; -} .el-message-box .el-button--primary{ background-color: #e1001a !important; color:#fff; @@ -532,7 +526,12 @@ picture { max-width: 768px; margin: 0 auto; } - + div[data-js-modal-menu] { + display:none; + } + aside div[data-js-modal-menu] { + display:block; + } html { font-size: 16px; } diff --git a/rc-busness/assets/css/producted.less b/rc-busness/assets/css/producted.less index 115ecc62..730a0bef 100644 --- a/rc-busness/assets/css/producted.less +++ b/rc-busness/assets/css/producted.less @@ -451,7 +451,6 @@ } span { font-size: 45px; - font-weight: bold; } strong { font-style: normal; diff --git a/rc-busness/assets/css/settlement.less b/rc-busness/assets/css/settlement.less index 12826929..07d11a18 100644 --- a/rc-busness/assets/css/settlement.less +++ b/rc-busness/assets/css/settlement.less @@ -236,6 +236,7 @@ color: #333333; font-style: normal; display: flex; justify-content: space-between; + align-items: baseline; span { font-size: 14px; @@ -251,6 +252,10 @@ color: #333333; } } } + .ts-right-arr { + line-height:1rem; + height:1.5rem; + } } diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue index 32045c60..c7dca958 100644 --- a/rc-busness/pages/personal/discount.vue +++ b/rc-busness/pages/personal/discount.vue @@ -231,6 +231,5 @@ import Myheader from "~/components/header.vue"; \ No newline at end of file diff --git a/rc-busness/pages/personal/settlement.less b/rc-busness/pages/personal/settlement.less index 925a5e72..fd3cbee5 100644 --- a/rc-busness/pages/personal/settlement.less +++ b/rc-busness/pages/personal/settlement.less @@ -8,7 +8,16 @@ ul li ol li em strong i { } .settlement { } - +.rc-merchandise { + li { + align-items: baseline; + } +} +.discountInfo { + i,em { + font-size:.875rem; + } +} .rc-discount { position: relative; width: 100%; @@ -38,7 +47,7 @@ ul li ol li em strong i { font-size: 12px; } span { - font-size: 26px; + font-size: 45px; } strong { font-style: normal; @@ -418,7 +427,7 @@ ul li ol li em strong i { justify-content: flex-end; flex-direction: column; align-items: self-end; - + text-align: right; i { font-style: normal; color: #333333; @@ -430,7 +439,15 @@ ul li ol li em strong i { font-style: normal; color: #e1001a; font-size: 26px; + display:inline-block; + width:5rem; } + + .discountInfo { + i,em { + font-size:1rem; + } + } span { display: block; diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index c5e1b587..64bb6eb1 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -88,8 +88,12 @@
+
+ 优惠金额: + {{ discountAmount }} +
合计金额: - {{ sumPrice }} + {{ discountedSumPrice }}
提交订单 @@ -147,7 +151,7 @@
- +
您还没有优惠券，可在商品的详情页面中领取
- -
-
-
- ￥{{ item.couponAmount }} -
-
-
- - {{ item.couponDesc }} - -
- 有效期 - {{ item.validTo }} -
-
- 立即使用 -
-
-
+ +
+
+
+ + ￥ + + + {{item.couponTypeId=='4'?parseInt(((item.discount)*10))+'折':item.couponAmount}} + +
+ {{ item.couponName }} +
+
+ + {{ item.couponName }} + +
+ 有效期 + {{item.validFrom}}至 + {{item.validTo}} +
+
+ 立即使用 +
+
+
@@ -201,6 +212,7 @@ export default { path:'/personal/settlement' } ], + usercolor:{color:'#e1001a'}, userimage: require("../../assets/image/unused.png"), curCoupon:{couponName:'未选择可用优惠券'}, drawlist:[], @@ -239,14 +251,71 @@ export default { promotion: "￥167.00", payment: "￥0.00 ", }, + discountAmount:0 }; }, computed: { - // 总价计算 - sumPrice() { - return this.goldmedal.reduce((pre, cur) => { - return pre + cur.buyCount * cur.productPrice; - }, 0); + sumPrice() { + return this.goldmedal.reduce((pre, cur) => { + return pre + cur.buyCount * cur.productPrice; + }, 0); + }, + // 折扣计算 + discountedSumPrice() { + let total = 0; + if(this.curCoupon.couponId) { + //Coupon Calculation + let couponUsed=false; + for(let itemInCart of this.goldmedal) { + if((!this.curCoupon.productCodes || this.curCoupon.productCodes.indexOf(itemInCart.productCode)>-1) && !couponUsed) { + if(this.curCoupon.minQuantity && this.curCoupon.minQuantity>itemInCart.buyCount) { + //Check minQuantity + total+=(itemInCart.buyCount * itemInCart.productPrice); + } else if(this.curCoupon.minPrice && this.curCoupon.minPrice > (itemInCart.buyCount * itemInCart.productPrice)) { + //Check minPrice + total+=(itemInCart.buyCount * itemInCart.productPrice); + } else { + //Into coupon discount calculation + switch(this.curCoupon.couponTypeId) { + case 1: //Amount deduct + total = total + (itemInCart.productPrice * itemInCart.buyCount - this.curCoupon.couponAmount); + this.discountAmount = this.curCoupon.couponAmount; + couponUsed=true; + break; + case 2: //Amount deduct with minPrice restriction + case 6: + total = total + (itemInCart.productPrice * itemInCart.buyCount) - this.curCoupon.couponAmount; + this.discountAmount = this.curCoupon.couponAmount; + couponUsed=true; + break; + case 3: //Limited product % discount + case 4: //% discount + total = total + (itemInCart.productPrice * itemInCart.buyCount) * (1-this.curCoupon.discount); + this.discountAmount = (itemInCart.productPrice * itemInCart.buyCount) * this.curCoupon.discount; + couponUsed=true; + break; + default: + total += itemInCart.productPrice * itemInCart.buyCount; + break; + } + //Into coupon discount calculation end + } + } else { + total += itemInCart.productPrice * itemInCart.buyCount; + } + } + } else { + //Normal Calculation + total=this.goldmedal.reduce((pre, cur) => { + return pre + cur.buyCount * cur.productPrice; + }, 0); + } + if(this.discountAmount) + this.discountAmount = this.discountAmount.toFixed(2); + if(!total) + total=0; + total = total.toFixed(2); + return total; }, }, methods: { @@ -278,14 +347,34 @@ export default { async userdraw(mobile) { let data = await getdraw(mobile); let _self = this; + let curTime = new Date().getTime(); + let valDateFromTime=0; + let valDateToTime=0; + let dateChecked=true; if (data) { - //TODO check status = 0 this.drawlist=[]; - data.data.forEach((item) => { - if(item.status==0) { - _self.drawlist.push(item); + for(let itemInCart of this.goldmedal) { + for(let myCoupon of data.data) { + valDateFromTime=0; + valDateToTime=0; + dateChecked=true; + if(myCoupon.fValidFrom) { + valDateFromTime = new Date(myCoupon.fValidFrom).getTime(); + } + if(myCoupon.fValidTo) { + valDateToTime = new Date(myCoupon.fValidTo).getTime(); + } + if(valDateFromTime && curTime < valDateFromTime) { + dateChecked=false; + } + if(valDateToTime && curTime > valDateToTime) { + dateChecked=false; + } + if(dateChecked && myCoupon.status == 0 && (myCoupon.productCodes.indexOf(itemInCart.productCode)>-1 || !myCoupon.productCodes)) { + _self.drawlist.push(myCoupon); + } } - }); + } } }, pickCoupon(item){ @@ -450,8 +539,8 @@ export default { let res = await generateOrderWX(postData); if (res.success) { let userPayData = { - orderId: res.data, - userprice: this.sumPrice, + orderId: res.data.orderNumber, + userprice: parseFloat(res.data.orderAmount).toFixed(2), userinformation: postData[0].orderAddress.addressUserName + " " + diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue index ae13d38d..156c1b67 100644 --- a/rc-busness/pages/personal/userpay.vue +++ b/rc-busness/pages/personal/userpay.vue @@ -19,7 +19,7 @@

付款金额:

-

￥{{ userPayData.userprice }}

+

￥{{ userPayData.userprice }}

收货信息:

diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 2d44eeda..a33cdc17 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -208,8 +208,8 @@
- -
您还没有优惠券，可在商品的详情页面中领取
+ +
目前还没有可用的优惠券
-
-
-
- ￥{{ item.couponAmount }} -
-
-
- - {{ item.couponDesc }} - -
- 有效期 - {{ item.validTo }} -
-
- 立即领取 -
-
-
+
+
+
+ + ￥ + + + {{item.couponTypeId=='4'?parseInt(((item.discount)*10))+'折':item.couponAmount}} + +
+ {{ item.couponName }} +
+
+ + {{ item.couponName }} + +
+ 有效期 + {{item.validFrom}}至 + {{item.validTo}} +
+
+ 立即领取 +
+
+
@@ -472,6 +479,7 @@ export default { userclose() { this.userlist = []; + this.dialogInfo1=false; }, async userquery() { let data = await goodsmessage(this.productCode); @@ -518,7 +526,7 @@ export default { let alllist = []; this.userlist = this.alldraw.data; this.userlist.forEach((element, index) => { - if (typeof element.productCodes == "string") { + if (typeof element.productCodes == "string" || !element.productCodes) { userlist.push(element); // let s=element.productCodes.split(','); // console.log(s.indexOf(this.productCode) != -1 ) @@ -527,12 +535,36 @@ export default { }); let menualist = []; userlist.filter((item) => { - item.productCodes = item.productCodes.split(","); - item.productCodes.forEach((element) => { - if (element == this.curItem.productCode && item.activityId !== 10) { - menualist.push(item); - } - }); + let valDateFromTime=0; + let valDateToTime=0; + let curTime = new Date().getTime(); + let dateChecked=true; + if(item.fValidFrom) { + valDateFromTime = new Date(item.fValidFrom).getTime(); + } + if(item.fValidTo) { + valDateToTime = new Date(item.fValidTo).getTime(); + } + if(valDateFromTime && curTime < valDateFromTime) { + dateChecked=false; + } + if(valDateToTime && curTime > valDateToTime) { + dateChecked=false; + } + if(dateChecked) { + if(!item.productCodes) { + menualist.push(item); + } else { + item.productCodes = item.productCodes.split(","); + item.productCodes.forEach((element) => { + if (element == this.curItem.productCode && item.activityId !== 10) { + menualist.push(item); + } + }); + } + } else { + //Expired coupons + } }); this.usernewlist = menualist; } From cab59567e8cebd4c61644db4380d65ff781d1db5 Mon Sep 17 00:00:00 2001 From: Vion Date: Mon, 24 Jan 2022 18:17:07 +0800 Subject: [PATCH 05/14] Coupon % calculation refined --- rc-busness/pages/personal/settlement.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index 64bb6eb1..65f1923a 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -290,8 +290,8 @@ export default { break; case 3: //Limited product % discount case 4: //% discount - total = total + (itemInCart.productPrice * itemInCart.buyCount) * (1-this.curCoupon.discount); - this.discountAmount = (itemInCart.productPrice * itemInCart.buyCount) * this.curCoupon.discount; + total = total + (itemInCart.productPrice * itemInCart.buyCount) * this.curCoupon.discount; + this.discountAmount = (itemInCart.productPrice * itemInCart.buyCount) * ( 1 - this.curCoupon.discount); couponUsed=true; break; default: From a2a6ca14bd019102b47aada5a0d251a3b02a027c Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Mon, 24 Jan 2022 19:29:33 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/assets/css/global.less | 4 + rc-busness/assets/css/usertion.less | 234 +++++++----- rc-busness/pages/myorder/usertion.vue | 498 +++++++++++++------------- rc-busness/static/images/delivery.png | Bin 0 -> 4984 bytes 4 files changed, 415 insertions(+), 321 deletions(-) create mode 100644 rc-busness/static/images/delivery.png diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index f9ca05fc..cd1b7348 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -10,6 +10,7 @@ body { border:unset; } + .rc-menu--xs .rc-screen-reader{ left:28%; } @@ -141,6 +142,9 @@ picture { margin-left: auto; margin-right: auto; } +.useruantity{ + margin: 1rem 1.25rem; +} .ts-remove { text-decoration: line-through; diff --git a/rc-busness/assets/css/usertion.less b/rc-busness/assets/css/usertion.less index e337189e..3b51b56d 100644 --- a/rc-busness/assets/css/usertion.less +++ b/rc-busness/assets/css/usertion.less @@ -2,8 +2,110 @@ ul li ol li em strong i { list-style: none; font-style: normal; } + .rc-main{ + margin: 0; + padding: 0; + } //手机端 @media screen and (max-width: 768px) { + .online{ + margin: 0; + &.bold{ + height: 0.5rem; + } + } + // 订单状态 + .rc-receiving { + width: 100%; + display: flex; + align-items: center; + // margin: 1rem 1.25rem; + em { + font-style: normal; + color: #e1001a; + font-size: 1.375rem; + font-weight: bold; + } + span { + color: #666666; + font-size: 0.875rem; + display: block; + margin-left: 1.125rem; + width: 62%; + margin-top: 0.5rem; + + } + } + //快递列表 + .delivery { + display: flex; + flex-direction: column; + margin: 1rem 1.25rem; + .to-delivery { + img{ + width: 1rem; + height: 1rem; + object-fit: contain; + } + display: flex; + align-items: center; + font-style: normal; + span { + display: block; + margin-left: 0.18rem; + color: #333333; + font-size: 1rem; + font-weight: 500; + } + i { + font-style: normal; + margin-left: 0.5rem; + display: block; + color: #999999; + font-size: 0.75rem; + margin-top: 0.31rem; + } + } + .bo-delivery { + span { + font-size: 0.87rem; + color: #666666; + display: block; + margin-top: 0.5rem; + } + } + } + //地址列表 + .mypersonal{ + .my-delivery { + display: flex; + align-items: center; + font-style: normal; + span { + display: block; + font-size: 0.87rem; + color: #333333; + } + i { + font-style: normal; + display: block; + font-size: 0.87rem; + color: #333333; + margin-left: .5rem; + } + } + .per-delivery { + span { + font-size:0.875rem; + color: #666666; + display: block; + margin-top: 0.43rem; + } + } + } + + + .rc-margin-y--md{ width: 100%; height: 80px; @@ -39,83 +141,7 @@ margin-right: 20px; .rc-foo{ display: none; } - .rc-receiving { - width: 100%; - height: 80px; - display: flex; - align-items: center; - em { - font-style: normal; - color: #e1001a; - font-size: 22px; - font-weight: bold; - } - span { - color: #666666; - font-size: 12px; - display: block; - margin-left: 18px; - width: 62%; - - } - } - .delivery { - display: flex; - flex-direction: column; - height: 80px; - .to-delivery { - display: flex; - align-items: center; - font-style: normal; - span { - display: block; - margin-left: 3px; - } - i { - font-style: normal; - margin-left: 8px; - display: block; - } - } - .bo-delivery { - span { - font-size: 14px; - - color: #666666; - display: block; - margin-top: 8px; - } - } - } - - .mypersonal { - display: flex; - flex-direction: column; - height: 80px; - .my-delivery { - display: flex; - align-items: center; - font-style: normal; - span { - display: block; - margin-left: 3px; - } - i { - font-style: normal; - margin-left: 8px; - display: block; - } - } - .per-delivery { - span { - font-size: 14px; - - color: #666666; - display: block; - margin-top: 8px; - } - } - } + .rc-usermain { display: flex; @@ -207,14 +233,16 @@ margin-right: 20px; .rc-merchandise { width: 100%; - margin-top: 32px; + margin-top: 24px; + padding-right: 0.7rem; + padding-left: 0.7rem; ul { width: 100%; display: flex; flex-direction: column; justify-content: space-between; - line-height: 26px; + line-height: 30px; i { font-style: normal; color: #666666; @@ -240,10 +268,15 @@ margin-right: 20px; } } } + .useruantity{ + padding-right: 20px; + } } .rc-payment{ + padding-right: 0.7rem; + padding-left: 0.7rem; width: 100%; margin-top: 32px; .u-trackingnumber{ @@ -294,6 +327,48 @@ margin-right: 20px; //pc端 @media screen and (min-width: 768px) and (max-width: 1920px) { + + //快递列表 + .delivery { + display: flex; + flex-direction: column; + margin: 1rem 1.25rem; + .to-delivery { + margin-top: 20px; + img{ + width: 24px; + height: 24px; + object-fit: contain; + } + display: flex; + align-items: center; + font-style: normal; + span { + display: block; + margin-left: 16px; + color: #333333; + font-size: 18px; + font-weight: 500; + } + i { + font-style: normal; + margin-left: 0.5rem; + display: block; + color: #999999; + font-size: 0.75rem; + margin-top: 0.31rem; + } + } + .bo-delivery { + margin-top: 16px; + span { + font-size: 0.87rem; + color: #666666; + display: block; + margin-top: 16px; + } + } + } .rc-margin-y--md{ display: none; } @@ -329,7 +404,6 @@ margin-right: 20px; .delivery { display: flex; flex-direction: column; - height: 140px; display: flex; justify-content: center; .viewdetails{ diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index 5a7e5d30..e066f05e 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -2,40 +2,65 @@
-
-
- {{item.status=='0'?'待付款':item.status=='1'?'待收货':item.status=='2'?'已完成':item.status=='3'?'已取消':'异常订单'}} - {{orderstatus}} +
+
+
+
+ {{ + item.status == "0" + ? "待付款" + : item.status == "1" + ? "待收货" + : item.status == "2" + ? "已完成" + : item.status == "3" + ? "已取消" + : "异常订单" + }} + {{ orderstatus }} +
+
+
+
+
+ + {{ trackingstates }} +
- -
-
- {{ trackingstates}} -
-
- {{ logisticsCompany }} -
-
- 查看详情 - -
+
+ +
-
-
- {{ item.addressUserName }} - {{ item.addressPhoneNumber }} -
-
- {{ item.addressProvinceName }}{{item.addressCityName}}{{item.addressCountyName}} -
+
+ 查看详情 +
-
+
+
+
+
+
+ {{ item.addressUserName }} + {{ item.addressPhoneNumber }} +
+
+ {{ item.addressProvinceName }}{{ item.addressCityName + }}{{ item.addressCountyName }} +
+
+
+
-
+
- +
@@ -47,13 +72,13 @@
数量:{{ userlist.pcs }}件 ￥{{ userlist.ecPrice }} -
- {{customer}} -
+
+ {{ customer }} +
+
+
+ {{ customer }}
-
- {{customer}} -
+
-
+
+
  • 商品总价: @@ -82,8 +109,10 @@
+
-
+
+
  • 订单编号:: @@ -104,271 +133,259 @@
  • 快递单号:
    - {{ logisticsNumber }} - - -
    + {{ logisticsNumber }} + +
-
-
+
合计金额: - ￥{{usersalesAmount}} -
-
- {{payorsucess}} -
+ ￥{{ usersalesAmount }} +
+
+ {{ payorsucess }} +
- -
-
- - {{payorsucess}} - +
+
+
+ + {{ payorsucess }} + +
-
- - +