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

src/views/buildVip/index.vue

@@ -83,8 +83,8 @@
               <el-option
                 v-for="(item, key) in educationList"
                 :key="key"
-                :label="item.userId"
-                :value="item.userName"
+                :label="item.userName"
+                :value="item.userId"
               />
             </el-select>
           </el-form-item>

src/views/contentManager/components/appPage.vue

@@ -176,6 +176,14 @@ export default {
       this.$router.push({
         path: "/contentManager/contentOperation",
         query: params,
+      }, (route) => {
+        // 处理默认选中的菜单
+        const matched = route.matched || []
+        for(let i in matched) {
+          if(matched[i].path == '/contentManager/contentOperation') {
+            route.matched[i].meta.activeMenu = '/platformIndex'
+          }
+        }
       });
     },
     onDel(row) {

src/views/contentManager/contentOperation.vue

@@ -18,25 +18,10 @@
         <el-form-item label="排序值">
           <el-input v-model.trim="form.order"></el-input>
         </el-form-item>
-        <!-- <el-form-item label="适用范围"
-                      prop="tenantId">
-          <el-select v-model="form.tenantId" style="width: 400px !important">
-            <el-option label="对内"
-                       value="1"></el-option>
-            <el-option label="对外"
-                       value="2"></el-option>
-          </el-select>
-        </el-form-item> -->
+        <!-- 平台的功能不需要选择分部 -->
         <el-form-item label="所属分部"
+                      v-if="type != 4 && type != 6 && type != 7"
                       prop="organIdList">
-          <!-- <el-select v-model="form.organIdList" placeholder="请选择所属分部" style="width: 400px !important">
-            <el-option
-              v-for="(item, index) in selects.branchs"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select> -->
           <select-all v-model.trim="form.organIdList"
                      style="width: 400px !important"
                      filterable
@@ -446,7 +431,7 @@ export default {
       form: {
         title: null,
         order: null,
-        tenantId: null,
+        // tenantId: null,
         coverImage: null,
         videoCoverImage: null,
         attribute1: null, // 时长
@@ -496,7 +481,7 @@ export default {
         subjectIdList: null,
         status: 1,
         content: null,
-        tenantId: null,
+        // tenantId: null,
         organIdList: null,
         subType: null,
         actionTime: null
@@ -666,21 +651,17 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + "成功");
-        this.$store.dispatch('delVisitedViews', this.$route)
-        this.$router.push({
-          path: "/contentManager/contentManager",
-          query: {
-            tabrouter: this.typeIndex(this.type)
-          }
-        });
+        this.onCancel()
       } else {
         this.$message.error(res.msg);
       }
     },
     onCancel () {
+      // 是否是平台功能
+      const isPlat = this.type == 4 || this.type == 6 || this.type == 7 ? true : false
       this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
-        path: "/contentManager/contentManager",
+        path: isPlat ? "/platformIndex" : "/contentManager/contentManager",
         query: {
           tabrouter: this.typeIndex(this.type)
         }
@@ -722,7 +703,7 @@ export default {
         type: query.type,
         status: 1,
         content: null,
-        tenantId: null,
+        // tenantId: null,
         organIdList: null,
         subType: null,
         actionTime: null
@@ -790,7 +771,7 @@ export default {
               linkUrl: result.linkUrl,
               type: result.type,
               status: result.status,
-              tenantId: result.tenantId.toString(),
+              // tenantId: result.tenantId.toString(),
               subjectIdList: subject.map(item => { return +item }),
               organIdList: organ.map(item => { return +item }),
               memo: result.memo,

src/views/productService/model/serviceModel.vue

@@ -64,19 +64,19 @@
       width="500px"
       append-to-body
     >
-      <paymentService :tableList="tableList" :orderNo="orderNo" :codeUrl="codeUrl" @close="onPaymentClose" />
+      <payment :tableList="tableList" :orderNo="orderNo" :codeUrl="codeUrl" @close="onPaymentClose" />
     </el-dialog>
   </div>
 </template>
 <script>
 // import { recharge } from '../api'
 import { vaildStudentUrl } from '@/utils/validate'
-import paymentService from '@/views/productService/model/paymentService'
+import payment from '@/views/productService/model/payment'
 import { tenantInfoRePay } from '../api'
 import { getTenantId } from '@/utils/auth'
 export default {
   props: ["value", "tenantInfo"],
-  components: { paymentService },
+  components: { payment },
   data() {
     return {
       payForm: {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -292,8 +292,8 @@
             <el-option
               v-for="(item, key) in technician"
               :key="key"
-              :label="item.userId"
-              :value="item.userName"
+              :label="item.userName"
+              :value="item.userId"
             >
               <span style="float: left">{{ item.userName }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{