正在显示
2 个修改的文件
包含
86 行增加
和
88 行删除
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | <u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" inactive-color="#969799" active-color="#000000" | 4 | <u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" inactive-color="#969799" active-color="#000000" |
5 | bar-width="90" bar-height="3" gutter="56" :current="Tabcurrent" @change="change"></u-tabs-swiper> | 5 | bar-width="90" bar-height="3" gutter="56" :current="Tabcurrent" @change="change"></u-tabs-swiper> |
6 | </view> | 6 | </view> |
7 | - <view v-if="orderstate"> | 7 | + <view v-if="orderList[0].length > 0"> |
8 | <swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" > | 8 | <swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" > |
9 | <swiper-item class="swiper-item"> | 9 | <swiper-item class="swiper-item"> |
10 | <scroll-view scroll-y style="height: 100%;width: 100%;" > | 10 | <scroll-view scroll-y style="height: 100%;width: 100%;" > |
@@ -485,7 +485,7 @@ | @@ -485,7 +485,7 @@ | ||
485 | tabsHeight: 0, | 485 | tabsHeight: 0, |
486 | dx: 0, | 486 | dx: 0, |
487 | orderstateText: '', | 487 | orderstateText: '', |
488 | - orderstate:true, //判断订单是否为空 | 488 | + // orderstate:true, //判断订单是否为空 |
489 | orderList: [ | 489 | orderList: [ |
490 | [], | 490 | [], |
491 | [], | 491 | [], |
@@ -501,11 +501,10 @@ | @@ -501,11 +501,10 @@ | ||
501 | self.Getdata(); | 501 | self.Getdata(); |
502 | // this.readorderlist(); | 502 | // this.readorderlist(); |
503 | // this.tidydata(); | 503 | // this.tidydata(); |
504 | - | ||
505 | }, | 504 | }, |
506 | onShow() { | 505 | onShow() { |
507 | self.Getdata() | 506 | self.Getdata() |
508 | - self.isorderstate() | 507 | + // self.isorderstate() |
509 | }, | 508 | }, |
510 | onPullDownRefresh(){ | 509 | onPullDownRefresh(){ |
511 | self.Getdata(); | 510 | self.Getdata(); |
@@ -517,7 +516,8 @@ | @@ -517,7 +516,8 @@ | ||
517 | watch:{ | 516 | watch:{ |
518 | bug(a,b){ | 517 | bug(a,b){ |
519 | self.$rqs('/api/order/index',{status:1}).then(res=>{ | 518 | self.$rqs('/api/order/index',{status:1}).then(res=>{ |
520 | - let updata = res.data.data.data; | 519 | + // let updata = res.data.data.data; |
520 | + let updata = res.data.data; | ||
521 | // if(updata == undefined){ | 521 | // if(updata == undefined){ |
522 | // updata = res.data.data; | 522 | // updata = res.data.data; |
523 | // } | 523 | // } |
@@ -541,15 +541,15 @@ | @@ -541,15 +541,15 @@ | ||
541 | status:0 | 541 | status:0 |
542 | } | 542 | } |
543 | self.$rqs('/api/order/index',par).then((res)=>{ | 543 | self.$rqs('/api/order/index',par).then((res)=>{ |
544 | - console.log(`index`,res); | 544 | + // console.log(`index`,res); |
545 | // console.log('myorder__res',res.data.data); | 545 | // console.log('myorder__res',res.data.data); |
546 | self.orderList= [[],[],[],[],[]]; | 546 | self.orderList= [[],[],[],[],[]]; |
547 | - let indexData = res.data.data.data; | 547 | + // let indexData = res.data.data.data; |
548 | + let indexData = res.data.data; | ||
548 | // if(indexData == undefined){ | 549 | // if(indexData == undefined){ |
549 | // indexData = res.data.data; | 550 | // indexData = res.data.data; |
550 | // } | 551 | // } |
551 | self.orderList[0] = indexData; | 552 | self.orderList[0] = indexData; |
552 | - console.dir(self.orderList[0]); | ||
553 | self.orderList[0].forEach((item,index)=>{ | 553 | self.orderList[0].forEach((item,index)=>{ |
554 | if(item.order_status == 1 || item.order_status == 11){ | 554 | if(item.order_status == 1 || item.order_status == 11){ |
555 | self.orderList[1].push(item) | 555 | self.orderList[1].push(item) |
@@ -565,7 +565,6 @@ | @@ -565,7 +565,6 @@ | ||
565 | } | 565 | } |
566 | }) | 566 | }) |
567 | self.$forceUpdate() | 567 | self.$forceUpdate() |
568 | - | ||
569 | }) | 568 | }) |
570 | }, | 569 | }, |
571 | suregoods(e){ | 570 | suregoods(e){ |
@@ -658,10 +657,10 @@ | @@ -658,10 +657,10 @@ | ||
658 | this.swiperCurrent = current; | 657 | this.swiperCurrent = current; |
659 | this.current = current; | 658 | this.current = current; |
660 | }, | 659 | }, |
661 | - isorderstate(){ | ||
662 | - // 判断订单状态有没有 | ||
663 | - this.orderList[0].length == 0 ? this.orderstate = false:this.orderstate = true | ||
664 | - } | 660 | + // isorderstate(){ |
661 | + // // 判断订单状态有没有 | ||
662 | + // this.orderList[0].length == 0 ? this.orderstate = false:this.orderstate = true | ||
663 | + // } | ||
665 | 664 | ||
666 | } | 665 | } |
667 | } | 666 | } |
1 | <template> | 1 | <template> |
2 | <view class="containerwys" style="padding-top: 332rpx;"> | 2 | <view class="containerwys" style="padding-top: 332rpx;"> |
3 | - <view style="height: 310rpx; width: 100%;margin-bottom: 24rpx; z-index: 100;" class="fixed top0 left0"> | 3 | + <view style="height: 310rpx; width: 100%;margin-bottom: 24rpx; z-index: 100;" class="fixed top0 left0" v-if="datas"> |
4 | <view class="headinforshow"> | 4 | <view class="headinforshow"> |
5 | 5 | ||
6 | - <view class="headinforshowtext" v-if="data.order_status=='1'"> | 6 | + <view class="headinforshowtext" v-if="datas.order_status=='1'"> |
7 | 待支付 | 7 | 待支付 |
8 | </view> | 8 | </view> |
9 | - <view class="headinforshowtext" v-if="data.order_status=='2'"> | 9 | + <view class="headinforshowtext" v-if="datas.order_status=='2'"> |
10 | 待发货 | 10 | 待发货 |
11 | </view> | 11 | </view> |
12 | - <view class="headinforshowtext" v-if="data.order_status=='3'"> | 12 | + <view class="headinforshowtext" v-if="datas.order_status=='3'"> |
13 | 待收货 | 13 | 待收货 |
14 | </view> | 14 | </view> |
15 | - <view class="headinforshowtext" v-if="data.order_status=='4'"> | 15 | + <view class="headinforshowtext" v-if="datas.order_status=='4'"> |
16 | 已完成 | 16 | 已完成 |
17 | </view> | 17 | </view> |
18 | - <view class="headinforshowtext" v-if="data.order_status=='21'"> | 18 | + <view class="headinforshowtext" v-if="datas.order_status=='21'"> |
19 | 后台审核中 | 19 | 后台审核中 |
20 | </view> | 20 | </view> |
21 | - <view class="headinforshowtext" v-if="data.order_status== '11'"> | 21 | + <view class="headinforshowtext" v-if="datas.order_status== '11'"> |
22 | 已取消 | 22 | 已取消 |
23 | </view> | 23 | </view> |
24 | - <view class="headinforshowtext" v-if="data.order_status == `21`&&data.refund_status==`1`"> | 24 | + <view class="headinforshowtext" v-if="datas.order_status == `21`&&datas.refund_status==`1`"> |
25 | 退款成功 | 25 | 退款成功 |
26 | </view> | 26 | </view> |
27 | 27 | ||
28 | - <view class="detailsText1" v-show="data.order_status == '1'"> | 28 | + <view class="detailsText1" v-show="datas.order_status == '1'"> |
29 | <view class="lasttime"> | 29 | <view class="lasttime"> |
30 | 剩余支付时间 | 30 | 剩余支付时间 |
31 | </view> | 31 | </view> |
32 | 32 | ||
33 | <u-count-down class="counttime" ref="uCountDown" :autoplay='false' font-size="22" | 33 | <u-count-down class="counttime" ref="uCountDown" :autoplay='false' font-size="22" |
34 | - :timestamp="data.countdown" :show-days="false" :show-hours="false" @change="gettimedown"> | 34 | + :timestamp="datas.countdown" :show-days="false" :show-hours="false" @change="gettimedown"> |
35 | </u-count-down> | 35 | </u-count-down> |
36 | <view class="lasttime1"> | 36 | <view class="lasttime1"> |
37 | 逾期自动取消 | 37 | 逾期自动取消 |
@@ -41,34 +41,34 @@ | @@ -41,34 +41,34 @@ | ||
41 | <view class="addressinfor" style="transform: translateY(-2rpx);"> | 41 | <view class="addressinfor" style="transform: translateY(-2rpx);"> |
42 | <image src="/static/order/addressIcon.png" mode="widthFix"></image> | 42 | <image src="/static/order/addressIcon.png" mode="widthFix"></image> |
43 | <view class="addressinfortext"> | 43 | <view class="addressinfortext"> |
44 | - {{data.sh_address}} | 44 | + {{datas.sh_address}} |
45 | </view> | 45 | </view> |
46 | <view class="inforname"> | 46 | <view class="inforname"> |
47 | <text class="name" v-cloak> | 47 | <text class="name" v-cloak> |
48 | - {{data.sh_name}} | 48 | + {{datas.sh_name}} |
49 | </text> | 49 | </text> |
50 | <text class="phonenumber" v-cloak> | 50 | <text class="phonenumber" v-cloak> |
51 | - {{data.sh_mobile}} | 51 | + {{datas.sh_mobile}} |
52 | </text> | 52 | </text> |
53 | </view> | 53 | </view> |
54 | </view> | 54 | </view> |
55 | </view> | 55 | </view> |
56 | <view> | 56 | <view> |
57 | - <view class="neworderComm" v-if="data.order_status == '3'"> | ||
58 | - <image :src="data.goods_detail[0].image"></image> | 57 | + <view class="neworderComm" v-if="datas.order_status == '3'"> |
58 | + <image :src="datas.goods_detail[0].image"></image> | ||
59 | <view class="orderCommtext" v-cloak> | 59 | <view class="orderCommtext" v-cloak> |
60 | - {{data.goods_detail[0].goods_name}} | 60 | + {{datas.goods_detail[0].goods_name}} |
61 | </view> | 61 | </view> |
62 | <view class="smell" v-cloak> | 62 | <view class="smell" v-cloak> |
63 | - {{data.goods_specc[0].spec_value}} | ||
64 | - {{data.goods_specc[1].spec_value}} | ||
65 | - {{data.goods_specc[2].spec_value}} | 63 | + {{datas.goods_specc[0].spec_value}} |
64 | + {{datas.goods_specc[1].spec_value}} | ||
65 | + {{datas.goods_specc[2].spec_value}} | ||
66 | </view> | 66 | </view> |
67 | <view class="orderspnumberv-cloak"> | 67 | <view class="orderspnumberv-cloak"> |
68 | - X{{data.goods_detail[0].total_num}} | 68 | + X{{datas.goods_detail[0].total_num}} |
69 | </view> | 69 | </view> |
70 | <view class="price" v-cloak> | 70 | <view class="price" v-cloak> |
71 | - ¥{{data.total_price}} | 71 | + ¥{{datas.total_price}} |
72 | </view> | 72 | </view> |
73 | <view style="position: absolute; width: 168rpx; height: 64rpx;border:1rpx solid #D6D6D6; | 73 | <view style="position: absolute; width: 168rpx; height: 64rpx;border:1rpx solid #D6D6D6; |
74 | color: #D1D1D1; line-height: 64rpx; text-align: center; top: 236rpx;right: 34rpx; | 74 | color: #D1D1D1; line-height: 64rpx; text-align: center; top: 236rpx;right: 34rpx; |
@@ -77,20 +77,20 @@ | @@ -77,20 +77,20 @@ | ||
77 | </view> | 77 | </view> |
78 | </view> | 78 | </view> |
79 | <view class="orderComm" v-else> | 79 | <view class="orderComm" v-else> |
80 | - <image :src="data.goods_detail[0].image"></image> | 80 | + <image :src="datas.goods_detail[0].image"></image> |
81 | <view class="orderCommtext" v-cloak> | 81 | <view class="orderCommtext" v-cloak> |
82 | - {{data.goods_detail[0].goods_name}} | 82 | + {{datas.goods_detail[0].goods_name}} |
83 | </view> | 83 | </view> |
84 | <view class="smell" v-cloak> | 84 | <view class="smell" v-cloak> |
85 | - {{data.goods_specc[0].spec_value}} | ||
86 | - {{data.goods_specc[1].spec_value}} | ||
87 | - {{data.goods_specc[2].spec_value}} | 85 | + {{datas.goods_specc[0].spec_value}} |
86 | + {{datas.goods_specc[1].spec_value}} | ||
87 | + {{datas.goods_specc[2].spec_value}} | ||
88 | </view> | 88 | </view> |
89 | <view class="orderspnumber" v-cloak> | 89 | <view class="orderspnumber" v-cloak> |
90 | - X{{data.goods_detail[0].total_num}} | 90 | + X{{datas.goods_detail[0].total_num}} |
91 | </view> | 91 | </view> |
92 | <view class="price" v-cloak> | 92 | <view class="price" v-cloak> |
93 | - ¥{{data.total_price}} | 93 | + ¥{{datas.total_price}} |
94 | </view> | 94 | </view> |
95 | 95 | ||
96 | </view> | 96 | </view> |
@@ -127,7 +127,7 @@ | @@ -127,7 +127,7 @@ | ||
127 | </view> | 127 | </view> |
128 | </u-popup> | 128 | </u-popup> |
129 | </view> | 129 | </view> |
130 | - <!-- <dill :user_coupon_id='data.user_coupon_id' :total_price='total_price' :coupon_price='data.coupon_price' /> --> | 130 | + <!-- <dill :user_coupon_id='datas.user_coupon_id' :total_price='total_price' :coupon_price='datas.coupon_price' /> --> |
131 | <view class="dillbox"> | 131 | <view class="dillbox"> |
132 | <view> | 132 | <view> |
133 | <view class="row"> | 133 | <view class="row"> |
@@ -135,7 +135,7 @@ | @@ -135,7 +135,7 @@ | ||
135 | 商品总价 | 135 | 商品总价 |
136 | </view> | 136 | </view> |
137 | <view class="price" v-cloak> | 137 | <view class="price" v-cloak> |
138 | - ¥{{data.total_price}} | 138 | + ¥{{datas.total_price}} |
139 | </view> | 139 | </view> |
140 | </view> | 140 | </view> |
141 | <view class="row" v-if="true"> | 141 | <view class="row" v-if="true"> |
@@ -146,28 +146,28 @@ | @@ -146,28 +146,28 @@ | ||
146 | -¥19 | 146 | -¥19 |
147 | </view> | 147 | </view> |
148 | </view> | 148 | </view> |
149 | - <view class="row" v-if="true"> | 149 | + <view class="row" v-if="datas.user_coupon_id.length > 0"> |
150 | <view class="text1"> | 150 | <view class="text1"> |
151 | 店铺优惠券 | 151 | 店铺优惠券 |
152 | </view> | 152 | </view> |
153 | <view class="price1" v-cloak> | 153 | <view class="price1" v-cloak> |
154 | - -¥{{data.user_coupon_id[0].price}} | 154 | + -¥{{datas.user_coupon_id[0].price}} |
155 | </view> | 155 | </view> |
156 | </view> | 156 | </view> |
157 | - <view class="row" v-if="true"> | 157 | + <view class="row" v-if="datas.user_coupon_id[1]"> |
158 | <view class="text1" v-cloak> | 158 | <view class="text1" v-cloak> |
159 | - {{data.user_coupon_id[1].name}} | 159 | + {{datas.user_coupon_id[1].name}} |
160 | </view> | 160 | </view> |
161 | <view class="price1" v-cloak> | 161 | <view class="price1" v-cloak> |
162 | - -¥{{data.user_coupon_id[1].price}} | 162 | + -¥{{datas.user_coupon_id[1].price}} |
163 | </view> | 163 | </view> |
164 | </view> | 164 | </view> |
165 | - <view class="row" v-if="true"> | 165 | + <view class="row" v-if="datas.user_coupon_id[2]"> |
166 | <view class="text1" v-cloak> | 166 | <view class="text1" v-cloak> |
167 | - {{data.user_coupon_id[2].name}} | 167 | + {{datas.user_coupon_id[2].name}} |
168 | </view> | 168 | </view> |
169 | <view class="price1"> | 169 | <view class="price1"> |
170 | - -¥{{data.user_coupon_id[2].price}} | 170 | + -¥{{datas.user_coupon_id[2].price}} |
171 | </view> | 171 | </view> |
172 | </view> | 172 | </view> |
173 | </view> | 173 | </view> |
@@ -182,25 +182,25 @@ | @@ -182,25 +182,25 @@ | ||
182 | <view class="line1"></view> | 182 | <view class="line1"></view> |
183 | <view class="row" style="display: flex;"> | 183 | <view class="row" style="display: flex;"> |
184 | <view style="width: 220rpx; height: 40rpx;line-height: 72rpx;text-align: right; flex: 1;"> | 184 | <view style="width: 220rpx; height: 40rpx;line-height: 72rpx;text-align: right; flex: 1;"> |
185 | - 实付款:<view style="color: #ee0f5d; display: inline-block;">¥{{data.coupon_price}}</view> | 185 | + 实付款:<view style="color: #ee0f5d; display: inline-block;">¥{{datas.coupon_price}}</view> |
186 | </view> | 186 | </view> |
187 | </view> | 187 | </view> |
188 | </view> | 188 | </view> |
189 | - <!-- <LogisticsInfor :receipt_time='receipt_time' :freight_time='freight_time' :sinNum='q' :order_no='data.order_no' :express_no='data.express_no' :express_company='express_company' :remark='data.remark'/> --> | 189 | + <!-- <LogisticsInfor :receipt_time='receipt_time' :freight_time='freight_time' :sinNum='q' :order_no='datas.order_no' :express_no='datas.express_no' :express_company='express_company' :remark='datas.remark'/> --> |
190 | <!-- 物流信息组件 --> | 190 | <!-- 物流信息组件 --> |
191 | <view class="box"> | 191 | <view class="box"> |
192 | - <view class="row1 public" v-if="data.order_status !=1"> | 192 | + <view class="row1 public" v-if="datas.order_status !=1"> |
193 | <view class="sinNumText">快递单号</view> | 193 | <view class="sinNumText">快递单号</view> |
194 | - <view class="sinNum" v-cloak>{{data.express_no}}</view> | ||
195 | - <view class="Copy" @click="$clickCopy(data.express_no)">复制</view> | 194 | + <view class="sinNum" v-cloak>{{datas.express_no}}</view> |
195 | + <view class="Copy" @click="$clickCopy(datas.express_no)">复制</view> | ||
196 | </view> | 196 | </view> |
197 | <view class="row2 public"> | 197 | <view class="row2 public"> |
198 | <view class="sinNumText">订单编号</view> | 198 | <view class="sinNumText">订单编号</view> |
199 | - <view class="sinNum" v-cloak>{{data.order_no}}</view> | 199 | + <view class="sinNum" v-cloak>{{datas.order_no}}</view> |
200 | </view> | 200 | </view> |
201 | - <view class="row3 public" v-if="data.order_status !=1"> | 201 | + <view class="row3 public" v-if="datas.order_status !=1"> |
202 | <view class="sinNumText">快递公司</view> | 202 | <view class="sinNumText">快递公司</view> |
203 | - <view class="sinNum" v-cloak>{{data.express_company}}</view> | 203 | + <view class="sinNum" v-cloak>{{datas.express_company}}</view> |
204 | </view> | 204 | </view> |
205 | <view class="row3 public"> | 205 | <view class="row3 public"> |
206 | <view class="sinNumText">支付方式</view> | 206 | <view class="sinNumText">支付方式</view> |
@@ -208,50 +208,50 @@ | @@ -208,50 +208,50 @@ | ||
208 | </view> | 208 | </view> |
209 | <view class="row4 public"> | 209 | <view class="row4 public"> |
210 | <view class="sinNumText">备注</view> | 210 | <view class="sinNumText">备注</view> |
211 | - <view class="sinNum" v-cloak>{{data.remark}}</view> | 211 | + <view class="sinNum" v-cloak>{{datas.remark}}</view> |
212 | </view> | 212 | </view> |
213 | <view class="row5 public"> | 213 | <view class="row5 public"> |
214 | <view class="order_time">下单时间</view> | 214 | <view class="order_time">下单时间</view> |
215 | - <view class="orderdatetime" v-cloak>{{$u.timeFormat(data.createtime, 'yyyy-mm-dd hh:M:ss')}}</view> | 215 | + <view class="orderdatetime" v-cloak>{{$u.timeFormat(datas.createtime, 'yyyy-mm-dd hh:M:ss')}}</view> |
216 | </view> | 216 | </view> |
217 | - <view class="row5 public" v-if="data.order_status == '11'"> | 217 | + <view class="row5 public" v-if="datas.order_status == '11'"> |
218 | <view class="order_time">取消时间</view> | 218 | <view class="order_time">取消时间</view> |
219 | - <view class="orderdatetime" v-cloak>{{$u.timeFormat(data.qxtime, 'yyyy-mm-dd hh:M:ss')}}</view> | 219 | + <view class="orderdatetime" v-cloak>{{$u.timeFormat(datas.qxtime, 'yyyy-mm-dd hh:M:ss')}}</view> |
220 | </view> | 220 | </view> |
221 | - <view class="row5 public" v-if="data.order_status != 1"> | 221 | + <view class="row5 public" v-if="datas.order_status != 1"> |
222 | <view class="order_time">付款时间</view> | 222 | <view class="order_time">付款时间</view> |
223 | - <view class="orderdatetime" v-cloak>{{$u.timeFormat(data.pay_time, 'yyyy-mm-dd hh:M:ss')}}</view> | 223 | + <view class="orderdatetime" v-cloak>{{$u.timeFormat(datas.pay_time, 'yyyy-mm-dd hh:M:ss')}}</view> |
224 | </view> | 224 | </view> |
225 | - <view class="row5 public" v-if="data.order_status !=1"> | 225 | + <view class="row5 public" v-if="datas.order_status !=1"> |
226 | <view class="order_time">发货时间</view> | 226 | <view class="order_time">发货时间</view> |
227 | - <view class="orderdatetime" v-cloak>{{$u.timeFormat(data.freight_time, 'yyyy-mm-dd hh:M:ss')}}</view> | 227 | + <view class="orderdatetime" v-cloak>{{$u.timeFormat(datas.freight_time, 'yyyy-mm-dd hh:M:ss')}}</view> |
228 | </view> | 228 | </view> |
229 | - <view class="row5 public" v-if="data.order_status !=1&&data.order_status!=21&&data.order_status!=3"> | 229 | + <view class="row5 public" v-if="datas.order_status !=1&&datas.order_status!=21&&datas.order_status!=3"> |
230 | <view class="order_time">收货时间</view> | 230 | <view class="order_time">收货时间</view> |
231 | - <view class="orderdatetime" v-cloak>{{$u.timeFormat(data.receipt_time, 'yyyy-mm-dd hh:M:ss')}}</view> | 231 | + <view class="orderdatetime" v-cloak>{{$u.timeFormat(datas.receipt_time, 'yyyy-mm-dd hh:M:ss')}}</view> |
232 | </view> | 232 | </view> |
233 | - <view class="row5 public" v-if="data.order_status!= 1&&data.order_status!=3&&data.order_status!=4"> | 233 | + <view class="row5 public" v-if="datas.order_status!= 1&&datas.order_status!=3&&datas.order_status!=4"> |
234 | <view class="order_time">申请退款时间</view> | 234 | <view class="order_time">申请退款时间</view> |
235 | - <view class="orderdatetime" v-cloak>{{$u.timeFormat(data.sqtktime, 'yyyy-mm-dd hh:M:ss')}}</view> | 235 | + <view class="orderdatetime" v-cloak>{{$u.timeFormat(datas.sqtktime, 'yyyy-mm-dd hh:M:ss')}}</view> |
236 | </view> | 236 | </view> |
237 | <view class="row5 public" | 237 | <view class="row5 public" |
238 | - v-if="data.order_status !=1&&data.order_status!=21&&data.order_status!=3&&data.order_status!=4"> | 238 | + v-if="datas.order_status !=1&&datas.order_status!=21&&datas.order_status!=3&&datas.order_status!=4"> |
239 | <view class="order_time">退款成功时间</view> | 239 | <view class="order_time">退款成功时间</view> |
240 | - <view class="orderdatetime" v-cloak>{{$u.timeFormat(data.tkcgtime, 'yyyy-mm-dd hh:M:ss')}}</view> | 240 | + <view class="orderdatetime" v-cloak>{{$u.timeFormat(datas.tkcgtime, 'yyyy-mm-dd hh:M:ss')}}</view> |
241 | </view> | 241 | </view> |
242 | </view> | 242 | </view> |
243 | - <view class="callWaiter" v-if="data.order_status == '21'"> | 243 | + <view class="callWaiter" v-if="datas.order_status == '21'"> |
244 | <view class="adj">客服电话:1875623659</view> | 244 | <view class="adj">客服电话:1875623659</view> |
245 | <view class="clickCall" @click="$callup(phone)">一键拨号</view> | 245 | <view class="clickCall" @click="$callup(phone)">一键拨号</view> |
246 | </view> | 246 | </view> |
247 | <view class="returnbtn"> | 247 | <view class="returnbtn"> |
248 | 248 | ||
249 | - <view class="btn" @click="DELOrder" v-if="data.order_status == '11'||data.order_status == '4'">删除订单</view> | ||
250 | - <view class="btn" @click="SQtuikuan" v-if="data.order_status == '2'">申请退款</view> | ||
251 | - <view class="btn" @click="Receipt" v-if="data.order_status == '3'">确认收货</view> | ||
252 | - <view class="btn" @click="returnbtn" v-if="data.order_status == '21'">返回列表</view> | 249 | + <view class="btn" @click="DELOrder" v-if="datas.order_status == '11'||datas.order_status == '4'">删除订单</view> |
250 | + <view class="btn" @click="SQtuikuan" v-if="datas.order_status == '2'">申请退款</view> | ||
251 | + <view class="btn" @click="Receipt" v-if="datas.order_status == '3'">确认收货</view> | ||
252 | + <view class="btn" @click="returnbtn" v-if="datas.order_status == '21'">返回列表</view> | ||
253 | 253 | ||
254 | - <view class="btnYN" v-if=" data.order_status== '1'"> | 254 | + <view class="btnYN" v-if=" datas.order_status== '1'"> |
255 | <view class="btnNo" @click="open(0)">取消付款</view> | 255 | <view class="btnNo" @click="open(0)">取消付款</view> |
256 | <view class="btnYes" @click="WXpay(currorderid)">支付</view> | 256 | <view class="btnYes" @click="WXpay(currorderid)">支付</view> |
257 | </view> | 257 | </view> |
@@ -342,10 +342,8 @@ | @@ -342,10 +342,8 @@ | ||
342 | phone: 1875623659, //客服电话 | 342 | phone: 1875623659, //客服电话 |
343 | WXnumber: 1875623659, | 343 | WXnumber: 1875623659, |
344 | q: '98756456876354687', | 344 | q: '98756456876354687', |
345 | - currorderid: null, | ||
346 | - data: null, | ||
347 | - | ||
348 | - | 345 | + currorderid: '', |
346 | + datas: '', | ||
349 | } | 347 | } |
350 | }, | 348 | }, |
351 | onLoad(e) { | 349 | onLoad(e) { |
@@ -370,7 +368,7 @@ | @@ -370,7 +368,7 @@ | ||
370 | methods: { | 368 | methods: { |
371 | SQtuikuan() { | 369 | SQtuikuan() { |
372 | self.$rqs('/api/order/refund', { | 370 | self.$rqs('/api/order/refund', { |
373 | - id:self.data.id | 371 | + id:self.datas.id |
374 | }).then(res => { | 372 | }).then(res => { |
375 | console.log('后台审核'); | 373 | console.log('后台审核'); |
376 | }) | 374 | }) |
@@ -380,7 +378,7 @@ | @@ -380,7 +378,7 @@ | ||
380 | YnoFK() { | 378 | YnoFK() { |
381 | // 点击确认取消付款 | 379 | // 点击确认取消付款 |
382 | self.$rqs('/api/order/cancel', { | 380 | self.$rqs('/api/order/cancel', { |
383 | - id:self.data.id | 381 | + id:self.datas.id |
384 | }).then(res => { | 382 | }).then(res => { |
385 | console.log('取消订单成功'); | 383 | console.log('取消订单成功'); |
386 | uni.navigateBack({ | 384 | uni.navigateBack({ |
@@ -396,8 +394,9 @@ | @@ -396,8 +394,9 @@ | ||
396 | self.$rqs('/api/order/detail', { | 394 | self.$rqs('/api/order/detail', { |
397 | id:self.currorderid | 395 | id:self.currorderid |
398 | }).then(res => { | 396 | }).then(res => { |
399 | - self.data = res.data.data; | ||
400 | - console.log('self.data', self.data); | 397 | + self.datas = res.data.data; |
398 | + console.log('self.data', self.datas); | ||
399 | + console.log('datas.order_status', self.datas.order_status); | ||
401 | }) | 400 | }) |
402 | }, | 401 | }, |
403 | detailsDel() { | 402 | detailsDel() { |
@@ -485,7 +484,7 @@ | @@ -485,7 +484,7 @@ | ||
485 | if (e == 0) { | 484 | if (e == 0) { |
486 | console.log(`倒计时结束`); | 485 | console.log(`倒计时结束`); |
487 | let d; //用来保存id | 486 | let d; //用来保存id |
488 | - self.data.order_status = 11 | 487 | + self.datas.order_status = 11 |
489 | self.$rqs('/api/order/text', { | 488 | self.$rqs('/api/order/text', { |
490 | id:self.currorderid | 489 | id:self.currorderid |
491 | }).then(res => { | 490 | }).then(res => { |
-
mentioned in commit f202f3e4
-
mentioned in merge request !193
-
mentioned in commit 68075b83
-
mentioned in commit 68075b83
-
请 注册 或 登录 后发表评论