售后申请时间和退款成功时间写反&唤醒app调试未完成

common/common.ts

@@ -246,5 +246,6 @@ export default {
 			return num;
 			return num;
 		}
 		}
 	},
 	},
+	
   
   
 }
 }
\ No newline at end of file

pages/afterSaleDetail/afterSaleDetail.vue

@@ -113,9 +113,9 @@
 							this.processIndex = 0;
 							this.processIndex = 0;
 						}
 						}
 						this.options = [
 						this.options = [
-							{title:'提交申请',desc:'退款将退回到您的支付宝/微信账号请注意查收',time:this.courseInfoItem.refundTime},
+							{title:'提交申请',desc:'退款将退回到您的支付宝/微信账号请注意查收',time:this.courseInfoItem.applyRefundTime},
 							{title:'退款中',desc:'您的退款申请已通过，待财务退款',time:this.courseInfoItem.refundingTime},
 							{title:'退款中',desc:'您的退款申请已通过，待财务退款',time:this.courseInfoItem.refundingTime},
-							{title:'退款成功',desc:'您的退款申请已成功',time:this.courseInfoItem.applyRefundTime},
+							{title:'退款成功',desc:'您的退款申请已成功',time:this.courseInfoItem.refundTime},
 						]
 						]
 					}
 					}
 				})
 				})

pages/courseDetail/courseDetail.vue

@@ -171,7 +171,12 @@
 				sharelogin: false,
 				sharelogin: false,
 				startTime: '',
 				startTime: '',
 				newCourseInfo:{},
 				newCourseInfo:{},
-				isPauseFlag:true
+				isPauseFlag:true,
+				CONFIG : {
+				        android: 'https://a.app.qq.com/o/simple.jsp?pkgname=com.xiaoxiao.shihaoo',
+				        ios: 'https://apps.apple.com/cn/app/%E6%98%AF%E5%A5%BD/id1457958161',
+				        scheme: 'com.qdxxzy.user://'
+				    }
 			};
 			};
 		},
 		},
 		methods: {
 		methods: {
@@ -187,6 +192,58 @@
 					this.sharelogin = false
 					this.sharelogin = false
 				}
 				}
 			},
 			},
+			/**
+			     * 判断是否为微信浏览器
+			     * 兼容ios
+			     * */
+			// isWeiXin() {
+			//         return /micromessenger/i.test(navigator.userAgent.toLowerCase()) || typeof navigator.wxuserAgent !== 'undefined'
+			// },
+			// openApp(url, callback) {
+			//        let {isAndroid, isIOS, isIOS9} = judgePhoneType();
+			//        if(this.isWeiXin()){
+			//            alert("请您在浏览器中打开,即可下载") ;
+			//            return ;
+			//        }
+			//        if (isAndroid || isIOS) {
+			//            let hasApp = true, t = 1000,
+			//                t1 = Date.now(),
+			//                ifr = document.createElement("iframe");
+			//            setTimeout(function () {
+			//                if (!hasApp) {
+			//                    callback && callback()
+			//                }
+			//                document.body.removeChild(ifr);
+			//            }, 2000);
+			
+			//            ifr.setAttribute('src', url);
+			//            ifr.setAttribute('style', 'display:none');
+			//            document.body.appendChild(ifr);
+			
+			//            setTimeout(function () { //启动app时间较长处理
+			//                let t2 = Date.now();
+			//                if (t2 - t1 < t + 100) {
+			//                    hasApp = false;
+			//                }
+			//            }, t);
+			//        }
+			//        if (isIOS9) {
+			//            location.href = url;
+			//            setTimeout(function () {
+			//                callback && callback()
+			//            }, 250);
+			//            setTimeout(function () {
+			//                location.reload();
+			//            }, 1000);
+			//        }
+			// },
+			  /**
+			     * 超时跳转h5页面
+			     * */
+			//  goConfirmAddr() {
+			//         let { isAndroid } = judgePhoneType();
+			//         window.location.href =  !isAndroid  ? CONFIG.ios : CONFIG.android ;
+			// },
 			jumpapp() {
 			jumpapp() {
 				let platform = uni.getSystemInfoSync().platform
 				let platform = uni.getSystemInfoSync().platform
 				if (platform == 'ios') {
 				if (platform == 'ios') {

pages/orderConfirm/orderConfirm.vue

@@ -130,7 +130,7 @@
 		</view>
 		</view>
 		<view class="markBox" @click="tipsFlag=false" v-if="tipsFlag">
 		<view class="markBox" @click="tipsFlag=false" v-if="tipsFlag">
 		  <view class="guideImgBox">
 		  <view class="guideImgBox">
-			<text class="iconfont icon-yindaojiantou"></text>
+			<image src="../../static/Group132.png" mode="widthFix"></image>
 			<view class="tips">
 			<view class="tips">
 			  <view class="text-center">请点击右上角菜单</view>
 			  <view class="text-center">请点击右上角菜单</view>
 			  <view>因微信屏蔽支付宝的支付请求，请使用浏览器打开页面完成支付。在浏览器内支付完成后，请返回微信，到我的订单下，以检测支付结果。</view>
 			  <view>因微信屏蔽支付宝的支付请求，请使用浏览器打开页面完成支付。在浏览器内支付完成后，请返回微信，到我的订单下，以检测支付结果。</view>
@@ -225,6 +225,7 @@
 					if(this.deviceType == 3){
 					if(this.deviceType == 3){
 						param.isPayOrAuth = 1;
 						param.isPayOrAuth = 1;
 						api.wxAuthorize(param).then((res)=>{
 						api.wxAuthorize(param).then((res)=>{
+							this.paymentBtnDisabled = false;
 							if(res['success']){
 							if(res['success']){
 								window.location.href = res['data']['paymentForm']['action'];
 								window.location.href = res['data']['paymentForm']['action'];
 							}
 							}
@@ -667,6 +668,12 @@
 
 
 .guideImgBox {
 .guideImgBox {
   margin: 20px auto;
   margin: 20px auto;
+  uni-image{
+	  width: 25%!important;
+	  position: absolute;
+	  right: 0;
+	  top:0;
+  }
 }
 }
 
 
 .tips {
 .tips {