Commit 5c220466 authored by 李俊赕's avatar 李俊赕

v3bug修复

parent 147b58f4
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
protocolContent:'', protocolContent:'',
signUrl:'', signUrl:'',
jumpLoginStatus:true
}, },
...@@ -123,15 +123,17 @@ ...@@ -123,15 +123,17 @@
title:'加载中……' title:'加载中……'
}) })
const res = await vm.$u.api.getSettleBaseInfo() const res = await vm.$u.api.getSettleBaseInfo()
if (!res.status) { if (!res || !res.status) {
uni.showToast({ uni.showToast({
title: res.message || '获取基本信息错误', title: res && res.message || '获取基本信息错误',
icon: 'none' icon: 'none'
}); });
return false; return false;
} }
this.globalData.settledInfo = res.data this.globalData.settledInfo = res.data
console.log(res.data,'res.data') if(!res.data){
return
}
callBack(vm,res.data) callBack(vm,res.data)
uni.hideLoading() uni.hideLoading()
return res.data return res.data
......
//免登录接口 //免登录接口
import util from '@/utils/util.js' import util from '@/utils/util.js'
let noLoginUrl = [ let noLoginUrl = [
// '/addons/cms/wxapp.user/getworkertype',
// '/api/cmstag/tagListByType',
// '/addons/cms/wxapp.login/wxa',//授权昵称头像等
// '/addons/cms/wxapp.login/login',// 授权手机号
// '/addons/ask/api.common/config',
// '/addons/ask/api.login/login',
// '/addons/ask/api.login/register',
// '/addons/ask/api.login/thirdLogin',
// '/addons/ask/api.login/resetpwd',
// '/addons/ask/api.user/myinfo',
// '/addons/ask/api.user/answer',
// '/addons/ask/api.user/question',
// '/addons/ask/api.user/article',
// '/addons/ask/api.user/follower',
// '/addons/ask/api.user/attention',
// '/addons/ask/api.question/index',
// '/addons/ask/api.question/show',
// '/addons/ask/api.article/index',
// '/addons/ask/api.article/show',
// '/addons/ask/api.zone/index',
// '/addons/ask/api.tag/index',
// '/addons/ask/api.tag/show',
// '/addons/ask/api.expert/index',
// '/addons/ask/api.sms/send',
// '/addons/ask/api.ems/send',
// '/addons/ask/api.ajax/get_answer_list',
// '/addons/ask/api.ajax/get_comment_list',
// '/addons/ask/api.ajax/get_question_list',
// '/addons/ask/api.ajax/get_article_list',
// '/addons/ask/api.common/aboutus',
// '/addons/ask/api.common/agreement',
// '/addons/ask/api.login/wxLogin',
// '/addons/ask/api.login/appLogin',
// '/addons/ask/api.login/mobilelogin',
// '/addons/ask/api.search/index',
// '/addons/recharge/api.recharge/config',
// '/addons/third/api/getAuthUrl',
// '/addons/third/api/callback',
// '/addons/third/api/account',
'/v1/h5/settled/get-settled-info', '/v1/h5/settled/get-settled-info',
'/v1/h5/settled/area', '/v1/h5/settled/area',
'/v1/h5/settled/save-info', '/v1/h5/settled/save-info',
...@@ -65,7 +25,20 @@ import globalUrl from '@/common/base_url.js' ...@@ -65,7 +25,20 @@ import globalUrl from '@/common/base_url.js'
const install = (Vue, vm) => { const install = (Vue, vm) => {
let systemApiUrl = globalUrl.systemUrl.apiUrl let systemApiUrl = globalUrl.systemUrl.apiUrl
let ucenterApiUrl = globalUrl.ucenterUrl.apiUrl let ucenterApiUrl = globalUrl.ucenterUrl.apiUrl
function toLoginPage(){
const app = getApp()
let jumpLoginStatus
if(app && app.globalData){
jumpLoginStatus = app.globalData.jumpLoginStatus
}
if(!jumpLoginStatus){
return
}
app.globalData.jumpLoginStatus = false
vm.$u.route('/pages/login/wxlogin');
}
Vue.prototype.$u.http.setConfig({ Vue.prototype.$u.http.setConfig({
baseUrl: systemApiUrl, baseUrl: systemApiUrl,
header: { header: {
...@@ -78,7 +51,8 @@ const install = (Vue, vm) => { ...@@ -78,7 +51,8 @@ const install = (Vue, vm) => {
const reg = /\?\w+/; const reg = /\?\w+/;
let token = util.getToken() let token = util.getToken()
if(!token && noLoginUrl.indexOf(config.url)<0){ if(!token && noLoginUrl.indexOf(config.url)<0){
vm.$u.route('/pages/login/wxlogin'); toLoginPage()
return false
} }
// // const token = app && app.globalData && app.globalData.token || '' // // const token = app && app.globalData && app.globalData.token || ''
if(config.url.indexOf('access-token=')>=0 && config.params['access-token']){ if(config.url.indexOf('access-token=')>=0 && config.params['access-token']){
...@@ -116,13 +90,12 @@ const install = (Vue, vm) => { ...@@ -116,13 +90,12 @@ const install = (Vue, vm) => {
if (res.header.__token__) { if (res.header.__token__) {
vm.$u.vuex('vuex__token__', res.header.__token__); vm.$u.vuex('vuex__token__', res.header.__token__);
} }
console.log(res,'res')
const code = getCode(res) const code = getCode(res)
switch (code) { switch (code) {
case 1: case 1:
case 0: case 0:
if(res.status ===401 || res.statusCode === 401){ if(res.status ===401 || res.statusCode === 401){
vm.$u.route('/pages/login/wxlogin'); toLoginPage()
return return
} }
return result; return result;
...@@ -146,8 +119,7 @@ const install = (Vue, vm) => { ...@@ -146,8 +119,7 @@ const install = (Vue, vm) => {
let pages = getCurrentPages(); let pages = getCurrentPages();
if((pages[pages.length - 1]).route!=='pages/login/wxlogin'){ if((pages[pages.length - 1]).route!=='pages/login/wxlogin'){
util.setToken('') toLoginPage()
vm.$u.route('/pages/login/wxlogin');
return return
} }
return result; return result;
......
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
"navigationBarTitleText": "充电桩安装招募" "navigationBarTitleText": "充电桩安装招募"
} }
},{
"path": "pages/settle/base",
"style": {
"navigationBarTitleText": "基本信息"
}
},{ },{
"path": "pages/settle/sign-contract", "path": "pages/settle/sign-contract",
"style": { "style": {
......
...@@ -36,6 +36,10 @@ ...@@ -36,6 +36,10 @@
this.icon_notice = getApp().globalData.icon_auth_notice this.icon_notice = getApp().globalData.icon_auth_notice
this.icon_auth_notice_new = getApp().globalData.icon_auth_notice_new this.icon_auth_notice_new = getApp().globalData.icon_auth_notice_new
}, },
onShow(){
const app = getApp()
app.globalData.jumpLoginStatus = true
},
methods: { methods: {
//用户授权得到用户的信息 //用户授权得到用户的信息
getUserInfo: async function(e) { getUserInfo: async function(e) {
......
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
</view--> </view-->
<view class="item item-select u-row-between" @click="gopage('/pages/settle/select?selectType=area')"> <view class="item item-select u-row-between" @click="gopage('/pages/settle/select?selectType=area')">
<view class="label">接单城市:</view> <view class="label">接单城市:</view>
<p class="u-flex-1 u-text-right txt">{{ areaTxts.join(',') || "" }}</p> <p class="u-flex-1 u-text-right txt">{{ areaTxts.slice(0,2).join(',') || "" }}</p>
<u-icon name="arrow-right" color="#999" size="28"></u-icon> <u-icon name="arrow-right" color="#999" size="28"></u-icon>
</view> </view>
<view class="tips">(必选项)选择你可以服务的城市,可选多个</view> <view class="tips">(必选项)选择你可以服务的城市,可选多个</view>
<view class="item item-select flex-yc" @click="gopage('/pages/settle/select?selectType=working_age')"> <view class="item item-select flex-yc" @click="gopage('/pages/settle/select?selectType=working_age')">
<view class="label">电工工龄(年):</view> <view class="label">电工工龄(年):</view>
<p class="u-flex-1 u-text-right" v-show="baseInfo.working_age !== ''"> <p class="u-flex-1 u-text-right area" v-show="baseInfo.working_age !== ''">
{{ workingAgeTxt }} {{ workingAgeTxt }}
</p> </p>
<u-icon name="arrow-right" color="#999" size="28"></u-icon> <u-icon name="arrow-right" color="#999" size="28"></u-icon>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
placeholder="请输入详细服务地址" placeholder="请输入详细服务地址"
placeholder-style='color:#CCCCCC;font-size:28rpx;'/> placeholder-style='color:#CCCCCC;font-size:28rpx;'/>
</view> </view>
<view class="tips">(必填项)填写可接收物料的地址</view>
</view> </view>
</view> </view>
...@@ -641,6 +641,9 @@ ...@@ -641,6 +641,9 @@
.blueColor{ .blueColor{
color: #007AFF; color: #007AFF;
} }
.area{
max-width: 400rpx;
}
/* .back_view{ /* .back_view{
background-color: #FFFFFF; background-color: #FFFFFF;
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</view> </view>
<view class="seat"></view> <view class="seat"></view>
<view class="btn-wrap fixed flex flex-xc"> <view class="btn-wrap fixed flex flex-xc">
<button class="btn-submit" :disabled="!submitBtnStatus" @click="submitFileInfo"> <button class="btn-submit" :disabled="!submitBtnStatus" @click="$u.debounce(submitFileInfo, 500)">
{{ {{
!submitBtnStatus ? "完成必填项,可提交资料" : "提交" !submitBtnStatus ? "完成必填项,可提交资料" : "提交"
}} }}
...@@ -242,6 +242,7 @@ ...@@ -242,6 +242,7 @@
icon: 'none' icon: 'none'
}) })
formFlag = false; formFlag = false;
return formFlag;
} }
if (!fileInfo.id_card_back_check) { if (!fileInfo.id_card_back_check) {
uni.showToast({ uni.showToast({
......
...@@ -39,6 +39,9 @@ ...@@ -39,6 +39,9 @@
vm.status = result.record.status vm.status = result.record.status
} }
let settledInfo = await app.getBaseInfo(this,callBack) let settledInfo = await app.getBaseInfo(this,callBack)
if(!settledInfo){
return
}
this.settledInfo = settledInfo this.settledInfo = settledInfo
this.status = settledInfo.record.status this.status = settledInfo.record.status
}, },
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<view class="tips-box" v-if="info.tipsArr"> <view class="tips-box" v-if="info.tipsArr">
<text :class="['tips',info.tipsArr.length>1 && index===0 ? 'red' : '']" v-for="(txt,index) in info.tipsArr">{{txt}}</text> <text :class="['tips',info.tipsArr.length>1 && index===0 ? 'red' : '']" v-for="(txt,index) in info.tipsArr">{{txt}}</text>
</view> </view>
<button class="btn-submit" @click="goPage(info.url)">{{info.btnTxt}}</button> <button class="btn-submit" @click="$u.debounce(goPage, 500)">{{info.btnTxt}}</button>
</view> </view>
</template> </template>
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
return return
} }
const status = record.status const status = record.status
// const status = 4
const infoArr = this.promptList.filter(item=>{ const infoArr = this.promptList.filter(item=>{
const itemStatus = item.status const itemStatus = item.status
// console.log(itemStatus,'itemStatus') // console.log(itemStatus,'itemStatus')
...@@ -115,12 +116,19 @@ ...@@ -115,12 +116,19 @@
return itemStatus===status || idx>=0 return itemStatus===status || idx>=0
}) })
const info = infoArr.length>0 && infoArr[0] const info = infoArr.length>0 && infoArr[0]
if(info && status===6){ if(!info){
this.info = this.promptList[0]
return
}
if(status===6){
info.tipsArr[0] = '请缴纳'+ this.settledInfo.record.deposit +'元质保金' info.tipsArr[0] = '请缴纳'+ this.settledInfo.record.deposit +'元质保金'
}else if(status===4){
info.tipsArr[1] = this.settledInfo.record.reason || ''
} }
this.info = info this.info = info
}, },
goPage(url) { goPage() {
const url = this.info.url
uni.navigateTo({ uni.navigateTo({
url, url,
}); });
......
...@@ -386,6 +386,10 @@ ...@@ -386,6 +386,10 @@
this.selected.working_age = item.value this.selected.working_age = item.value
this.selected.workingAgeTxt = item.name this.selected.workingAgeTxt = item.name
}, },
selectAllarea(idx){
const allChildren = this.areaList[this.currentIndex]
},
selectArea(areaItem) { selectArea(areaItem) {
const code = areaItem.id const code = areaItem.id
const selected = this.selected const selected = this.selected
...@@ -445,6 +449,7 @@ ...@@ -445,6 +449,7 @@
.nav-right { .nav-right {
height: 100%; height: 100%;
overflow-x: hidden;
overflow: auto; overflow: auto;
width: 375rpx; width: 375rpx;
......
...@@ -3,7 +3,36 @@ ...@@ -3,7 +3,36 @@
<view class="content-txt"> <view class="content-txt">
<view class="title">入驻协议内容</view> <view class="title">入驻协议内容</view>
<view class="txt">此处为协议正式内容</view> <view class="txt">
</br>
师傅入驻须知
</br>
一、入驻流程
提交资料 → 审核通过 → 签署协议 → 开始接单
</br>
</br>
二、入驻条件
</br>
1.年龄在18-60周岁之间;
</br>
2.初中及以上学历;
</br>
3.能熟练使用智能手机;
</br>
4.与人交流时态度良好,沟通顺畅;
</br>
</br>
三、注意事项
</br>
1.若审核通过,平台工作人员将会电话联系您,并邀约参加师傅培训会,请您耐心等待;
</br>
2.开关插座、线路维修、空开漏保等品类的师傅需持有电工证;
</br>
3.家电清洗品类的师傅需持有专业高温清洗设备,并在每一笔清洗订单中上传设备照片(单独水枪类清洗设备不符合规定)。
</br>
4.请如实填写自己擅长品类,如有核实师傅申请的维修品类和开通账号的维修品类不一致,将不给予接单资格
</br>
</view>
</view> </view>
<view class="base-list"> <view class="base-list">
<view class="item item-input flex-yc"> <view class="item item-input flex-yc">
...@@ -49,7 +78,7 @@ ...@@ -49,7 +78,7 @@
</view> </view>
<view class="seat"></view> <view class="seat"></view>
<view class="btn-wrap flex-xc"> <view class="btn-wrap flex-xc">
<button class="btn-submit" :disabled="!submitStatus" @click="submitBaseInfo"> <button class="btn-submit" :disabled="!submitStatus" @click="$u.debounce(submitBaseInfo, 500)">
我已阅读协议,点击签约{{count ? '('+count+')' : ''}} 我已阅读协议,点击签约{{count ? '('+count+')' : ''}}
</button> </button>
</view> </view>
...@@ -97,7 +126,7 @@ ...@@ -97,7 +126,7 @@
}) })
this.startCounting() this.startCounting()
// this.getBaseInfo() this.getBaseInfo()
// const url = 'https://m.test.ibanshou.cn/activity/settled_2021/mini' // const url = 'https://m.test.ibanshou.cn/activity/settled_2021/mini'
// uni.navigateTo({ // uni.navigateTo({
// url:'/pages/settle/web?url='+url // url:'/pages/settle/web?url='+url
......
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