Merge branch 'apply' into dev

aae2918a · sunchao · c8a7deeb · ae0c414a · aae2918a · aae2918a
Commit aae2918a authored Dec 12, 2022 by sunchao
9 changed files
--- a/components/clause/clause.vue
+++ b/components/clause/clause.vue
--- a/components/login/login.vue
+++ b/components/login/login.vue
@@ -41,12 +41,12 @@
 			<view class="agree" v-if="loginType!='resetpw'">
 				<label class="radio" @click="agreeFlag=!agreeFlag"><radio :checked="agreeFlag" /></label>
 				<text>已阅读并同意</text>
-				<text class="file" @click="getFile('center',1)">服务协议</text>
+				<text class="file" @click="getFile(1)">服务协议</text>
 				<text>和</text>
-				<text class="file" @click="getFile('center',2)">隐私政策</text>
+				<text class="file" @click="getFile(2)">隐私政策</text>
 			</view>
 			<view class="login_btn" @click="loginInCheck()" v-if="loginType!='resetpw'">
-				{{loginType=='register'?'注册':'登录'}} {{this.loginType}} {{agreeFlag}}
+				{{loginType=='register'?'注册':'登录'}}
 			</view>
 			<view class="login_btn" v-if="loginType=='resetpw'" @click="loginInCheck()">
 				保存
@@ -69,16 +69,6 @@
 			</view>
 		</view>
 	</view>
-	<uni-popup ref="popup" type="top" background-color="#fff">
-		<view class="description">
-			<view class="" v-if="fileType==1">
-				服务协议
-			</view>
-			<view class="" v-if="fileType==2">
-				隐私政策
-			</view>
-		</view>
-	</uni-popup>
 </template>
 <script>
@@ -111,20 +101,10 @@
 				}
 			},
 			methods: {
-				getFile(type,fileType) {
+				getFile(type){
-					// this.type = type;
+					uni.navigateTo({
-					// this.fileType = fileType;
+						url:`/components/clause/clause?type=${type}`
-					// // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+					})
-					// this.$refs.popup.open(type)
-					if(fileType == 1){
-						uni.openDocument({
-							filePath:'../../static/file/CFFPstudy.docx'
-						})
-					}else{
-						uni.openDocument({
-							filePath:'../../static/file/CFFPPrivacy.docx'
-						})
-					}
 				},
 				getLoginType(){
 					this.loginType==='codelogin'?this.loginType='pwlogin':this.loginType='codelogin';

--- a/pages.json
+++ b/pages.json
@@ -463,9 +463,16 @@
            {
                "navigationBarTitleText": "",
                "enablePullDownRefresh": false
-            }
+            } 
+        },
-        }
+		{
+		    "path" : "components/clause/clause",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    } 
+		}
    ],
 	// "tabBar": {
 	//         "color": "#7A7E83", // tab 上的文字默认颜色

--- a/pages/application-process/applyCommon.scss
+++ b/pages/application-process/applyCommon.scss
@@ -47,6 +47,9 @@
 		            display: flex;
 		            flex-wrap: wrap;
 		            font-size: 30rpx;
