Skip to content

O
office-web
Commit 71ebfba8 by 无尘
Options

fix: 修改门点编辑判断

parent 8eff2084
Showing with 18 additions and 20 deletions
changelog.md
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
### Bug Fixes ### Bug Fixes
* 修改门店图片上传 ([4b813c9](http://115.159.76.241/office/office-web/commits/4b813c9)) * 修改门店图片上传 ([4b813c9](http://115.159.76.241/office/office-web/commits/4b813c9))
* 修改门店图片上传插件方法 ([8eff208](http://115.159.76.241/office/office-web/commits/8eff208))
......
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.1204e96b69acf1dac3d0ec68f83939a0.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.f65d8f8672b8bdf60dfa.js></script><script type=text/javascript src=./static/js/vendor.fe6bbed1214c1931680c.js></script><script type=text/javascript src=./static/js/app.00231ebf281d6f3e60c0.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.1204e96b69acf1dac3d0ec68f83939a0.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.ce600c185710a8f9440a.js></script><script type=text/javascript src=./static/js/vendor.fe6bbed1214c1931680c.js></script><script type=text/javascript src=./static/js/app.00231ebf281d6f3e60c0.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.ce600c185710a8f9440a.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,n,r){for(var t,b,o,i=0,u=[];i<c.length;i++)b=c[i],f[b]&&u.push(f[b][0]),f[b]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(a&&a(c,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var c={},f={44:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"eb0a4246ba12b2f19e2a",1:"0ebe3ead93207dc78a78",2:"a3034ac019ab3b076959",3:"7f87f1f60c09bb6ad371",4:"7dd9b3bb0689b9db1cf3",5:"3417bcae84d670c66db1",6:"fbd06ea78358b8144d70",7:"fb9879c0177f64d093fb",8:"1a34bcb6afc2f082ef3a",9:"325d932bbdd43400378c",10:"4e361f7d71dc54b505c7",11:"f0a5934a01e738b98d90",12:"083c2dea91ab829164ab",13:"cd7e52c325cdc13a2368",14:"c7093604e27c367303cf",15:"bd12670087ac2b78bcd8",16:"1524360dd522553f9835",17:"0df740b440fad8662864",18:"07d5abcfefbcf450eccc",19:"dabaaf4b65f9f75c9a0d",20:"f5dd0c36e2944f5fa78c",21:"7faaa888e2db1aa1e5a3",22:"e2b096ce6ec3d2f5b0d7",23:"36f14084226b8d6bba02",24:"da00208b59bc1152ea8c",25:"e18d84688b21155beafe",26:"f7dd53aad405f73538cb",27:"e85ffa7929197dc4609a",28:"c75ca2dc62974c43903c",29:"25c23e727c71fda1821b",30:"5546948c939232668fc6",31:"16358ad3a9085c551664",32:"20338d6b658d38bf70dc",33:"375e96e88f2f82b30e3c",34:"57d4132e0ff6a5a8ac00",35:"aed8a28b82487ff5f295",36:"158063a49dabc462fe14",37:"f30f4e653b1f9e708aaa",38:"ac5ef7410309c861198f",39:"3e612f993ddd107c14dd",40:"f965564e0c6bf413d47f",43:"13848f214bb993c20004"}[e]+".js";var t=setTimeout(b,12e4);function b(){r.onerror=r.onload=null,clearTimeout(t);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=b,n.appendChild(r),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.f65d8f8672b8bdf60dfa.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,b,o,i=0,u=[];i<a.length;i++)b=a[i],f[b]&&u.push(f[b][0]),f[b]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var a={},f={44:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"eb0a4246ba12b2f19e2a",1:"0ebe3ead93207dc78a78",2:"a3034ac019ab3b076959",3:"7f87f1f60c09bb6ad371",4:"7dd9b3bb0689b9db1cf3",5:"3417bcae84d670c66db1",6:"fbd06ea78358b8144d70",7:"fb9879c0177f64d093fb",8:"b18031280a9ca3c6bcf3",9:"325d932bbdd43400378c",10:"4e361f7d71dc54b505c7",11:"f0a5934a01e738b98d90",12:"083c2dea91ab829164ab",13:"cd7e52c325cdc13a2368",14:"c7093604e27c367303cf",15:"bd12670087ac2b78bcd8",16:"1524360dd522553f9835",17:"0df740b440fad8662864",18:"07d5abcfefbcf450eccc",19:"dabaaf4b65f9f75c9a0d",20:"f5dd0c36e2944f5fa78c",21:"7faaa888e2db1aa1e5a3",22:"e2b096ce6ec3d2f5b0d7",23:"36f14084226b8d6bba02",24:"da00208b59bc1152ea8c",25:"e18d84688b21155beafe",26:"f7dd53aad405f73538cb",27:"e85ffa7929197dc4609a",28:"c75ca2dc62974c43903c",29:"25c23e727c71fda1821b",30:"5546948c939232668fc6",31:"16358ad3a9085c551664",32:"20338d6b658d38bf70dc",33:"375e96e88f2f82b30e3c",34:"57d4132e0ff6a5a8ac00",35:"aed8a28b82487ff5f295",36:"158063a49dabc462fe14",37:"f30f4e653b1f9e708aaa",38:"ac5ef7410309c861198f",39:"3e612f993ddd107c14dd",40:"f965564e0c6bf413d47f",43:"13848f214bb993c20004"}[e]+".js";var t=setTimeout(b,12e4);function b(){r.onerror=r.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=b,n.appendChild(r),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/views/contacts/storeInfo.vue
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<el-form-item label="联系电话" prop="phoneNumber"> <el-form-item label="联系电话" prop="phoneNumber">
<el-input v-model="storeInfo.phoneNumber"></el-input> <el-input v-model="storeInfo.phoneNumber"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="营业时间" prop="shopHours"> <el-form-item label="营业时间" prop="openTime">
<el-time-select <el-time-select
:editable="false" :editable="false"
placeholder="起始时间" placeholder="起始时间"
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
step: '00:05', step: '00:05',
end: '24:00' end: '24:00'
}" }"
@change="changeTime"
> >
</el-time-select> </el-time-select>
~ ~
...@@ -52,7 +51,6 @@ ...@@ -52,7 +51,6 @@
end: '24:00', end: '24:00',
minTime: storeInfo.openTime minTime: storeInfo.openTime
}" }"
@change="changeTime"
> >
</el-time-select> </el-time-select>
</el-form-item> </el-form-item>
...@@ -199,6 +197,17 @@ export default { ...@@ -199,6 +197,17 @@ export default {
return callback(); return callback();
} }
}; };
let validateHours = (rule, value, callback) => {
if (value) {
if (!!this.storeInfo.closeTime) {
return callback();
} else {
return callback(new Error('请选择营业时间'));
}
} else {
return callback(new Error('请选择营业时间'));
}
};
return { return {
// 面包屑参数 // 面包屑参数
navpath: [ navpath: [
...@@ -281,7 +290,7 @@ export default { ...@@ -281,7 +290,7 @@ export default {
imageUrls: [{ type: 'array', required: true, message: '请选择门店图片', trigger: 'change' }], imageUrls: [{ type: 'array', required: true, message: '请选择门店图片', trigger: 'change' }],
areaId: [{ required: true, message: '请选择门店地址', trigger: 'blur' }], areaId: [{ required: true, message: '请选择门店地址', trigger: 'blur' }],
storeType: [{ required: true, message: '请选择门店类型', trigger: 'blur' }], storeType: [{ required: true, message: '请选择门店类型', trigger: 'blur' }],
shopHours: [{ required: true, message: '请选择营业时间', trigger: 'blur' }], openTime: [{ required: true, validator: validateHours, trigger: 'blur' }],
location: [{ required: true, message: '请选择经纬度', trigger: 'blur' }], location: [{ required: true, message: '请选择经纬度', trigger: 'blur' }],
phoneNumber: [{ required: true, validator: validatePhone, trigger: 'blur' }], phoneNumber: [{ required: true, validator: validatePhone, trigger: 'blur' }],
storeCode: [{ required: true, message: '请输入门店代码', trigger: 'blur' }], storeCode: [{ required: true, message: '请输入门店代码', trigger: 'blur' }],
...@@ -301,16 +310,6 @@ export default { ...@@ -301,16 +310,6 @@ export default {
this.storeInfo.storeGroupId = list[0].label; this.storeInfo.storeGroupId = list[0].label;
this.storeInfo.storeGroupId = list[0].id; this.storeInfo.storeGroupId = list[0].id;
}, },
changeTime() {
let that = this;
if (!!that.storeInfo.openTime && !!that.storeInfo.closeTime) {
that.storeInfo.shopHours = that.storeInfo.openTime + ',' + that.storeInfo.closeTime;
} else {
that.storeInfo.shopHours = '';
}
},
/** /**
* 省市区选择 * 省市区选择
*/ */
...@@ -339,7 +338,6 @@ export default { ...@@ -339,7 +338,6 @@ export default {
}, },
async clickToSave() { async clickToSave() {
let that = this; let that = this;
await that.changeTime();
let p1 = new Promise(function(resolve, reject) { let p1 = new Promise(function(resolve, reject) {
that.$refs['storeInfo'].validate(valid => { that.$refs['storeInfo'].validate(valid => {
if (valid) { if (valid) {
...@@ -387,7 +385,6 @@ export default { ...@@ -387,7 +385,6 @@ export default {
obj.imageUrls = newImgs; obj.imageUrls = newImgs;
obj.location = obj.longitude + ',' + obj.latitude; obj.location = obj.longitude + ',' + obj.latitude;
that.storeInfo = obj; that.storeInfo = obj;
that.changeTime();
}, },
uploadOnSuccess(res, list) { uploadOnSuccess(res, list) {
// 店铺图片上传成功后拿到返回的URL做预览 // 店铺图片上传成功后拿到返回的URL做预览
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment