打包

dist/static/css/chunk-28c73574.90e5e2b8.css → dist/static/css/chunk-3276df7a.ace2fe48.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}[data-v-2a5ca859] .el-button--primary,[data-v-2a5ca859] .el-button--primary:active,[data-v-2a5ca859] .el-button--primary:focus,[data-v-2a5ca859] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-2a5ca859] .el-dialog__body{padding:0 20px}[data-v-2a5ca859] .el-date-editor.el-input,[data-v-2a5ca859] .el-select{width:100%!important}
+.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}[data-v-083419ed] .el-button--primary,[data-v-083419ed] .el-button--primary:active,[data-v-083419ed] .el-button--primary:focus,[data-v-083419ed] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-083419ed] .el-dialog__body{padding:0 20px}[data-v-083419ed] .el-date-editor.el-input,[data-v-083419ed] .el-select{width:100%!important}

dist/static/css/chunk-a6baf504.87ac0c57.css → dist/static/css/chunk-b88df458.b8b53865.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}.select[data-v-2ef3692a]{font-size:14px}.btnList[data-v-2ef3692a]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-2ef3692a]{margin-right:15px}
+.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}.select[data-v-3fec11c3]{font-size:14px}.btnList[data-v-3fec11c3]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-3fec11c3]{margin-right:15px}

src/views/categroyManager/insideSetting/chargeProfitManager.vue

@@ -80,13 +80,13 @@
                ref="ruleForm">
         <el-form-item label="收费方式" required
                       :label-width="formLabelWidth">
-          <el-radio v-model.number="form.type"
+          <el-radio v-model.number="form.type" @change="onRadioChange('ruleForm')"
                     :label="1">比例分润</el-radio>
-          <el-radio v-model.number="form.type"
+          <el-radio v-model.number="form.type" @change="onRadioChange('ruleForm')"
                     :label="2">收费种类</el-radio>
         </el-form-item>
 
-        <div v-if="form.type == 1">
+        <div v-show="form.type == 1">
           <el-form-item label="公"
                         prop="comScale"
                         :label-width="formLabelWidth">
@@ -99,7 +99,7 @@
           </el-form-item>
         </div>
 
-        <div v-if="form.type == 2">
+        <div v-show="form.type == 2">
           <el-form-item label="课程" required
                         :label-width="formLabelWidth">
             <el-select placeholder="请选择方式"
@@ -129,7 +129,7 @@
               <el-option label="私"
                          value="PER"></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> 
           <el-form-item label="其它" required
                         :label-width="formLabelWidth">
             <el-select placeholder="请选择方式"
@@ -165,7 +165,17 @@ import pagination from '@/components/Pagination/index'
 import { paymentConfigQueryPage, paymentConfigGet, paymentConfigAdd, paymentConfigUpdate, paymentConfigDel } from '@/api/systemManage'
 import { branchQueryPage } from '@/api/specialSetting'
 import store from '@/store'
