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

dist/static/css/chunk-9eb93a2c.5a001678.css → dist/static/css/chunk-2e152e2c.3eda6d65.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.tr-cotainer{margin-top:20px}.teacherInfo .infoWrap[data-v-5092ede6]{margin-top:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.teacherInfo .infoWrap .left[data-v-5092ede6]{max-width:1000px;width:100%}.teacherInfo .infoWrap .left h4[data-v-5092ede6]{margin-bottom:20px}.teacherInfo .infoWrap .right[data-v-5092ede6]{margin-left:100px}.teacherInfo .infoWrap .right .teacherIcon[data-v-5092ede6]{width:150px;height:150px;border-radius:50%;overflow:hidden}.teacherInfo .infoWrap .right .teacherIcon img[data-v-5092ede6]{width:150px;height:150px}[data-v-5092ede6] .el-form-item{width:100%}[data-v-5092ede6] .el-date-editor.el-input,[data-v-5092ede6] .el-select{width:100%!important}[data-v-5092ede6] .el-form-item__content{font-size:14px!important;margin-right:5%}.courseInfo h4{margin-bottom:20px}.courseInfo .tableMargin{margin-top:20px}.salarySet h3{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left,.salarySet .tableList .right{float:left}.salarySet .tableList .left{width:40%;margin-right:2%}.salarySet .tableList .right{width:56%;margin-left:2%}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.tr-cotainer{margin-top:20px}.teacherInfo .infoWrap[data-v-77d86276]{margin-top:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.teacherInfo .infoWrap .left[data-v-77d86276]{max-width:1000px;width:100%}.teacherInfo .infoWrap .left h4[data-v-77d86276]{margin-bottom:20px}.teacherInfo .infoWrap .right[data-v-77d86276]{margin-left:100px}.teacherInfo .infoWrap .right .teacherIcon[data-v-77d86276]{width:150px;height:150px;border-radius:50%;overflow:hidden}.teacherInfo .infoWrap .right .teacherIcon img[data-v-77d86276]{width:150px;height:150px}[data-v-77d86276] .el-form-item{width:100%}[data-v-77d86276] .el-date-editor.el-input,[data-v-77d86276] .el-select{width:100%!important}[data-v-77d86276] .el-form-item__content{font-size:14px!important;margin-right:5%}.courseInfo h4{margin-bottom:20px}.courseInfo .tableMargin{margin-top:20px}.salarySet h3{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left,.salarySet .tableList .right{float:left}.salarySet .tableList .left{width:40%;margin-right:2%}.salarySet .tableList .right{width:56%;margin-left:2%}

src/api/buildTeam.js

@@ -487,7 +487,7 @@ export function openPayment (data) {
   return request({
     url: api + `/studentRegistration/openPayment`,
     method: 'POST',
-    data
+    data: qs.stringify(data)
   })
 }
 
@@ -516,4 +516,13 @@ export function resetHighClass (data) {
     method: 'POST',
     data: qs.stringify(data)
   })
+}
+
+// 确认开团
+export function musicGroupFound (data) {
+  return request({
+    url: api + `/musicGroup/found`,
+    method: 'POST',
+    data: qs.stringify(data)
+  })
 }

src/main.js

@@ -32,13 +32,13 @@ import '@/permission' // permission control
 // }
 
 // 高德地址
-import VueAMap from 'vue-amap'
-Vue.use(VueAMap)
-VueAMap.initAMapApiLoader({
-  key: 'b1e6ac2eb28902ce91a490edf194e000',
-  plugin: ['AMap.Geolocation', 'AMap.PlaceSearch', 'AMap.Geocoder'],
-  v: '1.4.4'
-})
+// import VueAMap from 'vue-amap'
+// Vue.use(VueAMap)
+// VueAMap.initAMapApiLoader({
+//   key: 'b1e6ac2eb28902ce91a490edf194e000',
+//   plugin: ['AMap.Geolocation', 'AMap.PlaceSearch', 'AMap.Geocoder'],
+//   v: '1.4.4'
+// })
 
 // set ElementUI lang to EN
 Vue.use(ElementUI, { locale })

src/views/categroyManager/insideSetting/addressManager.vue

@@ -151,7 +151,7 @@
                    @click="onTeachingSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="选择地图"
+    <el-dialog :close-on-click-modal="false" title="选择地图"
                custom-class="map-container"
                :visible.sync="mapStatus"
                width="800px">

src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -115,7 +115,9 @@
       </div>
       <div class="right">
         <div class="teacherIcon">
-          <img src="@/assets/images/base/woman.png"
+          <img v-if="topForm.avatar" :src="topForm.avatar"
+               alt="">
+          <img v-else src="@/assets/images/base/woman.png"
                alt="">
         </div>
 

src/views/teamBuild/components/teamSoundMoney.vue

@@ -422,9 +422,7 @@ export default {
       }
       obj.musicGroupPaymentEntities = []
       // 添加学校主体付费方式
-      // console.log(this.payfor.company.ischeck)
       if (this.payfor.school.ischeck) {
-
         obj.musicGroupPaymentEntities.push({
           'amount': this.payfor.school.price,
           'memo': this.payfor.school.value,
@@ -441,44 +439,82 @@ export default {
           'name': '公司'
         })
       }
+      let activeSoundList = this.activeSoundList
       // 添加商品以及教辅
-      obj.musicGroupSubjectGoodsGroups = [];
-      for (let i in this.activeSoundList) {
-        // 遍历声部里的乐器
-        let some = {};
-        some.subjectId = this.activeSoundList[i].id;
-        some.type = 'INSTRUMENT';
-        some.goodsIdList = this.activeSoundList[i].zhonglei.join(',');
-        obj.musicGroupSubjectGoodsGroups.push(some);
-      }
-      // 遍历声部里的教辅
-      for (let i in this.activeSoundList) {
+      obj.musicGroupSubjectGoodsGroups = []
+      obj.musicGroupSubjectPlans = []
+      activeSoundList.forEach(active => {
+        // 乐器
+        active.zhonglei.forEach(zl => {
+          let some = {
+            subjectId: active.id,
+            type: 'INSTRUMENT',
+            goodsIdList: zl
+          }
+          obj.musicGroupSubjectGoodsGroups.push(some);
+        })
+
         // 遍历声部里的乐器
-        for (let j in this.activeSoundList[i].markList) {
-          let some = {};
-          some.subjectId = this.activeSoundList[i].id;
-          some.type = 'ACCESSORIES';
-          some.goodsIdList = this.activeSoundList[i].markList[j].goods.join(',');
-          some.name = this.activeSoundList[i].markList[j].name;
-          some.price = this.activeSoundList[i].markList[j].price;
+        active.markList.forEach(mark => {
+          let some = {
+            subjectId: active.id,
+            type: 'ACCESSORIES',
+            goodsIdList: mark,
+            name: mark.name,
+            price: mark.price
+          }
           obj.musicGroupSubjectGoodsGroups.push(some);
-        }
+        })
 
-      }
-      // 添加声部
-      obj.musicGroupSubjectPlans = [];
-      for (let i in this.activeSoundList) {
-        let item = {};
-        // expectedStudentNum
-        item.expectedStudentNum = this.activeSoundList[i].jihua;
-        item.fee = this.activeSoundList[i].yuji;
-        item.kitGroupPurchaseType = this.activeSoundList[i].fangshi;
-        item.subName = this.activeSoundList[i].sound;
-        item.subjectId = this.activeSoundList[i].id;
-        // depositFee  只有租赁才有
-        item.depositFee = this.activeSoundList[i].fangshiprice;
+        // 添加声部
+
+
+        let item = {
+          expectedStudentNum: active.jihua,
+          fee: active.yuji,
+          kitGroupPurchaseType: active.fangshi,
+          subName: active.sound,
+          subjectId: active.id,
+          depositFee: active.fangshiprice // depositFee  只有租赁才有
+        }
         obj.musicGroupSubjectPlans.push(item);
-      }
+      })
+      // for (let i in this.activeSoundList) {
+      //   // 遍历声部里的乐器
+      //   let some = {};
+      //   some.subjectId = this.activeSoundList[i].id;
+      //   some.type = 'INSTRUMENT';
+      //   some.goodsIdList = this.activeSoundList[i].zhonglei.join(',');
+      //   obj.musicGroupSubjectGoodsGroups.push(some);
+      // }
+      // // 遍历声部里的教辅
+      // for (let i in this.activeSoundList) {
+      //   // 遍历声部里的乐器
+      //   for (let j in this.activeSoundList[i].markList) {
+      //     let some = {};
+      //     some.subjectId = this.activeSoundList[i].id;
+      //     some.type = 'ACCESSORIES';
+      //     some.goodsIdList = this.activeSoundList[i].markList[j].goods.join(',');
+      //     some.name = this.activeSoundList[i].markList[j].name;
+      //     some.price = this.activeSoundList[i].markList[j].price;
+      //     obj.musicGroupSubjectGoodsGroups.push(some);
+      //   }
+
+      // }
+      // // 添加声部
+      // obj.musicGroupSubjectPlans = [];
+      // for (let i in this.activeSoundList) {
+      //   let item = {};
+      //   // expectedStudentNum
+      //   item.expectedStudentNum = this.activeSoundList[i].jihua;
+      //   item.fee = this.activeSoundList[i].yuji;
+      //   item.kitGroupPurchaseType = this.activeSoundList[i].fangshi;
+      //   item.subName = this.activeSoundList[i].sound;
+      //   item.subjectId = this.activeSoundList[i].id;
+      //   // depositFee  只有租赁才有
+      //   item.depositFee = this.activeSoundList[i].fangshiprice;
+      //   obj.musicGroupSubjectPlans.push(item);
+      // }
       createTeam(obj).then(res => {
         if (res.code == 200) {
           // 成功 跳转到乐团报名详情

src/views/teamBuild/signupList.vue

@@ -10,12 +10,11 @@
           <div class='newBand close'>停止乐团</div>
           <div class='newBand' @click="paymentStatus = true"
                v-if="status=='APPLY'">开始缴费</div>
-          <div class='newBand' @click="onCreateQRCode"
-               v-if="status=='APPLY'">生成二维码</div>
-          <div class='newBand'
+          <div class='newBand' @click="onGoHome"
                v-if="status=='PAY'">确认开团</div>
           <div class='newBand'
                v-if="status=='PAY'">延长缴费</div>
+          <div class='newBand' @click="onCreateQRCode" >生成二维码</div>
         </div>
       </div>
       <p class='msg'> <img src="@/assets/images/base/clock.png"
@@ -125,12 +124,13 @@
                            prop="parentsPhone"
                            align='center'>
           </el-table-column>
-          <el-table-column label="学员状态" v-if='status == "PAY"'
+           <!-- v-if='status == "PAY"' -->
+          <el-table-column label="学员状态"
                            prop="paymentStatus"
                            align='center'>
             <template slot-scope="scope">
               <div>
-                {{ scope.row.paymentStatus|paymentStatus }}
+                {{ scope.row.paymentStatus | paymentStatus }}
               </div>
             </template>
           </el-table-column>
@@ -283,7 +283,7 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { getTeamRecruit, getintoClass, getStudentList, findSound, musicGroupOpenPay, openPayment } from '@/api/buildTeam'
+import { getTeamRecruit, getintoClass, getStudentList, findSound, musicGroupOpenPay, openPayment, musicGroupFound } from '@/api/buildTeam'
 import { resetStudentSubject, getStudentFeeDetail } from '@/api/studentManager'
 import QRCode from 'qrcodejs2'
 export default {
@@ -427,19 +427,20 @@ export default {
         })
         return false
       }
-      let studentIds = []
+      let ids = []
       selection.forEach(item => {
-        studentIds.push(item.studentId)
+        ids.push(item.id)
       })
 
       openPayment({
-        id: studentIds.join(',')
+        ids: ids.join(',')
       }).then(res => {
         if(res.code == 200) {
           this.$message({
             message: '开启成功',
             type: 'success'
           })
+          this.getList()
         } else {
           this.$message.error(res.msg)
         }
@@ -473,6 +474,26 @@ export default {
         }, 500)
       }
     },
+    onGoHome() { // 确认开团
+      musicGroupFound({
+        musicGroupId: this.$route.query.id
+      }).then(res => {
+        if(res.code == 200) {
+          this.$message({
+            type: 'success',
+            message: '开启成功'
+          })
+          this.$router.push({
+            path: '/business/teamDetails',
+            query: {
+              status: 'PROGRESS',
+              id: this.$route.query.id,
+              name: this.$route.query.name
+            }
+          })
+        }
+      })
+    },
     handleSelectionChange(val) {
         this.multipleSelection = val;
     },

vue.config.js

@@ -16,11 +16,11 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // const port = process.env.port || process.env.npm_config_port || 9528 // dev port
 // http://47.99.212.176:8000
 // 
-let target = 'http://192.168.3.27:8000' // 箭河
+// let target = 'http://192.168.3.27:8000' // 箭河
 // 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 = {
   /**