+					.form-control{
+						width: 50%;
+						}
 		            }
 		        }
 		        .contentItem:last-child {

--- a/pages/application-process/education.vue
+++ b/pages/application-process/education.vue
@@ -36,7 +36,7 @@
 					 </picker>
 			       </view>
 			       <view class="contentItem">
-			         <text>毕业学校</text>
+			         <text>毕业学校{{applyParam.approvalStatus}}</text>
 			         <input class="form-control" v-model="applyParam.lastGraduateSchool" style="background: #666666;"
 					 :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
 			       </view>

--- a/pages/commonDetail/commonDetail.vue
+++ b/pages/commonDetail/commonDetail.vue
@@ -35,6 +35,7 @@
 					readId:this.readId?this.readId:undefined
 				}
 				api[obj.req](params).then(res=>{
+					console.log(res)
 					if(res['success']){
 						const r = res['data'][obj.result];
 						if(r && r.length>0){
@@ -113,7 +114,7 @@
 				this.queryLists(
 					{
 						req:'userShareBuyList',
-						result:'userShareLinks',
+						result:'userShareBuys',
 						id:'orderId',
 						children:[
 							{no:1,name:'用户',width: '30%',value:'',link:null,alias:'buyName'},

--- a/pages/orderConfirm/orderConfirm.vue
+++ b/pages/orderConfirm/orderConfirm.vue
@@ -117,7 +117,15 @@
 				</view>
 			</uni-popup>
 		</view>
+		<view class="markBox" @click="tipsFlag=false" v-if="tipsFlag">
+		  <view class="guideImgBox">
+			<text class="iconfont icon-yindaojiantou"></text>
+			<view class="tips">
+			  <view class="text-center">请点击右上角菜单</view>
+			  <view>因微信屏蔽支付宝的支付请求，请使用浏览器打开页面完成支付。在浏览器内支付完成后，请返回微信，到我的订单下，以检测支付结果。</view>
+			</view>
+		  </view>
+		</view>
 	</view>
 </template>
@@ -148,7 +156,8 @@
 				charset:'',
 				contentType:'',
 				payForm:'',
-				deviceType:''
+				deviceType:'',
+				tipsFlag:false
 			}
 		},
 		computed:{
@@ -169,6 +178,9 @@
 		},
 		methods: {
+			replaceUrl(){
+			},
 			// 支付
 			pay(){
 				if(this.paymentBtnDisabled){
@@ -245,6 +257,12 @@
 					//#ifdef H5
 					//支付宝h5支付
 					param.paymentType = 2;
+					if(this.deviceType == 3){
+						this.tipsFlag = true;
+						let url = window.location.href + '&isRedirect=1';
+						window.history.replaceState(null, '',url);
+						return;
+					}
 					api.unifiedPay(param).then((res)=>{
 						const data = res['data'];
 						this.paymentBtnDisabled = false;
@@ -339,8 +357,10 @@
 			}
 			this.courseDetail();
 			this.queryByUserIdFortuneStatistic()
-			console.log(option)
 			this.deviceType = common.checkDeviceType();
+			if(option.isRedirect == 1){
+				this.pay();
+			}
 		},
 		mounted() {
@@ -577,5 +597,42 @@
 		}
 	}
+.markBox {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  width: 100%;
+  height: 100%;
+  color: #fff;
+  display: flex;
+  justify-content: flex-end;
+  z-index: 100000;
+  background: rgba(0, 0, 0, 0.8);
+}
+// .iconfont {
+//   position: absolute;
+//   right: 8%;
+//   font-size: 40px;
+//   top: 2px;
+//   font-weight: bold;
+// }
+.guideImgBox {
+  margin: 20px auto;
+}
+.tips {
+  margin-top: 20%;
+  padding: 0 30px;
+}
+.tips p {
+  font-size: 18px;
+  margin-top: 10px;
+  text-align: justify;
+  letter-spacing: 1px;
+}
 </style>
--- a/pages/saleCourseLists/saleCourseLists.vue
+++ b/pages/saleCourseLists/saleCourseLists.vue
@@ -102,7 +102,7 @@
 			// 查看订单详情
 			viewDetail(item){
 				uni.navigateTo({
-					url:`/pages/orderDetail/orderDetail?id=${item.orderId}&type=drop`
+					url:`/pages/orderDetail/orderDetail?id=${item}&type=drop`
 				})
 			},
 		   bindDateChange: function(e) {

--- a/util/router.js
+++ b/util/router.js
@@ -3,6 +3,7 @@
 const whiteList = [
 	'/components/login/login',
 	'/pages/invitationRegister/invitationlogin',
+	'/components/clause/clause'
 ]
 export default function initApp(){
 	uni.addInterceptor('navigateTo', {