Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/components/Tooltip/index.vue

@@ -30,6 +30,7 @@
     white-space: nowrap;
     text-overflow: ellipsis;
     max-width: 100%;
-    display: inline-block;
+    display: block;
+
   }
 </style>

src/components/overflow-text/index.vue

@@ -42,6 +42,7 @@ export default {
     overflow : hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+
     // display: -webkit-box;
     // -webkit-line-clamp: 2;
     // -webkit-box-orient: vertical;

src/constant/index.js

@@ -200,15 +200,28 @@ export const belongDaya = {
   0: '其它课酬',
   1: '基本课酬'
 }
-
-export const musicClassType = {
-  NORMAL: "声部班",
-  MIX: "合奏班",
-  HIGH: "基础技能班",
-  SNAP: "临时班",
-  HIGH_ONLINE: '线上基础技能班',
-  MUSIC_NETWORK: "乐团网管课"
-}
+let tenantConfig = sessionStorage.getItem('tenantConfig')
+tenantConfig = tenantConfig ? JSON.parse(tenantConfig) : {}
+let tenantId = tenantConfig.tenantId
+let musicClassType = null
+if (tenantId == 1) {
+  musicClassType = {
+    NORMAL: "声部班",
+    MIX: "合奏班",
+    HIGH: "基础技能班",
+    SNAP: "临时班",
+    HIGH_ONLINE: '线上基础技能班',
+    MUSIC_NETWORK: "乐团网管课"
+  }
+} else {
+  musicClassType = {
+    NORMAL: "声部班",
+    MIX: "合奏班",
+    HIGH: "基础技能班",
+    SNAP: "临时班",
+  }
+}
+export {musicClassType}
 
 export const inspectionItem = {
   INSPECT: '下校巡查',
@@ -386,23 +399,23 @@ export const chargingStatus = {
 }
 
 export const coupontypeDetail = {
-  OTHER:'其他',
-  MUSICAL:'乐器',
-  ACCESSORIES:'辅件',
-  MAINTENANCE:'乐保服务',
-  TEACHING:'教材',
-  PRACTICE:'网管课',
-  SINGLE:'声部课',
-  MIX:'合奏课',
-  VIP:'VIP',
-  FULLCOUPON:'全类券',
-  MEMBER:'团练宝'
+  OTHER: '其他',
+  MUSICAL: '乐器',
+  ACCESSORIES: '辅件',
+  MAINTENANCE: '乐保服务',
+  TEACHING: '教材',
+  PRACTICE: '网管课',
+  SINGLE: '声部课',
+  MIX: '合奏课',
+  VIP: 'VIP',
+  FULLCOUPON: '全类券',
+  MEMBER: '团练宝'
 }
 
 
 // 发券方式
 export const issue = {
-  0:'主动领取',
-  1:'手动发放',
-  2:'交易获取'
+  0: '主动领取',
+  1: '手动发放',
+  2: '交易获取'
 }

src/layout/components/AppMain.vue

@@ -151,6 +151,7 @@ export default {
     },
   },
   async mounted() {
+
     this.$bus.$on("showguide", (obj) => {
       this.guideList = [];
       obj.forEach((element) => {

src/views/categroyManager/insideSetting/addressManager.vue

@@ -269,13 +269,16 @@
             v-model.trim="form.address"
             :disabled="true"
           >
-            <el-button
-              slot="append"
+          <template   slot="append">
+             <el-button
+              class="addMapBtn"
               @click="addMap"
               type="primary"
               icon="el-icon-plus"
               >选择</el-button
             >
+          </template>
+
           </el-input>
         </el-form-item>
         <!-- <el-form-item
@@ -791,6 +794,10 @@ export default {
     padding: 0;
   }
 }
+.addMapBtn {
+    background-color: var(--color-primary)!important;
+    color: #fff!important;
+}
 .el-input-group__append {
   background: #f5f7fa;
   border-color: #dcdfe6;

src/views/teamDetail/components/resetClass.vue

@@ -32,14 +32,16 @@
           v-if="team_status == 'PROGRESS'"
           @click="postpone"
           style="margin-bottom: 20px"
-          >课程顺延</el-button>
+          >课程顺延</el-button
+        >
         <el-button
           type="primary"
           v-permission="'/memberClassList'"
           v-if="courseViewType == 2 && team_status == 'PROGRESS'"
           @click="gotoMemberCourse"
           style="margin-bottom: 20px"
-          >会员课程排课</el-button>
+          >会员课程排课</el-button
+        >
         <!-- <div
           class="newBand"
           style="width: 120px"
@@ -236,7 +238,9 @@
             </div>
             <div
               class="add"
-              v-if="permission('classGroup/revisionAddClassGroup')"
+              v-if="
+                permission('classGroup/revisionAddClassGroup') && tenantId == 1
+              "
               @click="addNewClass('MUSIC_NETWORK')"
             >
               新建乐团网管课
@@ -427,6 +431,7 @@
           prop="type"
         >
           <el-select
+            v-if="tenantId == 1"
             v-model.trim="newClassForm.type"
             clearable
             @change="chioseHightype"
@@ -438,6 +443,21 @@
               :value="item.value"
             ></el-option>
           </el-select>
+          <el-select
+            v-else
+            v-model.trim="newClassForm.type"
+            clearable
+            @change="chioseHightype"
+          >
+            <el-option
+              v-for="(item, index) in highTypeList1"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+
+          <!-- highTypeList1 -->
         </el-form-item>
         <el-form-item
           label="主教老师"
@@ -836,6 +856,7 @@ export default {
         { value: "HIGH", label: "基础技能班" },
         { value: "HIGH_ONLINE", label: "线上基础技能班" },
       ],
+      highTypeList1: [{ value: "HIGH", label: "基础技能班" }],
       cooperationList: [],
       singleList: [],
       activeSingleLists: [],
@@ -893,6 +914,7 @@ export default {
       team_status: "",
       activeList: [],
       courseViewType: "",
+      tenantId: null,
     };
   },
   created() {
@@ -901,7 +923,11 @@ export default {
   // activated() {
   //   this.init();
   // },
-  mounted() {},
+  mounted() {
+    let tenantConfig = sessionStorage.getItem("tenantConfig");
+    tenantConfig = tenantConfig ? JSON.parse(tenantConfig) : {};
+    this.tenantId = tenantConfig.tenantId;
+  },
   methods: {
     permission(val) {
       return permission(val);