From f7c360eac5fda680e561b6ca2d3eb6767d2b3707 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Mon, 30 Oct 2023 20:10:12 +0800
Subject: [PATCH] 1

---
 src/App.vue                                      |  2 +-
 src/components/merchantManagement/memberInfo.vue | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5ce94cd..dbc036b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,7 @@
 <script>
 import zhCn from "ant-design-vue/lib/locale-provider/zh_CN";
 let sp = document.createElement('script')
-sp.src = '//at.alicdn.com/t/c/font_3135652_muu1luphz6.js'
+sp.src = '//at.alicdn.com/t/c/font_3135652_5t152xx5xxp.js'
 document.body.appendChild(sp)
 export default {
   provide() {
diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index 805d620..dd2b21f 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -63,9 +63,9 @@
           <!-- <div class="bb1 ml12 mr12 mt4 mb4" style="wdith:calc(100% - 24px)"></div> -->
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
             <template v-for="(item, index) in groupList">
-              <a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">
+              <a-menu-item :key="item.teamName" class="fsa" :class="item.id != -1 ? 'showdot' : ''" @click="selectGroup(item)">
                 {{item.teamName}}
-                <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomRight">
+                <a-dropdown overlayClassName="groupdropdown" v-if="item.id != -1" :trigger="['click']" placement="bottomRight">
                   <i class="iconfont icon-gengduo3 thedot f14" @click.stop></i>
                   <div class="groupdropdownbox backTable" slot="overlay">
                     <div @click="[addGroupShow = true,isEdit = true,recordId = item.id,groupName=item.teamName]">修改名称</div>
@@ -98,7 +98,7 @@
         <!-- :expanded-row-keys.sync="expandedRowKeys" -->
         <!-- v-if="modalTitle == ''" -->
         <div class>
-          <a-table :columns="columns" :scroll="{x:currWidth}" :data-source="memberList" :pagination="false" @change="onChange" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle'}" :rowKey="(record) => record.id">
+          <a-table :columns="columns" :scroll="{x:currWidth,scrollToFirstRowOnChange:false}" :data-source="memberList" :pagination="false" @change="onChange" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle'}" :rowKey="(record) => record.id">
             <!-- <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a> -->
             <span slot="nickName" slot-scope="text, record">{{ record.aliasName || record.userName }}</span>
             <div slot="inAgencyStatistics" slot-scope="text, record">
@@ -190,7 +190,7 @@
         </div>-->
       </div>
     </div>
-    <a-modal :title="modalTitle" v-model="visible" centered id="demo" @cancel="modalCancel" width="640px" destroyOnClose class="detailWindow">
+    <a-modal :title="modalTitle" v-model="visible" centered id="demo" @cancel="modalCancel" width="640px" :destroyOnClose="true" class="detailWindow">
       <template slot="footer" v-if="this.modalTitle != '成员详情'">
         <a-button key="back" @click="modalCancel">取消</a-button>
         <a-button key="submit" class="ml16" type="primary" :loading="loading" @click="handleSubmit">确定</a-button>
@@ -776,13 +776,13 @@ export default {
         this.visible = true
       } else {
         this.modalTitle = '添加成员'
-        let agencyTeamId
+        let agencyTeamId = -1
         this.groupList.forEach((item) => {
           if (item.teamName == this.selectedKeys[0]) {
             agencyTeamId = item.id
           }
         })
-        console.log(agencyTeamId);
+        console.log(agencyTeamId)
         this.visible = true
         this.$nextTick(() => {
           console.log(123)