lilei il y a 2 ans
Parent
commit
1d585ffc3d

+ 3 - 0
components/uni-popup/image-txt-popup.vue

@@ -117,6 +117,9 @@
 			width: 30%;
 			line-height: 2.8;
 			border-radius: 1rem;
+			&::after{
+				border:0;
+			}
 		}
 	}
 </style>

+ 3 - 3
pages/digitalShelf/choosePart.vue

@@ -515,14 +515,14 @@
 				// 游客去认证
 				if(this.userInfo.sysUserFlag == '0'){
 					// 未认证
-					if(!this.storeApply || this.storeApply&&!this.storeApply.auditStatus){
+					if(!this.storeApply || this.storeApply&&(!this.storeApply.auditStatus || this.storeApply.auditStatus == 'REFUSE')){
 						this.showPopup = true
 					}
 					// 认证通过
-					if(this.storeApply&&(this.storeApply.auditStatus=='WAIT' || this.storeApply.auditStatus == 'REFUSE')){
+					if(this.storeApply&&this.storeApply.auditStatus=='WAIT'){
 						uni.showModal({
 							title: '提示',
-							content: this.storeApply.auditStatus=='WAIT' ? '门店认证资料审核中,请耐心等待!' : '门店认证资料审核不通过,请重新提交审核!',
+							content: '门店认证资料审核中,请耐心等待!',
 							confirmText: '好的',
 							showCancel: false
 						})

+ 2 - 2
pages/index/index.vue

@@ -150,6 +150,8 @@
 			this.vinList = []
 			// 检测是否登录
 			this.$store.dispatch('checkLogin',()=>{
+				// 用户头像
+				this.avatarUrl = this.$store.state.vuex_userPhoto || uni.getStorageSync('userPhoto');
 				// 获取数据字典
 				this.getListLookUp();
 				// 获取支付,收款方式
@@ -179,8 +181,6 @@
 				if(this.userInfo.sysUserFlag == '0'){
 					this.findLastApply()
 				}
-				// 用户头像
-				this.avatarUrl = this.$store.state.vuex_userPhoto
 			}
 		},
 		methods: {

+ 2 - 3
pages/personData/personData.vue

@@ -84,9 +84,8 @@
 		},
 		onShow() {
 			//检测是否登录
-			this.$store.dispatch('checkLogin')
-			this.avatarUrl = this.$store.state.vuex_userPhoto
-			console.log(this.avatarUrl,'this.avatarUrl')
+			this.$store.dispatch('checkLogin');
+			this.avatarUrl = this.$store.state.vuex_userPhoto || uni.getStorageSync('userPhoto');
 		},
         methods: {
 		  onChooseAvatar(e) {

+ 0 - 8
pages/storeManage/personnel.vue

@@ -62,14 +62,6 @@
 		onShow() {
 			this.getRow(1)
 		},
-		// 判断员工身份权限
-		filters:{
-			isManagerFilter(isManagerFilterVal){
-				if(isManagerFilterVal == 1){
-					return '负责人'
-				}
-			}
-		},
 		methods:{
 			// 查询列表
 			getRow (pageNo) {

+ 4 - 4
pages/storeManage/storeAuth.vue

@@ -37,16 +37,16 @@
 					<Address ref="applyAddress" @onConfirm="areaConfirm"></Address>
 				</u-form-item>
 				<u-form-item label="详细地址" required prop="addrDetail">
-					<u-input type="textarea" auto-height v-model="form.addrDetail" placeholder="请输入详细地址"/>
+					<u-input type="textarea" maxlength="100" auto-height v-model="form.addrDetail" placeholder="请输入详细地址"/>
 				</u-form-item>
 				<u-form-item label="联系人姓名" required prop="contactName">
-					<u-input v-model="form.contactName" placeholder="请输入联系人姓名"/>
+					<u-input v-model="form.contactName" maxlength="30" placeholder="请输入联系人姓名"/>
 				</u-form-item>
 				<u-form-item label="联系人手机">
 					{{form.contactPhone}}
 				</u-form-item>
 				<u-form-item label="汽配商邀请码">
-					<u-input v-model="form.inviteCode" :clearable="false" @input="inputDealer" @blur="findDealer" @confirm="findDealer" placeholder="如没有可不填"/>
+					<u-input v-model="form.inviteCode" maxlength="30" :clearable="false" @input="inputDealer" @blur="findDealer" @confirm="findDealer" placeholder="如没有可不填"/>
 				</u-form-item>
 				<u-form-item label="汽配商" v-if="form.inviteName.length">
 					{{form.inviteName||'--'}}
@@ -223,13 +223,13 @@
 					title: "正在查询"
 				})
 				xprhFindDealer({inviteCode: this.form.inviteCode}).then(res => {
+					uni.hideLoading()
 					if(res.status == 200){
 						this.form.inviteName = res.data&&res.data.dealerName
 					}else{
 						this.form.inviteName = ''
 					}
 					uni.showToast({icon: 'none',title: res.message,duration:5000})
-					uni.hideLoading()
 				})
 			},
 			//  表单提交

+ 4 - 2
store/index.js

@@ -15,7 +15,7 @@ try{
 }
 
 // 需要永久存储,且下次APP启动需要取出的,在state中的变量名
-let saveStateKeys = ['vuex_carBrandList','vuex_userInfo'];
+let saveStateKeys = ['vuex_carBrandList'];
 
 // 保存变量到本地存储中
 const saveLifeData = function(key, value){
@@ -49,7 +49,7 @@ const store = new Vuex.Store({
 		vuex_shelfChoosePart: [], // 数字货架临配选择配件
 		vuex_allLookUp: [],  //  数据字典
 		vuex_paymentTypeList: [], // 支付方式
-		vuex_userInfo: null, // 用户信息
+		vuex_userInfo:  null, // 用户信息
 		vuex_userPhoto: null, // 用户头像
 		vuex_permCodes: [], // 权限码
 		vuex_openid: "",
@@ -70,6 +70,7 @@ const store = new Vuex.Store({
             state.hasLogin = true;
 			state.vuex_userInfo = data.auth_user;
 			state.vuex_userPhoto = data.auth_user.extInfo&&data.auth_user.extInfo.userExtInfo ? data.auth_user.extInfo.userExtInfo.headImage : ''
+			uni.setStorageSync('userPhoto', state.vuex_userPhoto);
 			// VISITOR:游客,EMPLOYEE:雇员
 			data.auth_user['identifyType'] = data.sysUserFlag == '0' ? 'VISITOR' : 'EMPLOYEE';
 			data.auth_user['sysUserFlag'] = data.sysUserFlag;
@@ -86,6 +87,7 @@ const store = new Vuex.Store({
 			uni.removeStorageSync('token')
 			uni.removeStorageSync('userInfo')
 			uni.removeStorageSync('permCodes')
+			uni.removeStorageSync('userPhoto')
 			state.vuex_storeShelf = null
 			state.vuex_userInfo = null
 			state.vuex_userPhoto = null