| manifest.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/login/supplier-login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/login/supplier-reg.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
manifest.json
@@ -49,7 +49,7 @@ "quickapp" : {}, /* 快应用特有相关 */ "mp-weixin" : { "appid" : "wx6d0ecc4e18710458", "appid" : "wx1441324401626290", "setting" : { "urlCheck" : false, "es6" : true, pages/login/supplier-login.vue
@@ -120,22 +120,22 @@ tmp.$nextTick(async () => { if (!tmp.currentInfo.customerDTO) { tmp.$message.showToast( '您尚未完善信息无法绑定') setTimeout(() => { uni.reLaunch({ url: '/pages/home/home' }) '您尚未完善信息无法绑定') setTimeout(() => { uni.reLaunch({ url: '/pages/home/home' }) }, 500) return } else { if (tmp.currentInfo.customerDTO .partnerId) { tmp.$message.showToast( '您已绑定，请联系客服解除绑定') setTimeout(() => { uni.reLaunch({ url: '/pages/home/home' }) '您已绑定，请联系客服解除绑定') setTimeout(() => { uni.reLaunch({ url: '/pages/home/home' }) }, 500) return } else { @@ -149,7 +149,8 @@ } = await tmp.$http.request('post', '/api/customer/bind/partner', { data: { partnerUserId: querydto.partnerUserId partnerUserId: querydto .partnerUserId } }) tmp.$message.hideLoading() @@ -228,8 +229,11 @@ } else { console.log('to login 3') //退出登录了，或者失效了 uni.navigateTo({ url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}` // uni.navigateTo({ // url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}` // }) uni.navigateTo({ url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}` }) } } catch (e2) { @@ -251,11 +255,14 @@ } } console.log('to login 2', `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}` ) // console.log('to login 2', // `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}` // ) // uni.navigateTo({ // url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}` // }) uni.navigateTo({ url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}` url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}` }) } @@ -402,9 +409,12 @@ }) // #endif // #ifdef PUB_CUSTOMER addstr = '?source=step' uni.navigateTo({ url: '/sub_pages/customer/customer-info/customer-info' + addstr // addstr = '?source=step' // uni.navigateTo({ // url: '/sub_pages/customer/customer-info/customer-info' + addstr // }) uni.redirectTo({ url: '/pages/login/supplier-reg' }) // #endif }, pages/login/supplier-reg.vue
@@ -40,7 +40,11 @@ <!-- #endif --> </view> <!-- #ifdef PUB_CUSTOMER --> <view class="t-a form-input"> <u-input placeholder="请输入店铺名称" :border="false" v-model="regCustomerName"></u-input> </view> <!-- #endif --> <view class="t-a form-input" v-if="loginType=='code'"> <u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber"> <template slot="suffix"> @@ -49,19 +53,11 @@ </view> </template> </u-input> <!-- <u-input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber" style="position: relative;z-index: 1;" /> --> </view> <view class="t-a form-input" v-if="loginType=='code'"> <!-- <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode" style="position: relative;z-index: 1;" /> --> <view class="t-a form-input"> <u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input> </view> <view class="t-a form-input" v-if="loginType=='code'"> @@ -82,7 +78,8 @@ <view class="topic-font m-l-0 m-r-a" @click="backInfoPage" v-if="source==='step'">返回上一步 </view> <!-- #ifdef PUB_CUSTOMER --> <view class="topic-font m-l-a m-r-a" @click="scanPartnerCode" v-if="source==='step'">扫码绑定合伙人 <!-- v-if="source==='step'" --> <view class="topic-font m-l-0 m-r-a" @click="scanPartnerCode">扫码绑定合伙人 </view> <!-- #endif --> <view class="topic-font m-l-a m-r-0" @click="toLogin">前往登录</view> @@ -127,6 +124,7 @@ getCodeisWaiting: false, Timer: undefined, protocal: false, regCustomerName: '', source: '', // #ifdef PUB_SUPPLIER apitype: 'supplier', @@ -149,6 +147,12 @@ if (dto.partnerUserId) { this.partnerId = dto.partnerUserId || '' this.partnerName = dto.partnerUserName || '佚名' } } if (options.partnerUserId) { this.partnerId = options.partnerUserId || '' if (options.partnerUserName) { this.partnerName = options.partnerUserName || '佚名' } } // #endif @@ -349,6 +353,12 @@ }); return; } // #ifdef PUB_CUSTOMER if (!that.regCustomerName) { this.$message.showToast('店铺名称未填写') return } // #endif // if (this.pcfvalue == undefined) { // util.showMyToast('必须勾选《用户服务协议》及《隐私政策》'); // return; @@ -377,7 +387,16 @@ // dto.partnerId = this.partnerId || undefined dto.partnerUserId = this.partnerId || undefined post.dto = dto } else { // #ifdef PUB_CUSTOMER var dto = {} dto.partnerUserId = this.partnerId || undefined dto.name = this.regCustomerName || '' post.dto = dto // #endif } post.wxcode = wxcode // const {
