Merge branch 'LAO_MO' into online

src/views/sporadicManager/sporadicList.vue

@@ -102,7 +102,7 @@
                label-width="100px"
                label-position="right"
                :inline="true"
-               ref="zeroForm">
+               ref="maskForm">
         <el-form-item label="标题"
                       prop="title">
           <el-input v-model="maskForm.title"
@@ -262,19 +262,20 @@ export default {
       this.zeroVisible = true;
       this.title = '查看收费'
       this.activeRow = row
-      this.maskForm = {
-        code: vaildStudentUrl() + `/#/sporadicLogin?id=${this.activeRow.id}`,
-        type: parseInt(row.chargeType),
-        desc: row.detail,
-        title: row.title,
-        organId: row.organId,
-        money: row.amount
-      }
-      // chargeType: this.maskForm.type,
-      //   detail: this.maskForm.desc,
-      //   title: this.maskForm.title,
-      //   organId: this.maskForm.organId,
-      //   amount: this.maskForm.money
+      this.maskForm.code = vaildStudentUrl() + `/#/sporadicLogin?id=${this.activeRow.id}`
+      this.maskForm.type = parseInt(row.chargeType)
+      this.maskForm.desc = row.detail
+      this.maskForm.title = row.title
+      this.maskForm.organId = row.organId
+      this.maskForm.money = row.amount
+      // this.maskForm = {
+      //   code: vaildStudentUrl() + `/#/sporadicLogin?id=${this.activeRow.id}`,
+      //   type: parseInt(row.chargeType),
+      //   desc: row.detail,
+      //   title: row.title,
+      //   organId: row.organId,
+      //   money: row.amount
+      // }
     },
     // look2Code () { },
     onCreateQRCode () { // 生成报名二维码
@@ -300,7 +301,7 @@ export default {
       }, 500)
     },
     addZero () {
-      this.$refs['zeroForm'].validate(item => {
+      this.$refs['maskForm'].validate(item => {
         if (item) {
           let obj = {
             chargeType: this.maskForm.type,
@@ -327,7 +328,7 @@ export default {
       }).then(() => {
         removeZero({ id: row.id }).then(res => {
           if (res.code == 200) {
-            this.$message.error('删除成功')
+            this.$message.success('删除成功')
             this.zeroVisible = false;
             this.getList()
           }
@@ -347,7 +348,7 @@ export default {
           title: '',
           code: ''
         }
-        // this.$refs['zeroForm'].resetFields()
+        // this.$refs['maskForm'].resetFields()
         // console.log(this.$refs['zeroForm'].resetFields)
       }
     },

vue.config.js

@@ -17,9 +17,9 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // 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://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' // 乔