add

App.vue

@@ -162,6 +162,9 @@
 					//   this.audioTeam.push(result.extras.type);
 					// }
 				}
+
+				console.log("收到消息")
+				console.log(result)
 				// 点击事件
 				if (notificationEventType == 'notificationOpened') {
 					if (result.extras.type == 2) {

manifest.json

@@ -2,8 +2,8 @@
 	"name": "惠农生活",
 	"appid": "__UNI__3A527D1",
 	"description": "",
-	"versionName": "2.0.45",
+	"versionName": "2.0.48",
-	"versionCode": 2045,
+	"versionCode": 2048,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {

pages/gather/subnvue/concat.nvue

@@ -180,7 +180,7 @@
 
 	.next-btn {
 		position: absolute;
-		bottom: 100rpx;
+		bottom: 100px;
 		left: 375rpx;
 		transform: translateX(-50%);
 		width: 240rpx;

pages/index/subnvue/concat.nvue

@@ -19,7 +19,7 @@
 			<image src="/static/images/greenLine.png" style="width:35px;height: 60px;" mode=""></image>
 		</view>
 		<view class="tabbar2 center" :style="{top:(offsetY-68)+'px'}">
-			<image src="/static/images/fabu.png" class="tab-icon"></image>
+			<image src="/static/images/ydwd.png" class="tab-icon"></image>
 			<text class="te">工作台</text>
 		</view>
 		<view class="pointe2" :style="{top:(offsetY-58)+'px'}">

pages/store/settled/index.vue

@@ -1,6 +1,33 @@
 <template>
 	<view class="">
-		<!-- <view class="bar" style="padding-top: var(--status-bar-height);"> -->
+
+		<view class="settlementAgreement" v-if="isshow">
+			<view class="setAgCount" style="width: 100%;height: 100%;padding-top: 180rpx;">
+				<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:90rpx"
+					@click="isshow=false,num=10">
+					<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
+				</view>
+
+				<div class="title">{{detail.title}}</div>
+				<view class="contenta" v-if="detail.mer_services_agree">
+					<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
+
+				</view>
+				<view class="contenta" v-else>
+					<jyf-parser :html="detail.mer_supply_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
+				</view>
+
+				<view class="setAgCountbtn">
+					<view class="border"></view>
+					<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0"
+						@click="agree">
+						<text v-if="num>0">请仔细阅读协议 {{num}}秒后可提交</text>
+						<text v-else>同意本协议</text>
+					</button>
+				</view>
+			</view>
+		</view>
+		<view class="" v-else>
 			<view class="bar" style="padding-top:var(--status-bar-height) ;">
 				<view class="" style="height: 30rpx;">
 				</view>
@@ -237,8 +264,8 @@
 				<u-picker cancelColor='#3ABE40' confirmColor='#3ABE40' @cancel='showMerchantCategoryPicker=false'
 					@confirm='confirmCate' :show="showMerchantCategoryPicker" keyName="category_name"
 					:columns="MerchantCategoryColumn"></u-picker>
-			<u-picker cancelColor='#3ABE40' confirmColor='#3ABE40' @cancel='showStoreType=false' @confirm='confirmType'
+				<u-picker cancelColor='#3ABE40' confirmColor='#3ABE40' @cancel='showStoreType=false'
-				:show="showStoreType" keyName="type_name" :columns="StoreTypeColumn">
+					@confirm='confirmType' :show="showStoreType" keyName="type_name" :columns="StoreTypeColumn">
 				</u-picker>
 				<u-picker cancelColor='#3ABE40' confirmColor='#3ABE40' @cancel='showCompanyType=false'
 					@confirm='confirmCompany' :show="showCompanyType" :columns="companyColumn" keyName='label'>
@@ -259,9 +286,9 @@
 					ref="verify">
 				</Verify>
 			</view>
-
-
 		</view>
+	</view>
+
 
 
 
@@ -288,7 +315,8 @@
 		getStoreTypeApi,
 		getIntention,
 		getGoodsDetails,
-		getUnimpInfo
+		getUnimpInfo,
+		agreeiness
 	} from '@/api/store.js';
 	import Verify from '@/components/verify/verify.vue';
 	export default {
@@ -302,6 +330,7 @@
 		// },
 		data() {
 			return {
+				isshow: false,
 				tagStyle: {
 					img: 'width:100%;display:block;'
 				},
@@ -328,7 +357,9 @@
 					}]
 				],
 				text: '获取验证码',
+				detail: {},
 				uniMpInfo: "",
+				num: 10,
 				formData: {
 					"phone": "",
 					"mer_name": "",
@@ -362,6 +393,24 @@
 			},
 			mapGetters(['isLogin', 'viewColor', 'keyColor'])),
 		methods: {
+			countDown() {
+				let {
+					num
+				} = this;
+				num = num > 0 ? num - 1 : "0";
+				setTimeout(() => {
+					this.num = num;
+					if (num == '0') {
+						return
+					}
+					if (this.isshow == false && this.num > 0) {
+						this.num = 10
+						return
+					}
+					this.countDown();
+				}, 1000);
+			},
+
 			back() {
 				uni.navigateBack()
 			},
@@ -490,12 +539,27 @@
 					}
 				}, 1000);
 			},
