zhanghui 2 лет назад
Родитель
Сommit
c9f9d84c3d
3 измененных файлов с 14 добавлено и 16 удалено
  1. 1 1
      orderPages/orderDetail/index.rpx.scss
  2. 7 13
      orderPages/orderDetail/index.vue
  3. 6 2
      pages/order/index.vue

+ 1 - 1
orderPages/orderDetail/index.rpx.scss

@@ -139,7 +139,7 @@
 
 .bottom1{
   width: 750rpx;
-  height: 212rpx;
+  height: 150rpx;
   background: #FFFFFF;
   position: fixed;
   bottom: 0;

+ 7 - 13
orderPages/orderDetail/index.vue

@@ -273,7 +273,7 @@ export default {
             appealId:'',
             appealReason:'',
             orderId:'',
-            curServiceTab:1,
+            curServiceTab:2,
             userInfo:{},
             tradeNo:'',
             password:''
@@ -314,12 +314,7 @@ export default {
                 });
                 that.$refs.popup.close()
                 that.getOrderDetailByOrderId(that.orderId)
-            }).catch(() =>{
-                that.$refs.popup.close()
-                uni.showToast({
-                    title: "操作失败"
-                })
-            });
+            })
 
         },
 
@@ -378,11 +373,7 @@ export default {
                             that.$refs.popup.close()
                         }
                     });
-                }).catch(() =>{
-                    uni.showToast({
-                        title: "操作失败"
-                    })
-                });
+                })
             }
         },
 
@@ -450,7 +441,10 @@ export default {
             })
         },
         payItem(num){
-            if (this.userInfo.balance < this.price){
+          console.log('this.userInfo.balance',this.userInfo.balance*1)
+          console.log('this.price',this.allPrice*1)
+
+            if (this.userInfo.balance*1 < this.allPrice*1 && num == 1){
                 return
             }
             this.curServiceTab = num

+ 6 - 2
pages/order/index.vue

@@ -179,7 +179,7 @@
 				windowHeight: '',
 
 				userInfo:{},
-				curServiceTab:1,
+				curServiceTab:2,
 				tradeNo:'',
 				password:'',
 				openType:0,//开启的支付类型:1一键支付子订单费用,2:支付预约费用
@@ -313,7 +313,10 @@
 			},
 
 			payItem(num){
-				if (this.userInfo.balance*1 < this.price*1){
+
+				console.log(this.userInfo.balance*1,this.appointmentOrder.totalAmount*1)
+
+				if (this.userInfo.balance*1 < this.appointmentOrder.totalAmount*1){
 					return
 				}
 				this.curServiceTab = num
@@ -329,6 +332,7 @@
 				console.log(order)
 				console.log(number)
 				this.openType=number
+				this.appointmentOrder = order
 				this.$api.oneClickPay({
 					orderId:order.orderId
 				}).then(res=>{