修改问题

src/utils/request.js

@@ -45,7 +45,7 @@ function tryHideFullScreenLoading () {
 const service = axios.create({
   baseURL: '', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000 // request timeout
+  timeout: 6000 // request timeout
 })
 // { fullscreen: true, text: '努力加载中', spinner: 'el-icon-loading' }
 // request interceptor

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -105,7 +105,6 @@ export default {
             this.result = res.data
             this.checkAll = res.data.menuIds.length >= 38
             this.isIndeterminate = res.data.menuIds.length > 0 && res.data.menuIds.length < 38
-
           }
         })
       }
@@ -143,8 +142,13 @@ export default {
       })
       return list
     },
-    onReSet(formName) {
-      this.$refs[formName].resetFields()
+    onReSet() {
+      this.$refs.tree.setCheckedNodes([])
+      this.result = {
+        roleName: null,
+        roleDesc: null,
+      }
+      this.checkAll = false
     },
     onCancel() {
       this.$router.push('/specialSetup/adminManager')

src/views/categroyManager/vipActiveList.vue

@@ -490,7 +490,7 @@ export default {
       this.activeType = row.type;
       this.attribute1 = row.attribute1;
       this.attribute2 = row.attribute2;
-      this.giveClassPaySalaryFlag = !!row.giveClassPaySalaryFlag;
+      this.giveClassPaySalaryFlag = row.giveClassPaySalaryFlag == 1 ? true : false;
     },
     // 点击确认按钮发送修改请求
     resetRow () {

src/views/journal/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <h2>系统设置 <div class="squrt"></div>
+    <h2>系统日志 <div class="squrt"></div>
     </h2>
     <div class="m-core">
       <el-tabs type="border-card"
@@ -9,7 +9,7 @@
                      name='0'>
           <item v-if="activeStatus[0]" />
         </el-tab-pane>
-        <el-tab-pane label="学员投诉信息"
+        <el-tab-pane label="学员申诉"
                      name='1'>
           <studentComplain v-if="activeStatus[1]" />
         </el-tab-pane>

src/views/journal/journalItem.vue

@@ -3,7 +3,7 @@
     <div class="left">
       <div class="unread"> <img :src="img.boxicon"
              alt=""> 未读消息
-        <div class="count">{{ noReadMessage }}</div>
+        <div class="count" v-if="noReadMessage >= 1">{{ noReadMessage }}</div>
       </div>
       <div class="read">
         <img :src="img.bookicon"
@@ -100,11 +100,13 @@ export default {
         boxicon: require('@/assets/images/base/boxicon.png'),
         Hboxicon: require('@/assets/images/base/boxicon-h.png')
       },
-      activities: [{
-
-      }],
+      activities: [{ }],
       pageInfo: {
         isSinglePage: false, // 是否只有一页
+        limit: 10,
+        page: 1,
+        readStatus: null,
+        total: 0,
       },
       noReadMessage: 0, // 未读消息
       dataList: []
@@ -118,14 +120,23 @@ export default {
       // 未读消息
       queryCountOfUnread().then(res => {
         if(res.code == 200) {
-          this.noReadMessage = res.data
+          if(res.data && res.data.SYSTEM) {
+            this.noReadMessage = res.data.SYSTEM
+          }
+          
         }
       })
-
-      sysMessageList().then(res => {
+    },
+    sysMessageList() {
+      sysMessageList({
+        group: 'SYSTEM',
+        rows: this.pageInfo.limit,
+        page: this.pageInfo.page
+      }).then(res => {
         console.log(res)
         if(res.code == 200) {
           this.dataList = res.data.rows
+          this.pageInfo.total = res.data.total
         }
       })
     }

src/views/journal/leaveOperation.vue

@@ -3,7 +3,7 @@
     <div class="left">
       <div class="unread"> <img :src="img.boxicon"
              alt=""> 未读消息
-        <div class="count">84</div>
+        <div class="count" v-if="noReadMessage >= 1">{{ noReadMessage }}</div>
       </div>
       <div class="read">
         <img :src="img.bookicon"
@@ -81,6 +81,7 @@
   </div>
 </template>
 <script>
+import { queryCountOfUnread, sysMessageList } from '@/api/journal'
 export default {
   data () {
     return {
@@ -94,7 +95,32 @@ export default {
       },
       activities: [{
 
-      }]
+      }],
+      noReadMessage: 0, // 未读消息
+      dataList: []
+    }
+  },
+  mounted() {
+    this.__init()
+  },
+  methods: {
+    __init() {
+      // 未读消息
+      queryCountOfUnread().then(res => {
+        if(res.code == 200) {
+          if(res.data && res.data.SYSTEM) {
+            this.noReadMessage = res.data.SYSTEM
+          }
+          
+        }
+      })
+
+      sysMessageList().then(res => {
+        console.log(res)
+        if(res.code == 200) {
+          this.dataList = res.data.rows
+        }
+      })
     }
   }
 }

src/views/journal/musicGroup.vue

@@ -3,7 +3,7 @@
     <div class="left">
       <div class="unread"> <img :src="img.boxicon"
              alt=""> 未读消息
-        <div class="count">84</div>
+        <div class="count" v-if="noReadMessage >= 1">{{ noReadMessage }}</div>
       </div>
       <div class="read">
         <img :src="img.bookicon"
@@ -81,6 +81,7 @@
   </div>
 </template>
 <script>
+import { queryCountOfUnread, sysMessageList } from '@/api/journal'
 export default {
   data () {
     return {
@@ -94,7 +95,32 @@ export default {
       },
       activities: [{
 
-      }]
+      }],
+      noReadMessage: 0, // 未读消息
+      dataList: []
+    }
+  },
+  mounted() {
+    this.__init()
+  },
+  methods: {
+    __init() {
+      // 未读消息
+      queryCountOfUnread().then(res => {
+        if(res.code == 200) {
+          if(res.data && res.data.SYSTEM) {
+            this.noReadMessage = res.data.SYSTEM
+          }
+          
+        }
+      })
+
+      sysMessageList().then(res => {
+        console.log(res)
+        if(res.code == 200) {
+          this.dataList = res.data.rows
+        }
+      })
     }
   }
 }

src/views/journal/studentComplain.vue

@@ -3,7 +3,7 @@
     <div class="left">
       <div class="unread"> <img :src="img.boxicon"
              alt=""> 未读消息
-        <div class="count">84</div>
+        <div class="count" v-if="noReadMessage >= 1">{{ noReadMessage }}</div>
       </div>
       <div class="read">
         <img :src="img.bookicon"
@@ -81,6 +81,7 @@
   </div>
 </template>
 <script>
+import { queryCountOfUnread, sysMessageList } from '@/api/journal'
 export default {
   data () {
     return {
@@ -94,7 +95,34 @@ export default {
       },
       activities: [{
 
-      }]
+      }],
+      noReadMessage: 0, // 未读消息
+      dataList: []
+    }
+  },
+  mounted() {
+    this.__init()
+  },
+  methods: {
+    __init() {
+      // 未读消息
+      queryCountOfUnread().then(res => {
+        if(res.code == 200) {
+          if(res.data && res.data.SYSTEM) {
+            this.noReadMessage = res.data.SYSTEM
+          }
+          
+        }
+      })
+
+      sysMessageList({
+        search: 'SYSTEM'
+      }).then(res => {
+        console.log(res)
+        if(res.code == 200) {
+          this.dataList = res.data.rows
+        }
+      })
     }
   }
 }

