lilei 2 tahun lalu
induk
melakukan
74f34aeb87

+ 2 - 2
App.vue

@@ -1,8 +1,8 @@
 <script>
 <script>
 	export default {
 	export default {
 		globalData: {
 		globalData: {
-			baseUrl: 'http://192.168.0.103:9110/saas/clz/', // 本地
-			// baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
+			// baseUrl: 'http://192.168.0.103:9110/saas/clz/', // 本地
+			baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 		},
 		},
 		onLaunch: function() {
 		onLaunch: function() {

+ 2 - 1
pages/digitalShelf/choosePart.vue

@@ -307,9 +307,10 @@
 			},
 			},
 			// 获取数字货架分类作为二级分类
 			// 获取数字货架分类作为二级分类
 			getShelfProductType(){
 			getShelfProductType(){
+				const storeShelf = this.$store.state.vuex_storeShelf
 				getShelfProductType({
 				getShelfProductType({
 					codeList: this.vinCode,
 					codeList: this.vinCode,
-					shelfSn: this.$store.state.vuex_storeShelf.shelfSn
+					shelfSn: storeShelf?storeShelf.shelfSn:''
 				}).then(res => {
 				}).then(res => {
 					console.log(res,'getShelfProductType')
 					console.log(res,'getShelfProductType')
 					this.leve2Data = this.labelToPart(res.data || [])
 					this.leve2Data = this.labelToPart(res.data || [])

+ 10 - 4
pages/index/index.vue

@@ -22,7 +22,7 @@
 				<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 您有待取货的货架订单哦!</view> <text class="text">立即处理>></text>
 				<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 您有待取货的货架订单哦!</view> <text class="text">立即处理>></text>
 			</view>
 			</view>
 			<!-- 门店审核不通过 -->
 			<!-- 门店审核不通过 -->
-			<view class="notices flex" v-if="storeApply&&storeApply.auditStatus=='REFUSE'&&storeApply.readFlag=='0'">
+			<view class="notices flex justify_between" v-if="storeApply&&storeApply.auditStatus=='REFUSE'&&storeApply.readFlag=='0'">
 				<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 门店认证资料审核不通过,请重新提交审核!</view> <text class="text" @click="toKnow">知道了</text>
 				<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 门店认证资料审核不通过,请重新提交审核!</view> <text class="text" @click="toKnow">知道了</text>
 			</view>
 			</view>
 			<!-- 名片 -->
 			<!-- 名片 -->
@@ -129,7 +129,7 @@
 				return this.$store.state.vuex_userInfo
 				return this.$store.state.vuex_userInfo
 			},
 			},
 			storeApply(){
 			storeApply(){
-				return this.$store.state.vuex_storeAuthInfo
+				return this.$store.state.vuex_storeAuthInfo || null
 			}
 			}
 		},
 		},
 		onReady() {
 		onReady() {
@@ -176,7 +176,9 @@
 		onShow() {
 		onShow() {
 			if(this.hasLogin){
 			if(this.hasLogin){
 				// 查询门店认证信息
 				// 查询门店认证信息
-				this.findLastApply()
+				if(this.userInfo.sysUserFlag == '0'){
+					this.findLastApply()
+				}
 				// 用户头像
 				// 用户头像
 				this.avatarUrl = this.userInfo.extInfo&&this.userInfo.extInfo.userExtInfo ? this.userInfo.extInfo.userExtInfo.headImage : ''
 				this.avatarUrl = this.userInfo.extInfo&&this.userInfo.extInfo.userExtInfo ? this.userInfo.extInfo.userExtInfo.headImage : ''
 			}
 			}
@@ -361,6 +363,9 @@
 				}
 				}
 			},
 			},
 			toChoosePart(item){
 			toChoosePart(item){
+				if(this.userInfo.sysUserFlag == '0'){
+					return
+				}
 				if(this.hasShelf){
 				if(this.hasShelf){
 					item.text = item.modelInfo
 					item.text = item.modelInfo
 					uni.navigateTo({
 					uni.navigateTo({
@@ -403,7 +408,8 @@
 			z-index: 4;
 			z-index: 4;
 			.notices{
 			.notices{
 				padding: 0.5em 0 0;
 				padding: 0.5em 0 0;
-				font-size: 1em;
+				font-size: 0.9em;
+				margin-top: 0.5rem;
 				view{
 				view{
 					color: #ffaf46;
 					color: #ffaf46;
 					max-width: 80%;
 					max-width: 80%;

+ 1 - 1
pages/storeManage/addPerson.vue

@@ -42,7 +42,7 @@
 										</u-radio>
 										</u-radio>
 									</u-radio-group>
 									</u-radio-group>
 								</view>
 								</view>
-								<view style="color: #999;text-align: center;" v-else>
+								<view style="color: #999;text-align: center;padding:3rem 0;" v-else>
 									暂无岗位信息,请点击“新增岗位”
 									暂无岗位信息,请点击“新增岗位”
 								</view>
 								</view>
 							</view>
 							</view>

+ 7 - 11
pages/storeManage/personnel.vue

@@ -13,9 +13,13 @@
 							<view class="flex_1">
 							<view class="flex_1">
 								<view class="u-name">
 								<view class="u-name">
 									<text style="margin-right: 0.5rem;">{{item.name}}</text>
 									<text style="margin-right: 0.5rem;">{{item.name}}</text>
-									<u-icon :name="item.sex | sexFilter" size="28" :color="item.sex==1?'#00aaff':'#ffaaaa'" custom-prefix="custom-icon"></u-icon>
+									<u-icon :name="item.sex==1?'man':'woman'" size="28" :color="item.sex==1?'#00aaff':'#ffaaaa'"></u-icon>
+								</view>
+								<view class="u-mobile">
+									<text v-if="item.isManager == 1">门店负责人 / </text>
+									<text v-else>{{item.roleNames}} / </text>
+									{{item.mobile}}
 								</view>
 								</view>
-								<view class="u-mobile">{{item.mobile}}</view>
 							</view>
 							</view>
 							<view @click="editPerson(item)">
 							<view @click="editPerson(item)">
 								<u-icon size="34" name="edit-pen"></u-icon>
 								<u-icon size="34" name="edit-pen"></u-icon>
@@ -60,14 +64,6 @@
 		},
 		},
 		// 判断员工身份权限
 		// 判断员工身份权限
 		filters:{
 		filters:{
-			sexFilter(sexFilterVal){
-				if(sexFilterVal == 1){
-					return 'staff_icon_boy'
-				}
-				if(sexFilterVal == 0){
-					return 'staff_icon_girl'
-				}
-			},
 			isManagerFilter(isManagerFilterVal){
 			isManagerFilter(isManagerFilterVal){
 				if(isManagerFilterVal == 1){
 				if(isManagerFilterVal == 1){
 					return '负责人'
 					return '负责人'
@@ -144,7 +140,7 @@
 						margin-bottom: 0.5rem;
 						margin-bottom: 0.5rem;
 					}
 					}
 					.u-mobile{
 					.u-mobile{
-						color: #999;
+						color: #666;
 					}
 					}
 				}
 				}
 			}
 			}

+ 3 - 0
pages/vinRecord/vinRecord.vue

@@ -100,6 +100,9 @@
 				}
 				}
 			},
 			},
 			toChoosePart(item){
 			toChoosePart(item){
+				if(this.userInfo.sysUserFlag == '0'){
+					return
+				}
 				if(this.hasShelf){
 				if(this.hasShelf){
 					item.text = item.modelInfo
 					item.text = item.modelInfo
 					uni.navigateTo({
 					uni.navigateTo({

+ 1 - 1
store/index.js

@@ -140,7 +140,7 @@ const store = new Vuex.Store({
 							showCancel: false,
 							showCancel: false,
 							success() {
 							success() {
 								context.commit('logout');
 								context.commit('logout');
-								uni.redirectTo({
+								uni.navigateTo({
 									url: '/pages/login/login'
 									url: '/pages/login/login'
 								});
 								});
 							}
 							}