diff --git a/.env.development b/.env.development
index 4232b16..8f703d4 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ENV = 'development'
# 共享电动车管理系统/开发环境
# VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
-VUE_APP_BASE_API = 'http://localhost:8088'
+VUE_APP_BASE_API = 'http://192.168.2.46:8088'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/components/AreaMap/index.vue b/src/components/AreaMap/index.vue
index 8d634dd..9a1c241 100644
--- a/src/components/AreaMap/index.vue
+++ b/src/components/AreaMap/index.vue
@@ -116,8 +116,8 @@ export default {
console.log("接收参数", this.pathList);
console.log("接收参数", this.lon);
console.log("接收参数", this.lat);
- this.lon2 = this.lon === undefined ? 120.35218 : this.lon;
- this.lat2 = this.lat === undefined ? 26.944335 : this.lat;
+ this.lon2 = this.lon === null ? 120.35218 : this.lon;
+ this.lat2 = this.lat === null ? 26.944335 : this.lat;
// console.log(typeof JSON.parse(this.pathList));
await AMapLoader.load({
key: globalConfig.aMap.key, // 申请好的Web端开发者Key，首次调用 load 时必填
diff --git a/src/views/system/area/areaSet.vue b/src/views/system/area/areaSet.vue
index 4ddae04..c1edbf3 100644
--- a/src/views/system/area/areaSet.vue
+++ b/src/views/system/area/areaSet.vue
@@ -208,18 +208,18 @@
开启后当进入运营区域外内将进行断电
-
-
-
+
+
+
- 设置车辆的最大可以预约时间
+ 设置骑行前需要缴纳的押金金额
-
-
+
+
@@ -235,15 +235,16 @@
+
-
-
+
+
- 设置骑行前需要缴纳的押金金额
+ 设置车辆的最大可以预约时间
-
+
@@ -344,6 +345,9 @@ export default {
areaName: [{ required: true, message: "运营区域不能为空", trigger: "blur" }],
autoReplacementOrder: [{ required: true, message: "最低电量不能为空", trigger: "blur" }],
deptId: [{ required: true, message: "运营商不能为空", trigger: "blur" }],
+ ruleIds: [{ required: true, message: "收费方式不能为空", trigger: "blur" }],
+ deposit: [{ required: true, message: "骑行押金不能为空", trigger: "blur" }],
+
},
}
},
@@ -351,6 +355,8 @@ export default {
const areaId = this.$route.params && this.$route.params.areaId;
if (areaId) {
this.getArea(areaId);
+ }else{
+ this.reset()
}
this.getCityList();
this.userName = this.$store.state.user.name;
@@ -360,6 +366,57 @@ export default {
console.log(this.dictList, 'dictdict');
},
methods: {
+ reset() {
+ this.form = {
+ areaTime:'1',
+ areaId: null,
+ areaName: null,
+ boundaryStr: null,
+ longitude: null,
+ latitude: null,
+ // parkingPoint: null,
+ agreement: '亲爱的用户，为了确保您的骑行安全，
请务必遵守以下骑行提示：
仅限16岁及以上用户使用。
为确保安全，后座不允许载人。
请务必佩戴安全头盔，保护自身安全。
注意道路状况，避开坑洼，小心骑行。
请在规定的地点还车，避免随意停放。
不逆行、不闯红灯，遵守所有交通法规。
骑行时不要使用手机，保持注意力集中。
避免急刹车和急转弯，保持适当的车速。
夜间骑行时，确保车灯和反光标识正常。
紧急情况处理：
如有紧急情况，请及时拨打客服电话。
感谢您的理解与配合，祝您骑行愉快。
',
+ createBy: null,
+ createTime: null,
+ status: '1',
+ deptId: null,
+ contact: null,
+ phone: null,
+ autoReplacementOrder: 10,
+ remark: null,
+ province: null,
+ city: null,
+ county: null,
+ provinceList: [],
+ cityList: [],
+ countyList: [],
+ ruleIds: [],
+ areaOutOutage: true,
+ parkingOutDispatch: true,
+ areaOutDispatch: true,
+ noRidingOutage: true,
+ authentication: true,
+ msgSwitch: false,
+ parkingReturn: true,
+ areaOutReturn: true,
+ isDepositDeduction: true,
+ returnVerify: false,
+ deposit: 200,
+ customService: true,
+ undercharge: 10,
+ dispatchFee:10,
+ vehicleManagementFee:10,
+ error:5,
+ timeoutMinutes:30,
+ appointmentServiceFee:2,
+
+
+
+
+
+ };
+ this.resetForm("form");
+ },
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
@@ -387,6 +444,14 @@ export default {
data[`serviceName${index + 1}`] = service.name;
data[`servicePhone${index + 1}`] = service.phone;
});
+ if (data.isDepositDeduction === '1' && data.returnVerify === '1') {
+ this.$modal.msgError("押金抵扣和拍照审核不能同时开启");
+ return
+ }
+ if(data.serviceName1==''&&data.servicePhone1==''){
+ this.$modal.msgError("最少添加一个客服电话");
+ return
+ }
if (this.form.areaId != null) {
updateArea2({ areaId: this.form.areaId, boundary: this.form.boundary, boundaryStr: this.form.boundaryStr }).then(response => {
this.$modal.msgSuccess("修改成功");
@@ -617,7 +682,7 @@ export default {
.tips {
font-size: 14px;
color: #888;
- margin-top: -20px;
+ margin-top: -10px;
}
::v-deep .el-form-item__content::after {
@@ -643,7 +708,7 @@ export default {
.left_box {
padding: 10px;
- width: 49%;
+ width: 53%;
border: 1px solid #ccc;
border-radius: 10px;
}
@@ -653,7 +718,7 @@ export default {
border: 1px solid #ccc;
border-radius: 10px;
margin-left: 1%;
- width: 49%;
+ width: 44%;
.right_tit {
margin-bottom: 20px;
diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue
index 4e7e41a..8db9ff2 100644
--- a/src/views/system/area/index.vue
+++ b/src/views/system/area/index.vue
@@ -16,12 +16,12 @@
新增
-
+ 新增
- 修改
+
-
+
修改电子围栏