更新

dist/static/css/chunk-1fbf5af1.d3994266.css

@@ -1 +0,0 @@
-.serviceAttr[data-v-03c42a62]{position:relative;margin-top:18px;padding-top:18px;background-color:#f4f4f5;overflow:hidden;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.list-remove[data-v-03c42a62]{position:absolute;right:20px;top:18px}.list-remove .el-button--text[data-v-03c42a62]{font-size:18px;color:#f56c6c}.list-remove .el-button--text.is-disabled[data-v-03c42a62]{color:#c0c4cc}

dist/static/css/chunk-2b70c8a4.3c707320.css

@@ -0,0 +1 @@
+.serviceAttr[data-v-33470014]{position:relative;margin-top:18px;padding-top:18px;background-color:#f4f4f5;overflow:hidden;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.list-remove[data-v-33470014]{position:absolute;right:20px;top:18px}.list-remove .el-button--text[data-v-33470014]{font-size:18px;color:#f56c6c}.list-remove .el-button--text.is-disabled[data-v-33470014]{color:#c0c4cc}

dist/static/css/chunk-3ad08224.4364dde3.css

@@ -0,0 +1 @@
+[data-v-02dad27c] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden;background:#e7e7e7}.avatar-uploader-icon[data-v-02dad27c]{font-size:28px;color:#8c939d;width:258px;height:74px;line-height:74px;text-align:center}.avatar[data-v-02dad27c]{width:258px;height:74px;display:block}[data-v-89c133ac] .el-input-number .el-input__inner{text-align:left}

dist/static/css/chunk-e86cc352.bf67044a.css

@@ -1 +0,0 @@
-[data-v-45454b01] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader-icon[data-v-45454b01]{font-size:28px;color:#8c939d;width:258px;height:74px;line-height:74px;text-align:center}.avatar[data-v-45454b01]{width:258px;height:74px;display:block}[data-v-89c133ac] .el-input-number .el-input__inner{text-align:left}

src/views/organManager/components/memberSetting.vue

@@ -69,16 +69,27 @@
           <el-select
             v-model.trim="form.teachingMaterialId"
             :disabled="isDisabled"
+            v-show="!isDisabled"
             multiple
             filterable
             collapse-tags
             clearable
+            @change="onChange"
             placeholder="请选择可用教材"
             style="width: 238px !important"
           >
             <el-option v-for="(item, index) in teachList" :key="index"
               :label="item.name" :value="item.id"></el-option>
           </el-select>
+
+          <el-tag
+            :key="tag.id"
+            v-show="isDisabled"
+            v-for="tag in dynamicTags"
+            :disable-transitions="false"
+            @close="handleClose(tag)">
+            {{tag.name}}
+          </el-tag>
         </el-form-item>
       </el-form>
   </div>
@@ -113,7 +124,8 @@ export default {
         year_divide: null,
         teachingMaterialId: [], // 可用教材
       },
-      teachList: [] // 教材列表
+      teachList: [], // 教材列表
+      dynamicTags: []
     };
   },
   async mounted () {
@@ -125,6 +137,7 @@ export default {
         ...tmpConfig.member_config,
         teachingMaterialId: teachingMaterialId.split(',').map(i => Number(i))
       }
+      this.onChange()
     }
   },
   computed: {
@@ -139,6 +152,23 @@ export default {
         this.teachList = res.data?.rows || []
       } catch(e) {}
     },