+			shoplist(val) {
+				agreeiness({
+					type: val
+				}).then(res => {
+					this.detail = res.data
+				})
+			},
 			submit() {
 				if (!this.checkboxValue1[0]) {
 					return Toast("请勾选用户协议")
 				}
 				this.splitAddress(this.formData.address)
 				this.formData.step = this.step
+
+				if (this.step == 2) {
+					this.isshow = true
+					this.countDown()
+				} else {
+					this.agree()
+				}
+				return
 				create(this.formData).then(res => {
 					console.log(res.data.mer_intention_id, 'res')
 					this.formData.mer_intention_id = res.data.mer_intention_id
@@ -513,6 +577,29 @@
 					console.log(err, 'err')
 					Toast(err)
 				})
+			},
+			agree() {
+				this.isshow = false
+				create(this.formData).then(res => {
+					console.log(res.data.mer_intention_id, 'res')
+					this.formData.mer_intention_id = res.data.mer_intention_id
+					this.formData.status = 0
+					if (this.step == 2) {
+						getIntention(this.$store.state.app.userInfo.uid).then(res => {
+							if (Object.keys(res.data).length == 0) return
+							this.formData = res.data
+							this.step = this.formData.step
+							this.formData.phone = this.$store.state.app.userInfo.account
+						})
+					}
+					this.step++
+				}).catch(err => {
+					console.log(err, 'err')
+					Toast(err)
+				})
+
+
+
 			},
 			jumpToList() {
 				uni.navigateTo({
@@ -540,7 +627,8 @@
 			// this.getAssistProductList();
 		},
 		onLoad(option) {
-			console.log(this.$store.state.app)
+			// console.log(this.$store.state.app)
+			this.shoplist('mer_services_agree')
 			this.formData.phone = this.$store.state.app.userInfo.account
 			merClassifly().then(res => {
 				this.MerchantCategoryColumn = [res.data]
@@ -782,4 +870,538 @@
 		z-index: 999;
 
 	}
+
+	.settlementAgreement {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 12;
+		background: rgba(0, 0, 0, .5);
+	}
+
+	.settlementAgreement .setAgCount {
+		background: #fff;
+		width: 694rpx;
+		// height: 458px;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+
+		padding: 28rpx;
+		-webkit-transform: translate(-50%, -50%);
+		-moz-transform: translate(-50%, -50%);
+		transform: translate(-50%, -50%);
+		overflow: hidden;
+
+		.content {
+			height: 900rpx;
+			overflow-y: scroll;
+
+			/deep/ p {
+				font-size: 13px;
+				line-height: 22px;
+			}
+
+			/deep/ img {
+				max-width: 100%;
+			}
+		}
+	}
+
+	.upload {
+		margin-top: 20rpx;
+	}
+
+	.acea-row.row-middle {
+		-webkit-box-align: center;
+		-moz-box-align: center;
+		-o-box-align: center;
+		-ms-flex-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding-left: 2px;
+	}
+
+	.acea-row.row-column {
+		-webkit-box-orient: vertical;
+		-moz-box-orient: vertical;
+		-o-box-orient: vertical;
+		-webkit-flex-direction: column;
+		-ms-flex-direction: column;
+		flex-direction: column;
+	}
+
+	.acea-row.row-center-wrapper {
+		-webkit-box-align: center;
+		-moz-box-align: center;
+		-o-box-align: center;
+		-ms-flex-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		-webkit-box-pack: center;
+		-moz-box-pack: center;
+		-o-box-pack: center;
+		-ms-flex-pack: center;
+		-webkit-justify-content: center;
+		justify-content: center;
+	}
+
+	.merchantsSettled .list .item .pictrue {
+		width: 130rpx;
+		height: 130rpx;
+		margin: 24rpx 22rpx 0 0;
+		position: relative;
+		font-size: 11px;
+		color: #bbb;
+
+		&:nth-child(4n) {
+			margin-right: 0;
+		}
+
+		&:nth-last-child(1) {
+			border: 0.5px solid #ddd;
+			box-sizing: border-box;
+		}
+
+		uni-image,
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 1px;
+
+			img {
+				-webkit-touch-callout: none;
+				-webkit-user-select: none;
+				-moz-user-select: none;
+				display: block;
+				position: absolute;
+				top: 0;
+				left: 0;
+				opacity: 0;
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.icon-guanbi1 {
+			font-size: 33rpx;
+			position: absolute;
+			top: -10px;
+			right: -10px;
+		}
+	}
+
+	.uni-list-cell-db {
+		position: relative;
+	}
+
+	.wenhao {
+		width: 34rpx;
+		height: 34rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 28rpx;
+		border-radius: 50%;
+		background: #E3E3E3;
+		color: #ffffff !important;
+		margin-left: 4rpx;
+		position: absolute;
+		left: 122rpx;
+	}
+
+	.merchantsSettled .list .item .imageCode {
+		position: absolute;
+		top: 7px;
+		right: 0;
+	}
+
+	.merchantsSettled .list .item .icon {
+		font-size: 40rpx;
+		color: #b4b1b4;
+	}
+
+	.merchantsSettled .list .item input {
+		width: 400rpx;
+		font-size: 30rpx;
+	}
+
+	.merchantsSettled .list .item .placeholder {
+		color: #b2b2b2;
+	}
+
+	.merchantsSettled .default {
+		padding: 0 30rpx;
+		height: 90rpx;
+		background-color: #fff;
+		margin-top: 23rpx;
+	}
+
+	.merchantsSettled .default checkbox {
+		margin-right: 15rpx;
+	}
+
+	.merchantsSettled .acea-row uni-image {
+		width: 20px;
+		height: 20px;
+		display: block;
+	}
+
+	.merchantsSettled .list .item .codeIput {
+		width: 125px;
+	}
+
+	.uni-input-input {
+		display: block;
+		height: 100%;
+		background: none;
+		color: inherit;
+		opacity: 1;
+		-webkit-text-fill-color: currentcolor;
+		font: inherit;
+		line-height: inherit;
+		letter-spacing: inherit;
+		text-align: inherit;
+		text-indent: inherit;
+		text-transform: inherit;
+		text-shadow: inherit;
+	}
+
+	.merchantsSettled .list .item .code {
+		position: absolute;
+		width: 93px;
+		line-height: 27px;
+		border: 1px solid var(--view-theme);
+		border-radius: 15px;
+		color: var(--view-theme);
+		text-align: center;
+		bottom: 8px;
+		right: 0;
+		font-size: 12px;
+	}
+
+	.merchantsSettled .list .item .code.on {
+		background-color: #bbb;
+		color: #fff;
+		border-color: #bbb;
+	}
+
+	.merchantsSettled .submitBtn {
+		width: 588rpx;
+		margin: 0 auto;
+		height: 86rpx;
+		border-radius: 25px;
+		text-align: center;
+		line-height: 86rpx;
+		font-size: 15px;
+		color: #fff;
+		background: #E3E3E3;
+		margin-top: 25px;
+		// pointer-events: none;
+	}
+
+	.merchantsSettled .submitBtn.on {
+		background: var(--view-theme);
+		pointer-events: all;
+	}
+
+	uni-checkbox-group,
+	.settleAgree {
+		display: inline-block;
+		font-size: 24rpx;
+	}
+
+	uni-checkbox-group {
+		color: #b2b2b2;
+	}
+
+	.settleAgree {
+		color: var(--view-theme);
+		position: relative;
+		top: 2px;
+		left: 8px;
+	}
+
+	.merchantsSettled uni-checkbox .uni-checkbox-wrapper {
+		width: 30rpx;
+		height: 30rpx;
+		border: 2rpx solid #C3C3C3;
+		border-radius: 15px;
+	}
+
+	.settlementAgreement {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 12;
+		background: rgba(0, 0, 0, .5);
+	}
+
+	.settlementAgreement .setAgCount {
+		background: #fff;
+		width: 694rpx;
+		// height: 458px;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+
+		padding: 28rpx;
+		-webkit-transform: translate(-50%, -50%);
+		-moz-transform: translate(-50%, -50%);
+		transform: translate(-50%, -50%);
+		overflow: hidden;
+
+		.content {
+			height: 900rpx;
+			overflow-y: scroll;
+
+			/deep/ p {
+				font-size: 13px;
+				line-height: 22px;
+			}
+
+			/deep/ img {
+				max-width: 100%;
+			}
+		}
+	}
+
+	.settlementAgreement .setAgCount .close {
+		position: absolute;
+		top: 15rpx;
+		right: 15rpx;
+	}
+
+	.settlementAgreement .setAgCount .icon {
+		font-size: 42rpx;
+		color: #b4b1b4;
+		position: absolute;
+		top: 15rpx;
+		right: 15rpx;
+	}
+
+	.settlementAgreement .setAgCount .title {
+		color: #333;
+		font-size: 32rpx;
+		text-align: center;
+		font-weight: bold;
+	}
+
+	.settlementAgreement .setAgCount .content {
+		color: #333;
+		font-size: 26rpx;
+		line-height: 22px;
+		text-align: justify;
+		text-justify: distribute-all-lines;
+		overflow-y: scroll;
+		padding-bottom: 20rpx;
+	}
+
+	.settlementAgreement .setAgCount .contenta {
+		color: #333;
+		font-size: 26rpx;
+		line-height: 22px;
+		text-align: justify;
+		text-justify: distribute-all-lines;
+		height: 85%;
+		overflow-y: scroll;
+	}
+
+	.setAgCountbtn {
+		display: flex;
+		justify-content: space-around;
+		position: relative;
+
+		.setAgCountbtna {
+			margin-top: 40rpx;
+			// width: 200rpx;
+			height: 74rpx;
+			text-align: center;
+			line-height: 74rpx;
+			border-radius: 46rpx 46rpx;
+			opacity: 1;
+			border: 2rpx solid #B3B3B3;
+			font-size: 25rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #737373;
+
+		}
+
+		.setAgCountbtnb {
+			margin-top: 40rpx;
+			padding-left: 20rpx;
+			padding-right: 20rpx;
+			height: 74rpx;
+			text-align: center;
+			line-height: 74rpx;
+			background: #cecece;
+			border-radius: 46rpx 46rpx;
+			opacity: 1;
+
+			font-size: 25rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #fff;
+
+		}
+
+		.setAgCountbtnc {
+			margin-top: 40rpx;
+			height: 74rpx;
+			text-align: center;
+			line-height: 74rpx;
+			background: linear-gradient(270deg, #3da834 0%, #72BE53 100%);
+			border-radius: 46rpx 46rpx;
+			opacity: 1;
+			font-size: 25rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #fff;
+
+		}
+
+		.border {
+			position: absolute;
+			top: 0;
+			left: -28rpx;
+			width: 100vw;
+			height: 100%;
+			border-radius: 40rpx 40rpx 0 0;
+			box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2);
+			/* 在上边框添加阴影 */
+		}
+
+		.btn {
+			width: 694rpx;
+			font-weight: bold;
+			font-size: 34rpx;
+		}
+	}
+
+	.settledSuccessMain {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #fff;
+	}
+
+	.settledSuccessful {
+		flex: 1;
+		width: 100%;
+		padding: 0 56px;
+		height: auto;
+		background: #fff;
+		text-align: center;
+	}
+
+	.settledSuccessful .image {
+		width: 189px;
+		height: 157px;
+		margin-top: 66px;
+	}
+
+	.settledSuccessful .title {
+		color: #333333;
+		font-size: 16px;
+		font-weight: bold;
+		margin-top: 35px;
+	}
+
+	.settledSuccessful .info {
+		color: #A0A0A0;
+		font-size: 13px;
+		margin-top: 12px;
+	}
+
+	.settledSuccessful .goHome {
+		margin: 60px auto 0;
+		line-height: 43px;
+		color: #282828;
+		font-size: 15px;
+		border: 1px solid #B4B4B4;
+		border-radius: 60px;
+	}
+
+	/deep/ uni-checkbox .uni-checkbox-input {
+		width: 15px;
+		height: 15px;
+		position: relative;
+	}
+
+	/deep/ uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked:before {
+		font-size: 14px;
+	}
+
+	.loadingicon {
+		height: 100vh;
+		overflow: hidden;
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
+
+	.icon-xiangyou {
+		font-size: 22rpx;
+	}
+
+	// #ifdef MP
+	checkbox-group {
+		display: inline-block;
+	}
+
+	// #endif
+	.setAgCount {
+		/deep/ table {
+			border: 1px solid #DDD;
+			border-bottom: none;
+			border-right: none;
+		}
+
+		/deep/ td,
+		th {
+			padding: 5rpx 10rpx;
+			border-bottom: 1px solid #DDD;
+			border-right: 1px solid #DDD;
+		}
+	}
+
+	.merchantsSettled .list .items {
+		padding: 50rpx 0 20rpx;
+		border-bottom: 1px solid #eee;
+		position: relative;
+		margin: 0 20px;
+
+		.uni-list-area {
+			height: 50px;
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+
+			.uni-list-stree {
+				width: 30%;
+				margin-left: 10px;
+
+				.mer-area {
+					width: 100%;
+					border: 1px solid #C3C3C3;
+
+					picker {
+						display: flex;
+					}
+
+					input {
+						width: 100%;
+						font-size: 30rpx;
+
+					}
+				}
+			}
+		}
+
+	}
 </style>

pages/store/settled/index1.vue

@@ -227,7 +227,7 @@
 							<button class="settleAgree" @click="getConfig">《入驻协议》</button>
 						</view>
 
-						<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
+						<button class='submitBtn' @click="formSubmit">
 							提交申请
 						</button>
 					</view>
@@ -252,9 +252,6 @@
 					</view>
 
 					<div class="title">{{detail.title}}</div>
-					<!-- <view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
-					<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view> -->
-
 					<view class="contenta" v-if="detail.mer_services_agree">
 						<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
 
@@ -974,7 +971,7 @@
 				}
 			},
 			formSubmit() {
-				if (this.validateForm() && this.validate) {
+				if (true) {
 					if (this.merchantData.mer_type == '12') return this.agree();
 					if (this.codenote.length == 0) {
 						this.isshow = true
@@ -1500,7 +1497,7 @@
 		color: #fff;
 		background: #E3E3E3;
 		margin-top: 25px;
-		pointer-events: none;
+		// pointer-events: none;
 	}
 
 	.merchantsSettled .submitBtn.on {

pages/users/login/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<div :style="viewColor">
-		<div class="register_main" :style="{ 'background-image': formItem == 1 ? `url(${domain}/static/images/logo_bgl.png)` : `url(${domain}/static/images/logo_bgh.png)`}">
+		<div class="register_main"
+			:style="{ 'background-image': formItem == 1 ? `url(${domain}/static/images/logo_bgl.png)` : `url(${domain}/static/images/logo_bgh.png)`}">
 			<view class="system-height" :style="{ height: statusBarHeight }"></view>
 			<!-- #ifdef APP-PLUS -->
 			<view class="title-bar" style="height: 43px;">
@@ -21,12 +22,15 @@
 					<div class="list" :hidden="current !== 0">
 						<form @submit.prevent="submit">
 							<div class="item">
-								<input type="text" placeholder="请输入手机号或账号" placeholder-class="placeholder" v-model="account" required />
+								<input type="text" placeholder="请输入手机号或账号" placeholder-class="placeholder"
+									v-model="account" required />
 							</div>
 							<div class="item">
-								<input type="password" placeholder="填写登录密码" placeholder-class="placeholder" v-model="password" required />
+								<input type="password" placeholder="填写登录密码" placeholder-class="placeholder"
-								<navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
+									v-model="password" required />
-									忘记密码
+								<navigator class="forgetPwd" hover-class="none"
+									url="/pages/users/retrievePassword/index">
+									忘记密we码
 								</navigator>
 							</div>
 						</form>
@@ -37,8 +41,10 @@
 							<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" />
 						</div>
 						<div class="item">
-							<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
+							<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
-							<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
+								v-model="captcha" />
+							<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
+								@click="handleVerify">
 								{{ text }}
 							</button>
 						</div>
@@ -53,7 +59,9 @@
 					<div class="protocol acea-row row-between-wrapper">
 						<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 							<checkbox class="checkbox" :checked="isAgree ? true : false" />
-							<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
+							<text class="protocol_text">我已同意<text @click="userAgree"
+									class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
+									class="font_pro">《隐私政策》</text></text>
 						</checkbox-group>
 					</div>
 					<!-- #ifdef APP-PLUS -->
@@ -83,17 +91,23 @@
 							<input type="text" placeholder="请输入手机号" placeholder-class="placeholder" v-model="account" />
 						</div>
 						<div class="item">
-							<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
+							<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
-							<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
+								v-model="captcha" />
+							<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
+								@click="handleVerify">
 								{{ text }}
 							</button>
 						</div>
 						<div class="item">
-							<input type="password" placeholder="填写您的登录密码" placeholder-class="placeholder" v-model="password" />
+							<input type="password" placeholder="填写您的登录密码" placeholder-class="placeholder"
+								v-model="password" />
 						</div>
 						<div class="item" v-if="isShowCode">
-							<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="codeVal" />
+							<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
-							<div class="code" @click="getcaptcha"><image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" /></div>
+								v-model="codeVal" />
+							<div class="code" @click="getcaptcha">
+								<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
+							</div>
 						</div>
 					</div>
 					<div class="tip">
@@ -104,7 +118,9 @@
 					<div class="protocol acea-row row-between-wrapper">
 						<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 							<checkbox class="checkbox" :checked="isAgree ? true : false" />
-							<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>			
+							<text class="protocol_text">我已同意<text @click="userAgree"
+									class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
+									class="font_pro">《隐私政策》</text></text>
 						</checkbox-group>
 					</div>
 					<!-- #ifdef APP-PLUS -->
@@ -135,21 +151,27 @@
 						</view>
 						<view class="list">
 							<view class="item">
-								<input type='number' placeholder='填写手机号码' placeholder-class='placeholder' v-model="account"></input>
+								<input type='number' placeholder='填写手机号码' placeholder-class='placeholder'
+									v-model="account"></input>
 							</view>
 							<view class="item">
-								<input type='number' placeholder='填写验证码' placeholder-class='placeholder' class="codeIput" v-model="captcha"></input>
+								<input type='number' placeholder='填写验证码' placeholder-class='placeholder'
-								<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled' @click="handleVerify">
+									class="codeIput" v-model="captcha"></input>
+								<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
+									@click="handleVerify">
 									{{ text }}
 								</button>
 							</view>
 							<view class="item">
-								<input type='password' placeholder='填写登录密码' placeholder-class='placeholder' v-model="password"></input>
+								<input type='password' placeholder='填写登录密码' placeholder-class='placeholder'
+									v-model="password"></input>
 							</view>
 							<view class="protocol acea-row">
 								<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 									<checkbox class="checkbox" :checked="isAgree ? true : false" />
-									<text class="protocol_text">您已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>			
+									<text class="protocol_text">您已同意<text @click="userAgree"
+											class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
+											class="font_pro">《隐私政策》</text></text>
 								</checkbox-group>
 							</view>
 						</view>
@@ -160,7 +182,8 @@
 
 			</form>
 			<view class="copyright" @click="goCopyUrl">{{copyData}}</view>
-			<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" ref="verify"></Verify>
+			<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
+				ref="verify"></Verify>
 		</div>
 	</div>
 </template>
@@ -190,7 +213,10 @@
 		loginMpPhone
 	} from "@/api/user";
 	// #ifdef APP-PLUS
-	import { wechatAppAuth, appleAppAuth } from '@/api/api.js'
+	import {
+		wechatAppAuth,
+		appleAppAuth
+	} from '@/api/api.js'
 	// #endif
 	import attrs, {
 		required,
@@ -209,10 +235,16 @@
 		VUE_APP_API_URL,
 		configMap
 	} from "@/utils";
-	import { HTTP_REQUEST_URL } from '@/config/app';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
 	import parser from "@/components/jyf-parser/jyf-parser";
-	import { commonAuth } from '../../../api/public';
+	import {
-	import { mapGetters} from "vuex";
+		commonAuth
+	} from '../../../api/public';
+	import {
+		mapGetters
+	} from "vuex";
 	import Verify from '@/components/verify/verify.vue';
 	const BACK_URL = "login_back_url";
 
@@ -256,7 +288,8 @@
 		computed: {
 			...configMap(['login_logo', 'wechat_phone_switch'], mapGetters(['viewColor'])),
 			copyData() {
-				let copy = this.copyright.status == -1 ? this.copyright.year+" "+this.copyright.url : this.copyright.Copyright
+				let copy = this.copyright.status == -1 ? this.copyright.year + " " + this.copyright.url : this.copyright
+					.Copyright
 				return copy;
 			}
 		},
@@ -326,7 +359,8 @@
 							that.$store.commit('UPDATE_USERINFO', data.user);
 
 							let method
-							let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
+							let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+								'/pages/goods_cate/goods_cate',
 								'/pages/user/index', '/pages/plant_grass/index'
 							]
 							if (indexPat.includes(this.getPath(backUrl))) {
@@ -439,9 +473,11 @@
 						auth: {
 							userInfo: that.appleUserInfo,
 							openId: that.appleUserInfo.openId,
-							nickname: (that.appleUserInfo.fullName.familyName || '') + (that.appleUserInfo.fullName.giveName || ''),
+							nickname: (that.appleUserInfo.fullName.familyName || '') + (that.appleUserInfo.fullName
+								.giveName || ''),
 						}
-				}}).then(res => {
+					}
+				}).then(res => {
 					const data = res.data;
 					if (res.data.status == 200) {
 						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
@@ -453,7 +489,8 @@
 						that.$store.commit("SETUID", data.result.user.uid);
 						that.$store.commit('UPDATE_USERINFO', data.result.user);
 						let method
-						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
 							'/pages/user/index', '/pages/plant_grass/index'
 						]
 						if (indexPat.includes(this.getPath(backUrl))) {
@@ -527,7 +564,8 @@
 							openid: that.appUserInfo.authResult.openid,
 							phone: this.account,
 						}
-				}}).then(res => {
+					}
+				}).then(res => {
 					const data = res.data;
 					if (res.data.status == 200) {
 						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
@@ -539,7 +577,8 @@
 						that.$store.commit("SETUID", data.result.user.uid);
 						that.$store.commit('UPDATE_USERINFO', data.result.user);
 						let method
-						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
 							'/pages/user/index', '/pages/plant_grass/index'
 						]
 						if (indexPat.includes(this.getPath(backUrl))) {
@@ -632,7 +671,8 @@
 						that.$store.commit('UPDATE_USERINFO', data.user);
 
 						let method
-					let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
 							'/pages/user/index'
 						]
 						if (indexPat.includes(this.getPath(backUrl))) {
@@ -792,7 +832,8 @@
 						that.$store.commit('UPDATE_USERINFO', data.user);
 
 						let method
-						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
 							'/pages/user/index'
 						]
 						if (indexPat.includes(this.getPath(backUrl))) {
@@ -848,11 +889,13 @@
 		width: 28rpx;
 		height: 28rpx;
 	}
+
 	/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
 	/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
 		border: 1px solid var(--view-theme) !important;
 		background-color: var(--view-theme) !important;
 	}
+
 	.ChangePassword .phone {
 		font-size: 32rpx;
 		font-weight: bold;
@@ -876,18 +919,23 @@
 		height: 100%;
 		font-size: 32rpx;
 	}
+
 	.ChangePassword .list .item .placeholder {
 		color: #bbbbbb;
 	}
+
 	.ChangePassword .list .item input.codeIput {
 		width: 240rpx;
 	}
+
 	.register .whiteBg .title_info text {
 		color: var(--view-theme);
 	}
+
 	.register .list .item .code {
 		color: var(--view-theme);
 	}
+
 	.title-bar {
 		position: relative;
 		display: flex;
@@ -897,6 +945,7 @@
 		font-weight: 500;
 		color: #333333;
 		line-height: 48rpx;
+
 		.icon {
 			position: absolute;
 			left: 30rpx;
@@ -906,6 +955,7 @@
 			justify-content: center;
 			width: 80rpx;
 			height: 80rpx;
+
 			image {
 				width: 50rpx;
 				height: 50rpx;
@@ -923,15 +973,18 @@
 		margin: 40rpx auto 0 auto;
 		text-align: center;
 		line-height: 90rpx;
+
 		.iconfont {
 			font-size: 32rpx;
 			margin-right: 12rpx;
 		}
 	}
+
 	.code image {
 		width: 100%;
 		height: 100%;
 	}
+
 	.settlementAgreement {
 		width: 100%;
 		height: 100%;
@@ -941,41 +994,50 @@
 		background: rgba(0, 0, 0, .5);
 		z-index: 10;
 	}
+
 	.protocol_text {
 		color: #999;
 		font-size: 24rpx;
 	}
+
 	.protocol {
 		margin-top: 82rpx;
 		justify-content: center;
 	}
+
 	.protocol_text {
 		.font_pro {
 			color: var(--view-theme);
 		}
 	}
+
 	.appLogin {
 		margin-top: 82rpx;
+
 		.hds {
 			display: flex;
 			justify-content: center;
 			align-items: center;
 			font-size: 24rpx;
 			color: #B4B4B4;
+
 			.line {
 				width: 68rpx;
 				height: 1rpx;
 				background: #CCCCCC;
 			}
+
 			p {
 				margin: 0 20rpx;
 			}
 		}
+
 		.btn-wrapper {
 			display: flex;
 			align-items: center;
 			justify-content: center;
 			margin-top: 30rpx;
+
 			.btn {
 				display: flex;
 				align-items: center;
@@ -983,10 +1045,12 @@
 				width: 68rpx;
 				height: 68rpx;
 				border-radius: 50%;
+
 				+.btn {
 					margin-left: 30rpx;
 				}
 			}
+
 			.apple-btn {
 				display: flex;
 				align-items: center;
@@ -997,31 +1061,38 @@
 				background: #EAEAEA;
 				border-radius: 34rpx;
 				font-size: 24rpx;
+
 				.icon-s-pingguo {
 					color: #333;
 					margin-right: 10rpx;
 					font-size: 34rpx;
 				}
 			}
+
 			.iconfont {
 				font-size: 40rpx;
 				color: #fff;
 			}
+
 			.wx {
 				background-color: #61C64F;
+
 				&.btn-apple {
 					margin-right: 0;
 					background-color: #333;
 				}
 			}
+
 			.mima {
 				background-color: #28B3E9;
 			}
+
 			.yanzheng {
 				background-color: #F89C23;
 			}
 		}
 	}
+
 	.whiteBg .logon {
 		display: flex;
 		align-items: center;
@@ -1034,14 +1105,17 @@
 		color: #FFFFFF;
 		font-size: 30rpx;
 	}
+
 	.whiteBg .back {
 		border: 1px solid var(--view-theme);
 		color: var(--view-theme);
 		margin-top: 30rpx;
 		background-color: transparent;
 	}
+
 	.login-wrapper {
 		padding: 30rpx;
+
 		.shading {
 			display: flex;
 			align-items: center;
@@ -1052,6 +1126,7 @@
 			/* #endif */
 			/* #ifndef APP-VUE */
 			margin-top: 200rpx;
+
 			/* #endif */
 			image {
 				width: 180rpx;
@@ -1059,6 +1134,7 @@
 			}
 		}
 	}
+
 	.copyright {
 		position: fixed;
 		bottom: 30rpx;

pages/users/login/login_copy.vue

@@ -148,9 +148,9 @@
 						</view>
 					</view>
 					<view class="logon" @click="registerReset">完成并登录</view>
-					<view class="tip">
+					<!-- <view class="tip">
 						<text @click="formItem=1">立即登录</text>
-					</view>
+					</view> -->
 					<view class="protocol acea-row row-between-wrapper">
 						<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 							<checkbox class="checkbox" :checked="isAgree ? true : false" />
@@ -173,13 +173,13 @@
 			</view>
 
 			<!-- #ifdef APP-PLUS -->
-			<view class="footer-btns" v-if='formItem!=2'>
+			<view class="footer-btns">
 				<view class="login-type-btn" :class="{actLoginType:formItem==0}" style="margin-right: 70rpx;">
-					<text v-if='formItem == 1' @click="formItem = 0">微信快捷登录</text>
+					<text v-if='formItem == 1||formItem==2' @click="formItem = 0">微信快捷登录</text>
 					<text v-else @click="appOneClcik">本机一键登录</text>
 				</view>
 				<view class="login-type-btn" :class="{actLoginType:formItem==1}">
-					<text v-if='formItem == 0' @click="formItem = 1">更多登录方式</text>
+					<text v-if='formItem == 0 ||formItem==2' @click="formItem = 1">更多登录方式</text>
 					<text v-else @click="appOneClcik">本机一键登录</text>
 				</view>
 			</view>
@@ -1693,7 +1693,7 @@
 
 	.footer-btns {
 		position: absolute;
-		bottom: 160rpx;
+		bottom: 100rpx;
 		left: 50%;
 		transform: translate(-50%);
 		display: flex;

pages/users/retrievePassword/index.vue

@@ -5,35 +5,42 @@
 				<image :src="login_logo" v-if="login_logo" />
 			</view>
 		</view> -->
-		<view class="whiteBg" style="margin: 0;width: 100%;padding: 50rpx 60rpx;" :style="{ 'background-image': `url(${domain}/static/images/logo_bgl.png)`}">
+		<view class="whiteBg" style="margin: 0;width: 100%;padding: 50rpx 60rpx;"
+			:style="{ 'background-image': `url(${domain}/static/images/logo_bgl.png)`}">
 			<view class="login_title">
 				<view class="title_h">找回密码</view>
 			</view>
 			<form class="list">
 				<view class="item">
-					<input type="number" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" autocomplete="off" />
+					<input type="number" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account"
+						autocomplete="off" />
 					<!-- <input type="text" style="height: 0;opacity: 0"> -->
 				</view>
 				<view class="item">
-					<input type="password" placeholder="填写您的新密码" placeholder-class="placeholder" v-model="password" autocomplete="off" />
+					<input type="password" placeholder="填写您的新密码" placeholder-class="placeholder" v-model="password"
+						autocomplete="off" />
 				</view>
 				<view class="item">
-					<input type="password" placeholder="再次输入新密码" placeholder-class="placeholder" v-model="confirm_pwd" autocomplete="off" />
+					<input type="password" placeholder="再次输入新密码" placeholder-class="placeholder" v-model="confirm_pwd"
+						autocomplete="off" />
 				</view>
 				<view class="item" style="display: flex;justify-content: space-between;">
-					<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder" class="codeIput" v-model="captcha" autocomplete="off" />
+					<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder"
-					<button class="code" style="color: #fff;" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
+						class="codeIput" v-model="captcha" autocomplete="off" />
+					<button class="code" style="color: #fff;" :disabled="disabled"
+						:class="disabled === true ? 'on' : ''" @click="handleVerify">
 						{{ text }}
 					</button>
 				</view>
 			</form>
 			<view class="logon" @click="registerReset">确认</view>
-			<view class="tip">
+			<!-- <view class="tip">
 				<text @click="back">立即登录</text>
-			</view>
+			</view> -->
 		</view>
 		<view class="bottom"></view>
-      <Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" ref="verify"></Verify>
+		<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
+			ref="verify"></Verify>
 	</view>
 </template>
 
@@ -48,7 +55,9 @@
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
 	const app = getApp();
-	import { mapGetters} from "vuex";
+	import {
+		mapGetters
+	} from "vuex";
 	import sendVerifyCode from "@/mixins/SendVerifyCode";
 	import {
 		registerVerify,
@@ -56,14 +65,20 @@
 		getCodeApi,
 		getCaptcha
 	} from "@/api/user";
-	import { validatorDefaultCatch } from "@/utils/dialog";
+	import {
+		validatorDefaultCatch
+	} from "@/utils/dialog";
 	import attrs, {
 		required,
 		alpha_num,
 		chs_phone
 	} from "@/utils/validate";
-	import { configMap } from '@/utils';
+	import {
-	import { HTTP_REQUEST_URL } from '@/config/app';
+		configMap
+	} from '@/utils';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
 	import Verify from '@/components/verify/verify.vue';
 	export default {
 		name: "RetrievePassword",
@@ -85,10 +100,8 @@
 			};
 		},
 		computed: configMap(['login_logo'], mapGetters(['viewColor'])),
-		onReady() {
+		onReady() {},
-		},
+		mounted: function() {},
-		mounted: function() {
-		},
 		methods: {
 			back() {
 				uni.navigateBack();
@@ -184,9 +197,11 @@
 		background: #ffffff;
 		height: 100vh;
 	}
+
 	.register .list .item .code {
 		color: var(--view-theme);
 	}
+
 	.whiteBg .logon {
 		display: flex;
 		align-items: center;
@@ -199,6 +214,7 @@
 		color: #FFFFFF;
 		font-size: 30rpx;
 	}
+
 	.whiteBg {
 		background-repeat: no-repeat;
 		background-size: 100% auto;