refactor:取消订单

common/js/api.js

@@ -4,6 +4,7 @@ import request from '../js/request.js';
 export default {
 
 
+
 	//post请求  一键付款余额支付
 	scanCode(data){
 		return request({
@@ -176,6 +177,7 @@ export default {
 		})
 	},
 
+
 	// post请求，通用下单接口
 	commonGeneralOrder(data) {
 		return request({

orderPages/orderDetail/index.vue

@@ -281,7 +281,10 @@ export default {
     },
     methods: {
       getUserInfo() {
-        this.userInfo = uni.getStorageSync('userInfo');
+          this.$api.getUserInfo().then(res => {
+              this.userInfo = res.data.data
+              uni.setStorageSync('userInfo', res.data.data);
+          });
       },
         balancePay(){
 
@@ -293,14 +296,16 @@ export default {
                 return ;
             }
             this.$refs.passwordPopup.close()
-            // 用户信息
+
             this.$api.trade({
                 tradeNo: this.tradeNo,
                 password: this.password
             }).then((res)=>{
-                uni.switchTab({
-                    url:'/pages/order/index'
-                })
+                uni.showToast({
+                    title: '支付成功!'
+                });
+
+                that.getOrderDetailByOrderId(that.orderId)
             }).catch(() =>{
                 uni.showToast({
                     title: "操作失败"
@@ -340,8 +345,8 @@ export default {
                             uni.showToast({
                                 title: '支付成功!'
                             });
+                            that.getOrderDetailByOrderId(that.orderId)
                             that.$refs.popup.close()
-                            that.$refs.MescrollItem[that.tabIndex].downCallback()
                         },
                         fail: res => {
                             console.log(res)
@@ -350,7 +355,6 @@ export default {
                                 showCancel: false
                             });
                             that.$refs.popup.close()
-                            that.$refs.MescrollItem[that.tabIndex].downCallback()
                         }
                     });
                 }).catch(() =>{

pages/index/index.vue

@@ -105,7 +105,7 @@
               <!-- 左边内容 -->
               <view @click="gotoServiceOrder()" class="left-content">
                 <view class="title">
-                  到店服务
+                  当日排队
                 </view>
                 <view class="desc">
                   <!--									多种服务模式任您选择-->
@@ -117,7 +117,7 @@
               <!-- 右边内容 -->
               <view class="right-content" @click="goBookService()">
                 <view class="title">
-                  预约服务
+                  预约排队
                 </view>
                 <view class="desc">
                   <!--									拼命研发中敬请期待...-->

pages/order/index.vue

@@ -392,14 +392,12 @@
 							})
 						});
 					}
-
-
 				}
 			},
 
 			getUserInfo() {
 				let that = this
-				this.$api.getUserInfo().then(function (res) {
+				this.$api.getUserInfo().then(res => {
 					that.userInfo = res.data.data
 					uni.setStorageSync('userInfo', res.data.data);
 				});

pages/order/module/mescrollUni-item.vue

@@ -136,7 +136,7 @@
 							<view class="btn" v-if="item.orderStatus == 6"  @click="oneClickPay(item)">
 								<text>一键付款</text>
 							</view>
-							<view class="btn" v-if="item.orderStatus == 5 || item.orderStatus == 11">
+							<view class="btn" v-if="item.orderStatus == 5 || item.orderStatus == 11" @click="cancelOrder(item)">
 								<text>取消</text>
 							</view>
 							<view @click="appointment(item)" class="btn" v-if="item.orderStatus == 9">
@@ -298,6 +298,8 @@
 
 			},
 
+
+
 			//点击空布局按钮的回调
 			emptyClick() {
 				uni.showToast({
@@ -310,6 +312,19 @@
 				this.mescroll.resetUpScroll();
 			},
 
+			cancelOrder(item){
+				console.log('++++++++++++++++++++',item)
+				let that = this
+				this.$api.cancelOrder({
+					orderId:item.orderId
+				}).then(res=>{
+					that.downCallback()
+					that.$api.getUserInfo().then( res=> {
+						uni.setStorageSync('userInfo', res.data.data);
+					});
+				})
+			},
+
 			orderDetail(item) {
 				uni.navigateTo({
 					url:'/orderPages/orderDetail/index?id='+ item.orderId