Merge branch 'master' into wxl

dist/static/css/chunk-47d98e8a.61a37801.css

@@ -0,0 +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}.vipwrap[data-v-173bbefe]{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}.vipwrap .newBand[data-v-173bbefe]{margin-right:20px}.resetClassForm[data-v-173bbefe] .el-date-editor.el-input,.resetClassForm[data-v-173bbefe] .el-date-editor.el-input__inner{width:180px!important}[data-v-173bbefe] .el-date-editor.el-input,[data-v-173bbefe] .el-date-editor.el-input__inner{width:100px!important}

dist/static/js/chunk-2d0b8f21.783b5a70.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0b8f21"],{"319f":function(n,e,t){"use strict";t.r(e);var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  结算周期设置\n")])},c=[],l=t("2877"),r={},s=Object(l["a"])(r,u,c,!1,null,null,null);e["default"]=s.exports}}]);

dist/static/js/chunk-2d0c42e2.62e0bc46.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c42e2"],{"3a75":function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div",[t("router-view")],1)},c=[],r=t("2877"),l={},a=Object(r["a"])(l,u,c,!1,null,null,null);n["default"]=a.exports}}]);

dist/static/js/chunk-2d0c49aa.2dfc794d.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c49aa"],{"3c15":function(n,e,c){"use strict";c.r(e);var t=function(){var n=this,e=n.$createElement,c=n._self._c||e;return c("div",[n._v("\n  异常签到\n")])},u=[],a=c("2877"),l={},r=Object(a["a"])(l,t,u,!1,null,null,null);e["default"]=r.exports}}]);

dist/static/js/chunk-2d0cc2c5.c0a8c3fd.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0cc2c5"],{"4d98":function(e,n,c){"use strict";c.r(n);var t=function(){var e=this,n=e.$createElement,c=e._self._c||n;return c("div",[c("router-view")],1)},u=[],r=c("2877"),l={},i=Object(r["a"])(l,t,u,!1,null,null,null);n["default"]=i.exports}}]);

dist/static/js/chunk-2d0e22e3.34c43ada.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0e22e3"],{"7e32":function(n,e,t){"use strict";t.r(e);var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  支付通道设置\n")])},c=[],l=t("2877"),r={},s=Object(l["a"])(r,u,c,!1,null,null,null);e["default"]=s.exports}}]);

dist/static/js/chunk-2d0f0a2c.ddbd9970.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f0a2c"],{"9ce1":function(e,n,t){"use strict";t.r(n);var c=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div",{staticClass:"m-container"},[t("router-view")],1)},a=[],r={},s=r,u=t("2877"),i=Object(u["a"])(s,c,a,!1,null,null,null);n["default"]=i.exports}}]);

dist/static/js/chunk-2d208c0d.bab4493e.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d208c0d"],{a5ad:function(n,e,t){"use strict";t.r(e);var c=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  请假管理\n")])},u=[],a=t("2877"),l={},r=Object(a["a"])(l,c,u,!1,null,null,null);e["default"]=r.exports}}]);

dist/static/js/chunk-2d209131.5d48aa67.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d209131"],{a804:function(n,e,t){"use strict";t.r(e);var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  系统模板设置\n")])},c=[],l=t("2877"),a={},r=Object(l["a"])(a,u,c,!1,null,null,null);e["default"]=r.exports}}]);

dist/static/js/chunk-2d2221d6.a53adbe2.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d2221d6"],{ccdd:function(n,e,c){"use strict";c.r(e);var t=function(){var n=this,e=n.$createElement,c=n._self._c||e;return c("div",[n._v("\n  节假日设置\n")])},u=[],l=c("2877"),d={},r=Object(l["a"])(d,t,u,!1,null,null,null);e["default"]=r.exports}}]);

dist/static/js/chunk-2d226388.52a44c04.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d226388"],{e876:function(n,e,t){"use strict";t.r(e);var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  课程活动设置\n")])},c=[],l=t("2877"),r={},s=Object(l["a"])(r,u,c,!1,null,null,null);e["default"]=s.exports}}]);

dist/static/js/chunk-2d229d67.a43b4f63.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d229d67"],{dec3:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div",[t("router-view")],1)},c=[],r={},l=r,i=t("2877"),o=Object(i["a"])(l,u,c,!1,null,null,null);n["default"]=o.exports}}]);

