From 77618951785151efc48c46432b5c9a2e4dc2a7c0 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 29 Mar 2024 10:18:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=20-=20=E8=BA=AB=E4=BB=BD=E8=BF=87=E5=A4=9A?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=83=BD=E6=BB=91=E5=8A=A8=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                       |  6 +++
 pages/agent/centerV2.vue         | 12 +++++
 pages/agent/invite/my_invite.vue | 84 +++++++++++++++++++++++++++++
 pages/user/index.vue             | 90 ++++++++++++++++----------------
 4 files changed, 148 insertions(+), 44 deletions(-)
 create mode 100644 pages/agent/invite/my_invite.vue

diff --git a/pages.json b/pages.json
index 23c51b6..f5c9072 100644
--- a/pages.json
+++ b/pages.json
@@ -1400,6 +1400,12 @@
 					"style": {
 						"navigationBarTitleText": "订单管理"
 					}
+				},
+				{
+					"path": "invite/my_invite",
+					"style": {
+						"navigationBarTitleText": "我的邀请"
+					}
 				}
 			]
 		},
diff --git a/pages/agent/centerV2.vue b/pages/agent/centerV2.vue
index e165ad6..5002854 100644
--- a/pages/agent/centerV2.vue
+++ b/pages/agent/centerV2.vue
@@ -151,6 +151,18 @@ export default {
           icon: 'icon-dingdanguanli',
         });
       }
+      // 我的邀请
+      if(['6'].includes(String(agentType))){
+        menuList.push({
+          title: '我的邀请',
+          type: 'link',
+          url: '/pages/agent/invite/my_invite',
+          icon: 'icon-yaoqing1',
+        });
+      }
+
+
+
 
       // 工作台
       // staging_list:[
