Merge branch 'master' of http://git.dayaedu.com/molingzhide/dy-admin-manager

src/api/buildTeam.js

@@ -707,3 +707,6 @@ export function resetPassword (data) {
     data: qs.stringify(data)
   })
 }
+
+
+// 获取二维码

src/layout/components/Navbar.vue

@@ -29,15 +29,17 @@
         <el-dropdown-menu slot="dropdown"
                           class="user-dropdown">
           <!-- divided -->
+
           <el-dropdown-item>
             <span style="display:block;"
-                  @click="logout">退出</span>
+                  @click="resetPassWord">修改密码</span>
           </el-dropdown-item>
           <el-dropdown-item>
             <span style="display:block;"
-                  @click="resetPassWord">修改密码</span>
+                  @click="logout">退出</span>
           </el-dropdown-item>
         </el-dropdown-menu>
+
       </el-dropdown>
     </div>
     <el-dialog title="修改密码"
@@ -93,6 +95,8 @@
 </template>
 
 <script>
+import qs from 'qs'
+import axios from 'axios'
 import { mapGetters } from "vuex";
 // import Breadcrumb from '@/components/Breadcrumb'
 // import Hamburger from '@/components/Hamburger'
@@ -162,21 +166,30 @@ export default {
     },
     getCode () {
       // 获取验证码
+      if (!this.resetForm.phone) {
+        this.$message.error('请输入正确的手机号')
+        return
+      }
       if (!this.isDisable) {
         this.isDisable = true;
         // 发请求成功后开启定时器
         // 发送验证码 
-        let timer = setInterval(res => {
-          if (this.timerCount <= 0) {
-            clearInterval(timer)
-            this.isDisable = false;
-            this.btnName = '获取验证码';
-            this.timerCount = 60;
-          } else {
-            this.timerCount--;
-            this.btnName = `${this.timerCount}s后重试`
+        axios.post('/api-web/code/sendSms', qs.stringify({ mobile: this.resetForm.phone })).then(res => {
+          if (res.data.code == 200) {
+            let timer = setInterval(res => {
+              if (this.timerCount <= 0) {
+                clearInterval(timer)
+                this.isDisable = false;
+                this.btnName = '获取验证码';
+                this.timerCount = 60;
+              } else {
+                this.timerCount--;
+                this.btnName = `${this.timerCount}s后重试`
+              }
+            }, 1000)
           }
-        }, 1000)
+        })
+
       }
     }
   },

src/views/teamBuild/teamSeting/components/improvementClass.vue

@@ -263,7 +263,7 @@ export default {
             'dayOfWeek': this.maskForm.week, // 周几
             'startClassTime': this.maskForm.startTime,
             'endClassTime': this.maskForm.endTime,
-            'courseTimes': this.maskForm.count,
+            'courseTimes': this.topForm.count,
             'type': 'HIGH',
             'expectStudentNum': this.maskForm.count,
             'musicGroupId': this.teamid,

src/views/vipClass/vipDetail/components/fnanceInfo.vue

@@ -107,22 +107,22 @@ export default {
     }
   },
   mounted () {
-    let id = this.$route.query.id || 1;
+    let id = this.$route.query.id;
     this.id = id;
     this.getList();
     // 获取vip详情
-    getVipGroupDetail({ vipGroupId: this.id }).then(res => {
-      if (res.code == 200) {
-        // 课程总价
-        // 线上课课酬
-        // 线下课课酬
-        this.totalPrice = res.data.totalPrice;
-        this.onlineClassesUnitPrice = res.data.onlineClassesUnitPrice;
-        this.offlineClassesUnitPrice = res.data.offlineClassesUnitPrice;
+    // getVipGroupDetail({ vipGroupId: this.id }).then(res => {
+    //   if (res.code == 200) {
+    //     // 课程总价
+    //     // 线上课课酬
+    //     // 线下课课酬
+    //     this.totalPrice = res.data.totalPrice;
+    //     this.onlineClassesUnitPrice = res.data.onlineClassesUnitPrice;
+    //     this.offlineClassesUnitPrice = res.data.offlineClassesUnitPrice;
 
 
-      }
-    })
+    //   }
+    // })
   },
   methods: {
     search () {
@@ -136,10 +136,20 @@ export default {
       getVipGroupSalarys({ vipGroupId: this.id, organId: this.$store.getters.organ, page: this.rules.page, rows: this.rules.limit, startTime: this.searchForm.time[0] || null, endTime: this.searchForm.time[1] || null }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.pageInfo.rows;
+          //课程总价 totalPrice
+          this.totalPrice = res.data.baseInfo.totalCoursePrice;
+          // 扣费总额 totalFeeDeduction
           this.totalFeeDeduction = res.data.baseInfo.totalFeeDeduction;
+          //扣费笔数 feeDeductionNum
           this.feeDeductionNum = res.data.baseInfo.feeDeductionNum;
-          this.totalSalary = res.data.baseInfo.totalSalary;
+          // 课酬总额 totalSalary
+          this.totalSalary = res.data.baseInfo.expectTotalSalary;
+          // 线上课课酬
+          this.onlineClassesUnitPrice = res.data.baseInfo.totalOnlineTeacherSalary;
+          // 线下课课酬
+          this.offlineClassesUnitPrice = res.data.baseInfo.totalOfflineTeacherSalary;
           this.rules.total = res.data.pageInfo.total
+
         }
       })
     }

vue.config.js

@@ -20,7 +20,7 @@ const name = defaultSettings.title || '大雅后台管理系统' // page title
 let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
 // let target = 'http://47.99.212.176:8000' // 测试服
-let target = 'http://192.168.3.48:8000' // 乔
+// let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**