0106 15:33

111

src/router/index.js

@@ -92,9 +92,8 @@ export const constantRoutes = [
         hidden: false,
       }
     ]
-  }, 
-  { path: '*', redirect: '/404', hidden: true }
-
+  },
+  // { path: '*', redirect: '/404', hidden: true }
 ]
 // export const constantRoutes = [{
 //   path: '/',

src/views/buildVip/index.vue

@@ -229,12 +229,12 @@
           <el-form-item v-if="hasOnline"
                         label="线上课单价">
             <el-input v-model="rightForm.onlinePrice"
-                      :disabled="salaryReadonlyFlag==0" />
+                      :disabled="paymentReadonlyFlag==0" />
           </el-form-item>
           <el-form-item v-if="hasOffline"
                         label="线下课单价">
             <el-input v-model="rightForm.offlinePrice"
-                      :disabled="salaryReadonlyFlag==0" />
+                      :disabled="paymentReadonlyFlag==0" />
           </el-form-item>
           <el-form-item label="课程总价">
             <el-input v-model="rightForm.allPrice"
@@ -447,7 +447,8 @@ export default {
       hotType: '',
       attribute1: '',
       attribute2: '',
-      salaryReadonlyFlag: '', // 老师工资是否可配
+      salaryReadonlyFlag: '', // 老师课酬是否可配
+      paymentReadonlyFlag: '', // 课程单价是否可配
       lookList: [],
       onlinelookList: [], // 展示课表线上
       offlineLookList: [], // 展示课表线下
@@ -665,6 +666,7 @@ export default {
           this.attribute2 = this.activeList[i].attribute2;
           // 存储课酬是否可配置
           this.salaryReadonlyFlag = this.activeList[i].salaryReadonlyFlag
+          this.paymentReadonlyFlag = this.activeList[i].paymentReadonlyFlag
           //  hasOnline: false, hasOffline: false 还需要判断type类型 根据活动id获取
           if (this.activeList[i].salarySettlementJson) {
             let obj = JSON.parse(this.activeList[i].salarySettlementJson)

src/views/categroyManager/vipActiveList.vue

@@ -248,7 +248,9 @@
             </div>
             <div class="chioseWrap">
               <el-checkbox v-model="salaryReadonlyFlag"
-                           label="可自定义收费、结算标准"></el-checkbox>
+                           label="可自定义单价"></el-checkbox>
+              <el-checkbox v-model="paymentReadonlyFlag"
+                           label="可自定义课酬"></el-checkbox>
             </div>
           </div>
         </div>
@@ -346,6 +348,7 @@ export default {
       onlineprice: '',
       unonlineprice: '',
       salaryReadonlyFlag: true,
+      paymentReadonlyFlag: true,
       attribute1: '',
       attribute2: '',
       attribute3: '',
@@ -578,6 +581,7 @@ export default {
       }
       // 
       this.salaryReadonlyFlag = !!parseInt(row.salaryReadonlyFlag);
+      this.paymentReadonlyFlag = !!parseInt(row.paymentReadonlyFlag);
       this.activeType = row.type;
       this.attribute1 = row.attribute1;
       this.attribute2 = row.attribute2;
@@ -617,6 +621,7 @@ export default {
             offlineSalarySettlement = null
           }
           let salaryReadonlyFlag = this.salaryReadonlyFlag * 1;
+          let paymentReadonlyFlag = this.paymentReadonlyFlag * 1;
           let giveClassPaySalaryFlag = this.giveClassPaySalaryFlag * 1;
           let vipGroupSalarySettlement = {
             onlineSalarySettlement,
@@ -624,6 +629,7 @@ export default {
           }
           // 发请求创建活动
           resetVipActive({
+            paymentReadonlyFlag,
             id,
             coursesStartTime,
             coursesEndTime,

src/views/categroyManager/vipNewActive.vue

@@ -137,7 +137,9 @@
           </div>
           <div class="chioseWrap">
             <el-checkbox v-model="salaryReadonlyFlag"
-                         label="可自定义收费、结算标准"></el-checkbox>
+                         label="可自定义单价"></el-checkbox>
+            <el-checkbox v-model="paymentReadonlyFlag"
+                         label="可自定义课酬"></el-checkbox>
           </div>
         </div>
       </div>
@@ -233,6 +235,7 @@ export default {
       onlineprice: '',
       unonlineprice: '',
       salaryReadonlyFlag: true,
+      paymentReadonlyFlag: true,
       attribute1: '',
       attribute2: '',
       attribute3: '',
@@ -293,6 +296,7 @@ export default {
             offlineSalarySettlement = null
           }
           let salaryReadonlyFlag = this.salaryReadonlyFlag * 1;
+          let paymentReadonlyFlag = this.paymentReadonlyFlag * 1;
           let giveClassPaySalaryFlag = this.giveClassPaySalaryFlag * 1;
           let vipGroupSalarySettlement = {
             onlineSalarySettlement,
@@ -311,6 +315,7 @@ export default {
             vipGroupCategoryIdList,
             vipGroupSalarySettlement,
             salaryReadonlyFlag,
+            paymentReadonlyFlag,
             giveClassPaySalaryFlag,
             attribute1: this.attribute1,
             attribute2: this.attribute2,

src/views/setSilder/addSilder.vue

@@ -30,7 +30,7 @@
                        label="文件路径">
       </el-table-column>
       <el-table-column prop="parentPermission"
-                       label="高亮地址">
+                       label="高亮路径">
       </el-table-column>
       <el-table-column prop="permission"
                        label="权限标识">
@@ -74,6 +74,11 @@
           <el-input v-model="form.permission"
                     autocomplete="off"></el-input>
         </el-form-item>
+        <el-form-item label="高亮路径"
+                      :label-width="formLabelWidth">
+          <el-input v-model="form.path"
+                    autocomplete="off"></el-input>
+        </el-form-item>
         <el-form-item label="组件名"
                       :label-width="formLabelWidth">
           <el-input v-model="form.component"
@@ -134,7 +139,8 @@ export default {
         sort: 1,
         component: null,
         hid: 1,
-        type: 1
+        type: 1,
+        parentPermission: null
       }
     }
   },
@@ -168,7 +174,8 @@ export default {
           component: row.component,
           id: row.id,
           hid: row.hid,
-          type: Number(row.type)
+          type: Number(row.type),
+          parentPermission: row.parentPermission
         }
       }
     },
@@ -183,7 +190,8 @@ export default {
           sort: form.sort,
           parentId: form.parentId,
           hid: form.hid,
-          type: form.type
+          type: form.type,
+          parentPermission: form.parentPermission
         }).then(res => {
           if (res.code == 200) {
             this.$message.success('添加成功')
@@ -223,7 +231,8 @@ export default {
           component: res.component,
           sort: res.sort,
           hid: res.hid,
-          type: res.type
+          type: res.type,
+          parentPermission: res.parentPermission
         }
         if (res.sysMenus && res.sysMenus.length > 0) {
           tempList.children = this.setTableData(res.sysMenus)
@@ -250,7 +259,8 @@ export default {
         sort: 1,
         component: null,
         hid: 1,
-        type: 1
+        type: 1,
+        parentPermission: null
       }
       this.$refs[formName].resetFields()
     }

vue.config.js

@@ -19,10 +19,10 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://testadm.dayaedu.com/' //test环境
 // let target = 'http://192.168.3.27:8000' // 箭河
-let target = 'http://192.168.3.28:8000' //邹璇
+// let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:18000' //勇哥
 // let target = 'http://admin.dayaedu.com/' // 测试服
-// let target = 'http://192.168.3.48:8080' // 乔
+let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**