商铺设置

common/router/modules/routes.js

@@ -281,5 +281,12 @@ const routes = [{
 			title: 'helloWorld',
 		},
 	},
+	{
+		path: '/pages/store/settings',
+		name: 'settings',
+		meta: {
+			title: '店铺设置',
+		},
+	},
 ]
 export default routes

common/service/service.js

@@ -42,6 +42,7 @@ http.interceptor.request((config, cancel) => { /* 请求之前拦截器 */
   if(getTokenStorage()){
     config.header = {
       ...config.header,
+      'AppType':'AppType',
        'X-Access-Token':getTokenStorage()
     }
   }

components/index_nav.vue

@@ -64,6 +64,7 @@
 		},
 		methods: {
 			jump(item) {
+				
 				if (item.name == '客户评价') {
 					uni.navigateTo({
 						url: '/pages/evaluate/evaluate'
@@ -77,6 +78,12 @@
 						url: '/pages/index/full'
 					})
 				}
+				 if (item.name == '店铺设置') {
+					uni.navigateTo({
+						url: '/pages/store/settings'
+					})
+				}
+				
 			}
 		}
 	}

pages.json

@@ -248,6 +248,10 @@
 		}, {
 			"path": "pages/common/helloWorld",
 			"style": {}
+		},{
+			"path": "pages/store/settings",
+			"style": {}
+			
 		}
 
 	],

pages/login/login.vue

@@ -1,380 +1,394 @@
-  <template>
+<template>
 	<view class="zai-box">
-        <!-- <scroll-view scroll-y class="page"> -->
-            <!-- <view class="text-center" :style="[{animation: 'show ' + 0.4+ 's 1'}]"> -->
-			<!-- <image src="../../static/login/bejing.png" mode='aspectFit' class="zai-header "></image> -->
-			<view class="zai-header"></view>
-			<!-- <view class="text-center" >
+		<!-- <scroll-view scroll-y class="page"> -->
+		<!-- <view class="text-center" :style="[{animation: 'show ' + 0.4+ 's 1'}]"> -->
+		<!-- <image src="../../static/login/bejing.png" mode='aspectFit' class="zai-header "></image> -->
+		<view class="zai-header"></view>
+		<!-- <view class="text-center" >
 				<image src="https://static.jeecg.com/upload/test/login4_1595818039175.png" mode='aspectFit' class="zai-logo "></image>
 				<view class="zai-title text-shadow ">本地生活 </view>
 			</view> -->
-            <view class="box padding-lr-xl login-paddingtop" >
-				<block >
-					<view class="box-user flex align-center " :class="[shape=='round'?'round':'']">
-						<!-- <view class="title"><text class="cuIcon-people margin-right-xs"></text>手机号:</view> -->
-						<image src="../../static/login/Frame (27).png" mode='aspectFit' class="zai-logo "></image>
-						<input placeholder="请输入手机号" name="input" v-model="userName"></input>
-					</view>
-					<view class="box-user flex align-center" :class="[shape=='round'?'round':'']">
-						<!-- <view class="title"><text class="cuIcon-lock margin-right-xs"></text>密码:</view>
+		<view class="box padding-lr-xl login-paddingtop">
+			<block>
+				<view class="box-user flex align-center " :class="[shape == 'round' ? 'round' : '']">
+					<!-- <view class="title"><text class="cuIcon-people margin-right-xs"></text>手机号:</view> -->
+					<image src="../../static/login/Frame (27).png" mode='aspectFit' class="zai-logo "></image>
+					<input placeholder="请输入手机号" name="input" v-model="userName"></input>
+				</view>
+				<view class="box-user flex align-center" :class="[shape == 'round' ? 'round' : '']">
+					<!-- <view class="title"><text class="cuIcon-lock margin-right-xs"></text>密码:</view>
 						<input class="uni-input" placeholder="请输入密码" :password="!showPassword" v-model="password" /> -->
-						<image src="../../static/login/Frame (26).png" mode='aspectFit' class="zai-logo "></image>
-						<input placeholder="请输入密码"  :password="!showPassword" v-model="password" ></input>
-						<view class="action text-lg">
-						    <text :class="[showPassword ? 'cuIcon-attention' : 'cuIcon-attentionforbid']" @click="changePassword"></text>
-						</view>
-					</view>
-					<view style="margin-top: 216upx;">
-						<button  class="cu-btn round lg  bg-blue " style="display: flex;" :loading="loading" :class="[shape=='round'?'round':'']"
-							@tap="onLogin"><text space="emsp">{{loading ? "登录中...":" 登录 "}}</text>
-						</button>
-					</view>
-					<view class="flex align-center" style="margin-top:10px;color: #858585;font-size:11px">
-						<uni-data-checkbox	multiple  :localdata="sex" v-model="checked"  active-color="#FF852D "  style="margin-top: 2px;transform: scale(0.7,0.7	);"></uni-data-checkbox>
-						请您阅读并同意<view> <text @tap="nav('xieyi')" class="text-color"> 用户协议</text> 和 <text
-								class="text-color" @tap="nav('mimi')">隐私政策</text></view>
+					<image src="../../static/login/Frame (26).png" mode='aspectFit' class="zai-logo "></image>
+					<input placeholder="请输入密码" :password="!showPassword" v-model="password"></input>
+					<view class="action text-lg">
+						<text :class="[showPassword ? 'cuIcon-attention' : 'cuIcon-attentionforbid']"
+							@click="changePassword"></text>
 					</view>
