添加双11功能

src/views/dashboard/index.vue

@@ -234,6 +234,12 @@
             <el-radio v-model="radio" :label="2">线下</el-radio>
         </div>
 
+        
+        <div class="radioWrap" style="margin-top:20px">
+            <el-radio v-model="amountType" :label="1">乐器押金：800</el-radio>
+            <el-radio v-model="amountType" :label="2">乐器押金：1500</el-radio>
+        </div>
+
         <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="gotoMoneyok">确 定</el-button>
         </span>
@@ -352,6 +358,7 @@ export default {
       code: false,
       first: true,
       qrcodes: '',
+      amountType: 1,
       stuForm: {
           id: '',
           name: '',
@@ -650,6 +657,7 @@ export default {
             id: this.majorId, 
             smsMsg: val, 
             type: this.radio,
+            amountType: this.amountType,
             isSingle: this.radioInstrument })).then(res => {
             if (res.code == 200) {
                 this.$message.success("乐团报名成功请尽快缴费");

src/views/order/index.vue

@@ -41,6 +41,9 @@
             align="right">
         </el-date-picker>
       </el-form-item>
+      <el-form-item>
+        <el-checkbox v-model="promotionType">双11活动</el-checkbox>
+      </el-form-item>
       <el-button type="primary"
                  icon="el-icon-search"
                  plain
@@ -52,6 +55,7 @@
       <el-button plain
                  @click="exportis">导出</el-button>
     </el-form>
+    <p>订单总数：{{ total }}</p>
     <div class="tableWrap">
       <el-table :data='tableList'
                 id='tableid'
@@ -121,34 +125,36 @@ import '@/assets/tableExport.jquery.plugin.js'
 export default {
   data () {
     return {
-        pickerOptions: {
-          shortcuts: [{
-            text: '最近一周',
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit('pick', [start, end]);
-            }
-          }, {
-            text: '最近一个月',
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit('pick', [start, end]);
-            }
-          }, {
-            text: '最近三个月',
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit('pick', [start, end]);
-            }
-          }]
-        },
-        paymentTime: '',
+      promotionType: 0,
+      orderTotal: 0,
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+      paymentTime: '',
       topForm: {
         team: '', 
         instruments: '', 
@@ -227,6 +233,7 @@ export default {
             classId: params.instruments, 
             type: params.money,
             startTime: startTime,
+            promotionType: this.promotionType ? 1 : 0,
             endTime: endTime})).then(res => {
             this.tableList = res.data.rows;
             this.total = res.data.total;

vue.config.js

@@ -15,8 +15,9 @@ const name = defaultSettings.title || '大雅报名管理'; // page title
 // port = 9528 npm run dev OR npm run dev --port = 9528
 const port = process.env.port || process.env.npm_config_port || 9528; // dev port
 // const targetUrl = 'http://testpay.dayaedu.com'
-const targetUrl = 'https://manage.dayaedu.com'
-// const targetUrl = 'http://192.168.3.38:8088'
+// const targetUrl = 'https://manage.dayaedu.com'
+// let targetUrl = 'http://192.168.3.38:8088'
+const targetUrl = 'http://192.168.3.27:8088'
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
 	/**