From 6686a2794306aa2c4e300c889164326687f588a9 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 26 Feb 2024 18:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/app.js                   |  4 +--
 pages/goods_details/index_v.vue |  8 ++---
 pages/store/home/index.vue      |  2 ++
 pages/store/settled/index.vue   | 58 ++++++++++++++++-----------------
 pages/store/settled/unit.vue    | 58 +++++++++++++++++----------------
 pages/user/index.vue            | 19 ++++++++---
 6 files changed, 82 insertions(+), 67 deletions(-)

diff --git a/config/app.js b/config/app.js
index aed86ed..5d52a61 100644
--- a/config/app.js
+++ b/config/app.js
@@ -12,8 +12,8 @@ let httpApiSix
 let wsApi
 
 // 在打包之前请检查当前环境是否正确
-// const env = 'dev'; // 开发
-const env = 'prod'; // 生产
+const env = 'dev'; // 开发
+// const env = 'prod'; // 生产
 // const env = 'prew'; // 预上线
 
 switch (env) {
diff --git a/pages/goods_details/index_v.vue b/pages/goods_details/index_v.vue
index c129ee9..1cc3c9a 100644
--- a/pages/goods_details/index_v.vue
+++ b/pages/goods_details/index_v.vue
@@ -233,12 +233,12 @@
 									</view>
 									<view v-else class="txt">0人关注</view>
 								</view>
-								<!-- <navigator v-if="hide_mer_status != 1"
+								<navigator v-if="hide_mer_status != 1"
 									:url="'/pages/store/home/index?id='+storeInfo.merchant.mer_id" class="link"
-									hover-class="none">进店</navigator> -->
-                  <navigator v-if="hide_mer_status != 1 && storeInfo.merchant.village_id && !this.village_id"
+									hover-class="none">进店</navigator>
+                  <!-- <navigator v-if="hide_mer_status != 1 && storeInfo.merchant.village_id && !this.village_id && storeInfo.merchant.village_name"
                   	:url="`/pages/nongKe/specialty/short_index?type_code=PersonalStore&village_id=${storeInfo.merchant.village_id}&name=${storeInfo.merchant.village_name.replace('集体经营合作店铺','')}`" class="link"
-                  	hover-class="none">进店</navigator>
+                  	hover-class="none">进店</navigator> -->
 							</view>
 							<view class="score-wrapper">
 								<view class="item">
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 92da9f1..3bf3d92 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -1015,6 +1015,8 @@
 					} else {
 						this.tabs = this.tabs5			
 					}
+          if (res.data.business_status == 0 && this.isLihaiYun == 'LiHaiQiJianDian') this.tabs = this.tabs4;
+          
 
 					this.tab(this.type)
 					// #ifdef H5
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index cb0f1d1..53f76a6 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -34,35 +34,6 @@
 							</view>
 						</view>
 
-
-						<view class="item">
-							<view class="acea-row row-middle">
-								<text class="item-name">联系电话</text>
-								<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
-									@input="validateBtn" placeholder-class='placeholder' />
-							</view>
-						</view>
-						<view class="item rel">
-							<view class="acea-row row-middle">
-								<text class="item-name">验证码</text>
-								<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma"
-									@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
-								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
-									@click="handleVerify">
-									{{ text }}
-								</button>
-							</view>
-						</view>
-						<view class="item" v-if="isShowCode">
-							<view class="acea-row row-middle">
-								<text class="item-name">验证码</text>
-								<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
-									@input="validateBtn" placeholder-class='placeholder' />
-								<view class="imageCode" @click="again">
-									<image :src="codeUrl" />
-								</view>
-							</view>
-						</view>
 						<view class="item">
 							<view class="uni-list">
 								<view class="uni-list-cell">
@@ -231,6 +202,35 @@
 								</view>
 							</view>
 						</view>
