03/04 19:14

111

dist/static/css/chunk-de81446c.89066537.css → dist/static/css/chunk-06bfc1eb.7ab78b0c.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}.right-code .title[data-v-6c2e2046]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-6c2e2046]{display:inline-block}
+.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}.right-code .title[data-v-38463552]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-38463552]{display:inline-block}

dist/static/css/chunk-27c95ed6.20d0d867.css → dist/static/css/chunk-1bfbc84a.c47b45aa.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}.vipwrap[data-v-2f40a6bb]{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-2f40a6bb]{margin-right:20px}.resetClassForm[data-v-2f40a6bb] .el-date-editor.el-input,.resetClassForm[data-v-2f40a6bb] .el-date-editor.el-input__inner{width:180px!important}[data-v-2f40a6bb] .el-date-editor.el-input,[data-v-2f40a6bb] .el-date-editor.el-input__inner{width:100px!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}.vipwrap[data-v-396d358e]{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-396d358e]{margin-right:20px}.resetClassForm[data-v-396d358e] .el-date-editor.el-input,.resetClassForm[data-v-396d358e] .el-date-editor.el-input__inner{width:180px!important}[data-v-396d358e] .el-date-editor.el-input,[data-v-396d358e] .el-date-editor.el-input__inner{width:100px!important}

src/views/businessManager/orderManager/backMoney.vue

@@ -171,6 +171,12 @@ export default {
       }
     })
     this.getList()
+        var now = new Date();
+var startDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
+var endDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
+this.orderDate=[];
+this.orderDate.push(startDate)
+this.orderDate.push(endDate)
   },
   methods: {
     search () {

src/views/businessManager/orderManager/income.vue

@@ -189,6 +189,12 @@ export default {
       }
     })
     this.getList()
+    var now = new Date();
+var startDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
+var endDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
+this.orderDate=[];
+this.orderDate.push(startDate)
+this.orderDate.push(endDate)
   },
   methods: {
     onClear(type) {

src/views/businessManager/orderManager/incomeOne.vue

@@ -204,6 +204,12 @@ export default {
       }
     })
     this.getList()
+        var now = new Date();
+var startDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
+var endDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
+this.orderDate=[];
+this.orderDate.push(startDate)
+this.orderDate.push(endDate)
   },
   methods: {
     onClear (type) {

src/views/businessManager/orderManager/incomeTwo.vue

@@ -194,6 +194,12 @@ export default {
       }
     })
     this.getList()
+        var now = new Date();
+var startDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
+var endDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
+this.orderDate=[];
+this.orderDate.push(startDate)
+this.orderDate.push(endDate)
   },
   methods: {
     onClear (type) {

src/views/categroyManager/vipActiveList.vue

@@ -24,6 +24,25 @@
             ></el-option>
           </el-select>
         </el-form-item>
+                <el-form-item prop="organId">
+          <el-select
+            filterable
+            style="width:180px!important"
+            v-model="searchForm.enable"
+            clearable
+            @clear='resetEnable'
+            placeholder="活动状态"
+          >
+            <el-option
+              label="开启"
+              :value="true"
+            ></el-option>
+            <el-option
+              label="关闭"
+              :value="false"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button @click="search" type="danger">搜索</el-button>
         </el-form-item>
@@ -64,7 +83,7 @@
             <template slot-scope="scope">
               <div>
                 <p>{{ scope.row.coursesStartTime | formatTimer }}</p>
-                <p>{{ scope.row.coursesEndTime | formatTimer }}</p>
+                <p>{{ scope.row.coursesEndTime | formatTimer }}</p> 
               </div>
             </template>
           </el-table-column>
@@ -310,7 +329,7 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      searchForm: { organId: null },
+      searchForm: { organId: null,enable:null },
       organList: [],
       dialogVisible: false,
       resetForm: {
@@ -520,16 +539,22 @@ export default {
       this.getList();
     },
     getList() {
+      let enable = this.searchForm.enable
       vipGroupActivity({
         organId: this.searchForm.organId,
         rows: this.rules.limit,
-        page: this.rules.page
+        page: this.rules.page,
+        enable
       }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.rules.total = res.data.total;
         }
       });
+      
+    },
+    resetEnable(val){
+      val = null
     },
     // 格式化活动类型
     fommatterType(row, column) {

src/views/sporadicManager/sporadicList.vue

@@ -47,6 +47,8 @@
                        :value="6"></el-option>
             <el-option label="上门费"
                        :value="7"></el-option>
+                        <el-option label="账户余额"
+                       :value="8"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -169,6 +171,8 @@
                        :value="6"></el-option>
             <el-option label="上门费"
                        :value="7"></el-option>
+                                 <el-option label="账户余额"
+                       :value="8"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="金额"
@@ -260,6 +264,8 @@
                        :value="5"></el-option>
             <el-option label="上门费"
                        :value="7"></el-option>
+                                 <el-option label="账户余额"
+                       :value="8"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="学员编号"
@@ -619,7 +625,8 @@ export default {
         '4': '配件销售',
         '5': '维修费',
         '6': '福袋活动',
-        '7': '上门费'
+        '7': '上门费',
+        '8': '课程余额'
       }
       return template[val]
     }

src/views/vipClass/vipReset.vue

@@ -639,7 +639,7 @@ export default {
     // 删除循环周
     removeWeek(item) {
       for (let i in this.weekList) {
-        if (this.weekList[i].id == item.id) {
+        if (this.weekList[i].id == item.id) { 
           this.weekList.splice(i, 1);
         }
       }
@@ -707,6 +707,7 @@ export default {
           obj.courseCount = this.adjustmentForm.addCount;
           obj.teachMode = this.adjustmentForm.courseType;
           obj.singleClassPrice = this.adjustmentForm.fee;
+          obj.groupType = 'VIP'
           batchAppendVipGroupCourses(obj).then(res => {
             if (res.code == 200) {
               this.$message.success("恭喜您添加成功");