From 7e00aa30a9f53bd172b48626e7ba9eeaa83adce4 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 3 Nov 2022 15:01:20 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=20=20=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/activitiesAdd.vue | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue index 0d37b9cf..44285d81 100644 --- a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue +++ b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue @@ -14,13 +14,12 @@ - - - {{ info.clockRange }}米 - + +
{{ dict.getLabel('tfx_activityStatus',info.status) }} + {{ info.clockRange }}米 {{ info.intoBegintime }}至{{ info.intoEndtime}} {{ info.intoIntegral }}分 {{ info.exitBegintime }}至{{ info.exitEndtime}} @@ -160,6 +159,7 @@ export default { id: '', isEdit: false, info: {}, + mapDetail: null, map: null, placeSearch: null, placeDetail: { @@ -181,6 +181,9 @@ export default { if(this.params && this.params.id) { this.id = this.params.id this.getDetail() + setTimeout(() => { + this.getMap(this.info.lng,this.info.lat,this.info.address) + },500) } }, watch: { @@ -264,6 +267,19 @@ export default { }) }, + getMap(lng,lat,address) { + this.mapDetail = new AMap.Map(document.getElementById("mapDetail"), { + resizeEnable: true, + zooms: [6, 20], + zoom: 11, + }) + var marker = new AMap.Marker({ + position: new AMap.LngLat(lng,lat), + title: address + }) + this.mapDetail.add(marker); + }, + update() { this.isEdit = true this.getDetail() @@ -278,6 +294,8 @@ export default { this.form.intoTime = [res.data.intoBegintime,res.data.intoEndtime] this.form.exitTime = [res.data.exitBegintime,res.data.exitEndtime] this.info = res.data + this.placeDetail.lng = res.data.lng + this.placeDetail.lat = res.data.lat } }) }, From 07ce83805692de274d44d7b3cdc0c3a2f9cf35f3 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 3 Nov 2022 15:27:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppActivitiesManagement/components/activitiesAdd.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue index 44285d81..31414820 100644 --- a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue +++ b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue @@ -268,11 +268,17 @@ export default { }, getMap(lng,lat,address) { + AMapLoader.load({ + key: '54a02a43d9828a8f9cd4f26fe281e74e', + version: '2.0', + plugins: ['AMap.PlaceSearch', 'AMap.AutoComplete', 'AMap.Geocoder'], + }).then((AMap) => { this.mapDetail = new AMap.Map(document.getElementById("mapDetail"), { resizeEnable: true, zooms: [6, 20], zoom: 11, }) + }) var marker = new AMap.Marker({ position: new AMap.LngLat(lng,lat), title: address From 5089b071dda8bbf3ca8ac5ad39063e0ca8f1bfb6 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 3 Nov 2022 15:35:56 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppActivitiesManagement/components/activitiesAdd.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue index 31414820..e6a56e4e 100644 --- a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue +++ b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue @@ -23,7 +23,7 @@ {{ info.intoBegintime }}至{{ info.intoEndtime}} {{ info.intoIntegral }}分 {{ info.exitBegintime }}至{{ info.exitEndtime}} - {{ info.exitIntegral }} + {{ info.exitIntegral }}分 @@ -71,7 +71,6 @@ - From 3af39ca6a9f6c096da53a1e7f7e5418bb3b4dccc Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 3 Nov 2022 16:30:42 +0800 Subject: [PATCH 4/6] bug --- .../components/activitiesAdd.vue | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue index e6a56e4e..01b9e539 100644 --- a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue +++ b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue @@ -144,7 +144,7 @@ export default { exitTime: [], exitBegintime: '', exitEndtime: '', - exitIntegral: '', + exitIntegral: '', }, formRules: { title: [{required: true, message: "请输入活动名称", trigger: "blur"}], @@ -181,7 +181,6 @@ export default { this.id = this.params.id this.getDetail() setTimeout(() => { - this.getMap(this.info.lng,this.info.lat,this.info.address) },500) } }, @@ -272,17 +271,17 @@ export default { version: '2.0', plugins: ['AMap.PlaceSearch', 'AMap.AutoComplete', 'AMap.Geocoder'], }).then((AMap) => { - this.mapDetail = new AMap.Map(document.getElementById("mapDetail"), { - resizeEnable: true, - zooms: [6, 20], - zoom: 11, + this.mapDetail = new AMap.Map(document.getElementById("mapDetail"), { + resizeEnable: true, + zooms: [6, 20], + zoom: 11, + }) + var marker = new AMap.Marker({ + position: new AMap.LngLat(lng,lat), + title: address + }) + this.mapDetail.add(marker); }) - }) - var marker = new AMap.Marker({ - position: new AMap.LngLat(lng,lat), - title: address - }) - this.mapDetail.add(marker); }, update() { @@ -301,6 +300,7 @@ export default { this.info = res.data this.placeDetail.lng = res.data.lng this.placeDetail.lat = res.data.lat + this.getMap(this.info.lng,this.info.lat,this.info.address) } }) }, @@ -310,7 +310,7 @@ export default { selectVote(e) { this.form.voteUsers = e }, - + handleAreaSelect(v) { this.form.areaName = v?.[0]?.label }, @@ -417,4 +417,4 @@ export default { } } } - \ No newline at end of file + From f016cd338c7841fb039b62557da785414e4b8d0b Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 4 Nov 2022 14:05:47 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=BC=98=E6=83=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppMerchantDiscounts.vue | 147 ++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 project/tianfuxing/AppMerchantDiscounts/AppMerchantDiscounts.vue diff --git a/project/tianfuxing/AppMerchantDiscounts/AppMerchantDiscounts.vue b/project/tianfuxing/AppMerchantDiscounts/AppMerchantDiscounts.vue new file mode 100644 index 00000000..46ad5099 --- /dev/null +++ b/project/tianfuxing/AppMerchantDiscounts/AppMerchantDiscounts.vue @@ -0,0 +1,147 @@ + + + + + From 9383a41500b190401bf63c0049f546318a225703 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 4 Nov 2022 15:33:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=BC=98=E6=83=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppMerchantDiscounts.vue | 101 ++++++++---------- 1 file changed, 44 insertions(+), 57 deletions(-) diff --git a/project/tianfuxing/AppMerchantDiscounts/AppMerchantDiscounts.vue b/project/tianfuxing/AppMerchantDiscounts/AppMerchantDiscounts.vue index 46ad5099..9eee8976 100644 --- a/project/tianfuxing/AppMerchantDiscounts/AppMerchantDiscounts.vue +++ b/project/tianfuxing/AppMerchantDiscounts/AppMerchantDiscounts.vue @@ -5,23 +5,12 @@