Merge branch 'test' into 'master'

Test

See merge request quanshu/mp-ui-pc!151

src/views/business/coupon/add.vue

@@ -63,7 +63,7 @@
               <el-radio :label="0">所有盲票</el-radio>
               <el-radio :label="3">线上盲票</el-radio>
               <el-radio :label="4">线下盲票</el-radio>
-              <el-radio :label="1">指定盲票</el-radio>
+<!--              <el-radio :label="1">指定盲票</el-radio>-->
             </el-radio-group>
           </el-form-item>
         </el-form>
@@ -179,7 +179,7 @@ export default {
   methods: {
     update() {
       if (this.addData.type == 1) {
-        if(this.addData.useArea !== 0 && this.addData.useArea !== 1 && this.addData.useArea !== 2) {
+        if(this.addData.useArea !== 0 && this.addData.useArea !== 1 && this.addData.useArea !== 3 && this.addData.useArea !== 4) {
           this.$message({
             message: '请选择使用范围！',
             type: 'warning'

src/views/finance/withdraw/components/Detail.vue

@@ -43,13 +43,13 @@
           <el-form-item label="持卡人：">
             <span>{{ info.userName || "--" }}</span>
           </el-form-item>
-          <el-form-item label="开户行：">
-            <span>{{ info.branchName || "--" }}</span>
+          <el-form-item label="银行：">
+            <span>{{ info.bankName || "--" }}</span>
           </el-form-item>
         </div>
         <div class="form-flex">
-          <el-form-item label="银行：">
-            <span>{{ info.bankName || "--" }}</span>
+          <el-form-item label="开户行：">
+            <span>{{ info.branchName || "--" }}</span>
           </el-form-item>
         </div>
       </el-form>

src/views/index.vue

@@ -371,7 +371,7 @@ export default {
     };
   },
   mounted: function () {
-
+    this.initDefaultTime()
     this.initChart()
     // this.$nextTick(function () {
 
@@ -387,6 +387,16 @@ export default {
   },
   methods: {
 
+    initDefaultTime(){
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * (7-1));
+      this.timeArr1 = [start,end]
+      this.timeArr2 = [start,end]
+      this.timeArr3 = [start,end]
+      this.timeArr4 = [start,end]
+    },
+
     initChart(){
       // 初始化echarts实例
       this.chartObj1 = echarts.init(this.$refs.echart1);