修复bug

components/cancelPrompt/cancelPrompt.vue

@@ -156,7 +156,7 @@
 								<Text>按旅游费用总额的60%</Text>
 							</view>
 						</view>
-						<view class="showModalTime">请仔细阅读条款{{remainingTime}}s后确认</view>
+						<view class="showModalTime">请仔细阅读条款<template v-if="submitCancel">{{remainingTime}}s</template>后确认</view>
 						<view class="row-sb-n  showModalBottom">
 							<view class="showModalBott" @click="cancel">
 								<Text>关闭</Text>
@@ -187,7 +187,7 @@ export default {
                 Cancelmsg:{
                     Remark: ''
                 },
-				submitCancel: false,
+				submitCancel: true,
 				erpBaseInfo: null,
 				remainingTime: 10, // 初始倒计时时间（秒）
 				timerId: null,     // 定时器ID
@@ -213,7 +213,7 @@ export default {
 				if (this.remainingTime <= 0) {
 					clearInterval(this.timerId);
 					this.isRunning = false;
-					this.confirm(); // 时间耗尽回调
+					this.submitCancel = false; // 时间耗尽回调
 				}
 			}, 1000);
 		},
@@ -230,12 +230,16 @@ export default {
         confirm(){
 			let that = this
 			if(this.submitCancel) return
+			uni.showLoading({
+				title: "取消中...",
+			});
             that.submitCancel = true
 			that.apipost(
 				"GetCancelOrder_post", {
 					OrderNo: this.orderNo,
 				},
 				(res) => {
+					uni.hideLoading()
 					that.submitCancel = false
 					that.cancel()
 					if (res.resultCode == 1) {
@@ -250,6 +254,7 @@ export default {
 					}
 				},
 				(err) => {
+					uni.hideLoading()
 					uni.showToast({
 						title: err.message,
 						icon: "none",

pages/AggregateOrders/AggregateOrdersList.vue

@@ -58,7 +58,7 @@
 					v-for="(item,index) in statusList"
 					:key="index"
 					:class="[msg.OrderStatus==item.ID?'active':'']"
-					@click="msg.OrderStatus=item.ID,research()">
+					@click="getStatus(item.ID)">
 						<text>{{ item.Name }}</text>
 					</view>
 				</template>
@@ -118,13 +118,17 @@
         onLoad(options){
 			if(options.OrderTypeStr)this.msg.OrderTypeStr = options.OrderTypeStr
 			if(options.OrderStatus)this.msg.OrderStatus = options.OrderStatus
-			this.research()
+			
         },
         created() {
 			this.getOrderEnums()
-			
+			this.research()
         },
         methods:{
+			getStatus(ID){
+				this.msg.OrderStatus=ID
+				this.research()
+			},
 			research(status){
 				if(status)this.msg.OrderStatus = status;
 				this.msg.pageIndex = 1;

pages/AggregateOrders/components/header.vue

@@ -22,7 +22,8 @@
             <view style="padding: 0 20rpx;">
                 <view class="AggregateTitle">订单类型</view>
                 <view class="AggregateTypeBox row">
-                    <view class="AggregateType" v-for="(item,index) in orderTypeList" :key="index"
+                    <view class="AggregateType" v-for="(item,index) in orderTypeList" 
+                    :key="index"
                     :class="[params.OrderTypeStr==item.Id?'active':'']"
                     @click="getTypeId(item)">
                         <text>{{ item.Name }}</text>
@@ -82,13 +83,7 @@ export default {
     watch:{
         params:{
             handler(newVal, oldVal) {
-                if(newVal.OrderTypeStr){
-                    this.orderTypeList.forEach(x=>{
-                        if(x.Id==newVal.OrderTypeStr){
-                            this.getTypeId(x)
-                        }
-                    })
-                }
+                
             },
             deep:true
         }
@@ -205,7 +200,7 @@ export default {
     padding-top: 85rpx;
 }
 .carrHeader-right{
-    padding-right: 170rpx;
+    padding-right: 180rpx;
     display: flex;
 }
 .carrHeader-right img{

pages/AggregateOrders/components/orders.vue

@@ -41,7 +41,7 @@
                         <view class="col"></view>
                         <!-- #ifdef MP-DI -->
                         <view class="jz_Zailai" @click.stop=""
-                            style="width: 110rpx; margin-right: 10rpx;">
+                            style="width: 110rpx;">
                                  客服
                             <button class="AggOrdListH-RBut" open-type="contact" show-message-card="true"></button>
                         </view>
@@ -49,15 +49,15 @@
                         <view class="row">
                             <!-- #ifdef MP-DI -->
                                 <view v-if="item.orderStatus==1||item.orderStatus==2" class="jz_Zailai"
-                                style="width: 110rpx" @click.stop="goCancelZK(item)">取消</view>
+                                style="width: 110rpx;margin-left: 10rpx;" @click.stop="goCancelZK(item)">取消</view>
                                 <view v-if="item.orderStatus==1" class="jz_Zailai jz_ZailaiZF"
                                 style="width: 150rpx;margin-left: 10rpx;" @click.stop="submitGetCodeByOrderNo(item)">立即支付</view>
-                                <view v-if="item.orderStatus!=1" class="jz_Zailai" @click.stop="AnotherOrder(item)">再来一单</view>
+                                <view v-if="item.orderStatus!=1" style="margin-left: 10rpx;" class="jz_Zailai" @click.stop="AnotherOrder(item)">再来一单</view>
                             <!-- #endif -->
                             <!-- #ifdef MP-AG -->
                                 <view v-if="item.income == 0&&item.orderStatus==1" class="jz_Zailai"
-                                style="width: 110rpx" @click.stop="goCancel(item)">取消</view>
-                                <view v-else class="jz_Zailai" @click.stop="AnotherOrder(item)">再来一单</view>
+                                style="width: 110rpx;margin-left: 10rpx;" @click.stop="goCancel(item)">取消</view>
+                                <view v-else class="jz_Zailai" style="margin-left: 10rpx;" @click.stop="AnotherOrder(item)">再来一单</view>
 							 <!-- #endif -->
                         </view>
                     </view>

pages/AggregateOrders/components/searchHeader.vue

@@ -116,7 +116,7 @@ export default {
     flex: 1;
     display: flex;
     padding-left: 60rpx;
-    padding-right: 170rpx;
+    padding-right: 200rpx;
 }
 .carrHeader-right view{
     width: 1px;

pages/user-center/components/userHeader.vue

@@ -25,26 +25,28 @@
             <view class="userHeadPas column">
                 <view class="userHeadPasTop">
                     <view class="userHeadPasT_Num row-sb-n">
+                        <!-- #ifdef MG-AG-->
                         <view class="column">
-                            <text>{{formatNumberWithUnit(1234)}}</text>
+                            <text>{{formatNumberWithUnit(user_info.balance)}}</text>
                             <text class="userHeadPasTTeT">
                                 幸福存折
                             </text>
                         </view>
+                        <!-- #endif -->
                         <view class="column">
-                            <text>1852</text>
+                            <text>{{ user_info.integral }}</text>
                             <text class="userHeadPasTTeT">
                                 我的积分
                             </text>
                         </view>
                         <view class="column">
                             <text>
-                                {{formatNumberWithUnit(99999)}}
+                                {{formatNumberWithUnit(user_info.totalSavings)}}
                             </text>
                             <text class="userHeadPasTTeT">累计已省</text>
                         </view>
                         <view class="column">
-                            <text>3</text>
+                            <text>{{ user_info.couponNum }}</text>
                             <text class="userHeadPasTTeT">优惠券</text>
                         </view>
                     </view>

pages/visa/visa_SureOrder.vue

@@ -456,7 +456,7 @@
 			</view>
 		</view>
 		<view class="empty-block"></view>
-		<cancelProgress v-if="orderData.OrderStatus==1||orderData.OrderStatus==2" :datas="orderData"></cancelProgress>
+		<cancelProgress v-if="orderData.OrderStatus==2||orderData.OrderStatus==5" :datas="orderData"></cancelProgress>
 		<view class="empty-block"></view>
 		<view style="padding: 50rpx 40rpx" v-if="orderData.OrderModel">
 			<view class="big-title">