1214 12:26

111

src/views/studentManager/studentList.vue

@@ -89,7 +89,7 @@
                     @pagination="getList" />
       </div>
     </div>
-    <el-dialog title="新增学员"
+    <el-dialog :title="maskName"
                width="700px"
                label-width='100px'
                label-position="right"
@@ -135,10 +135,10 @@
                        label="男"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="名族"
+        <!-- <el-form-item label="名族"
                       prop="nation">
           <el-input v-model="studentForm.nation"></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="家长姓名">
           <el-input v-model="studentForm.parseName"></el-input>
         </el-form-item>
@@ -208,7 +208,8 @@ export default {
         nation: [{ required: true, message: '请输入名族' }]
       },
       isNew: false,
-      active: null
+      active: null,
+      maskName: '新增学员'
     }
   },
   mounted () {
@@ -319,11 +320,13 @@ export default {
     addStudent () {
       this.isNew = true;
       this.studentVisible = true;
+      this.maskName = '新增学员'
     },
     resetStudent (row) {
       this.isNew = false;
       this.active = row;
       this.studentVisible = true;
+      this.maskName = '修改学员'
       this.studentForm = {
         phone: row.parentsPhone,
         name: row.username,

src/views/teamBuild/signupList.vue

@@ -581,8 +581,8 @@ export default {
             this.$message.error(res.msg)
           }
         })
-      }).catch(() =>{})
-      
+      }).catch(() => { })
+
     },
     onCreateQRCode () { // 生成报名二维码
       this.qrcodeStatus = true
@@ -622,7 +622,7 @@ export default {
         }, 500)
       }
     },
-    onDownLoadExecl() { // 报表导出
+    onDownLoadExecl () { // 报表导出
       studentApplyDetailExport({
         musicGroupId: this.$route.query.id,
         page: 1,
@@ -734,17 +734,32 @@ export default {
       this.orderForm.subject = row.subjectName;
       getStudentFeeDetail({ musicGroupId: this.id, studentId: row.studentId }).then(res => {
         if (res.code == 200) {
-          this.orderForm.totalAmount = res.data.totalAmount;
-          this.orderForm.subjectFee = res.data.courseFee;
-          for (let i in res.data.goods) {
-            if (res.data.goods[i].goodsType == 'ACCESSORIES') {
-              this.orderForm.axe = res.data.goods[i].goodsName;
-              this.orderForm.axePrice = res.data.goods[i].musicalFee;
-            } else if (res.data.goods[i].goodsType == 'INSTRUMENT') {
-              this.orderForm.others = res.data.goods[i].goodsName;
-              this.orderForm.othersPrice = res.data.goods[i].musicalFee;
+          if (res.data) {
+            this.orderForm.totalAmount = res.data.totalAmount;
+            this.orderForm.subjectFee = res.data.courseFee;
+            let goodStr = '';
+            let goodPrice = 0;
+            let otherStr = '';
+            let othersPrice = 0;
+            for (let i in res.data.goods) {
+              if (res.data.goods[i].goodsType == 'INSTRUMENT') {
+                goodStr += res.data.goods[i].goodsName + ',';
+                goodPrice += parseFloat(res.data.goods[i].musicalFee);
+                // this.orderForm.axe = res.data.goods[i].goodsName;
+                // this.orderForm.axePrice = res.data.goods[i].musicalFee;
+              } else if (res.data.goods[i].goodsType == 'ACCESSORIES') {
+                otherStr += res.data.goods[i].goodsName + ',';
+                othersPrice += parseFloat(res.data.goods[i].musicalFee);
+                // this.orderForm.others = res.data.goods[i].goodsName;
+                // this.orderForm.othersPrice = res.data.goods[i].musicalFee;
+              }
             }
+            this.orderForm.others = otherStr.substring(0, otherStr.length - 1);
+            this.orderForm.othersPrice = othersPrice;
+            this.orderForm.axe = goodStr.substring(0, goodStr.length - 1);
+            this.orderForm.axePrice = goodPrice;
           }
+
         }
       })
 

vue.config.js

@@ -15,10 +15,11 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // port = 9528 npm run dev OR npm run dev --port = 9528
 // const port = process.env.port || process.env.npm_config_port || 9528 // dev port
 // http://47.99.212.176:8000 
-// // 
+// //  https://online.dayaedu.com
+let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://testadm.dayaedu.com/' //勇哥迁库
 // 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://47.99.212.176:8000' // 测试服
 // let target = 'http://192.168.3.48:8080' // 乔