diff --git a/pages/agent/invite/my_invite.vue b/pages/agent/invite/my_invite.vue
new file mode 100644
index 0000000..178bc60
--- /dev/null
+++ b/pages/agent/invite/my_invite.vue
@@ -0,0 +1,84 @@
+<template>
+	<view class="main-content">
+
+
+    我的邀请
+
+
+    <!-- 授权登录 -->
+    <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authClose"></authorize>
+	</view>
+</template>
+
+<script>
+import {mapGetters} from "vuex";
+import authorize from '@/components/Authorize';
+
+export default {
+  name: 'business',
+  components: {
+    authorize
+  },
+  computed: {
+    ...mapGetters(['isLogin', 'uid', 'userInfo', 'viewColor'])
+  },
+  data() {
+    return {
+      // 登录相关
+      isAuto: false, //没有授权的不会自动授权
+      isShowAuth: false,//是否隐藏授权
+
+
+    }
+  },
+  onLoad(options) {
+    let _this = this;
+    // 判断：是否登录
+    if (!this.isLogin) {
+      // 未登录  授权登录
+      this.isAuto = true;
+      this.isShowAuth = true
+    }else{
+      // 已登录  获取信息
+      this.init();
+    }
+  },
+  methods: {
+    // 授权回调
+    onLoadFun() {
+      if(this.isLogin){
+        this.isShowAuth = false;
+        this.init();
+      }
+    },
+    // 授权关闭
+    authClose(e) {
+      this.isShowAuth = e
+    },
+    // 授权成功 初始化
+    init () {
+
+
+    },
+
+
+
+
+
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.main-content{
+  width: 100vw!important;
+  min-height: 100vh!important;
+  background: orange;
+
+
+
+
+
+
+}
+</style>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index df0451d..ce039b3 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -278,54 +278,56 @@
     <uni-popup ref="agentIdentitySelect" type="bottom" :is-mask-click="false">
       <view class="agent-identity-list">
         <view class="_list">
-          <!--固定菜单-->
-          <template v-if="identityCurrentName == 'county'">
-            <view class="_list-item" v-if="userInfo.service" @click="toService(0)">
-              <view class="top">门店商家管理</view>
-              <view class="tag-list">
-                <view class="tag-list-item">门店商家管理中心</view>
+          <scroll-view :scroll-y="true" style="height: 100%; overflow: hidden;" >
+            <!--固定菜单-->
+            <template v-if="identityCurrentName == 'county'">
+              <view class="_list-item" v-if="userInfo.service" @click="toService(0)">
+                <view class="top">门店商家管理</view>
+                <view class="tag-list">
+                  <view class="tag-list-item">门店商家管理中心</view>
+                </view>
               </view>
-            </view>
-            <view class="_list-item" v-if="userInfo.shopMerService" @click="toService(2)">
-              <view class="top">酒道馆管理</view>
-              <view class="tag-list">
-                <view class="tag-list-item">酒道馆管理中心</view>
-              </view>
-            </view>
-          </template>
-          <template v-if="identityCurrentName == 'wine'">
-            <view class="_list-item" v-if="userInfo.smokeMerService" @click="toService(3)">
-              <view class="top">烟酒店管理</view>
-              <view class="tag-list">
-                <view class="tag-list-item">烟酒店管理中心</view>
-              </view>
-            </view>
-          </template>
-          <!--类型：1=总部发起人,2=省公司发起人,3=省合伙人(外勤),4=省合伙人(内勤),5=区县运营商,6=区县合伙人,7=餐厅,8=配送商,9=总部外勤,10=总部内勤-->
-          <view class="_list-item" v-for="(item,index) in identityCurrent" :key="index" @click="goToAgentCenter(item)">
-            <!--餐厅-->
-            <template v-if="item.agent_type == 7">
-              <view class="top">{{ item.mer ? item.mer.mer_name : '' }}</view>
-              <view class="tag-list">
-                <view class="tag-list-item">{{ item.agent_type_text }}</view>
-                <!--<view class="tag-list-item">{{ item.address }}</view>-->
+              <view class="_list-item" v-if="userInfo.shopMerService" @click="toService(2)">
+                <view class="top">酒道馆管理</view>
+                <view class="tag-list">
+                  <view class="tag-list-item">酒道馆管理中心</view>
+                </view>
               </view>
             </template>
-            <!--配送商-->
-            <template v-else-if="item.agent_type == 8 || item.agent_type == 11">
-              <view class="top">{{ item.agent_type_text }}</view>
-              <view class="tag-list delivery-tag">
-                <view class="tag-list-item" v-for="(merItem,merIndex) in item.merList" :key="merIndex">{{ merItem.mer_name || '' }}</view>
+            <template v-if="identityCurrentName == 'wine'">
+              <view class="_list-item" v-if="userInfo.smokeMerService" @click="toService(3)">
+                <view class="top">烟酒店管理</view>
+                <view class="tag-list">
+                  <view class="tag-list-item">烟酒店管理中心</view>
+                </view>
               </view>
             </template>
-            <!--其他角色-->
-            <template v-else>
-              <view class="top">{{ item.corporate_name || '' }}</view>
-              <view class="tag-list" v-if="item.agent_type_list">
-                <view class="tag-list-item" v-for="(tagItem,tagIndex) in Object.values(item.agent_type_list)" :key="tagIndex">{{ tagItem || '' }}</view>
+            <!--类型：1=总部发起人,2=省公司发起人,3=省合伙人(外勤),4=省合伙人(内勤),5=区县运营商,6=区县合伙人,7=餐厅,8=配送商,9=总部外勤,10=总部内勤-->
+            <view class="_list-item" v-for="(item,index) in identityCurrent" :key="index" @click="goToAgentCenter(item)">
+                <!--餐厅-->
+                <template v-if="item.agent_type == 7">
+                  <view class="top">{{ item.mer ? item.mer.mer_name : '' }}</view>
+                  <view class="tag-list">
+                    <view class="tag-list-item">{{ item.agent_type_text }}</view>
+                    <!--<view class="tag-list-item">{{ item.address }}</view>-->
+                  </view>
+                </template>
+                <!--配送商-->
+                <template v-else-if="item.agent_type == 8 || item.agent_type == 11">
+                  <view class="top">{{ item.agent_type_text }}</view>
+                  <view class="tag-list delivery-tag">
+                    <view class="tag-list-item" v-for="(merItem,merIndex) in item.merList" :key="merIndex">{{ merItem.mer_name || '' }}</view>
+                  </view>
+                </template>
+                <!--其他角色-->
+                <template v-else>
+                  <view class="top">{{ item.corporate_name || '' }}</view>
+                  <view class="tag-list" v-if="item.agent_type_list">
+                    <view class="tag-list-item" v-for="(tagItem,tagIndex) in Object.values(item.agent_type_list)" :key="tagIndex">{{ tagItem || '' }}</view>
+                  </view>
+                </template>
               </view>
-            </template>
-          </view>
+          </scroll-view>
         </view>
         <view class='close-btn' @click="closeAgentIdentitySelect">取消</view>
       </view>
@@ -934,12 +936,12 @@
   position: relative;
 
   ._list{
-    height: calc(100% - 160rpx);
+    height: calc(80vh - 160rpx);
     width: calc(100% - (var(--list-padding-) * 2));
     position: fixed;
     top: var(--list-padding-);
     left: var(--list-padding-);
-    overflow-y: auto;
+    overflow: auto;
     ._list-item{
       width: 100%;
       background: #FFFFFF;