From 366e575d79a57c6a8b13327b3dfb2557f32db11f Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 25 Jun 2024 09:39:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home.vue | 2 +- src/project/fengdu/AppMine/AppMine.vue | 2 +- src/project/fengdu/AppMine/myStoreList.vue | 6 ++- src/project/fengdu/AppStore/AppStore.vue | 16 +++++-- src/project/fengdu/AppStore/EvaluateForm.vue | 34 ++++++------- src/project/fengdu/AppStore/StoreDetail.vue | 21 ++++---- .../fengdu/AppStore/components/Evaluate.vue | 45 +++++++++++++++--- .../fengdu/AppStore/components/Situation.vue | 18 ++++--- src/project/fengdu/AppStore/store.png | Bin 0 -> 1461 bytes .../fengdu/AppStore/store_selected.png | Bin 0 -> 1372 bytes 10 files changed, 100 insertions(+), 44 deletions(-) create mode 100644 src/project/fengdu/AppStore/store.png create mode 100644 src/project/fengdu/AppStore/store_selected.png diff --git a/src/pages/home.vue b/src/pages/home.vue index 882f169..99db33a 100644 --- a/src/pages/home.vue +++ b/src/pages/home.vue @@ -61,7 +61,7 @@ export default { ...mapActions(['getUserInfo', 'autoLogin']), handleLogin() { if (!this.token) { - this.autoLogin(); + this.autoLogin({loginWay: ''}); } else this.$u.toast("已登录,无需重新登录!") }, handleAdminLogin({detail: {code: phoneCode}}) { diff --git a/src/project/fengdu/AppMine/AppMine.vue b/src/project/fengdu/AppMine/AppMine.vue index 5ec2e86..ef0f1f5 100644 --- a/src/project/fengdu/AppMine/AppMine.vue +++ b/src/project/fengdu/AppMine/AppMine.vue @@ -103,7 +103,7 @@ export default { type: 'token' }, { - icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiating.png", + icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodemendian.png", label: "我的门店", path: "./myStoreList", type: 'token' diff --git a/src/project/fengdu/AppMine/myStoreList.vue b/src/project/fengdu/AppMine/myStoreList.vue index b20e84e..3e30030 100644 --- a/src/project/fengdu/AppMine/myStoreList.vue +++ b/src/project/fengdu/AppMine/myStoreList.vue @@ -1,6 +1,6 @@ @@ -29,10 +29,20 @@ export default { } } }, + onLoad() { + }, methods: { change(e) { this.tabIndex = e - } + }, + toEvaluateForm(e) { + console.log(e) + uni.navigateTo({url: './EvaluateForm'}) + }, + toStoreDetail(e) { + console.log(e) + uni.navigateTo({url: './StoreDetail'}) + }, }, } diff --git a/src/project/fengdu/AppStore/EvaluateForm.vue b/src/project/fengdu/AppStore/EvaluateForm.vue index 74cfb18..4359091 100644 --- a/src/project/fengdu/AppStore/EvaluateForm.vue +++ b/src/project/fengdu/AppStore/EvaluateForm.vue @@ -3,7 +3,7 @@
小荣超市11111
- 评价时间：2024.06.01 + 评价时间：2024.06.01
@@ -29,27 +29,27 @@
(1)、门店整洁美观
- + 是 - + 否
(2)、有绿植安放
- + 是 - + 否
(3)、其他
- + 是 - + 否
@@ -57,36 +57,36 @@
(1)、车辆乱停
- + 是 - + 否
(2)、门头凌乱
- + 是 - + 否
(3)、垃圾凌乱
- + 是 - + 否
(4)、其他
- + 是 - + 否
@@ -138,8 +138,8 @@ export default { padding: 36px 32px 32px; box-sizing: border-box; color: #323233; - background-image: url("https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png"); - background-size: 100vw; + background-image: url("https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-headerBg.png"); + background-size: cover; background-repeat: no-repeat; .name { font-family: PingFangSC-SNaNpxibold; diff --git a/src/project/fengdu/AppStore/StoreDetail.vue b/src/project/fengdu/AppStore/StoreDetail.vue index d16b195..a938789 100644 --- a/src/project/fengdu/AppStore/StoreDetail.vue +++ b/src/project/fengdu/AppStore/StoreDetail.vue @@ -11,8 +11,8 @@ 4.8 -
- 评价 +
+ 评价
@@ -78,7 +78,11 @@ export default { } }, - methods: {}, + methods: { + toEvaluateForm() { + uni.navigateTo({url: './EvaluateForm'}) + } + }, } @@ -88,10 +92,10 @@ export default { background-color: #fff; .header-info { width: 100%; - height: 380px; + // height: 390px; padding: 40px 32px 32px 32px; box-sizing: border-box; - background-image: url("https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png"); + background-image: url("https://cdn.cunwuyun.cn/wechat/fd-store/store-detail-headerBg.png"); background-size: 100vw; background-repeat: no-repeat; .flex-top { @@ -133,9 +137,10 @@ export default { margin-left: 32px; vertical-align: bottom; img { - width: 20px; - height: 20px; - margin-right: 8px; + width: 28px; + height: 28px; + margin-right: 4px; + vertical-align: text-bottom; } } } diff --git a/src/project/fengdu/AppStore/components/Evaluate.vue b/src/project/fengdu/AppStore/components/Evaluate.vue index d13501d..32b9e5a 100644 --- a/src/project/fengdu/AppStore/components/Evaluate.vue +++ b/src/project/fengdu/AppStore/components/Evaluate.vue @@ -21,13 +21,13 @@
-
+
-
- 评价 +
+ 评价
小荣超市
@@ -68,11 +68,37 @@ export default { appName: '我要评价', data() { return { + list: [], + current: 1, + pages: 2, searchVal: '', gridName: '' } }, + created() { + console.log(44) + this.getList() + }, + onLoad() { + console.log(33) + this.getList() + }, methods: { + getList() { + console.log(122) + if(this.current > this.pages) return + this.$loading() + this.$instance.post(`/app/appshopassess/list`, null, { + params: { + current: this.current, size: 15 + } + }).then(res => { + if (res?.data) { + this.list = this.current == 1 ? list : [this.list, list].flat() + this.pages = res.data.total + } + }).finally(() => uni.hideLoading()) + }, getSearchList() { }, @@ -84,6 +110,12 @@ export default { // this.search.girdId = e?.id // this.getDatas() }, + toEvaluateForm() { + this.$emit('toEvaluateForm', {id: '123'}) + }, + toStoreDetail() { + this.$emit('toStoreDetail', {id: '123'}) + } }, } @@ -156,9 +188,10 @@ export default { font-size: 24px; color: #FFF; img { - width: 20px; - height: 20px; - margin-right: 8px; + width: 28px; + height: 28px; + margin-right: 4px; + vertical-align: text-bottom; } } .store-name { diff --git a/src/project/fengdu/AppStore/components/Situation.vue b/src/project/fengdu/AppStore/components/Situation.vue index c6690ee..ec80abf 100644 --- a/src/project/fengdu/AppStore/components/Situation.vue +++ b/src/project/fengdu/AppStore/components/Situation.vue @@ -6,7 +6,7 @@
- +

门店总数量

@@ -15,7 +15,7 @@
- +

门店总人数

@@ -24,7 +24,7 @@
- +

总网格数

@@ -33,7 +33,7 @@
- +

总网格员

@@ -55,9 +55,9 @@
门店名称 经营者姓名 - 经营者姓名 + 经营类型
-
+
小荣超市 小荣 小荣 @@ -75,6 +75,9 @@ export default { return { girdName: '' } + }, + onShow() { + }, methods: { handleGridSelect(e) { @@ -82,6 +85,9 @@ export default { // this.search.girdId = e?.id // this.getDatas() }, + toStoreDetail() { + this.$emit('toStoreDetail', {id: '123'}) + } }, } diff --git a/src/project/fengdu/AppStore/store.png b/src/project/fengdu/AppStore/store.png new file mode 100644 index 0000000000000000000000000000000000000000..676a3449b69b579d4de9726e2c6474ec61bacd26 GIT binary patch literal 1461 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 eh!Z&E;r{{`lI%d2YVvmg0000