xiao547607 4 سال پیش
والد
کامیت
57b97f477b
3فایلهای تغییر یافته به همراه18 افزوده شده و 23 حذف شده
  1. 1 1
      .env.test
  2. 0 4
      src/views/base/regionInfo-detail.vue
  3. 17 18
      src/views/bus/routeInfo-detail.vue

+ 1 - 1
.env.test

@@ -18,7 +18,7 @@ VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention
 VUE_APP_PUNCHLOCATION_URL=http://yktwechat.xiaoxinda.com/#/health/codeScene
 
 #车辆购票二维码
-VUE_APP_BUY_TICKET_URL=http://xpgj.xiaoxinda.com/jp-car/#/pages/buytickets/index
+VUE_APP_BUY_TICKET_URL=http://xpgj.xiaoxinda.com/jp-car-test/#/pages/buytickets/index
 
 #绑定微信
 VUE_APP_SCAN_CODE_LOGIN=7001

+ 0 - 4
src/views/base/regionInfo-detail.vue

@@ -140,9 +140,6 @@ export default {
         fullName: [
           { required: true, message: "全称不能为空", trigger: "blur" },
         ],
-        location:[
-          { required: true, message: "经纬度不能为空", trigger: "blur" },
-        ]
       },
       showDialog: true,
       loading: false,
@@ -162,7 +159,6 @@ export default {
         click: (e) => {
           var pt = e.lnglat; //点击选择新地址为中心点
           console.log(pt);
-
           this.pointPosition = [pt.lng, pt.lat];
           this.formModel.location = pt.lng + "," + pt.lat;
           this.formModel.longitude = pt.lng;

+ 17 - 18
src/views/bus/routeInfo-detail.vue

@@ -50,31 +50,32 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="开始时间" prop="startTime">
-            <el-time-select
+            <el-time-picker
               v-model="formModel.startTime"
-              placeholder="开始时间"
+              class="date-box"
+              format="HH:mm"
               value-format="HH:mm"
               style="width: 400px"
               :picker-options="{
-                start: '00:00',
-                step: '00:30',
-                end: '23:30',
+                selectableRange: `00:00:00 -${
+                  formModel.endTime ? formModel.endTime + ':00' : '23:59:00'
+                }`,
               }"
-            >
-            </el-time-select>
+            ></el-time-picker>
           </el-form-item>
           <el-form-item label="结束时间" prop="endTime">
-            <el-time-select
+            <el-time-picker
               v-model="formModel.endTime"
-              placeholder="结束时间"
+              class="date-box"
+              format="HH:mm"
+              value-format="HH:mm"
               style="width: 400px"
               :picker-options="{
-                start: '00:00',
-                step: '00:30',
-                end: '23:30',
+                selectableRange: `${
+                  formModel.startTime ? formModel.startTime + ':00' : '00:00:00'
+                }-23:59:00`,
               }"
-            >
-            </el-time-select>
+            ></el-time-picker>
           </el-form-item>
           <el-form-item label="间隔时间(分钟)" prop="interval">
             <el-input-number
@@ -340,9 +341,7 @@ export default {
         interval: [
           { required: true, message: "间隔时间不能为空", trigger: "blur" },
         ],
-        radius: [
-          { required: true, message: "半径不能为空", trigger: "blur" },
-        ],
+        radius: [{ required: true, message: "半径不能为空", trigger: "blur" }],
       },
       showDialog: true,
       loading: false,
@@ -650,7 +649,7 @@ export default {
 
         if (jsonData.result) {
           self.formModel = jsonData.data;
-          if(self.formModel.interval == null){
+          if (self.formModel.interval == null) {
             self.formModel.interval = 40;
           }
         } else {