Skip to content

C
CFFP-HB
Commit 0621b91a by sunerhu
Options

1.增加登录loading 

2.修改申请加盟第进入第三步返回第二步没数据问题，
3.调整银行卡宽度问题
4.修改个人中心页面权限问题。
5.修改上传文件路径问题--待测试
parent 7fbf069f
Showing with 50 additions and 41 deletions
components/bootpage/bootpage.vue
...@@ -120,6 +120,7 @@ ...@@ -120,6 +120,7 @@
if(res['success']){ if(res['success']){
this.userId = String(res['data']['userId']); this.userId = String(res['data']['userId']);
uni.setStorageSync('isLogin','1') uni.setStorageSync('isLogin','1')
uni.setStorageSync('loginType','pwlogin')
// uni.navigateTo({ // uni.navigateTo({
// url:'/pages/orderConfirm/orderConfirm?userId=' + this.userId // url:'/pages/orderConfirm/orderConfirm?userId=' + this.userId
// }) // })
......
components/login/login.vue
...@@ -147,6 +147,9 @@ ...@@ -147,6 +147,9 @@
}, 1000); }, 1000);
}, },
loginIn(loginType){ loginIn(loginType){
uni.showLoading({
title: '加载中...'
});
const params = { const params = {
loginType:loginType, loginType:loginType,
...this.form ...this.form
...@@ -170,6 +173,7 @@ ...@@ -170,6 +173,7 @@
icon: 'none' icon: 'none'
}) })
} }
uni.hideLoading()
}) })
}, },
registerIn(){ registerIn(){
......
pages/application-process/bank-card.vue
...@@ -162,4 +162,7 @@ ...@@ -162,4 +162,7 @@
<style lang="scss"> <style lang="scss">
@import 'applyCommon.scss'; @import 'applyCommon.scss';
.form-control{
min-width: 440rpx;
}
</style> </style>
pages/application-process/education.vue
...@@ -109,14 +109,10 @@ ...@@ -109,14 +109,10 @@
} }
}, },
onShow() { onShow() {
uni.$on("ckqueryById", res => { let loadquery = uni.getStorageSync('REFRESH')
console.log('第四步骤') if(loadquery == true) {
if (res == true) { this.queryById(null, uni.getStorageSync('cffp_userId'))
this.queryById(null, uni.getStorageSync('cffp_userId')) }
}
// 移除监听事件
uni.$off('ckqueryById');
})
}, },
methods: { methods: {
educationLevelQuery() { educationLevelQuery() {
...@@ -220,7 +216,7 @@ ...@@ -220,7 +216,7 @@
@import 'applyCommon.scss'; @import 'applyCommon.scss';
.photo_w { .photo_w {
height: 320rpx; height: 380rpx;
width: 80%; width: 80%;
margin: auto; margin: auto;
padding-bottom: 20rpx; padding-bottom: 20rpx;
......
pages/application-process/id-card.vue
...@@ -98,13 +98,10 @@ ...@@ -98,13 +98,10 @@
} }
}, },
onShow() { onShow() {
uni.$on("ckqueryById", res => { let loadquery = uni.getStorageSync('REFRESH')
console.log('第3步骤') if (loadquery == true) {
if (res == true) { this.queryById(null, uni.getStorageSync('cffp_userId'))
this.queryById(null, uni.getStorageSync('cffp_userId')) }
}
uni.$off('ckqueryById');
})
}, },
methods: { methods: {
queryById(id, userId) { queryById(id, userId) {
...@@ -165,7 +162,8 @@ ...@@ -165,7 +162,8 @@
} }
api.saveApplyInfo(this.applyParam).then((res) => { api.saveApplyInfo(this.applyParam).then((res) => {
if (res['success']) { if (res['success']) {
this.queryById(null, uni.getStorageSync('cffp_userId')) // this.queryById(null, uni.getStorageSync('cffp_userId'))
uni.setStorageSync('REFRESH', true) //用来告诉234步进行加载
uni.navigateTo({ uni.navigateTo({
// url:`id-card?id=${res['data']['id']}` // url:`id-card?id=${res['data']['id']}`
url: `education` url: `education`
......
pages/application-process/work-experience.vue
...@@ -147,14 +147,10 @@ ...@@ -147,14 +147,10 @@
}, 500) }, 500)
}, },
onShow() { onShow() {
uni.$on("ckqueryById", res => { let loadquery = uni.getStorageSync('REFRESH')
console.log(res,'接收到广播，第二步', ) if(loadquery == true) {
if (res == true) { this.queryById(null, uni.getStorageSync('cffp_userId'))
this.queryById(null, uni.getStorageSync('cffp_userId')) }
}
// 移除监听事件
uni.$off('ckqueryById');
})
}, },
methods: { methods: {
clickImg(i) { clickImg(i) {
...@@ -210,6 +206,7 @@ ...@@ -210,6 +206,7 @@
api.saveApplyInfo(this.applyParam).then((res) => { api.saveApplyInfo(this.applyParam).then((res) => {
if (res['success']) { if (res['success']) {
this.queryById(null, uni.getStorageSync('cffp_userId')) this.queryById(null, uni.getStorageSync('cffp_userId'))
uni.setStorageSync('REFRESH', true)
uni.navigateTo({ uni.navigateTo({
// url:`id-card?id=${res['data']['id']}` // url:`id-card?id=${res['data']['id']}`
url: `id-card` url: `id-card`
...@@ -265,7 +262,7 @@ ...@@ -265,7 +262,7 @@
@import 'applyCommon.scss'; @import 'applyCommon.scss';
.photo_w { .photo_w {
height: 320rpx; height: 380rpx;
width: 80%; width: 80%;
margin: auto; margin: auto;
padding-bottom: 20rpx; padding-bottom: 20rpx;
......
pages/orderConfirm/orderConfirm.vue
...@@ -251,19 +251,19 @@ ...@@ -251,19 +251,19 @@
orderInfo: aliOrderString, orderInfo: aliOrderString,
success: function (resp) { success: function (resp) {
uni.navigateTo({ 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) { fail: function (err) {
console.log('fail:' + JSON.stringify(err)); console.log('fail:' + JSON.stringify(err));
uni.navigateTo({ 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{ }else{
uni.navigateTo({ 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 @@ ...@@ -8,7 +8,7 @@
<view class="infoBox"> <view class="infoBox">
<view class="firstLineBox"> <view class="firstLineBox">
<view> <view>
<strong>{{customerBasicInfo.realName}}</strong> <strong>{{loginornot == true ?customerBasicInfo.realName :'游客'}}</strong>
<text class="csTag" v-if="customerBasicInfo.partnerType">{{customerBasicInfo.partnerType}}</text> <text class="csTag" v-if="customerBasicInfo.partnerType">{{customerBasicInfo.partnerType}}</text>
</view> </view>
<view class="personalInfoBtn" @click="userinfo()"> <view class="personalInfoBtn" @click="userinfo()">
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<i class="iconfont icon-bianji"></i> <i class="iconfont icon-bianji"></i>
</view> </view>
</view> </view>
<view>昵称：{{customerBasicInfo.nickName}}</view> <view>昵称：{{loginornot == true ?customerBasicInfo.nickName :'游客'}}</view>
<view>{{customerBasicInfo.userDescription}}</view> <view>{{customerBasicInfo.userDescription}}</view>
</view> </view>
</view> </view>
...@@ -138,13 +138,17 @@ ...@@ -138,13 +138,17 @@
tabBar, tabBar,
}, },
onShow() { onShow() {
let loginType = uni.getStorageSync('loginType')
if(loginType == "visitor" ){
this.loginornot = false
};
uni.$on("handClick", res => { uni.$on("handClick", res => {
console.log('接受到监听') console.log('接受到监听')
this.customerBasicInfo = res.data this.customerBasicInfo = res.data
// 移除监听事件 // 移除监听事件
uni.$off('handClick'); uni.$off('handClick');
}) });
// setTimeout(() => { // setTimeout(() => {
// this.loadshow = false // this.loadshow = false
// }, 10000) // }, 10000)
...@@ -208,10 +212,17 @@ ...@@ -208,10 +212,17 @@
}, },
userinfo(){ userinfo(){
if(this.loginornot){ if(this.loginornot === true){
uni.navigateTo({ uni.navigateTo({
url:`/pages/personalCenter/user-information?customerBasicInfo=` + JSON.stringify(this.customerBasicInfo) url:`/pages/personalCenter/user-information?customerBasicInfo=` + JSON.stringify(this.customerBasicInfo)
}) })
}else {
uni.showToast({
title: "游客不可进行修改",
duration: 2000,
icon: 'none'
});
return false
} }
}, },
// 弹窗 // 弹窗
...@@ -235,9 +246,6 @@ ...@@ -235,9 +246,6 @@
api.queryInfo({userId:this.userId}).then(res=>{ api.queryInfo({userId:this.userId}).then(res=>{
if(res['success']){ if(res['success']){
this.customerBasicInfo = res['data']; this.customerBasicInfo = res['data'];
if(this.customerBasicInfo.mobile == null){
this.loginornot = false
}
this.inviteEqrode = this.customerBasicInfo.invitationCode; this.inviteEqrode = this.customerBasicInfo.invitationCode;
uni.setStorageSync('user_mobile', res.data.mobile) uni.setStorageSync('user_mobile', res.data.mobile)
uni.setStorageSync('userinfodataForm', res.data) uni.setStorageSync('userinfodataForm', res.data)
......
pages/personalCenter/teamPerformance/teamPerformance.vue
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
text-align: center; text-align: center;
// width: 128rpx; // width: 128rpx;
// height: 48rpx; // height: 48rpx;
font-size: 32rpx; font-size: 28rpx;
font-weight: 800; font-weight: 800;
color: #20279B; color: #20279B;
line-height: 48rpx; line-height: 48rpx;
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
width: 128rpx; width: 128rpx;
height: 48rpx; height: 48rpx;
font-weight: 800; font-weight: 800;
font-size: 32rpx; font-size: 28rpx;
color: #666666; color: #666666;
line-height: 48rpx; line-height: 48rpx;
} }
......
uni_modules/lsj-upload/components/lsj-upload/lsj-upload.vue
...@@ -248,8 +248,9 @@ export default { ...@@ -248,8 +248,9 @@ export default {
}, },
// 创建选择器 // 创建选择器
create() { create() {
// /uni_modules/lsj-upload/hybrid/html/uploadFile.html
// 若iOS端服务端处理不了跨域就将hybrid目录内的html放到服务端去，并将此处path改成服务器上的地址 // 若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); let dom = this.lsjFile.create(path);
// #ifdef H5 // #ifdef H5
this.$refs.lsj.$el.appendChild(dom); this.$refs.lsj.$el.appendChild(dom);
......
util/router.js
...@@ -4,7 +4,8 @@ const whiteList = [ ...@@ -4,7 +4,8 @@ const whiteList = [
'/components/login/login', '/components/login/login',
'/pages/invitationRegister/invitationlogin', '/pages/invitationRegister/invitationlogin',
'/components/clause/clause', '/components/clause/clause',
'/pages/orderDetail/orderDetail' '/pages/orderDetail/orderDetail',
'/pages/courseDetail/courseDetail',
] ]
export default function initApp(){ export default function initApp(){
uni.addInterceptor('navigateTo', { uni.addInterceptor('navigateTo', {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment