zhanghui 2 лет назад
Родитель
Сommit
69e87e61cd
3 измененных файлов с 9 добавлено и 7 удалено
  1. 6 6
      myPages/aboutOur/index.vue
  2. 1 1
      orderPages/orderDetail/index.vue
  3. 2 0
      pages/order/index.vue

+ 6 - 6
myPages/aboutOur/index.vue

@@ -12,13 +12,13 @@ export default {
 	data() {
 	data() {
 		return {
 		return {
 			list:[
 			list:[
-				{title:'会员协议',to:'/myPages/TermsOfService/index?name='+'会员协议'+'&type=' + 1},
-				{title:'储值协议',to:'/myPages/TermsOfService/index?name='+'储值协议'+'&type=' + 8},
-				{title:'隐私条款',to:'/myPages/TermsOfService/index?name='+'隐私条款'+'&type=' + 3},
-        {title:'预约须知',to:'/myPages/TermsOfService/index?name='+'预约须知'+'&type=' + 5},
-        {title:'人脸识别服务协议',to:'/myPages/TermsOfService/index?name='+'人脸识别服务协议'+'&type=' + 6},
+				{title:'娇骄儿会员服务须知',to:'/myPages/TermsOfService/index?name='+'娇骄儿会员服务须知'+'&type=' + 1},
+				{title:'娇骄儿会员储值须知',to:'/myPages/TermsOfService/index?name='+'娇骄儿会员储值须知'+'&type=' + 8},
+				{title:'娇骄儿隐私政策',to:'/myPages/TermsOfService/index?name='+'娇骄儿隐私政策'+'&type=' + 3},
+        		{title:'预约须知',to:'/myPages/TermsOfService/index?name='+'预约须知'+'&type=' + 5},
+        		{title:'人脸识别服务协议',to:'/myPages/TermsOfService/index?name='+'人脸识别服务协议'+'&type=' + 6},
 				// {title:'储值使用说明',to:'/myPages/TermsOfService/index?name='+'储值使用说明'+'&type=' + 9},
 				// {title:'储值使用说明',to:'/myPages/TermsOfService/index?name='+'储值使用说明'+'&type=' + 9},
-        {title:'娇骄儿88卡权益服务协议',to:'/myPages/TermsOfService/index?name='+'娇骄儿88卡权益服务协议'+'&type=' + 4}
+        		{title:'娇骄儿88卡权益服务协议',to:'/myPages/TermsOfService/index?name='+'娇骄儿88卡权益服务协议'+'&type=' + 4}
 			],
 			],
 		};
 		};
 	},
 	},

+ 1 - 1
orderPages/orderDetail/index.vue

@@ -381,7 +381,7 @@ export default {
 
 
             for(let i=0;i<this.order.child.length;i++){
             for(let i=0;i<this.order.child.length;i++){
                 if (this.order.child[i].status==3){
                 if (this.order.child[i].status==3){
-                    uni.$u.toast('当前有订单正在申诉,不可付款')
+                    uni.$u.toast('子订单未审核结束')
                     return
                     return
                 }
                 }
             }
             }

+ 2 - 0
pages/order/index.vue

@@ -235,6 +235,7 @@
 						signType: "RSA",
 						signType: "RSA",
 						paySign: param.sign,
 						paySign: param.sign,
 						success: res => {
 						success: res => {
+							that.$refs.popup.close()
 							uni.showToast({
 							uni.showToast({
 								title: '支付成功!'
 								title: '支付成功!'
 							});
 							});
@@ -242,6 +243,7 @@
 							that.getUserInfo()
 							that.getUserInfo()
 						},
 						},
 						fail: res => {
 						fail: res => {
+							that.$refs.popup.close()
 							console.log(res)
 							console.log(res)
 							uni.showToast({
 							uni.showToast({
 								title: '支付失败',
 								title: '支付失败',