1.增加登录loading

2.修改申请加盟第进入第三步返回第二步没数据问题，
3.调整银行卡宽度问题
4.修改个人中心页面权限问题。
5.修改上传文件路径问题--待测试

components/bootpage/bootpage.vue

@@ -120,6 +120,7 @@
 					if(res['success']){
 						this.userId = String(res['data']['userId']);
 						uni.setStorageSync('isLogin','1')
+					    uni.setStorageSync('loginType','pwlogin')
 						// uni.navigateTo({
 						// 	url:'/pages/orderConfirm/orderConfirm?userId=' + this.userId
 						// })

components/login/login.vue

@@ -147,6 +147,9 @@
 					}, 1000);
 				  },
 				loginIn(loginType){
+					uni.showLoading({
+					  title: '加载中...'
+					});
 					const params = {
 						loginType:loginType,
 						...this.form
@@ -170,6 +173,7 @@
 								icon: 'none'					
 							})
 						}
+						uni.hideLoading()
 					})
 				},
 				registerIn(){

pages/application-process/bank-card.vue

@@ -162,4 +162,7 @@
 
 <style lang="scss">
 	@import 'applyCommon.scss';
+	.form-control{
+		min-width: 440rpx;
+	}
 </style>

pages/application-process/education.vue

@@ -109,14 +109,10 @@
 			}
 		},
 		onShow() {
-			uni.$on("ckqueryById", res => {
-				console.log('第四步骤')
-				if (res == true) {
-					this.queryById(null, uni.getStorageSync('cffp_userId'))
-				}
-				// 移除监听事件
-				uni.$off('ckqueryById'); 
-			})
+			let loadquery =  uni.getStorageSync('REFRESH')
+			if(loadquery  == true) {
+				this.queryById(null, uni.getStorageSync('cffp_userId'))
+			}
 		},
 		methods: {
 			educationLevelQuery() {
@@ -220,7 +216,7 @@
 	@import 'applyCommon.scss';
 
 	.photo_w {
-		height: 320rpx;
+		height: 380rpx;
 		width: 80%;
 		margin: auto;
 		padding-bottom: 20rpx;

pages/application-process/id-card.vue

@@ -98,13 +98,10 @@
 			}
 		},
 		onShow() {
-			uni.$on("ckqueryById", res => {
-				console.log('第3步骤')
-				if (res == true) {
-					this.queryById(null, uni.getStorageSync('cffp_userId'))
-				}
-				uni.$off('ckqueryById');
-			})
+			let loadquery = uni.getStorageSync('REFRESH')
+			if (loadquery == true) {
+				this.queryById(null, uni.getStorageSync('cffp_userId'))
+			}
 		},
 		methods: {
 			queryById(id, userId) {
@@ -165,7 +162,8 @@
 					}
 					api.saveApplyInfo(this.applyParam).then((res) => {
 						if (res['success']) {
-							this.queryById(null, uni.getStorageSync('cffp_userId'))
+							// this.queryById(null, uni.getStorageSync('cffp_userId'))
+							uni.setStorageSync('REFRESH', true) //用来告诉234步进行加载
 							uni.navigateTo({
 								// url:`id-card?id=${res['data']['id']}`
 								url: `education`

pages/application-process/work-experience.vue

@@ -147,14 +147,10 @@
 			}, 500)
 		},
 		onShow() {
-			uni.$on("ckqueryById", res => {
-				console.log(res,'接收到广播，第二步', )
-				if (res == true) {
-					this.queryById(null, uni.getStorageSync('cffp_userId'))
-				}
-				// 移除监听事件
-				uni.$off('ckqueryById');  
-			})
+			let loadquery =  uni.getStorageSync('REFRESH')
+			if(loadquery  == true) {
+				this.queryById(null, uni.getStorageSync('cffp_userId'))
+			}
 		},
 		methods: {
 			clickImg(i) {
@@ -210,6 +206,7 @@
 					api.saveApplyInfo(this.applyParam).then((res) => {
 						if (res['success']) {
 							this.queryById(null, uni.getStorageSync('cffp_userId'))
+							uni.setStorageSync('REFRESH', true)
 							uni.navigateTo({
 								// url:`id-card?id=${res['data']['id']}`
 								url: `id-card`
@@ -265,7 +262,7 @@
 	@import 'applyCommon.scss';
 
 	.photo_w {
-		height: 320rpx;
+		height: 380rpx;
 		width: 80%;
 		margin: auto;
 		padding-bottom: 20rpx;

pages/orderConfirm/orderConfirm.vue

@@ -251,19 +251,19 @@
 								    orderInfo: aliOrderString,
 								    success: function (resp) {
 										uni.navigateTo({
-											url:`/pages/orderStatus/orderStatus?orderId=${_this.orderId}&fileId=${_this.fileId}&orderStatus=2&userId=${_this.userId}isRedirect=1`
+											url:`/pages/orderStatus/orderStatus?orderId=${_this.orderId}&fileId=${_this.fileId}&orderStatus=2&userId=${_this.userId}&isRedirect=1`
 										})
 								    },
 								    fail: function (err) {
 								        console.log('fail:' + JSON.stringify(err));
 										uni.navigateTo({
-											url:`/pages/orderStatus/orderStatus?orderId=${_this.orderId}&fileId=${_this.fileId}&orderStatus=1&userId=${_this.userId}isRedirect=1`
+											url:`/pages/orderStatus/orderStatus?orderId=${_this.orderId}&fileId=${_this.fileId}&orderStatus=1&userId=${_this.userId}&isRedirect=1`
 										})
 								    }
 								});
 							}else{
 								uni.navigateTo({
-									url:`/pages/orderStatus/orderStatus?orderId=${this.orderId}&fileId=${this.fileId}&orderStatus=2&userId=${this.userId}isRedirect=1`
+									url:`/pages/orderStatus/orderStatus?orderId=${this.orderId}&fileId=${this.fileId}&orderStatus=2&userId=${this.userId}&isRedirect=1`
 								})
 							}
 						 

pages/personalCenter/personalCenter.vue

@@ -8,7 +8,7 @@
 			<view class="infoBox">
 				<view class="firstLineBox">
 					<view>
-						<strong>{{customerBasicInfo.realName}}</strong>
+						<strong>{{loginornot == true ?customerBasicInfo.realName :'游客'}}</strong>
 						<text class="csTag" v-if="customerBasicInfo.partnerType">{{customerBasicInfo.partnerType}}</text>
 					</view>
 					<view class="personalInfoBtn" @click="userinfo()">
@@ -16,7 +16,7 @@
 						<i class="iconfont icon-bianji"></i>
 					</view>
 				</view>
-				<view>昵称：{{customerBasicInfo.nickName}}</view>
+				<view>昵称：{{loginornot == true ?customerBasicInfo.nickName :'游客'}}</view>
 				<view>{{customerBasicInfo.userDescription}}</view>
 			</view>
 		</view>
@@ -138,13 +138,17 @@
 			tabBar,
 		},
 		onShow() {
+			let loginType  = uni.getStorageSync('loginType')
+			if(loginType == "visitor" ){
+				this.loginornot = false
+			};
 			uni.$on("handClick", res => {
 				console.log('接受到监听')
 				this.customerBasicInfo = res.data
 				// 移除监听事件
 				 uni.$off('handClick');  
-			})
-			
+			});
+	
 			// setTimeout(() => {
 			// 	this.loadshow = false
 			// }, 10000)
@@ -208,10 +212,17 @@
 			},
 		
 			userinfo(){
-				if(this.loginornot){
+				if(this.loginornot === true){
 					uni.navigateTo({
 						url:`/pages/personalCenter/user-information?customerBasicInfo=` + JSON.stringify(this.customerBasicInfo)
 					})
+				}else {
+					uni.showToast({
+						title: "游客不可进行修改",
+						duration: 2000,
+						icon: 'none'
+					});
+					return false
 				}
 			},
 			// 弹窗
@@ -235,9 +246,6 @@
 				api.queryInfo({userId:this.userId}).then(res=>{
 					if(res['success']){
 						this.customerBasicInfo = res['data'];
-						if(this.customerBasicInfo.mobile == null){
-							this.loginornot = false
-						}
 						this.inviteEqrode = this.customerBasicInfo.invitationCode;
 						uni.setStorageSync('user_mobile', res.data.mobile)
 						uni.setStorageSync('userinfodataForm', res.data)

pages/personalCenter/teamPerformance/teamPerformance.vue

@@ -250,7 +250,7 @@
 		text-align: center;
 		// width: 128rpx;
 		// height: 48rpx;
-		font-size: 32rpx;
+		font-size: 28rpx;
 		font-weight: 800;
 		color: #20279B;
 		line-height: 48rpx;
@@ -261,7 +261,7 @@
 		width: 128rpx;
 		height: 48rpx;
 		font-weight: 800;
-		font-size: 32rpx;
+		font-size: 28rpx;
 		color: #666666;
 		line-height: 48rpx;
 	}

uni_modules/lsj-upload/components/lsj-upload/lsj-upload.vue

@@ -248,8 +248,9 @@ export default {
 		},
 		// 创建选择器
 		create() {
+			// /uni_modules/lsj-upload/hybrid/html/uploadFile.html
 			// 若iOS端服务端处理不了跨域就将hybrid目录内的html放到服务端去，并将此处path改成服务器上的地址
-			let path = '/uni_modules/lsj-upload/hybrid/html/uploadFile.html';
+			let path = '../../hybrid/html/uploadFile.html';
 			let dom = this.lsjFile.create(path);
 			// #ifdef H5
 			this.$refs.lsj.$el.appendChild(dom);

util/router.js

@@ -4,7 +4,8 @@ const whiteList = [
 	'/components/login/login',
 	'/pages/invitationRegister/invitationlogin',
 	'/components/clause/clause',
-	'/pages/orderDetail/orderDetail'
+	'/pages/orderDetail/orderDetail',
+	'/pages/courseDetail/courseDetail',
 ]
 export default function initApp(){
 	uni.addInterceptor('navigateTo', {