-				</block>
-             
-				
-	
-				
-				<!-- #ifdef APP-PLUS -->
-				<!-- <view class="padding flex flex-direction  text-center">
+				</view>
+				<view style="margin-top: 216upx;">
+					<button class="cu-btn round lg  bg-blue " style="display: flex;" :loading="loading"
+						:class="[shape == 'round' ? 'round' : '']" @tap="onLogin"><text space="emsp">{{ loading ? "登录中..." : " 登录"}}</text>
+					</button>
+				</view>
+				<view class="flex align-center" style="margin-top:10px;color: #858585;font-size:11px">
+					<uni-data-checkbox multiple :localdata="sex" v-model="checked" active-color="#FF852D "
+						style="margin-top: 2px;transform: scale(0.7,0.7	);"></uni-data-checkbox>
+					请您阅读并同意<view> <text @tap="nav('xieyi')" class="text-color"> 用户协议</text> 和 <text class="text-color"
+							@tap="nav('mimi')">隐私政策</text></view>
+				</view>
+			</block>
+
+
+
+
+			<!-- #ifdef APP-PLUS -->
+			<!-- <view class="padding flex flex-direction  text-center">
 					当前版本:{{version}}
 				</view> -->
-				<!-- #endif -->
-				
-            </view>
-			<view class="footer">
-				<view class="text-color" @tap="nav('register')">去注册</view>
-				<text style="margin-top: 5px;" @tap="nav('resetpassword')">忘记密码</text>
-			</view>
-
-        <!-- </scroll-view> -->
-	
+			<!-- #endif -->
+
+		</view>
+		<view class="footer">
+			<view class="text-color" @tap="nav('register')">去注册</view>
+			<text style="margin-top: 5px;" @tap="nav('resetpassword')">忘记密码</text>
+		</view>
+
+		<!-- </scroll-view> -->
+
 		<!-- 登录加载弹窗 -->
 		<view class="cu-load load-modal" v-if="loading">
 			<!-- <view class="cuIcon-emojifill text-orange"></view> -->
-			<image src="https://static.jeecg.com/upload/test/login4_1595818039175.png" mode="aspectFit" class="round"></image>
+			<image src="https://static.jeecg.com/upload/test/login4_1595818039175.png" mode="aspectFit" class="round">
+			</image>
 			<view class="gray-text">登录中...</view>
 		</view>
-    </view>
+	</view>
 
-  </template>
+</template>
 
 <script>