src/views/studentManager/components/studentOrder.vue

@@ -120,6 +120,9 @@ export default {
       let params = this.searchForm
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
+      if(params.remark == '' || !params.remark) {
+        params.remark = null
+      }
       studentPaymentOrderList(params).then(res => {
         if(res.code == 200) {
           this.tableList = res.data.rows

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -13,32 +13,32 @@
           <el-table-column label="默认课酬-主教">
             <template slot-scope="scope">
               <el-input v-show="scope.row.courseScheduleType != 'HIGH'" v-model="scope.row.mainTeacher30MinSalary" placeholder="请输入课酬">
-                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">每45分钟</template>
-                <template slot="append" v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">每40分钟</template>
-                <template slot="append" v-else>每30分钟</template>
+                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                <template slot="append" v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
+                <template slot="append" v-else>元/30分钟</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="默认课酬-助教">
             <template slot-scope="scope">
               <el-input v-show="scope.row.courseScheduleType != 'HIGH'" v-model="scope.row.assistantTeacher30MinSalary" placeholder="请输入课酬">
-                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">每45分钟</template>
-                <template slot="append" v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">每40分钟</template>
-                <template slot="append" v-else>每30分钟</template>
+                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                <template slot="append" v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
+                <template slot="append" v-else>元/30分钟</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="3.0课酬-主教">
             <template slot-scope="scope">
               <el-input v-show="scope.row.courseScheduleType != 'CLASSROOM'" v-model="scope.row.mainTeacher90MinSalary" placeholder="请输入课酬">
-                <template slot="append">每{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template>
+                <template slot="append">元/{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="3.0课酬-助教">
             <template slot-scope="scope">
               <el-input v-show="scope.row.courseScheduleType != 'CLASSROOM'" v-model="scope.row.assistantTeacher90MinSalary" placeholder="请输入课酬">
-                <template slot="append">每{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template>
+                <template slot="append">元/{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template>
               </el-input>
             </template>
           </el-table-column>
@@ -51,14 +51,14 @@
           <el-table-column label="线上课">
             <template slot-scope="scope">
               <el-input v-model="scope.row.onlineClassesSalary" placeholder="请输入内容">
-                <template slot="append">每30分钟</template>
+                <template slot="append">元/30分钟</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="线下课">
             <template slot-scope="scope">
               <el-input v-model="scope.row.offlineClassesSalary" placeholder="请输入内容">
-                <template slot="append">每30分钟</template>
+                <template slot="append">元/30分钟</template>
               </el-input>
             </template>
           </el-table-column>
@@ -86,49 +86,49 @@ export default {
         courseScheduleType: "CLASSROOM",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
-        userId: this.$route.query.teacherId
+        userId: this.teacherId
       }, {
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
         courseScheduleType: "SINGLE",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
-        userId: this.$route.query.teacherId,
+        userId: this.teacherId,
       },{
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
         courseScheduleType: "MIX",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
-        userId: this.$route.query.teacherId
+        userId: this.teacherId
       },{
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
         courseScheduleType: "COMPREHENSIVE",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
-        userId: this.$route.query.teacherId
+        userId: this.teacherId
       },{
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
         courseScheduleType: "TRAINING_SINGLE",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
-        userId: this.$route.query.teacherId
+        userId: this.teacherId
       },{
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
         courseScheduleType: "TRAINING_MIX",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
-        userId: this.$route.query.teacherId
+        userId: this.teacherId
       },{
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
         courseScheduleType: "HIGH",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
-        userId: this.$route.query.teacherId
+        userId: this.teacherId
       }],
       vipTable: [],
       musicGroupTable: [],
@@ -137,7 +137,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.teacherId)
     this.__init()
   },
   methods: {
@@ -256,24 +255,29 @@ export default {
           checkStatus = false
         } 
       })
+      this.vipTable.forEach(item => {
+          if(item.offlineClassesSalary < 0 && item.onlineClassesSalary < 0) {
+            this.$message('输入课酬不能为负数')
+            checkStatus = false
+          }
+        })
       // 判断输入的值是否正确
       if(!checkStatus) return false
       teacherSalaryBatchUpset(teamTable).then(res => {
         if(res.code == 200) {
-          this.vipTable.forEach(item => {
-            if(item.offlineClassesSalary < 0 && item.onlineClassesSalary < 0) {
-              this.$message('输入课酬不能为负数')
-              checkStatus = false
-            }
-          })
+          
           // 判断输入的值是否正确
-          if(!checkStatus) return false
+          // if(!checkStatus) return false
           vipGroupSalarySet(this.vipTable).then(res => {
             if(res.code == 200) {
               this.$message({
                 message: '保存成功',
                 type: 'success'
               })
+
+              if(this.$route.query.type == 'create') {
+                this.$router.push('/business/teacherList')
+              }
             }
           })
         }

src/views/teamBuild/components/teamSoundMoney.vue

@@ -289,7 +289,8 @@ export default {
       topfor: {},
       checkfor: {},
       teamStatus: '',
-      teamid: ''
+      teamid: '',
+      tempGoodsList: [], // 临时商品
     }
   },
   methods: {
@@ -357,6 +358,7 @@ export default {
       getGoods({ 'subjectId': id, 'type': 'INSTRUMENT' }).then(res => {
         if (res.code == 200) {
           row.goodsList = res.data;
+          this.tempGoodsList = res.data
           // console.log(row);
         }
       })
@@ -460,10 +462,18 @@ export default {
         activeSoundList.forEach(active => {
           // 乐器
           active.zhonglei.forEach(zl => {
+            let goodsItem = []
+            this.tempGoodsList.forEach(goods => {
+              if(goods.id == zl) {
+                goodsItem = goods
+              }
+            })
             let some = {
               subjectId: active.id,
               type: 'INSTRUMENT',
-              goodsIdList: zl
+              goodsIdList: zl,
+              name: goodsItem.name,
+              price: goodsItem.groupPurchasePrice
             }
             obj.musicGroupSubjectGoodsGroups.push(some);
           })
@@ -491,7 +501,6 @@ export default {
           }
           obj.musicGroupSubjectPlans.push(item);
         })
-        console.log(obj);
         createTeam(obj).then(res => {
           if (res.code == 200) {
             // 成功 跳转到乐团报名详情
@@ -510,10 +519,18 @@ export default {
         activeSoundList.forEach(active => {
           // 乐器
           active.zhonglei.forEach(zl => {
+            let goodsItem = []
+            this.tempGoodsList.forEach(goods => {
+              if(goods.id == zl) {
+                goodsItem = goods
+              }
+            })
             let some = {
               subjectId: active.id,
               type: 'INSTRUMENT',
-              goodsIdList: zl
+              goodsIdList: zl,
+              name: goodsItem.name,
+              price: goodsItem.groupPurchasePrice
             }
             obj.musicGroupSubjectGoodsGroups.push(some);
           })

src/views/vipClass/vipList.vue

@@ -97,7 +97,7 @@
                            label="开课时间">
             <template slot-scope="scope">
               <div>
-                <p>{{scope.row.paymentExpireDate | formatterTime}}</p>
+                <p>{{scope.row.courseStartDate | formatterTime}}</p>
               </div>
             </template>
           </el-table-column>