dist/static/js/chunk-a18ee754.d9803d7d.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-a18ee754"],{"26fc":function(t,s,a){t.exports=a.p+"static/img/404_cloud.0f4bc32b.png"},"8cdb":function(t,s,a){"use strict";a.r(s);var e=function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"wscn-http404-container"},[a("div",{staticClass:"wscn-http404"},[t._m(0),t._v(" "),a("div",{staticClass:"bullshit"},[a("div",{staticClass:"bullshit__oops"},[t._v("OOPS!")]),t._v(" "),t._m(1),t._v(" "),a("div",{staticClass:"bullshit__headline"},[t._v(t._s(t.message))]),t._v(" "),a("div",{staticClass:"bullshit__info"},[t._v("Please check that the URL you entered is correct, or click the button below to return to the homepage.")]),t._v(" "),a("a",{staticClass:"bullshit__return-home",attrs:{href:""}},[t._v("Back to home")])])])])},c=[function(){var t=this,s=t.$createElement,e=t._self._c||s;return e("div",{staticClass:"pic-404"},[e("img",{staticClass:"pic-404__parent",attrs:{src:a("a36b"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child left",attrs:{src:a("26fc"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child mid",attrs:{src:a("26fc"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child right",attrs:{src:a("26fc"),alt:"404"}})])},function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"bullshit__info"},[t._v("All rights reserved\n        "),a("a",{staticStyle:{color:"#20a0ff"},attrs:{href:"https://wallstreetcn.com",target:"_blank"}},[t._v("wallstreetcn")])])}],i={name:"Page404",computed:{message:function(){return"The webmaster said that you can not enter this page..."}}},l=i,n=(a("ba3c"),a("2877")),r=Object(n["a"])(l,e,c,!1,null,"6dd02360",null);s["default"]=r.exports},a36b:function(t,s,a){t.exports=a.p+"static/img/404.a57b6f31.png"},ba3c:function(t,s,a){"use strict";var e=a("e6b3"),c=a.n(e);c.a},e6b3:function(t,s,a){}}]);

src/views/studentManager/studentList.vue

@@ -12,7 +12,7 @@
                class="searchForm"
                v-model="searchForm">
         <el-form-item>
-          <el-input placeholder="家长联系电话"
+          <el-input placeholder="学生姓名或电话"
                     @keyup.enter.native='onSearch'
                     v-model="searchForm.search"></el-input>
         </el-form-item>
@@ -27,16 +27,16 @@
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input placeholder="学生姓名"
                     @keyup.enter.native='onSearch'
                     v-model="searchForm.studentName"></el-input>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="onSearch"
-                     type="danger">搜索</el-button>
-          <el-button @click="onReSet"
-                     type="primary">重置</el-button>
+        <el-form-item> -->
+        <el-button @click="onSearch"
+                   type="danger">搜索</el-button>
+        <el-button @click="onReSet"
+                   type="primary">重置</el-button>
         </el-form-item>
       </el-form>
       <!-- 列表 -->

src/views/teamBuild/signupList.vue

@@ -5,9 +5,13 @@
         <h2>
           <!-- <div class="squrt"></div> -->
           <el-page-header @back="onCancel"
-                          :content="teamName + '报名详情'"></el-page-header>
+                          :content="teamName + '报名详情'">
+
+          </el-page-header>
           <!-- {{ teamName }}报名详情 -->
         </h2>
+        <p style="margin-bottom:15px; font-size:18px;  
+             font-weight:400">报名缴费截止时间:{{ applyExpireDate | formatTimer }}</p>
         <div class="btnList">
           <div class='newBand close'
                v-permission="'musicGroup/cancelMusicGroup'"
@@ -28,9 +32,9 @@
                @click="onCreateQRCode">报名链接</div>
           <div class='newBand'
                @click="onCreateQRCode2">缴费详情</div>
