From 0a9e89da833e5ce64de686e46a1cc630a023d05c Mon Sep 17 00:00:00 2001 From: mujinxia <1764373892@qq.com> Date: Thu, 22 Feb 2024 16:55:41 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8A=95=E8=AF=89=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/news1/feedback.vue | 830 ++++++++++++++++++++------------------- pages/news1/setting.vue | 4 +- 2 files changed, 430 insertions(+), 404 deletions(-) diff --git a/pages/news1/feedback.vue b/pages/news1/feedback.vue index 36d083b..df8b9a6 100644 --- a/pages/news1/feedback.vue +++ b/pages/news1/feedback.vue @@ -1,61 +1,59 @@ @@ -233,6 +212,22 @@ export default { }, submit() { const that = this + if (that.form.comment == '') { + uni.showToast({ + title: '请填写投诉内容！', + icon: 'none', + duration: 2000 + }) + return + } + if (this.form.phone && (!/^\+?\d[\d -]{8,12}\d/.test(this.form.phone))) { + uni.showToast({ + title: '手机号格式不正确！', + icon: 'none', + duration: 2000 + }) + return + } let params = { shop_id: that.shop_id, type: that.form.type, @@ -243,6 +238,8 @@ export default { feedback.add(params) .then(res => { that.$toast(res.message) + that.shop_id = '' + that.form = that.$options.data().form }) .catch(reject) }) @@ -253,6 +250,7 @@ export default { */ onOrderTab(type) { this.OrderType = type; + this.feedBackList = [] if (type != 0) { this.getFeedBack(type) } @@ -265,7 +263,7 @@ export default { is_my: 0, page: that.page } - // params.is_my = type == 1 ? 0 : 1 + params.is_my = type == 1 ? 0 : 1 return new Promise((resolve, reject) => { feedback.list(params) .then(res => { @@ -505,7 +503,7 @@ page { .feedbackContent { padding: 0 30rpx 30rpx; - border-bottom: 1px solid #A0A0A0; + border-bottom: 1px solid #eee; .fbTitle { position: relative; @@ -574,24 +572,27 @@ page { } - .empty { - text-align: center; - position: relative; - top: 150rpx; - - image { - width: 210rpx; - height: auto; - } +} - .emptytext { - font-size: 32rpx; - font-family: PingFang SC, PingFang SC; - font-weight: 500; - color: #717171; +.empty { + width: 100%; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + height: calc(100vh - 102rpx); - } + .emptyImg { + width: 210rpx; } + .emptytext { + font-size: 32rpx; + font-family: PingFang SC, PingFang SC; + font-weight: 500; + color: #717171; + margin-top: 36rpx; + + } } From 32ea3887fb95d85253b542ac1caf17026ca31601 Mon Sep 17 00:00:00 2001 From: mujinxia <1764373892@qq.com> Date: Thu, 22 Feb 2024 19:54:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/news1/feedback.vue | 5 ++++- pages/news1/setting.vue | 29 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/pages/news1/feedback.vue b/pages/news1/feedback.vue index 0a2f103..c37e2b3 100644 --- a/pages/news1/feedback.vue +++ b/pages/news1/feedback.vue @@ -131,11 +131,14 @@ + + + diff --git a/pages/news1/setting.vue b/pages/news1/setting.vue index e89ccbc..78a4a8e 100644 --- a/pages/news1/setting.vue +++ b/pages/news1/setting.vue @@ -30,12 +30,7 @@ 手机号 - - - + {{ info.mobile }} @@ -47,19 +42,19 @@ - 清除缓存 + 用户服务协议 - 隐私 + 隐私政策 - 关于 + 关于我们 @@ -74,7 +69,7 @@ - + @@ -178,6 +173,8 @@ export default { if (o.confirm) { uni.removeStorage('token'); uni.removeStorage('userInfo'); + uni.clearStorageSync() + uni.clearStorage() uni.reLaunch({ url: '/pages/login/index' }) @@ -219,7 +216,7 @@ page { height: 28rpx; } -.box-avter { +.box-avter { width: 100%; display: flex; justify-content: space-between; @@ -254,7 +251,8 @@ page { height: 114rpx; border-radius: 50%; } -.bottomBtn{ + +.bottomBtn { width: 100%; position: fixed; bottom: 0; @@ -263,12 +261,13 @@ page { z-index: 88; background: #fff; } -.submitBtn { - height: 88upx; + +.submitBtn { + height: 88upx; line-height: 88upx; background: #FFAAA4; background: #FE483B; - border-radius: 36px; + border-radius: 36px; font-size: 28upx; font-family: PingFang SC, PingFang SC; font-weight: 500; From 3eb69bf7dd28c64316aad844628206d9d6aeffd3 Mon Sep 17 00:00:00 2001 From: mujinxia <1764373892@qq.com> Date: Thu, 22 Feb 2024 21:32:06 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=BC=96=E5=86=99=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E5=8A=A9=E6=89=8B=E9=A1=B5=E9=9D=A2=E5=8F=8A=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=8A=AC=E5=A4=B4=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 15 + pages/invoice/editset.vue | 581 +++++++++++++++++++++++++++++++++++++ pages/invoice/indexset.vue | 210 ++++++++++++++ pages/news1/feedback.vue | 15 +- pages/news1/setting.vue | 2 +- 5 files changed, 808 insertions(+), 15 deletions(-) create mode 100644 pages/invoice/editset.vue create mode 100644 pages/invoice/indexset.vue diff --git a/pages.json b/pages.json index f702626..c813374 100644 --- a/pages.json +++ b/pages.json @@ -333,6 +333,14 @@ "enablePullDownRefresh": false } + } + , { + "path": "pages/invoice/indexset", + "style": { + "navigationBarTitleText": "发票助手", + "enablePullDownRefresh": false + } + }, { "path": "pages/invoice/detail", "style": { @@ -347,6 +355,13 @@ "enablePullDownRefresh": false } + }, { + "path": "pages/invoice/editset", + "style": { + "navigationBarTitleText": "发票抬头", + "enablePullDownRefresh": false + } + }, { "path": "pages/invoice/list", "style": { diff --git a/pages/invoice/editset.vue b/pages/invoice/editset.vue new file mode 100644 index 0000000..1bf4dab --- /dev/null +++ b/pages/invoice/editset.vue @@ -0,0 +1,581 @@ + + + + + diff --git a/pages/invoice/indexset.vue b/pages/invoice/indexset.vue new file mode 100644 index 0000000..46be60d --- /dev/null +++ b/pages/invoice/indexset.vue @@ -0,0 +1,210 @@ + + + + diff --git a/pages/news1/feedback.vue b/pages/news1/feedback.vue index c37e2b3..4cd7501 100644 --- a/pages/news1/feedback.vue +++ b/pages/news1/feedback.vue @@ -583,19 +583,6 @@ page { align-items: center; justify-content: center; flex-direction: column; - height: calc(100vh - 102rpx); - - .emptyImg { - width: 210rpx; - } - - .emptytext { - font-size: 32rpx; - font-family: PingFang SC, PingFang SC; - font-weight: 500; - color: #717171; - margin-top: 36rpx; - - } + height: calc(100vh - 102rpx); } diff --git a/pages/news1/setting.vue b/pages/news1/setting.vue index 78a4a8e..5c1027e 100644 --- a/pages/news1/setting.vue +++ b/pages/news1/setting.vue @@ -184,7 +184,7 @@ export default { }, bindPickerInvoice() { uni.navigateTo({ - url: "/pages/invoice/index" + url: "/pages/invoice/indexset" }) }, bindPickerChange(e) { From f61adbe6be2898055cb140af8bd2d6a2247b52d2 Mon Sep 17 00:00:00 2001 From: mujinxia <1764373892@qq.com> Date: Thu, 22 Feb 2024 21:34:43 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/invoice/indexset.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/invoice/indexset.vue b/pages/invoice/indexset.vue index 46be60d..f41a81d 100644 --- a/pages/invoice/indexset.vue +++ b/pages/invoice/indexset.vue @@ -55,7 +55,7 @@ import * as InvoiceApi from '@/api/invoice' export default { data() { return { - tabIndex: 1, + tabIndex: 0, invoicList: [], recordList: [1, 2] }; @@ -90,8 +90,8 @@ export default { background: #F5F5F5; .invoice-btn { - height: 104rpx; - background: #F21A1C; + height: 104rpx; + background: #F55349; color: #fff; font-size: 32rpx; font-weight: bold; From de2efe4185069af3a13a7c91c3709bd2ddbf7ec3 Mon Sep 17 00:00:00 2001 From: mujinxia <1764373892@qq.com> Date: Thu, 22 Feb 2024 21:47:36 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=88=91=E4=BB=AC?= =?UTF-8?q?=E3=80=81=E6=94=BF=E7=AD=96=E3=80=81=E6=9C=8D=E5=8A=A1=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 7 +++++ pages/news1/setting.vue | 11 +++++--- pages/news1/text.vue | 60 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 pages/news1/text.vue diff --git a/pages.json b/pages.json index c813374..9afd9da 100644 --- a/pages.json +++ b/pages.json @@ -955,6 +955,13 @@ "navigationBarTextStyle": "black", "navigationBarTitleText": "设置" } + },{ + "path": "text", + "style": { + "navigationStyle": "default", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "协议" + } }, { "path": "help", diff --git a/pages/news1/setting.vue b/pages/news1/setting.vue index 5c1027e..103a765 100644 --- a/pages/news1/setting.vue +++ b/pages/news1/setting.vue @@ -40,19 +40,19 @@ - + 用户服务协议 - + 隐私政策 - + 关于我们 @@ -182,6 +182,11 @@ export default { } }); }, + toTextPage(n) { + uni.navigateTo({ + url: "/pages/news1/text?pageFlag=" + n + }) + }, bindPickerInvoice() { uni.navigateTo({ url: "/pages/invoice/indexset" diff --git a/pages/news1/text.vue b/pages/news1/text.vue new file mode 100644 index 0000000..a3edc5e --- /dev/null +++ b/pages/news1/text.vue @@ -0,0 +1,60 @@ + + + + +