-
+// let validNumber = (rule, value, callback) => {
+//   if (!value) {
+//     callback(new Error('请输入数值'))
+//   } else if (value > 10) {
+//     callback(new Error('输入的值不能大于10'))
+//   } else if(value < 0) {
+//     callback(new Error('请入的值不能小于0'))
+//   } else {
+//     callback()
+//   }
+// }
 export default {
   components: { pagination },
   data () {
@@ -216,18 +226,36 @@ export default {
       handler(newvalue, oldvalue) {
         if(newvalue) {
           this.form.perScale = 10 - newvalue
+          if(newvalue > 10) {
+            this.form.comScale = 10
+          } else if(newvalue < 0) {
+            this.form.comScale = 0
+          }
         }
       }
     },
     'form.perScale': {
       handler(newvalue, oldvalue) {
         if(newvalue) {
-          this.form.comScale = 10 - newvalue
+          if(newvalue > 10) {
+            this.form.perScale = 10
+            this.form.comScale = 0
+          } else if(newvalue < 0) {
+            this.form.perScale = 0
+            this.form.comScale = 10
+          } else {
+            this.form.comScale = 10 - newvalue
+          }
         }
       }
     }
   },
   methods: {
+    onRadioChange(formName) {
+      // console.log(value)
+  
+      this.$refs[formName].clearValidate()
+    },
     onChargeSubmit (formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {

src/views/teamDetail/components/studentList.vue

@@ -16,7 +16,10 @@
       <div class="right">
         <div class="newStudent"
              style="margin-bottom:10px;"
-             @click=" addStudentVisible = true">新增学员</div>
+             @click="addStudentVisible = true">新增学员</div>
+        <div class="newStudent"
+             style="margin-bottom:10px;"
+             @click="onCreateQRCode">报名连接</div>
         <div class="newStudent"
              @click='gotoSignin'>点名总览</div>
       </div>
@@ -362,7 +365,6 @@
                          clearable
                          multiple
                          placeholder="选择辅件"
-                         clearable
                          v-model="maskForm.instrGoodsIdList">
                 <el-option v-for="(item, index) in ACCESSORIESLIST"
                            :key="index"
@@ -440,12 +442,27 @@
                    @click="chioseType">确 定</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog title="报名二维码"
+               :visible.sync="qrcodeStatus"
+               width="300px">
+      <div class="left-code">
+        <h2>学员报名连接</h2>
+        <div id="qrcode"
+             class="qrcode code"
+             ref="qrCodeUrl"></div>
+        <p class="code-url"
+           v-if="codeUrl">{{ codeUrl }}</p>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
 import { getTeamStudentList, getTeamStudentInfo, getSingleClass, findSound, StudentQuit, findSubjectPlan, getGoods, getSubject, getMusicGroupAllClass } from '@/api/buildTeam'
 import { addStudent, getStudentClass, getStudentInfoByPhone } from '@/api/studentManager'
 import pagination from '@/components/Pagination/index'
+import { vaildStudentUrl } from '@/utils/validate'
+import QRCode from 'qrcodejs2'
 export default {
   props: {
     teamid: {
@@ -499,6 +516,10 @@ export default {
       highList: [],
       snapList: [],
       soundList: [],
+      qrcodeStatus: false, // 生成二维码
+      qrcodes: true,
+      qrcode: null,
+      codeUrl: null,
       maskForm: {
         studentName: '',
         sex: '',
@@ -608,6 +629,24 @@ export default {
 
   },
   methods: {
+    onCreateQRCode () { // 生成报名二维码
+      this.qrcodeStatus = true
+      let id = this.$route.query.id
+      if (this.qrcodes) {
+        this.qrcodes = false
+        setTimeout(() => {
+          this.qrcode = new QRCode('qrcode', {
+            width: 200,
+            height: 200,
+            colorDark: '#000000',
+            colorLight: '#ffffff',
+            correctLevel: QRCode.CorrectLevel.H
+          })
+          this.qrcode.makeCode(vaildStudentUrl() + '/#/login?musicGroupId=' + id)
+          this.codeUrl = vaildStudentUrl() + '/#/login?musicGroupId=' + id
+        }, 500)
+      }
+    },
     getList () {
       let obj = {
         musicGroupId: this.teamid,
@@ -864,6 +903,9 @@ export default {
 //     flex-direction: row;
 //   }
 // }
+.headWrap {
+  padding: 20px 0;
+}
 /deep/.el-date-editor.el-input {
   width: auto;
   .el-input__inner {
@@ -904,4 +946,31 @@ export default {
     cursor: pointer;
   }
 }
+.left-code,
+.right-code {
+  // width: 50%;
+  // float: left;
+  h2 {
+    display: block;
+    font-size: 18px;
+    text-align: center;
+    padding-bottom: 8px;
+    line-height: 1;
+    height: 30px;
+    margin-bottom: 0;
+  }
+
+  .qrcode {
+    img {
+      width: 200px;
+      height: 200px;
+      margin: 0 auto;
+    }
+  }
+  .code-url {
+    font-size: 18px;
+    text-align: center;
+    padding: 15px 15px 0 15px;
+  }
+}
 </style>

src/views/teamDetail/teamList.vue

@@ -443,7 +443,7 @@ export default {
         }
         case 'APPLY': {
           // 报名中
-          this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id, name: row.name, search, rules } })
+          this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id,  name: row.name, search, rules } })
           break;
         }
         case 'PAY': {