+            <view class="item">
+            	<view class="acea-row row-middle">
+            		<text class="item-name">联系电话</text>
+            		<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
+            			@input="validateBtn" placeholder-class='placeholder' />
+            	</view>
+            </view>
+            <view class="item rel">
+            	<view class="acea-row row-middle">
+            		<text class="item-name">验证码</text>
+            		<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma"
+            			@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
+            		<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
+            			@click="handleVerify">
+            			{{ text }}
+            		</button>
+            	</view>
+            </view>
+            <view class="item" v-if="isShowCode">
+            	<view class="acea-row row-middle">
+            		<text class="item-name">验证码</text>
+            		<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
+            			@input="validateBtn" placeholder-class='placeholder' />
+            		<view class="imageCode" @click="again">
+            			<image :src="codeUrl" />
+            		</view>
+            	</view>
+            </view>
+            
 						<view class="item no-border">
 							<checkbox-group @change='ChangeIsAgree'>
 								<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
diff --git a/pages/store/settled/unit.vue b/pages/store/settled/unit.vue
index fa4249f..966bdbb 100644
--- a/pages/store/settled/unit.vue
+++ b/pages/store/settled/unit.vue
@@ -42,34 +42,7 @@
 						</view>
 
 
-						<view class="item">
-							<view class="acea-row row-middle">
-								<text class="item-name">联系电话</text>
-								<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
-									@input="validateBtn" placeholder-class='placeholder' />
-							</view>
-						</view>
-						<view class="item rel">
-							<view class="acea-row row-middle">
-								<text class="item-name">验证码</text>
-								<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma"
-									@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
-								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
-									@click="handleVerify">
-									{{ text }}
-								</button>
-							</view>
-						</view>
-						<view class="item" v-if="isShowCode">
-							<view class="acea-row row-middle">
-								<text class="item-name">验证码</text>
-								<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
-									@input="validateBtn" placeholder-class='placeholder' />
-								<view class="imageCode" @click="again">
-									<image :src="codeUrl" />
-								</view>
-							</view>
-						</view>
+						
 						<!-- <view class="item">
 							<view class="uni-list">
 								<view class="uni-list-cell">
@@ -128,6 +101,35 @@
 								</view>
 							</view>
 						</view>
+            <view class="item">
+            	<view class="acea-row row-middle">
+            		<text class="item-name">联系电话</text>
+            		<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
+            			@input="validateBtn" placeholder-class='placeholder' />
+            	</view>
+            </view>
+            <view class="item rel">
+            	<view class="acea-row row-middle">
+            		<text class="item-name">验证码</text>
+            		<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma"
+            			@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
+            		<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
+            			@click="handleVerify">
+            			{{ text }}
+            		</button>
+            	</view>
+            </view>
+            <view class="item" v-if="isShowCode">
+            	<view class="acea-row row-middle">
+            		<text class="item-name">验证码</text>
+            		<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
+            			@input="validateBtn" placeholder-class='placeholder' />
+            		<view class="imageCode" @click="again">
+            			<image :src="codeUrl" />
+            		</view>
+            	</view>
+            </view>
+            
 						<!-- <view class="item no-border">
 							<checkbox-group @change='ChangeIsAgree'>
 								<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 4f42e5d..787f4f9 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -536,8 +536,7 @@
 				else if (item.url == '/pages/users/user_grade/index') item.isShow = that.member_status == 1
 				else if (item.url == '/pages/users/user_integral/index') item.isShow = that.integral_status == 1
 				else item.isShow = true
-
-
+        
 			},
 			showMenu(menu) {
 				return !menu || ['integral', 'service', 'admin_order', 'verify_order', 'intention', 'promoter', 'balance']
@@ -658,8 +657,20 @@
 				getMenuList().then(res => {
 					that.personalMenu = []
 					res.data.menu.forEach((item, index) => {
-						that.filterMenus(item)
-						that.personalMenu.push(item)
+						that.filterMenus(item);
+            // 指定可以查看该订单的用户类型
+            let query = []; 
+            let flag = false;
+            let rooms = item.url.split('?'); // 截取参数
+            if(rooms[1]) query = rooms[1].split('&'); //分割参数
+            query.forEach(item=>{ // 遍历参数
+              let t = item.split('='); // 获取键值对
+              if(t.length>1 && t[0]=='type_code' ){ // 判断是否包含正确参数, 参数名称是否为type_code
+                let x = t[1].split(','); // 逗号分割多种用户
+                if(!x.includes(this.$store.state.app.userInfo.mer_info.type_code)) flag = true;
+              }
+            })
+						if(!flag) that.personalMenu.push(item);
 					})
 					that.imgUrls = res.data.banner
 				});