确认收货和展示退款中

pagesD/pages/personal/myOrder.vue

@@ -45,7 +45,7 @@
                         </div>
                         <div class="order__btn" @click.stop="pull(item.id)">
                             <span v-if="item.aftersaleStatus==0 && item.currentPrice > 0" @click.stop="pull(item.id)">申请退款</span>
-                            <span class="btn__two" @click="orderDetail(item.id)">查看详情</span>
+                            <span class="btn__two" @click.stop="orderDetail(item.id)">查看详情</span>
                         </div>
                     </div>
                 </div>
@@ -76,8 +76,8 @@
                             <span>￥{{item.amount/100}}</span>
                         </div>
                         <div class="order__btn">
-                            <span @click="goCarTime(item.id)">查看物流</span>
-                            <span class="btn__two">确认收货</span>
+                            <span @click.stop="goCarTime(item.id)">查看物流</span>
+                            <span class="btn__two" @click.stop="confirmReceipt(item.id)">确认收货</span>
                         </div>
                     </div>
                 </div>
@@ -108,8 +108,8 @@
                             <span>￥{{item.amount/100}}</span>
                         </div>
                         <div class="order__btn">
-                            <span @click="goCarTime(item.id)">查看物流</span>
-                            <span class="btn__two" @click="orderDetail(item.id)">查看详情</span>
+                            <span @click.stop="goCarTime(item.id)">查看物流</span>
+                            <span class="btn__two" @click.stop="orderDetail(item.id)">查看详情</span>
                         </div>
                     </div>
                 </div>
@@ -117,7 +117,8 @@
                     <div class="item">
                         <div class="item__time">
                             <span>{{item.successTime}}</span>
-                            <span style="color:#666666">已退款</span>
+                            <span style="color:#666666" v-if="item.orderStatus==40">已退款</span>
+                            <span v-else>退款中</span>
                         </div>
                         <div class="item__top">
                             <div>
@@ -142,8 +143,8 @@
                         </div>
                         <div class="order__btn">
                             <u-modal :show="showDelModal" @confirm="confirmDel" @cancel="cancelModal" :title="delTitle" ref="delModal" :showCancelButton="true"></u-modal>
-                            <span @click="showDel(item.id)">删除记录</span>
-                            <span class="btn__two" @click="orderDetail(item.id)">查看详情</span>
+                            <span @click.stop="showDel(item.id)">删除记录</span>
+                            <span class="btn__two" @click.stop="orderDetail(item.id)">查看详情</span>
                         </div>
                     </div>
                 </div>
@@ -245,8 +246,6 @@ export default {
             });
         },
         goCarTime(id) {
-            console.log("123")
-            console.log(id)
             uni.navigateTo({
                 url: '/pagesD/pages/personal/carTime?orderId=' + id
             })
@@ -315,6 +314,31 @@ export default {
                 }
             })
         },
+        //确认收货
+        confirmReceipt(orderId){
+            let that = this;
+            uni.showModal({
+            	title: '确认收货',
+            	content: '确认收货吗？',
+            	success: function (res) {
+            		if (res.confirm) {
+            			let opts = {url: '/app/user/confirm/receipt/' + orderId,method: 'put'};
+                        that.http.httpTokenRequest(opts, {}).then(res => {
+                            if (res.data.code == 200) {
+                                uni.showToast({
+                                	title: '收货成功',
+                                	icon: "success",
+                                });
+                            }
+                            that.getOrderList();
+                        })
+            		} else if (res.cancel) {
+            			
+            		}
+            	}
+            });
+            
+        },
     },
     onShow() {
         //this.load()