-          <!-- <div class='newBand'
-               @click='onDownLoadExecl'>报名导出</div> -->
-          <p style="margin-bottom:15px;">报名缴费截止时间:{{ applyExpireDate | formatTimer }}</p>
+          <div class='newBand'
+               @click='onDownLoadExecl'>报名导出</div>
+
         </div>
       </div>
       <!--  stepImgs: {
@@ -199,9 +203,10 @@
                              slot="reference">备注</el-button>
                 </el-popover>
                 <!-- PAY -->
+                <!-- &&scope.row.paymentStatus==1 -->
                 <el-button type='text'
                            v-permission="'studentRegistration/queryFeeDetail'"
-                           v-if='status == "PAY"&&scope.row.paymentStatus==1'
+                           v-if='status == "PAY"'
                            @click='lookdetail(scope.row)'>查看</el-button>
               </div>
             </template>
@@ -736,7 +741,7 @@ export default {
         if (res.code == 200) {
           if (res.data) {
             this.orderForm.totalAmount = res.data.totalAmount;
-            this.orderForm.subjectFee = res.data.courseFee;
+            // this.orderForm.subjectFee = res.data.courseFee;
             let goodStr = '';
             let goodPrice = 0;
             let otherStr = '';
@@ -752,6 +757,8 @@ export default {
                 othersPrice += parseFloat(res.data.goods[i].musicalFee);
                 // this.orderForm.others = res.data.goods[i].goodsName;
                 // this.orderForm.othersPrice = res.data.goods[i].musicalFee;
+              } else if (res.data.goods[i].goodsType == 'COURSE') {
+                this.orderForm.subjectFee = res.data.goods[i].musicalFee
               }
             }
             this.orderForm.others = otherStr.substring(0, otherStr.length - 1);
@@ -774,6 +781,22 @@ export default {
 
     }
   },
+  watch: {
+    orderVisible (val) {
+      if (!val) {
+        this.orderForm = {
+          name: '',
+          totalAmount: '',
+          subject: '',
+          subjectFee: '',
+          axe: '',
+          axePrice: '',
+          others: '',
+          othersPrice: ''
+        }
+      }
+    }
+  }
 }
 </script>
 <style lang="scss">
@@ -781,7 +804,7 @@ export default {
   margin-left: 12px;
   .topWrap {
     padding: 18px 58px;
-    height: 136px;
+    // height: 136px;
     background-color: #fff;
     display: flex;
     flex-direction: row;

src/views/vipClass/vipReset.vue

@@ -234,6 +234,8 @@
                width="800px"
                :visible.sync="adjustmentVisible">
       <el-form :model='adjustmentForm'
+               label-position="right"
+               label-width="120px"
                ref='adjustmentForm'
                :rules="adjustmentRules"
                :inline="true">
@@ -245,7 +247,14 @@
         <el-form-item label="添加课时数"
                       prop="addCount"
                       v-if='isaddCourse'>
-          <el-input v-model="adjustmentForm.addCount"></el-input>
+          <el-input type='number'
+                    v-model="adjustmentForm.addCount"></el-input>
+        </el-form-item>
+        <br>
+        <el-form-item label="单课费用"
+                      prop="fee"
+                      v-if='isaddCourse'>
+          <el-input v-model="adjustmentForm.fee"></el-input>
         </el-form-item>
         <el-form-item label="课程类型"
                       prop="courseType"
@@ -382,6 +391,7 @@ export default {
         date: [{ required: true, message: '请选择上课时间', trigger: 'blur' },],
         startTime: [{ required: true, message: '请选择上课开始时间', trigger: 'blur' },],
         endTime: [{ required: true, message: '请选择上课结束时间', trigger: 'blur' },],
+
       },
       schoolList: [],
       Frules: null,
@@ -391,12 +401,14 @@ export default {
         courseTime: '',
         checked: false,
         addCount: '',
-        courseType: ''
+        courseType: '',
+        fee: ''
       },
       adjustmentRules: {
         courseTime: [{ required: true, message: '请选择开始时间' }],
         addCount: [{ required: true, message: '请输入加课次数' }],
-        courseType: [{ required: true, message: '请选择课程类型' }]
+        courseType: [{ required: true, message: '请选择课程类型' }],
+        fee: [{ required: true, message: '请输入费用' }]
       },
       weekDateList: [
         { value: '1', label: '星期一' },
@@ -650,6 +662,7 @@ export default {
           obj.vipGroupId = this.vipid;
           obj.courseCount = this.adjustmentForm.addCount;
           obj.teachMode = this.adjustmentForm.courseType;
+          obj.singleClassPrice = this.adjustmentForm.fee;
           batchAppendVipGroupCourses(obj).then(res => {
             if (res.code == 200) {
               this.$message.success('恭喜您添加成功');