From 669d1b494b3b045e9108cf1cb01dd1374b18aff4 Mon Sep 17 00:00:00 2001 From: whyAlwaysMe1995 <14001890+whyalwaysme1995@user.noreply.gitee.com> Date: Thu, 9 May 2024 09:26:15 +0000 Subject: [PATCH 1/5] =?UTF-8?q?update=20public/components/property/addFeeC?= =?UTF-8?q?onfig/addFeeConfig.js.=20=E4=BF=AE=E5=A4=8D=E9=99=84=E5=8A=A0?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=80=BC=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: whyAlwaysMe1995 <14001890+whyalwaysme1995@user.noreply.gitee.com> --- public/components/property/addFeeConfig/addFeeConfig.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/components/property/addFeeConfig/addFeeConfig.js b/public/components/property/addFeeConfig/addFeeConfig.js index c63422bde..aad6b2d66 100644 --- a/public/components/property/addFeeConfig/addFeeConfig.js +++ b/public/components/property/addFeeConfig/addFeeConfig.js @@ -219,9 +219,9 @@ errInfo: "附加费用不能为空" }, { - limit: "moneyModulus", + limit: "num", param: "", - errInfo: "附加费用格式错误" + errInfo: "附加费用必须为数字" } ], 'addFeeConfigInfo.billType': [ -- Gitee From fe9095295eef06d3d310366a92d25defcf44c1ef Mon Sep 17 00:00:00 2001 From: whyAlwaysMe1995 <14001890+whyalwaysme1995@user.noreply.gitee.com> Date: Thu, 9 May 2024 09:58:31 +0000 Subject: [PATCH 2/5] Revert "update public/components/property/addFeeConfig/addFeeConfig.js." This reverts commit 669d1b494b3b045e9108cf1cb01dd1374b18aff4. --- public/components/property/addFeeConfig/addFeeConfig.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/components/property/addFeeConfig/addFeeConfig.js b/public/components/property/addFeeConfig/addFeeConfig.js index aad6b2d66..c63422bde 100644 --- a/public/components/property/addFeeConfig/addFeeConfig.js +++ b/public/components/property/addFeeConfig/addFeeConfig.js @@ -219,9 +219,9 @@ errInfo: "附加费用不能为空" }, { - limit: "num", + limit: "moneyModulus", param: "", - errInfo: "附加费用必须为数字" + errInfo: "附加费用格式错误" } ], 'addFeeConfigInfo.billType': [ -- Gitee From a8ba8f3ab9a83b605ee4f72aa93379add39066ca Mon Sep 17 00:00:00 2001 From: whyAlwaysMe1995 <14001890+whyalwaysme1995@user.noreply.gitee.com> Date: Thu, 9 May 2024 09:59:59 +0000 Subject: [PATCH 3/5] =?UTF-8?q?update=20public/vcCore/vcFramework.js.=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E5=B0=91moneyModulus=E9=AA=8C?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: whyAlwaysMe1995 <14001890+whyalwaysme1995@user.noreply.gitee.com> --- public/vcCore/vcFramework.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/vcCore/vcFramework.js b/public/vcCore/vcFramework.js index 2bc7f0b9d..34ac7b320 100644 --- a/public/vcCore/vcFramework.js +++ b/public/vcCore/vcFramework.js @@ -2595,6 +2595,9 @@ if (configObj.limit == 'money') { validate.setState(validate.money(tmpDataObj), configObj.errInfo); } + if (configObj.limit == 'moneyModulus') { + validate.setState(validate.moneyModulus(tmpDataObj), configObj.errInfo); + } if (configObj.limit == 'idCard') { validate.setState(validate.idCard(tmpDataObj), configObj.errInfo); } -- Gitee From 70ef09779070a0759cdf0a071f7339ef67be82aa Mon Sep 17 00:00:00 2001 From: pj Date: Wed, 19 Jun 2024 15:30:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 6 +- .../editCommunityTels/editCommunityTels.html | 91 +++++++++++++++ .../editCommunityTels/editCommunityTels.js | 109 ++++++++++++++++++ .../addActivitiesView/addActivitiesView.html | 9 ++ .../addActivitiesView/addActivitiesView.js | 6 +- .../addCommunityTel/addCommunityTel.html | 39 +++++++ .../addCommunityTel/addCommunityTel.js | 67 +++++++++++ .../editActivitiesView.html | 9 ++ .../editActivitiesView/editActivitiesView.js | 6 +- .../addReserveCatalog/addReserveCatalog.html | 9 ++ .../addReserveCatalog/addReserveCatalog.js | 13 +++ .../editReserveCatalog.html | 9 ++ .../editReserveCatalog/editReserveCatalog.js | 13 +++ public/h5/images/diningService.png | Bin 0 -> 744006 bytes public/h5/images/localMarket.png | Bin 0 -> 182567 bytes .../common/enterCommunity/enterCommunity.html | 5 + .../common/enterCommunity/enterCommunity.js | 3 + .../addReserveDining/addReserveDining.html | 9 ++ .../addReserveDining/addReserveDining.js | 5 +- .../addReserveService/addReserveService.html | 9 ++ .../addReserveService/addReserveService.js | 3 +- .../editReserveDining/editReserveDining.html | 9 ++ .../editReserveDining/editReserveDining.js | 5 +- .../editReserveService.html | 9 ++ .../editReserveService/editReserveService.js | 5 +- .../reserveCatalogManage.html | 10 ++ .../reserveCatalogManage.js | 1 + public/user.html | 2 + 28 files changed, 447 insertions(+), 14 deletions(-) create mode 100644 public/components/common/editCommunityTels/editCommunityTels.html create mode 100644 public/components/common/editCommunityTels/editCommunityTels.js create mode 100644 public/components/property/addCommunityTel/addCommunityTel.html create mode 100644 public/components/property/addCommunityTel/addCommunityTel.js create mode 100644 public/h5/images/diningService.png create mode 100644 public/h5/images/localMarket.png diff --git a/app.js b/app.js index ff5e160b0..d23594c61 100644 --- a/app.js +++ b/app.js @@ -40,10 +40,10 @@ let opts = { } // todo 测试环境 测试使用，生产环境请用nginx带来 -app.use('/callComponent', proxy('http://192.168.100.108:8088', opts)); -app.use('/app', proxy('http://192.168.100.108:8088', opts)); +app.use('/callComponent', proxy('http://127.0.0.1:8008', opts)); +app.use('/app', proxy('http://127.0.0.1:8008', opts)); app.use('/ws', createProxyMiddleware({ - target: 'http://192.168.100.108:8008', + target: 'http://127.0.0.1:8008', changeOrigin: true, ws: true })); diff --git a/public/components/common/editCommunityTels/editCommunityTels.html b/public/components/common/editCommunityTels/editCommunityTels.html new file mode 100644 index 000000000..4b2c166fa --- /dev/null +++ b/public/components/common/editCommunityTels/editCommunityTels.html @@ -0,0 +1,91 @@ + \ No newline at end of file diff --git a/public/components/common/editCommunityTels/editCommunityTels.js b/public/components/common/editCommunityTels/editCommunityTels.js new file mode 100644 index 000000000..1350b663f --- /dev/null +++ b/public/components/common/editCommunityTels/editCommunityTels.js @@ -0,0 +1,109 @@ +(function (vc, vm) { + vc.extends({ + data: { + communityId:"", + communityTels:[], + editCommunityTelInfo: { + id: '', + communityId: '', + tel: '' + }, + addCommunityTelModel: false + }, + _initMethod: function () { + }, + _initEvent: function () { + vc.on('editCommunityTels', 'editCommunityTelsModel', + function (_params) { + $('#editCommunityTelsModel').modal('show'); + vc.component.communityId = _params; + vc.component.listCommunityTels() + }); + }, + methods: { + listCommunityTels: function () { + let _param = { + params: { + communityId: vc.component.communityId + } + }; + vc.http.apiGet('/communityTel.listCommunityTel', _param, + function (json, res) { + let _json = JSON.parse(json); + vc.component.communityTels = _json.data; + }, + function (errInfo, error) { + console.log('请求失败处理'); + vc.toast(errInfo); + }); + }, + editCommunityTelValidate: function () { + return vc.validate.validate({ + editCommunityTelInfo: vc.component.editCommunityTelInfo + }, { + 'editCommunityTelInfo.tel': [ + { + limit: "required", + param: "", + errInfo: "联系方式不能为空" + } + ] + }); + }, + openAddCommunityTelModel: function () { + vc.component.addCommunityTelModel = true + }, + closeAddCommunityTelModel: function () { + vc.component.editCommunityTelInfo = { + id: '', + communityId: '', + tel: '' + } + vc.component.addCommunityTelModel = false + }, + deleteCommunityTel: function (communtityTel) { + let _param = { + params: { + id: communtityTel.id + } + }; + vc.http.apiGet('/communityTel.deleteCommunityTel', _param, + function (json, res) { + let _json = JSON.parse(json); + if (_json.code == 0) { + vc.component.listCommunityTels(); + return; + } else { + vc.toast(_json.msg); + } + }, + function (errInfo, error) { + console.log('请求失败处理'); + vc.toast(errInfo); + }); + }, + saveCommunityTelInfo: function () { + if (!vc.component.editCommunityTelValidate()) { + vc.toast(vc.validate.errInfo); + return; + } + if(vc.component.editCommunityTelInfo.communityId == ''){ + vc.component.editCommunityTelInfo.communityId = vc.component.communityId + } + vc.http.apiPost('/communityTel.saveCommunityTel', JSON.stringify(vc.component.editCommunityTelInfo), { + emulateJSON: true + }, + function (json, res) { + vc.component.listCommunityTels(); + vc.component.closeAddCommunityTelModel(); + vc.toast("保存成功"); + return; + }, + function (errInfo, error) { + console.log('请求失败处理'); + vc.toast(errInfo); + }); + } + } + }); +})(window.vc, window.vc.component); \ No newline at end of file diff --git a/public/components/property/addActivitiesView/addActivitiesView.html b/public/components/property/addActivitiesView/addActivitiesView.html index 116b6eb30..d6a55943f 100644 --- a/public/components/property/addActivitiesView/addActivitiesView.html +++ b/public/components/property/addActivitiesView/addActivitiesView.html @@ -30,6 +30,15 @@ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
@@ -143,4 +147,5 @@ + diff --git a/public/pages/common/enterCommunity/enterCommunity.js b/public/pages/common/enterCommunity/enterCommunity.js index 18e7535bd..b1095c3d6 100644 --- a/public/pages/common/enterCommunity/enterCommunity.js +++ b/public/pages/common/enterCommunity/enterCommunity.js @@ -46,6 +46,9 @@ _openUpdateCommunityModel: function (_community) { vc.emit('editCommunityArea', 'openEditCommunityModal', _community); }, + _openeEditCommunityTelsModel: function (_community) { + vc.emit('editCommunityTels', 'editCommunityTelsModel', _community.communityId); + }, _showCommunityStatus(_statusCd) { if (_statusCd == '1000') { return "入驻审核"; diff --git a/public/pages/reserve/addReserveDining/addReserveDining.html b/public/pages/reserve/addReserveDining/addReserveDining.html index 1e4be2de9..0b6985dc9 100644 --- a/public/pages/reserve/addReserveDining/addReserveDining.html +++ b/public/pages/reserve/addReserveDining/addReserveDining.html @@ -83,6 +83,15 @@ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+