+    onChange() {
+      const val = this.form.teachingMaterialId
+      this.dynamicTags = []
+      if(val && val.length > 0) {
+        this.teachList.forEach(item => {
+          if(val.includes(item.id)) {
+            this.dynamicTags.push({
+              name: item.name,
+              id: item.id
+            })
+          }
+        });
+      }
+    },
+    handleClose(tag) {
+
+    },
     onSubmit() {
       let status = false
       this.$refs.form.validate(_ => {

src/views/organManager/components/organInfo.vue

@@ -17,6 +17,7 @@
               accept=".png"
               :headers="headers"
               :show-file-list="false"
+              :disabled="isDisabled"
               size="small"
               :on-success="handleAvatarSuccess"
               :before-upload="beforeAvatarUpload"
@@ -24,6 +25,7 @@
               <img v-if="form.logo" :src="form.logo" class="avatar" />
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload>
+            <div class="tips" v-show="!isDisabled" style="line-height: 1;color: red;">图片尺寸：258x74；支持的格式：png；</div>
           </el-form-item>
         </el-col>
         <el-form-item label="机构名称" prop="name"
@@ -31,6 +33,7 @@
           <el-input
             v-model.trim="form.name"
             size="small"
+            :disabled="isDisabled"
             placeholder="请输入机构名称"
           ></el-input>
         </el-form-item>
@@ -39,8 +42,7 @@
           <el-input
             v-model.trim="form.contacts"
             size="small"
-            :min="11"
-            :max="11"
+            :disabled="isDisabled"
             placeholder="请输入机构联系人"
           ></el-input>
         </el-form-item>
@@ -51,8 +53,9 @@
             v-model.trim="form.phone"
             size="small"
             :max="11"
-            :min="11"
+            :disabled="isDisabled"
             type="number"
+            oninput="if(value.length > 11)value=value.slice(0, 11)"
             style="width: 184px"
             placeholder="请输入联系人手机号"
           ></el-input>
@@ -63,6 +66,7 @@
           <el-input
             v-model.trim="form.email"
             size="small"
+            :disabled="isDisabled"
             placeholder="请输入机构邮箱"
           ></el-input>
         </el-form-item>
@@ -72,6 +76,7 @@
             v-model.trim="form.customerServicePhone"
             size="small"
             type="number"
+            :disabled="isDisabled"
             placeholder="请输入机构客服电话"
           ></el-input>
         </el-form-item>
@@ -79,15 +84,17 @@
           <el-input
             v-model.trim="form.address"
             size="small"
+            :disabled="isDisabled"
             placeholder="请输入机构地址"
           ></el-input>
         </el-form-item>
-        <el-form-item label="商品描述" prop="remark">
+        <el-form-item label="机构简介" prop="remark">
           <el-input
             type="textarea"
             size="small"
             show-word-limit
             :max="200"
+            :disabled="isDisabled"
             v-model.trim="form.remark"
           ></el-input>
         </el-form-item>
@@ -98,7 +105,7 @@
 <script>
 import { getToken } from "@/utils/auth";
 export default {
-  props: ['data'],
+  props: ['type', 'data'],
   data () {
     return {
       headers: {
@@ -114,13 +121,21 @@ export default {
         customerServicePhone: null,
         remark: null,
       },
+      payState: null,
       imageWidthM: 258,
       imageHeightM: 74,
     };
-  },
+  }, 
   mounted () {
     if(this.data) {
       this.form = { ...this.data }
+      this.payState = this.data.payState
+    }
+  },
+  computed: {
+    isDisabled() {
+      console.log(this.payState)
+      return this.type == 'setting' || this.payState == 1  ? true : false
     }
   },
   methods: {
@@ -194,6 +209,7 @@ export default {
   cursor: pointer;
   position: relative;
   overflow: hidden;
+  background: #e7e7e7;
 }
 .avatar-uploader-icon {
   font-size: 28px;

src/views/organManager/organOperation.vue

@@ -16,7 +16,7 @@
       </div>
       <div v-if="status">
         <!-- 机构基本信息 -->
-        <organInfo ref="organInfo" :data="info" v-show="active == 0" />
+        <organInfo ref="organInfo" :data="info" v-show="[0, 2].includes(active)" :type="getType" />
         <!-- 产品定价 确认设置 -->
         <div v-show="[1, 2].includes(active)">
           <openService ref="openService" :data="productInfo" :type="getType" />
@@ -86,7 +86,6 @@ export default {
     async onNext() {
       if(this.active == 0) {
         const organStatus = await this.$refs.organInfo.onSubmit()
-        console.log(organStatus)
         if(organStatus) {
           this.active += 1
         }
@@ -95,7 +94,6 @@ export default {
         const memberStatus = await this.$refs.memberSetting.onSubmit()
         const ruleStatus = await this.$refs.roomRules.onSubmit()
         const rateStatus = await this.$refs.rateSetting.onSubmit()
-        console.log('验证中')
         if(openStatus && memberStatus && ruleStatus && rateStatus) {
           this.active += 1
         }
@@ -120,7 +118,6 @@ export default {
             ...rateData
           }
         }
-        console.log(params)
         try {
           if(this.payType == 'create') {
             const res = await tenantInfoAdd(params)
@@ -142,6 +139,31 @@ export default {
         path: "/organManager/organList"
       });
     }
+    // let lodash = this.$helpers.lodash;
+    //     let storage = JSON.parse(localStorage.getItem(`base`));
+    //     if (!lodash.isEqual(this.topFrom, storage) && storage) {
+    //       // 提示保存
+    //       return await this.$confirm("已修改当前页面数据是否保存", "提示", {
+    //         confirmButtonText: "是",
+    //         cancelButtonText: "否",
+    //         type: "warning",
+    //         closeOnClickModal: false,
+    //         distinguishCancelAndClose: true,
+    //       })
+    //         .then(async () => {
+    //           let b = await this.gotoNext(str);
+    //           console.log(b);
+    //           return b;
+    //         })
+    //         .catch((e) => {
+    //           console.log(e);
+    //           if (e == "close") {
+    //             return false;
+    //           } else {
+    //             localStorage.removeItem(`${this.teamid}base`);
+    //             return true;
+    //           }
+    //         });
   },
 };
 </script>

src/views/platformManager/serviceManager/form.vue

@@ -23,8 +23,7 @@
           <el-input v-model="form.name" placeholder="请输入服务名称"></el-input>
         </el-form-item>
         <el-form-item label="产品服务" prop="productId" :rules="[{ required: true, message: '请选择产品服务', trigger: 'change' }]">
-          <el-select v-model="form.productId"
-                      placeholder="请选择产品服务">
+          <el-select v-model="form.productId" multiple collapse-tags clearable placeholder="请选择产品服务">
             <el-option v-for="(item, index) in productList"
                         :key="index"
                         :label="item.name"
@@ -107,7 +106,7 @@ export default {
           }]
         }],
         name: null,
-        productId: null,
+        productId: [],
         id: query.id || null
       }
     };
@@ -125,7 +124,7 @@ export default {
           console.log(queryInfo)
           const result = queryInfo.data || null
           if(result) {
-            this.form.productId = Number(result.productId),
+            this.form.productId = result.productId.split(',').map(i => Number(i)),
             this.form.name = result.name,
             this.form.attrList = this.formatAttr(result.detailList, 'asc')
           }
@@ -162,7 +161,7 @@ export default {
     async onSubmit (formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          const { attrList, ...res } = this.form
+          const { attrList, productId, ...res } = this.form
           let isYear = 0, isMonth = 0
           attrList.forEach(attr => {
             if(attr.mode == 'YEAR') {
@@ -177,6 +176,7 @@ export default {
           }
           const params = {
             ...res,
+            productId: productId.join(','),
             detailList: this.formatAttr(attrList)
           }
           if (this.payType == 'create') {

vue.config.js

@@ -16,11 +16,11 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // http://47.99.212.176:8000
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
-let target = 'http://192.168.3.227:8000' // 何国威
+// let target = 'http://192.168.3.227:8000' // 何国威
 // let target = 'http://192.168.3.124:8000' //邹璇
 // let target = 'http://192.168.3.112:8000' //勇哥
 // let target = 'http://dev.dayaedu.com' // 开发环境
-// let target = 'https://test.dayaedu.com' //测试环境
+let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {