From bb5d193f435c384d804d10dad4313877cef99adb Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 27 Mar 2024 11:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=90=88=E4=BC=99?=
 =?UTF-8?q?=E4=BA=BA=E9=82=80=E8=AF=B7=E9=85=92=E9=81=93=E9=A6=86=E5=92=8C?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/agent/centerV2.vue      | 19 ++++++++++++++++++-
 pages/store/settled/index.vue | 11 ++++-------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/pages/agent/centerV2.vue b/pages/agent/centerV2.vue
index a97dc91..e165ad6 100644
--- a/pages/agent/centerV2.vue
+++ b/pages/agent/centerV2.vue
@@ -288,6 +288,24 @@ export default {
             level: 8,
           }
         });
+        menuList.push({
+          title: '酒道馆商户邀请码',
+          type: 'invite_qr_code',
+          url: '',
+          icon: 'icon-erweima1',
+          params: {
+            type: 'shopMer'
+          }
+        });
+        menuList.push({
+          title: '商户入驻邀请码',
+          type: 'invite_qr_code',
+          url: '',
+          icon: 'icon-erweima1',
+          params: {
+            type: 'mer'
+          }
+        });
       }
       if(Number(agentType) !== 11){
         menuList.push({
@@ -314,7 +332,6 @@ export default {
       }
 
 
-
       return menuList;
     },
     ...mapGetters(['isLogin', 'uid', 'userInfo', 'viewColor'])
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index bdcc16e..9459fff 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -63,7 +63,7 @@
 							<view class="imageCode" @click="again"><image :src="codeUrl" /></view>
 						</view>
 					</view>
-					<view class="item" v-if="merchant_type != 3">
+					<view class="item" v-if="![1,3].includes(Number(merchant_type))">
 						<view class="uni-list">
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db acea-row row-middle">
@@ -76,7 +76,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="item" v-if="merchant_type != 3">
+					<view class="item" v-if="![1,3].includes(Number(merchant_type))">
 						<view class="uni-list">
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db acea-row row-middle">
@@ -144,7 +144,6 @@
 	</view>
 </template>
 <script>
-
 	import { manageIsEligible,create, verify, merClassifly, getGoodsDetails, updateGoodsRecord, getStoreTypeApi} from '@/api/store.js';
 	import {getCaptcha, getAgreementApi, searchUser} from "@/api/user";
 	import { mapGetters } from "vuex";
@@ -154,7 +153,6 @@
   import Verify from '@/components/verify/verify.vue';
 	import { HTTP_REQUEST_URL } from '@/config/app';
   import spread from "../../../libs/spread";
-
 	const app = getApp();
 	export default {
 		components: {
@@ -233,7 +231,6 @@
         _this.merchant_type = scene.mt || 0;
       }
 
-
 			if (this.isLogin) {
 				this.getClassfication();
 				this.getStoreType();
@@ -562,7 +559,7 @@
 			validateBtn: function() {
 				let that = this,
 					value = that.merchantData;//value.yanzhengma &&
-				if (value.enterprise_name && value.user_name && value.phone && /^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone) && that.isAgree && (value.classification || this.merchant_type == 3)) {
+				if (value.enterprise_name && value.user_name && value.phone && /^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone) && that.isAgree && (value.classification || [1,3].includes(Number(this.merchant_type)))) {
 					if (!that.isShowCode) {
 						that.validate = true;
 					} else {
@@ -586,7 +583,7 @@
 				if (!value.phone) return that.$util.Tips({title: '请输入手机号'});
 				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({title: '请输入正确的手机号码'});
 				// if (!value.yanzhengma) return that.$util.Tips({title: '请填写验证码'});
-				if (!value.classification && this.merchant_type != 3) return that.$util.Tips({title: '请选择商户分类'});
+				if (!value.classification && ![1,3].includes(Number(this.merchant_type))) return that.$util.Tips({title: '请选择商户分类'});
 				if (!that.isAgree) return that.$util.Tips({title: '请勾选并同意入驻协议'});
 				if (that.isShowCode && !that.codeVal) return that.$util.Tips({title: '请填写图片验证码'});