-	import { ACCESS_TOKEN,USER_NAME,USER_INFO } from "@/common/util/constants"
-	import { mapActions } from "vuex"
-    import configService from '@/common/service/config.service.js';
-	
-    export default {
-        data() {
-            return {
-				sex: [{
-					text: '',
-					value: 1
-				}],
-				checked:[],
-				shape:'',//round 圆形
-				loading: false,
-				userName: '18956455265',
-				password: '123456',
-				phoneNo: '',
-				smsCode: '',
-				showPassword: false, //是否显示明文
-				loginWay: 1, //1: 账密，2：验证码
-				smsCountDown: 0,
-				smsCountInterval: null,
-				toggleDelay: false,
-				version:'',
-				//第三方登录相关信息
-				thirdType:"",
-				thirdLoginInfo:"",
-				thirdLoginState:false,
-				bindingPhoneModal:false,
-				thirdUserUuid:'',
-				url: {
-					bindingThirdPhone: '/sys/thirdLogin/bindingThirdPhone'
-				}
-            };
-        },
-		onLoad:function(){
-			// #ifdef APP-PLUS
-			var that=this
-			plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) {
-				that.version=wgtinfo.version
-			});
-			// #endif
+import { ACCESS_TOKEN, USER_NAME, USER_INFO } from "@/common/util/constants"
+import { mapActions } from "vuex"
+import configService from '@/common/service/config.service.js';
+
+export default {
+	data() {
+		return {
+			sex: [{
+				text: '',
+				value: 1
+			}],
+			checked: [],
+			shape: '',//round 圆形
+			loading: false,
+			userName: '18956455265',
+			password: '123456',
+			phoneNo: '',
+			smsCode: '',
+			showPassword: false, //是否显示明文
+			loginWay: 1, //1: 账密，2：验证码
+			smsCountDown: 0,
+			smsCountInterval: null,
+			toggleDelay: false,
+			version: '',
+			//第三方登录相关信息
+			thirdType: "",
+			thirdLoginInfo: "",
+			thirdLoginState: false,
+			bindingPhoneModal: false,
+			thirdUserUuid: '',
+			url: {
+				bindingThirdPhone: '/sys/thirdLogin/bindingThirdPhone'
+			}
+		};
+	},
+	onLoad: function () {
+		// #ifdef APP-PLUS
+		var that = this
+		plus.runtime.getProperty(plus.runtime.appid, function (wgtinfo) {
+			that.version = wgtinfo.version
+		});
+		// #endif
+	},
+	computed: {
+
+		isSendSMSEnable() {
+			return this.smsCountDown <= 0 && this.phoneNo.length > 4;
+		},
+		getSendBtnText() {
+			if (this.smsCountDown > 0) {
+				return this.smsCountDown + '秒后发送';
+			} else {
+				return '发送验证码';
+			}
+		},
+		canSMSLogin() {
+			return this.userName.length > 4 && this.smsCode.length > 4;
+		},
+		canPwdLogin() {
+			return this.userName.length > 4 && this.password.length > 4;
 		},
-		computed: {
-		
-		      isSendSMSEnable() {
-		        return this.smsCountDown <= 0 && this.phoneNo.length > 4;
-		      },
-		      getSendBtnText() {
-		        if (this.smsCountDown > 0) {
-		          return this.smsCountDown + '秒后发送';
-		        } else {
-		          return '发送验证码';
-		        }
-		      },
-		      canSMSLogin() {
-		        return this.userName.length > 4 && this.smsCode.length > 4;
-		      },
-		      canPwdLogin() {
-		        return this.userName.length > 4 && this.password.length > 4;
-		      },
+	},
+	methods: {
+		...mapActions(["mLogin", "PhoneLogin", "ThirdLogin"]),
+		nav(url) {
+			this.$Router.push({ name: url })
+			// uni.navigateTo({
+			// 	url: url
+			// });
 		},
-        methods: {
-			 ...mapActions([ "mLogin","PhoneLogin","ThirdLogin" ]),
-			 nav(url) {
-				this.$Router.push({name:url})
-				// uni.navigateTo({
-				// 	url: url
-				// });
-			},
-			//  登录
-			onLogin: function (){
-				
-					if(!this.checked || this.checked.length==0){
-			          this.$tip.toast('请阅读后勾选并同意《平台协议》及《隐私协议》政策');
-			          return;
-			        }
-			        if(!this.userName || this.userName.length==0){
-			          this.$tip.toast('请填写手机号');
-			          return;
-			        }
-			        if(!this.password || this.password.length==0){
-			           this.$tip.toast('请填写密码');
-			          return;
-			        }
-			        let loginParams = {
-						phone:this.userName,
-						passWord:this.password
-			        }
-					this.loading=true;
-				
-			        this.mLogin(loginParams).then((res) => {
-					  this.loading=false;
-			          if(res.data.success){
-						 // #ifdef APP-PLUS
-						  this.saveClientId()
-						 // #endif
-						 // #ifndef APP-PLUS
-						  this.$tip.success('登录成功!')
-						  this.$Router.replaceAll({name:'index'})
-						 // #endif
-						}else{
-			              this.$tip.alert(res.data.message);
-			            }
-			        }).catch((err) => { 
-			          let msg = err.data.message || "请求出现错误，请稍后再试"
-			          this.loading=false;
-					  this.$tip.alert(msg);
-			        }).finally(()=>{
-					  this.loading=false;
-					})
-			},
-			saveClientId(){
-				var info = plus.push.getClientInfo();
-				var cid = info.clientid;
-				this.$http.get("/sys/user/saveClientId",{params:{clientId:cid}}).then(res=>{
-					console.log("res::saveClientId>",res)
+		//  登录
+		onLogin: function () {
+
+			if (!this.checked || this.checked.length == 0) {
+				this.$tip.toast('请阅读后勾选并同意《平台协议》及《隐私协议》政策');
+				return;
+			}
+			if (!this.userName || this.userName.length == 0) {
+				this.$tip.toast('请填写手机号');
+				return;
+			}
+			if (!this.password || this.password.length == 0) {
+				this.$tip.toast('请填写密码');
+				return;
+			}
+			let loginParams = {
+				phone: this.userName,
+				passWord: this.password
+			}
+			this.loading = true;
+
+			this.mLogin(loginParams).then((res) => {
+				this.loading = false;
+				if (res.data.success) {
+					// #ifdef APP-PLUS
+					this.saveClientId()
+					// #endif
+					// #ifndef APP-PLUS
 					this.$tip.success('登录成功!')
-					this.$Router.replaceAll({name:'index'})
-				})
-			},
-			changePassword() {
-				this.showPassword = !this.showPassword;
-			},
-			onSMSSend() {
-				// let smsParams = {};
-				// smsParams.phone=this.phoneNo;
-				// smsParams.smsmode="0";
-				let checkPhone = new RegExp(/^[1]([3-9])[0-9]{9}$/);
-                if(!this.phoneNo || this.phoneNo.length==0){
-					this.$tip.toast('请输入手机号');
-					return false
-				}
-				if(!checkPhone.test(this.phoneNo)){
-					this.$tip.toast('请输入正确的手机号');
-					return false
+					this.$Router.replaceAll({ name: 'index' })
+					// #endif
+				} else {
+					this.$tip.alert(res.data.message);
 				}
-				this.$http.get("/merchant/app/sendMsg",{params:{phone:this.phoneNo}}).then(res=>{
-				  if(res.data.success){
+			}).catch((err) => {
+				let msg = err.data.message || "请求出现错误，请稍后再试"
+				this.loading = false;
+				this.$tip.alert(msg);
+			}).finally(() => {
+				this.loading = false;
+			})
+		},
+		saveClientId() {
+			var info = plus.push.getClientInfo();
+			var cid = info.clientid;
+			this.$http.get("/sys/user/saveClientId", { params: { clientId: cid } }).then(res => {
+				console.log("res::saveClientId>", res)
+				this.$tip.success('登录成功!')
+				this.$Router.replaceAll({ name: 'index' })
+			})
+		},
+		changePassword() {
+			this.showPassword = !this.showPassword;
+		},
+		onSMSSend() {
+			// let smsParams = {};
+			// smsParams.phone=this.phoneNo;
+			// smsParams.smsmode="0";
+			let checkPhone = new RegExp(/^[1]([3-9])[0-9]{9}$/);
+			if (!this.phoneNo || this.phoneNo.length == 0) {
+				this.$tip.toast('请输入手机号');
+				return false
+			}
+			if (!checkPhone.test(this.phoneNo)) {
+				this.$tip.toast('请输入正确的手机号');
+				return false
+			}
+			this.$http.get("/merchant/app/sendMsg", { params: { phone: this.phoneNo } }).then(res => {
+				if (res.data.success) {
 					this.smsCountDown = 60;
 					this.startSMSTimer();
-				  }else{
+				} else {
 					this.smsCountDown = 0;
 					this.$tip.toast(res.data.message);
-				  }
-				});
-			  },
-			startSMSTimer() {
-				this.smsCountInterval = setInterval(() => {
-				  this.smsCountDown--;
-				  if (this.smsCountDown <= 0) {
-					clearInterval(this.smsCountInterval);
-				  }
-				}, 1000);
-			},
-			onSMSLogin() {
-				let checkPhone = new RegExp(/^[1]([3-9])[0-9]{9}$/);
-			
-				if(!this.phoneNo || this.phoneNo.length==0){
-				  this.$tip.toast('请填写手机号');
-				  return;
-				}
-				if(!checkPhone.test(this.phoneNo)){
-					this.$tip.toast('请输入正确的手机号');
-					return false
-				}
-				if(!this.smsCode || this.smsCode.length==0){
-				  this.$tip.toast('请填短信验证码');
-				  return;
 				}
-				if(!this.checked || this.checked.length==0){
-					this.$tip.toast('请阅读后勾选并同意《平台协议》及《隐私协议》政策');
-					return;
+			});
+		},
+		startSMSTimer() {
+			this.smsCountInterval = setInterval(() => {
+				this.smsCountDown--;
+				if (this.smsCountDown <= 0) {
+					clearInterval(this.smsCountInterval);
 				}
-				let loginParams = {
-				  mobile:this.phoneNo,
-				  captcha:this.smsCode
-				};
-				this.$http.get("/merchant/app/checkCode",{params:{phone:this.phoneNo, code:this.smsCode}}).then(res=>{
-				  if(res.data.success){
+			}, 1000);
+		},
+		onSMSLogin() {
+			let checkPhone = new RegExp(/^[1]([3-9])[0-9]{9}$/);
+
+			if (!this.phoneNo || this.phoneNo.length == 0) {
+				this.$tip.toast('请填写手机号');
+				return;
+			}
+			if (!checkPhone.test(this.phoneNo)) {
+				this.$tip.toast('请输入正确的手机号');
+				return false
+			}
+			if (!this.smsCode || this.smsCode.length == 0) {
+				this.$tip.toast('请填短信验证码');
+				return;
+			}
+			if (!this.checked || this.checked.length == 0) {
+				this.$tip.toast('请阅读后勾选并同意《平台协议》及《隐私协议》政策');
+				return;
+			}
+			let loginParams = {
+				mobile: this.phoneNo,
+				captcha: this.smsCode
+			};
+			this.$http.get("/merchant/app/checkCode", { params: { phone: this.phoneNo, code: this.smsCode } }).then(res => {
+				if (res.data.success) {
 					this.nav('settled')
 					// this.$tip.success('登录成功!')
 					// this.$Router.replaceAll({name:'index'})
-				  }else{
+				} else {
 					this.$tip.error(res.data.message);
-				  }
-				}).catch((err) => {
-				  let msg = ((err.response || {}).data || {}).message || err.data.message || "请求出现错误，请稍后再试"
-				  this.$tip.error(msg);
-				});
-				// this.PhoneLogin(loginParams).then((res) => {
-				//   console.log("res====》",res)
-				//   if(res.data.success){
-				// 	// this.$tip.success('登录成功!')
-				// 	// this.$Router.replaceAll({name:'index'})
-				//   }else{
-				// 	this.$tip.error(res.data.message);
-				//   }
-				// }).catch((err) => {
-				//   let msg = ((err.response || {}).data || {}).message || err.data.message || "请求出现错误，请稍后再试"
-				//   this.$tip.error(msg);
-				// });
-			},
-			loginSuccess() {
-			  // 登陆成功，重定向到主页
-			  this.$Router.replace({name:'index'})
-			},
-			requestFailed(err) {
-			  this.$message.warning("登录失败")
-			},
-        },
-		beforeDestroy() {
-		    if (this.smsCountInterval) {
-		        clearInterval(this.smsCountInterval);
-		    }
+				}
+			}).catch((err) => {
+				let msg = ((err.response || {}).data || {}).message || err.data.message || "请求出现错误，请稍后再试"
+				this.$tip.error(msg);
+			});
+			// this.PhoneLogin(loginParams).then((res) => {
+			//   console.log("res====》",res)
+			//   if(res.data.success){
+			// 	// this.$tip.success('登录成功!')
+			// 	// this.$Router.replaceAll({name:'index'})
+			//   }else{
+			// 	this.$tip.error(res.data.message);
+			//   }
+			// }).catch((err) => {
+			//   let msg = ((err.response || {}).data || {}).message || err.data.message || "请求出现错误，请稍后再试"
+			//   this.$tip.error(msg);
+			// });
+		},
+		loginSuccess() {
+			// 登陆成功，重定向到主页
+			this.$Router.replace({ name: 'index' })
+		},
+		requestFailed(err) {
+			this.$message.warning("登录失败")
 		},
-    }
+	},
+	beforeDestroy() {
+		if (this.smsCountInterval) {
+			clearInterval(this.smsCountInterval);
+		}
+	},
+}
 </script>
 
 <style scoped lang="scss">
-page{
+page {
 	background: #FFFFFF;
-	height:100%;
+	height: 100%;
 }
-	.uni-data-checklist{
-		flex:none;
-		/deep/.checklist-group .checklist-box{
-			margin-right: 0 !important;
-		}
+
+.uni-data-checklist {
+	flex: none;
+
+	/deep/.checklist-group .checklist-box {
+		margin-right: 0 !important;
 	}
-	.footer{
-		position: fixed;
-		bottom: 54upx;
-		font-size: 12px;
-		background: #FFFFFF;
-		color: #999999;
-		text-align: center;
+}
+
+.footer {
+	position: fixed;
+	bottom: 54upx;
+	font-size: 12px;
+	background: #FFFFFF;
+	color: #999999;
+	text-align: center;
+	width: 100%;
+	// left: 50%;
+	// transform: translateX(-50%);
+}
+
+.text-color {
+	color: #449AFF;
+	margin: 0 10upx;
+}
+
+.login-paddingtop {
+	// padding-top: 100upx;
+	padding: 100upx 32upx 0 32upx;
+}
+
+.zai-box {
+	background: #FFFFFF;
+	height: 100%;
+
+	.zai-header {
 		width: 100%;
-		// left: 50%;
-		// transform: translateX(-50%);
-	}
-	.text-color {
-		color: #449AFF ;
-		margin: 0 10upx;
+		height: 432upx;
+		background-image: url(../../static/login/bejing.png);
+		background-size: cover;
 	}
-    .login-paddingtop {
-        // padding-top: 100upx;
-		padding: 100upx 32upx 0 32upx;
-    }
-
-    .zai-box {
-		background: #FFFFFF;
-		height: 100%;
-		.zai-header{
-			width: 100%;
-			height: 432upx;
-			background-image: url(../../static/login/bejing.png);
-			background-size: cover;
-		}
-        // padding: 0 20upx;
-        // padding-top: 100upx;
-        // position: relative;
-    }
-
-    .zai-logo {
-        width: 20px;
-        height: 20px;
-    }
-.box-user{
+
+	// padding: 0 20upx;
+	// padding-top: 100upx;
+	// position: relative;
+}
+
+.zai-logo {
+	width: 20px;
+	height: 20px;
+}
+
+.box-user {
 	border-bottom: 1px solid #EFEFEF;
 	min-height: 45px;
-	image{
+
+	image {
 		margin-right: 10px;
 	}
-	input{
-	font-size: 14px;
+
+	input {
+		font-size: 14px;
 		flex: 1;
 	}
 }
-    .zai-title {
-       font-size: 58upx;
-       color: #000000;
-       text-align: center;
-    }
-
-  	.input-placeholder,
-  	.zai-input {
-  		color: #94afce;
-  	}
-
-  	.zai-label {
-  		padding: 60upx 0;
-  		text-align: center;
-  		font-size: 30upx;
-  		color: #a7b6d0;
-  	}
-
-  	.zai-btn {
-  		background: #ff65a3;
-  		color: #fff;
-  		border: 0;
-  		border-radius: 100upx;
-  		font-size: 36upx;
-  	}
-
-  	.zai-btn:after {
-  		border: 0;
-  	}
-
-  	/*按钮点击效果*/
-  	.zai-btn.button-hover {
-  		transform: translate(1upx, 1upx);
-  	}
-  </style>
+
+.zai-title {
+	font-size: 58upx;
+	color: #000000;
+	text-align: center;
+}
+
+.input-placeholder,
+.zai-input {
+	color: #94afce;
+}
+
+.zai-label {
+	padding: 60upx 0;
+	text-align: center;
+	font-size: 30upx;
+	color: #a7b6d0;
+}
+
+.zai-btn {
+	background: #ff65a3;
+	color: #fff;
+	border: 0;
+	border-radius: 100upx;
+	font-size: 36upx;
+}
+
+.zai-btn:after {
+	border: 0;
+}
+
+/*按钮点击效果*/
+.zai-btn.button-hover {
+	transform: translate(1upx, 1upx);
+}
+</style>

pages/login/settled.vue

@@ -1,9 +1,9 @@
 <template>
     <view>
-        <cu-custom bgColor="bg-gradual-blue1" :isBack="true">
-            <block slot="content">申请入驻</block>
+        <cu-custom :bgColor="title=='申请入驻'?'bg-gradual-blue1':'bg-fff'" :isBack="true">
+            <block slot="content">{{ title }}</block>
         </cu-custom>
-        <view class="progress">
+        <view class="progress" v-if="title=='申请入驻'">
             <view class="progress-style progress-bag">
                 <view v-if="tab==1" class="progress-icon"></view>
                 <view v-if="tab==2" class="progress-style progress-bag1" :style="[{animation: 'top ' + 0.4+ 's 1'}]">
@@ -19,6 +19,13 @@
                 <view :class="tab=='3'?'color':''">门店信息</view>
             </view>
         </view>
+        <view class="progress-status" v-else >
+            <view class="status">
+                <image src="/static/login/status1.png" mode="aspectFit"></image>
+                <text>待审核</text>
+            </view>
+            <view>2025/08/28 09:54:36 提交的店铺信息待审核中</view>
+        </view>
         <view v-if="tab == 1" class="tab-top">
             <form>
                  <!-- <view class="borderRadiu">
@@ -68,37 +75,37 @@
                 <view class=" cu-form-group">
                     <view class="title">主体类型</view>
                     <!-- <uni-data-checkbox  v-model="form.type" :localdata="hobby"></uni-data-checkbox> -->
-                    <radio-group @change="typeChang($event, 'type')" v-model="form.type">
+                    <radio-group @change="typeChang($event, 'type')" v-model="form.type" >
                         <label class="margin-left-sm">
-                            <radio :class="form.type=='1'?'checked blue':''" :checked="form.type=='1'?true:false" value="1"></radio>
+                            <radio :class="form.type=='1'?'checked blue':''" :checked="form.type=='1'?true:false" value="1" :disabled="isDisabled"></radio>
                             <!-- <checkbox class=' blue' :class="form.type?'checked':''" :checked="form.type?true:false" value="1"></checkbox> -->
                             <text class="margin-left-sm">普通企业</text>
                         </label>
                         <label class="margin-left-sm">
-                            <radio :class="form.type=='2'?'checked blue':''" :checked="form.type=='2'?true:false" value="2"></radio>
+                            <radio :class="form.type=='2'?'checked blue':''" :checked="form.type=='2'?true:false" value="2" :disabled="isDisabled"></radio>
                             <text class="margin-left-sm">个体工商户</text>
                         </label>
                     </radio-group>
                 </view>
                 <view class="cu-form-group">
                     <view class="title">公司名称</view>
-                    <input placeholder="请输入公司名称" v-model="form.corporateName" name="input"></input>
+                    <input placeholder="请输入公司名称" v-model="form.corporateName" name="input" :disabled="isDisabled"></input>
                 </view>
                 <view class="cu-form-group">
                     <view class="title">统一代码</view>
-                    <input placeholder="请输入统一社会信用代码" v-model="form.creditCode" name="input"></input>
+                    <input placeholder="请输入统一社会信用代码" v-model="form.creditCode" name="input" :disabled="isDisabled"></input>
                 </view>
                 <view class="cu-form-group">
                     <view class="title">有效期 </view>
                     <!-- <uni-data-checkbox  v-model="form.lifespan" :localdata="lifespanOption"></uni-data-checkbox> -->
-                    <radio-group  @change="typeChang($event, 'lifespanType')" v-model="form.lifespanType">
+                    <radio-group  @change="typeChang($event, 'lifespanType')" v-model="form.lifespanType" >
                         <label class="margin-left-sm">
-                            <radio :class="form.lifespanType=='1'?'checked blue':''" :checked="form.lifespanType=='1'?true:false" value="1"></radio>
+                            <radio :class="form.lifespanType=='1'?'checked blue':''" :checked="form.lifespanType=='1'?true:false" value="1" :disabled="isDisabled"></radio>
                             <!-- <checkbox class=' blue' :class="form.type?'checked':''" :checked="form.type?true:false" value="1"></checkbox> -->
                             <text class="margin-left-sm">长期有效</text>
                         </label>
                         <label class="margin-left-sm">
-                            <radio :class="form.lifespanType=='2'?'checked blue':''" :checked="form.lifespanType=='2'?true:false" value="2"></radio>
+                            <radio :class="form.lifespanType=='2'?'checked blue':''" :checked="form.lifespanType=='2'?true:false" value="2" :disabled="isDisabled"></radio>
                             <text class="margin-left-sm">固定期限</text>
                         </label>
                     </radio-group>
@@ -114,8 +121,8 @@
                     </radio-group> -->
                 </view>
                 <view class="cu-form-group" v-if="form.lifespanType == 2">
-                    <view class="title">日期开始时间</view>
-                    <picker mode="date" :value="form.lifespanBegin" @change="typeChang($event, 'lifespanBegin')">
+                    <view class="title">有效期起</view>
+                    <picker mode="date" :disabled="isDisabled" :value="form.lifespanBegin" @change="typeChang($event, 'lifespanBegin')">
                         <view class="picker" v-if="form.lifespanBegin">
                             {{ form.lifespanBegin  }}
                         </view>
@@ -125,8 +132,8 @@
                     </picker>
                 </view>
                 <view class="cu-form-group" v-if="form.lifespanType == 2">
-                    <view class="title">日期结束时间</view>
-                    <picker mode="date" :value="form.lifespanEnd" @change="typeChang($event, 'lifespanEnd')">
+                    <view class="title">有效期止</view>
+                    <picker mode="date" :disabled="isDisabled" :value="form.lifespanEnd" @change="typeChang($event, 'lifespanEnd')">
                         <view class="picker" v-if="form.lifespanEnd">
                             {{ form.lifespanEnd }}
                         </view>
@@ -158,11 +165,11 @@
                     </view>
                 <view class="cu-form-group  ">
                     <view class="title">法人姓名</view>
-                    <input placeholder="请输入法人姓名" v-model="form.legalPerson" name="input"></input>
+                    <input placeholder="请输入法人姓名" v-model="form.legalPerson" name="input" :disabled="isDisabled"></input>
                 </view>
                 <view class="cu-form-group">
                     <view class="title">法人证件号</view>
-                    <input placeholder="请输入法人证件号" v-model="form.legalPersonCode" name="input"></input>
+                    <input placeholder="请输入法人证件号" v-model="form.legalPersonCode" name="input" :disabled="isDisabled"></input>
                 </view>
                 <view class="customize">
                     <view class="title">法人证件照片</view>
@@ -195,12 +202,11 @@
                     <view class="content ">
                         <text class="text-bold">提交门店信息</text>
                         <i class="text-bg " ></i>
-
                     </view>
                 </view>
                 <view class="cu-form-group">
                     <view class="title">门店名称</view>
-                    <input placeholder="请输入门店名称" v-model="form.storeName" name="input"></input>
+                    <input placeholder="请输入门店名称" v-model="form.storeName" name="input" :disabled="isDisabled"></input>
                 </view>
                 <view class="cu-form-group" >
                     <view class="title">所在地区</view>
@@ -238,18 +244,21 @@
                         门店照片需包含完整的门店入口和招牌名称，建议现场拍摄门头照;最多可上传10张，支持格式bmp、png、jpeg、jpg，单个图片不超过5MB，建议尺寸在2000*1500px以上                    </view>
                 </view>
             </view>
-           
             </form>
         </view>
         <view v-if="tab == 1" class="padding flex flex-direction sub-bottom">
             <button  class="cu-btn bg-blue round " @click="tab=2">保存并下一步</button>
         </view>
-        <view v-if="tab == 2" class="padding flex sub-bottom">
+        <view v-if="tab == 2 && title=='申请入驻'" class="padding flex sub-bottom">
             <button class="cu-btn round line-blue  shadow"  @click="tab = 1">上一步</button>
             <button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round " @click="tab=3">保存并下一步</button>
         </view>
+        <view v-else class="padding flex sub-bottom">
+            <button class="cu-btn round line-gray  shadow"  @click="$Router.push({ name: 'settings' })">取消</button>
+            <button style="margin-left: 12upx;width:77%" class="cu-btn line-blue  round shadow" @click="tab=3">下一页</button>
+        </view>
         <view v-if="tab == 3" class="padding flex sub-bottom">
-            <button class="cu-btn round line-blue  shadow"  @click="tab = 2">上一步</button>
+            <button class="cu-btn round line-blue  shadow"  @click="tab = 2">{{title=='申请入驻'?'上一步':'上一页'}}</button>
             <button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round " @click="sumbit">提交审核</button>
         </view>
         <view class="cu-load load-modal" v-if="lodingshow">
@@ -285,6 +294,8 @@ export default {
             //     text: '固定期限',
             //     value: 2
             // }],
+            isDisabled:false,
+            title:'申请入驻',
             lodingshow:false,
             form: {
                 name: null,
@@ -317,13 +328,23 @@ export default {
         }
     },
 
-    async onLoad() {
-        let res = await this.$http.get("/merchant/app/allList")
-        if (res.data.success) {
-            this.supplierOption = res.data.result
-        } else {
-            this.$tip.toast(res.data.message);
+    async onLoad(data) {
+        let obj=JSON.parse(decodeURIComponent(data.params));
+        if(obj){
+            console.log(obj,333333333);
+            
+            this.title='店铺信息'
+            this.tab=2
+            this.isDisabled=true
+            obj.lifespanType= obj.lifespanType?obj.lifespanType:'1'
+            this.form=obj
         }
+        // let res = await this.$http.get("/merchant/app/allList")
+        // if (res.data.success) {
+        //     this.supplierOption = res.data.result
+        // } else {
+        //     this.$tip.toast(res.data.message);
+        // }
 
     },
     methods: {
@@ -529,13 +550,7 @@ page{
     background-color: #ffffff;
     // border-bottom: 1px solid #eee;
 }
-.text-bg{
-    display: block;
-    width: 100%;
-    height: 3px;
-    background: linear-gradient( 90deg, #88BFFF 0%, #449AFF 100%);
-    border-radius: 4px 4px 4px 4px;
-}
+
 .sub-bottom{
     position: fixed;
     width: 100%;
@@ -543,6 +558,27 @@ page{
     background: #FFFFFF;
     border-top: 1px solid #EEEEEE;
 }
+.progress-status{
+    position: fixed;
+    width: 100%;
+    z-index: 9999;
+    padding: 26upx 42upx;
+    background: #FFFFFF;
+    .status{
+        font-size: 38upx;
+        color: #F6863E;
+        font-weight: 500;
+    margin-bottom: 10upx;
+        text{
+            margin-left:5upx
+        }
+        image{
+            vertical-align:text-top;
+            width: 42upx;
+            height: 42upx;
+        }
+    }
+}
 .progress{
     position: fixed;
     height: 96upx;

pages/store/settings.vue

@@ -0,0 +1,190 @@
+<template>
+    <view>
+        <cu-custom bgColor="bg-fff" :isBack="true">
+            <block slot="content">店铺设置</block>
+        </cu-custom>
+        <view class="bg-fff">
+            <view class="flex cu-form-group  ">
+                <view class="content ">
+                    <text class="text-bold">基本信息</text>
+                    <i class="text-bg "></i>
+                </view>
+            </view>
+            <view class="cu-form-group justify-between" v-for="val in liList" :key="val.label" @click="jump(val)">
+                <view class="title">
+                    <text>{{ val.label }}</text>
+                    <text  v-if="indexOption[val.status]==0" class="bg-orange">待审核</text>
+                    <text  v-if="indexOption[val.status]==1" class="bg-grey">审核通过</text>
+                    <text  v-if="indexOption[val.status]==2" class="bg-pink">审核驳回</text>
+                </view>
+                <view >
+                    <text  style="color: #C7C6CA ;">去配置</text>
+                    <text class='cuIcon-right' style="color: #C7C6CA ;"></text>
+                </view>
+            </view>
+        </view>
+        <view class="bg-fff margin-top">
+            <view class="flex cu-form-group  ">
+                <view class="content ">
+                    <text class="text-bold">其他信息</text>
+                    <i class="text-bg "></i>
+                </view>
+            </view>
+            <view class="cu-form-group justify-between" >
+                <view class="title">
+                    <text>经营资质</text>
+                    <text class="bg-orange">待审核</text>
+                </view>
+                <view >
+                    <text  style="color: #C7C6CA ;">去配置</text>
+                    <text class='cuIcon-right' style="color: #C7C6CA ;"></text>
+                </view>
+            </view>
+            <view class="cu-form-group justify-between" >
+                <view class="title">
+                    <text>服务设施</text>
+                </view>
+                <view >
+                    <text  style="color: #C7C6CA ;">去配置</text>
+                    <text class='cuIcon-right' style="color: #C7C6CA ;"></text>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+import { USER_INFO } from "@/common/util/constants"
+
+export default {
+    data(){
+        return{
+            liList: [
+                {
+                    label:'店铺信息',
+                    status:'status'
+                }, {
+                    label:'品牌信息',
+                    status:'logoStatus'
+                }, {
+                    label:'经营信息',
+                    status:'videoStatus'
+                }
+            ],
+          
+            indexOption:{
+        "id": "1887039799020273666",
+        "status": 1,
+        "type": 1,
+        "corporateName": "山西萨奥商务有限公司",
+        "creditCode": "91350200M000100Y43",
+        "lifespanType": null,
+        "lifespanBegin": "2020-02-06",
+        "lifespanEnd": "2030-02-10",
+        "legalPerson": "李虎虎",
+        "legalPersonCode": "110150198612082510",
+        "businessLicense": "temp/营业执照_1738740283252.png",
+        "identityOne": "temp/zhengmian_1738740288146.png",
+        "identityTwo": "temp/背面_1738740290745.png",
+        "storeType": 1,
+        "storeName": "山西领航汽车服务有限公司",
+        "businessType": "1881621741363683330",
+        "country": "140105",
+        "purveyorId": "1879053784867610626",
+        "address": "山西省太原市小店区康宁街108号",
+        "storeExtent": null,
+        "localMerchantTimes": null,
+        "longitude": "112.569957",
+        "latitude": "37.736476",
+        "headPhoto": "temp/car_1738740320841.jpg",
+        "merchantStatus": 2,
+        "createTime": "2025-02-05 15:25:22",
+        "updateTime": "2025-02-05 15:25:30",
+        "logoId": null,
+        "logo": null,
+        "logoStatus": null,
+        "logoCategory": null,
+        "logoUpdateTime": null,
+        "logoUpdateBy": null,
+        "videoId": null,
+        "video": null,
+        "photo": null,
+        "videoCategory": null,
+        "videoStatus": null,
+        "videoUpdateTime": null,
+        "videoUpdateBy": null,
+        "specialId": null,
+        "special": null,
+        "specialCategory": null,
+        "specialStatus": null,
+        "specialUpdateTime": null,
+        "specialUpdateBy": null,
+        "content": null,
+        "grade": null
+    },
+        }
+    },
+    async onLoad() {
+			
+            let merchantId=uni.getStorageSync(USER_INFO).merchantId;
+            
+        let res = await this.$http.get("/merchant/localMerchantInfo/queryAppInfoById?id="+merchantId)
+        if (res.data.success) {
+            // this.indexOption = res.data.result
+        } else {
+            this.$tip.toast(res.data.message);
+        }
+        
+    },
+    methods:{
+        jump(item) {
+				if (item.label == '店铺信息') {
+                    const queryString =encodeURIComponent(JSON.stringify(this.indexOption)) 
+                    uni.navigateTo({
+                        url: `/pages/login/settled?params=${queryString}`
+                    });
+					// uni.navigateTo({
+					// 	url: '/pages/login/settled?type=1'
+					// })
+				} 
+				
+			}
+    }
+}
+</script>
+<style scoped>
+page{
+    background: #F8F8FA;
+}
+.cu-form-group{
+    margin: 18upx 42upx;
+}
+/* .cu-form-group+.cu-form-group{
+    border:none;
+	border-top: 1upx solid #eee;
+
+} */
+.cu-form-group:not(.bg-fff :has(+ .cu-form-group)) {
+    border:none
+}
+.bg-orange{
+    background: #FBF9E4;
+    color: #F6863E;
+    font-size: 24upx;
+    padding: 6upx 10upx;
+    margin-left: 12upx;
+}
+.bg-grey{
+    background: #F3F3F3;
+    color: #7E7E7E;
+    font-size: 24upx;
+    padding: 6upx 10upx;
+    margin-left: 12upx;
+}
+.bg-pink{
+    background: #FBE5E4;
+    color: #F34F4F;
+    font-size: 24upx;
+    padding: 6upx 10upx;
+    margin-left: 12upx;
+}
+</style>

plugin/colorui/main.css

@@ -2351,7 +2351,13 @@ button.cuIcon.lg {
 	height: 60upx;
 	line-height: 60upx;
 }
-
+.text-bg{
+    display: block;
+    width: 100%;
+    height: 3px;
+    background: linear-gradient( 90deg, #88BFFF 0%, #449AFF 100%);
+    border-radius: 4px 4px 4px 4px;
+}
 .cu-form-group input {
 	flex: 1;
 	font-size: 30upx;
@@ -3424,7 +3430,10 @@ scroll-view.cu-steps .cu-item {
 	background-color: #e54d42;
 	color: #ffffff;
 }
+.bg-fff {
+	background-color: #ffffff;
 
+}
 .bg-orange {
 	background-color: #f37b1d;
 	color: #ffffff;