hmy_farmer-main.git

			@@ -1,5 +1,5 @@
			<template>
			<view class="main-container login-container img100 relative" style="margin-top: 0rpx;">
			<view class="main-container login-container img100 relative" style="margin-top: 0rpx;min-height: 100vh;">
			<!-- background-image:url('@/static/images/supplier/login/bg.png') -->

			<image class="component-bg"
			@@ -22,7 +22,7 @@
			</view>
			<view class="t-a input form-input" v-if="loginType=='pwd'">
			<!-- <input type="text" name="userName" placeholder="请输入账号" v-model="userName" /> -->
			<u-input placeholder="请输入账号" :border="false" v-model="userName"></u-input>
			<u-input placeholder="请输入账号" :border="false" v-model="userName" @blur="validatePhoneNumber()"></u-input>

			</view>
			<view class="t-a input form-input" v-if="loginType=='pwd'">
			@@ -31,7 +31,7 @@
			<view class="t-a input form-input" v-if="loginType=='code'">


			<u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber">
			<u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber" @blur="validatePhoneNumber()">
			<template slot="suffix">
			<view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
			{{ getCodeText }}
			@@ -46,6 +46,43 @@

			</view>

			<view class="flex flex-wrap-normal" v-if="true">
			<view :style="{'margin-top': '24rpx','margin-right': '12rpx','font-size':'24rpx'}"
			@click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']">

			</view>
			<!-- /pages/help/content?id=新手帮助 -->
			<!-- 用户协议，隐私政策、卖家入驻协议、合伙人入驻协议 -->

			<!-- #ifdef PUB_PARTNER -->
			<view class="topic-gray">
			请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>、
			<span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span>
			、<span class="t-red" @click="goto('/pages/help/content?id=合伙人入驻协议',false)">《合伙人入驻协议》</span>
			如您同意该指引，请勾选开始使用本小程序
			</view>
			<!-- #endif -->
			<!-- #ifdef PUB_SUPPLIER -->
			<view class="topic-gray">
			请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>、
			<span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span>
			、<span class="t-red" @click="goto('/pages/help/content?id=卖家入驻协议',false)">《卖家入驻协议》</span>
			如您同意该指引，请勾选开始使用本小程序
			</view>
			<!-- #endif -->
			<!-- #ifdef PUB_CUSTOMER -->
			<view class="topic-gray">
			请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>和
			<span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span>
			如您同意该指引，请勾选开始使用本小程序
			</view>
			<!-- #endif -->

			</view>





			<button @tap="login()" class="bottom-button">登录</button>

			@@ -58,7 +95,9 @@
			<view class="topic-font m-l-a m-r-0" v-if="apitype!=='loginAdmin'" @click="toReg">前往注册</view>

			<!-- #ifdef PUB_CUSTOMER -->
			<view class="topic-font m-l-a m-r-0" @click="toHome">返回首页</view>
			<view class="topic-font m-l-a m-r-0" @click="toHome" v-if="!source">返回首页</view>
			<view class="topic-font m-l-a m-r-0" @click="backpage" v-if="source==='jump'">返回上一页</view>

			<!-- #endif -->
			<!-- #ifdef PUB_PARTNER -->
			<view class="topic-font m-l-a m-r-0" @click="()=>{
			@@ -85,6 +124,8 @@
			<script>
			export default {
			async onLoad(options) {
			this.source = options.source \|\| ''
			this.sharePartnerUserId = options.sharePartnerUserId \|\| ''
			// #ifdef PUB_CUSTOMER
			var query = options.q && decodeURIComponent(options.q) \|\| ''
			var querydto = {}
			@@ -99,7 +140,24 @@
			console.error('error', e)
			}
			}
			console.log('options query111', querydto)
			try {
			if (!querydto.partnerUserId) {
			if (options.query && options.query.scene \|\| options.scene) {
			//说明是特殊小程序二维码扫码跳转的
			var keyvalues = decodeURIComponent(options.query&&options.query.scene \|\| options.scene).split("&")
			for (var item of keyvalues) {
			var tarr = item.split("=")
			querydto[tarr[0]] = tarr[1]
			}
			}
			}

			} catch (e) {
			console.error('error2', e)
			}


			console.log('options query111', options, querydto)
			// this.optionsStr = JSON.stringify(options) \|\| ''
			if (querydto.partnerUserId) {
			//通过接口获取名称，兼容，url上不能放中文的情况
			@@ -120,22 +178,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 +207,8 @@
			} = await tmp.$http.request('post',
			'/api/customer/bind/partner', {
			data: {
			partnerUserId: querydto.partnerUserId
			partnerUserId: querydto
			.partnerUserId
			}
			})
			tmp.$message.hideLoading()
			@@ -228,8 +287,25 @@
			} else {
			console.log('to login 3')
			//退出登录了，或者失效了
			// uni.navigateTo({
			// url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
			// })
			if (!querydto.partnerUserName) {
			tmp.$message.showLoading()
			const resname = await tmp.$http.request('get',
			'/api/customer/partner/name', {
			params: {
			id: querydto.partnerUserId
			}
			})
			tmp.$message.hideLoading()
			if (resname.code == 0) {
			querydto.partnerUserName = resname.data \|\| ''
			}

			}
			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\|\|''}`
			})
			}
			} catch (e2) {
			@@ -251,11 +327,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\|\|''}`
			})
			}

			@@ -266,8 +345,8 @@
			},
			onShareAppMessage() {
			let that = this;
			var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name \|\| that.currentInfo.supplierDTO &&
			currentInfo.supplierDTO.name \|\| that.currentInfo.partnerDTO && currentInfo.partnerDTO.name \|\| ''
			var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name \|\| that.currentInfo.supplierDTO &&
			that.currentInfo.supplierDTO.name \|\| that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name \|\| ''
			var url =
			`/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id\|\|''}&shareName=${name\|\|''}`; //你的转发页面路径拼接参数
			return {
			@@ -277,8 +356,8 @@
			},
			onShareTimeline() {
			let that = this;
			var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name \|\| that.currentInfo.supplierDTO &&
			currentInfo.supplierDTO.name \|\| that.currentInfo.partnerDTO && currentInfo.partnerDTO.name \|\| ''
			var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name \|\| that.currentInfo.supplierDTO &&
			that.currentInfo.supplierDTO.name \|\| that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name \|\| ''
			var url =
			`/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id\|\|''}&shareName=${name\|\|''}`; //你的转发页面路径拼接参数
			return {
			@@ -297,6 +376,8 @@

			phoneNumber: '',
			smsCode: '',
			source: '', //来源
			sharePartnerUserId: '', //分享跳转登录的id

			checked: false,
			loginType: 'pwd', //pwd和code，密码和验证码登录
			@@ -305,6 +386,7 @@
			getCodeBtnColor: "#20613D",
			getCodeisWaiting: false,
			Timer: undefined,
			protocal:false,
			// #ifdef PUB_SUPPLIER
			apitype: 'loginSupplier',
			// #endif
			@@ -318,6 +400,23 @@
			};
			},
			methods: {
			// 手机号码正则表达式校验
			validatePhoneNumber() {

			// 手机号码正则表达式，可以根据需要调整
			const phoneRegex = /^[1][3-9][0-9]{9}$/;
			if (this.loginType == 'pwd') {
			if (!phoneRegex.test(this.userName)) {
			this.$message.showToast('请填写正确手机号码')
			}
			}
			if (this.loginType == 'code') {
			if (!phoneRegex.test(this.phoneNumber)) {
			this.$message.showToast('请填写正确手机号码')
			}
			}

			},
			async getCode() {
			console.log('getCode')
			uni.hideKeyboard() //隐藏已经显示的软键盘，如果软键盘没有显示则不做任何操作。
			@@ -381,7 +480,7 @@
			}, 1000)
			},
			toHome() {
			uni.redirectTo({
			uni.reLaunch({
			url: '/pages/home/home'
			})
			},
			@@ -397,21 +496,31 @@
			})
			// #endif
			// #ifdef PUB_SUPPLIER
			uni.redirectTo({
			uni.reLaunch({
			url: '/pages/login/supplier-reg'
			})
			// #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.reLaunch({
			url: '/pages/login/supplier-reg'
			})
			// todo 如果是有分享id的，可能需要提前进行绑定


			// #endif
			},
			changeAll(e) {
			this.pcfvalue = e.detail.value[0]
			},
			async login() {
			if(!this.protocal){
			this.$message.showToast('请同意用户协议')
			return
			}
			uni.showLoading({
			title: '登陆中'
			});
			@@ -477,6 +586,8 @@
			// uni.navigateBack();
			// }, 1000);



			} else {
			// uni.showToast({
			// title: '登录失败！',