修改订单问题

pages/bookShop/orderLCont.vue

@@ -188,7 +188,7 @@
               style="width: 100rpx; height: 100rpx"
             ></image>
             <view class="itemJian">
-              <view class="orderTitle" style="line-height: 100rpx">
+              <view class="orderTitle" style="line-height: 44rpx">
                 <text>{{ orderContet.remark }}</text>
               </view>
               <view class="orderPrice">
@@ -198,6 +198,7 @@
             </view>
             <br clear="both" />
           </view>
+		  
           <view class="orderContent" v-if="orderContet.orderType == 'vip'">
             <image
               src="/static/icon/vip.png"
@@ -215,6 +216,16 @@
             </view>
             <br clear="both" />
           </view>
+		  
+		  <view class="orderContent" v-if="orderContet.orderType == 'aiVip'||orderContet.orderType == 'upgradeAiVip'" style=" display: flex; align-items: center; justify-content: center;">
+		  		<image src="/static/icon/order_vip.png" mode="aspectFill" style="width: 100rpx; height: 100rpx; flex-shrink: 0;"></image>
+		  		<view class="itemJian">
+		  		  <view class="orderTitle" style="line-height: 46rpx; margin-bottom: 0;">
+		  			{{ orderContet.aiBuyConfig.title }}<span style=" color: red;">（{{ orderContet.aiBuyConfig.count }}次）<span v-if="orderContet.orderType=='upgradeAiVip'">（VIP升级）</span></span>
+		  		  </view>
+		  		</view>
+		  </view>
+		  
           <view
             class="orderContent"
             v-else-if="orderContet.orderType == 'point'"

pages/component/commonComponents/address/edit.vue

@@ -222,7 +222,7 @@
 								validateFunction: (rule, value, data, callback) => {
 									// 异步需要返回 Promise 对象
 									return new Promise((resolve, reject) => {
-										if (!this.$base.phoneRegular.test(value)) {
+										if (!/^\d{5,15}$/.test(value)) {
 											reject(new Error("手机号格式不正确"));
 										} else {
 											resolve();

pages/component/commonComponents/orderSubmit.vue

@@ -1007,7 +1007,7 @@
           if (value.indexOf(".") !== -1) {
             value = value.split(".")[0]; // 截取小数点前的部分
           }
-  
+ 
           // 如果输入为0，强制设置为0并显示为 "0"
           if (val == 0) {
             this.jfNumber = 0;
@@ -1034,6 +1034,7 @@
           if (this.curCouponId && this.curCoupon.couponEntity.id) {
             couponAmount = this.curCoupon.couponEntity.couponAmount;
           }
+		  
           this.actualPayment =
             this.totalPrice -
             couponAmount -
@@ -1291,6 +1292,7 @@
             that.freightNum -
             that.districtAmount -
             that.vipPrice;
+			console.log(that.actualPayment)
         } else {
           that.actualPayment =
             that.totalPrice +

pages/mine/wallet/recharge/index.vue

@@ -2,8 +2,7 @@
 	<view class="container commonPageBox">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<z-nav-bar title="充值" bgColor="#258feb" fontColor="#fff" :homeState="options.source == 'order' ? 1000 : 2000"
-			:backState="options.source == 'order' ? 2000 : 1000" @click-home="handleHomeClick"></z-nav-bar>
+		<z-nav-bar title="充值" bgColor="#258feb" fontColor="#fff"></z-nav-bar>
 
 		<view>
 			<view class="cha_jine">
@@ -234,12 +233,6 @@
 					
 				});
 			},
-			//回到首页
-			handleHomeClick(){
-				uni.switchTab({
-				  url: '/pages/peanut/home'
-				});
-			},
 			// 关闭交易订单
 			finishTransaction(trans) {
 				this.iapChannel.finishTransaction(
@@ -641,8 +634,8 @@
 													title: "支付成功",
 												});
 												setTimeout(() => {
-													uni.navigateTo({
-														url: "/pages/mine/wallet/index/index?source=recharge",
+													uni.switchTab({
+														url: "/pages/mine/mine/index",
 													});
 												}, 2000);
 											} else {
@@ -673,8 +666,8 @@
 												title: "支付成功",
 											});
 											setTimeout(() => {
-												uni.navigateTo({
-													url: "/pages/mine/wallet/index/index?source=recharge",
+												uni.switchTab({
+													url: "/pages/mine/mine/index",
 												});
 											}, 2000);
 										} else {

pages/order/index.vue

@@ -392,20 +392,17 @@ export default {
 		},
 		//下单
 		async goBuyJie() {
-			
 			debounce(async () => {
-				uni.showLoading({
-					title: '加载中'
-				});	
 				if(!this.name){
 					uni.showToast({
 						title: "培训姓名不能为空",
 						icon: 'none'
 					});
-					uni.hideLoading()
 					return
 				}
-					
+				uni.showLoading({
+					title: '加载中'
+				});	
 				var that = this;
 				let data = {
 					paymentMethod: that.payType,