From 54b2d0579e769d1229051d5c2a1852887252036a Mon Sep 17 00:00:00 2001 From: wangdong <1551135706@qq.com> Date: Mon, 29 Apr 2024 14:19:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=A3=8E=E6=A0=BC?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/home/index.js | 4 + api/shop/index.js | 17 ++ config.js | 4 +- pages.json | 236 +++++++++------- pages/activity/newGoods.vue | 2 +- pages/activity/newPeople.vue | 2 +- pages/activity/presale.vue | 2 +- pages/activity/ranking.vue | 2 +- pages/activity/seckill.vue | 4 +- pages/feedback/form.vue | 336 ++++++++++++++++++++++ pages/feedback/index.vue | 56 ++++ pages/feedback/list.vue | 226 +++++++++++++++ pages/index/index.vue | 15 +- pages/invite/index.vue | 3 +- pages/news/coupon/index.vue | 3 +- pages/shopList/certificate.vue | 70 +++++ pages/shopList/index.vue | 140 +++++----- pages/shopList/shopPage.vue | 429 ++++++++++++++++++++++++++++- pages/squareDynamic/index.vue | 5 +- pages/squareDynamic/publish.vue | 17 +- pages/styleColor.js | 5 +- pages/user/index - 副本.vue | 2 +- pages/user/personal/index.vue | 2 +- pages/wallet/index.vue | 2 +- static/background/user-header2.png | Bin 24800 -> 0 bytes static/cer.png | Bin 0 -> 611 bytes static/dynamic-banner.png | Bin 65919 -> 0 bytes static/feedback.png | Bin 0 -> 1124 bytes static/feedback/circle-choose.png | Bin 0 -> 1020 bytes static/feedback/circle.png | Bin 0 -> 981 bytes static/feedback/photo.png | Bin 0 -> 1318 bytes static/myFeedback.png | Bin 0 -> 1043 bytes static/publish-banner.png | Bin 64409 -> 0 bytes static/right.png | Bin 0 -> 570 bytes static/seckill/topHeader.png | Bin 30813 -> 0 bytes static/success.png | Bin 20060 -> 0 bytes static/wallet.png | Bin 17772 -> 0 bytes 37 files changed, 1379 insertions(+), 205 deletions(-) create mode 100644 api/shop/index.js create mode 100644 pages/feedback/form.vue create mode 100644 pages/feedback/index.vue create mode 100644 pages/feedback/list.vue create mode 100644 pages/shopList/certificate.vue delete mode 100644 static/background/user-header2.png create mode 100644 static/cer.png delete mode 100644 static/dynamic-banner.png create mode 100644 static/feedback.png create mode 100644 static/feedback/circle-choose.png create mode 100644 static/feedback/circle.png create mode 100644 static/feedback/photo.png create mode 100644 static/myFeedback.png delete mode 100644 static/publish-banner.png create mode 100644 static/right.png delete mode 100644 static/seckill/topHeader.png delete mode 100644 static/success.png delete mode 100644 static/wallet.png diff --git a/api/home/index.js b/api/home/index.js index 30a1fac..08e9fb5 100644 --- a/api/home/index.js +++ b/api/home/index.js @@ -15,6 +15,10 @@ const api = { export const wxAppSetting = (param, option) => { return request.post('index/wxAppSetting', param, option) } +// 小程序风格 +export const wxAppStyle = (param, option) => { + return request.post('/merchant/getPageStyle', param, option) +} // benner列表 export const getBannerList = (param, option) => { return request.get(api.getBannerList, param, option) diff --git a/api/shop/index.js b/api/shop/index.js new file mode 100644 index 0000000..fdff12f --- /dev/null +++ b/api/shop/index.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +// api地址 +const api = { + getShopList: 'merchant/list', + getShopDetail: 'merchant/detail' +} + +// 商户列表 +export function getShopList(param) { + return request.get(api.getShopList, { ...param }) +} + +// 商户详情 +export function getShopDetail(param) { + return request.get(api.getShopDetail, { ...param }) +} diff --git a/config.js b/config.js index 4b033e3..37a3828 100644 --- a/config.js +++ b/config.js @@ -7,7 +7,9 @@ export default { * 后端api地址 (必填; 斜杠/结尾; 请确保能访问) * 例如: https://www.你的域名.com/index.php?s=/api/ */ - apiUrl: "https://www.royaum.com.cn/index.php?s=/api/", + // apiUrl: "https://www.royaum.com.cn/index.php?s=/api/", + + apiUrl: "https://test-www.royaum.com.cn/index.php?s=/api/", picUrl:'https://www.royaum.com.cn', /** diff --git a/pages.json b/pages.json index 0845aa6..c158908 100644 --- a/pages.json +++ b/pages.json @@ -15,7 +15,6 @@ "selectedIconPath": "static/tabbar/cate-active.png", "text": "分类" }, { - // "pagePath": "pages/serve/index", "pagePath": "pages/shopList/index", "iconPath": "static/tabbar/serve.png", "selectedIconPath": "static/tabbar/serve-active.png", @@ -41,13 +40,6 @@ "navigationStyle": "custom" } }, - { - "path": "pages/serve/index", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "服务" - } - }, { "path": "pages/category/index", "style": { @@ -72,13 +64,6 @@ } } }, - { - "path": "pages/serve/install", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "安装报修" - } - }, { "path": "pages/member/index", "style": { @@ -205,30 +190,6 @@ "navigationBarTitleText": "账单明细" } }, - { - "path": "pages/wallet/index", - "style": { - "navigationBarTitleText": "我的钱包" - } - }, - { - "path": "pages/wallet/balance/log", - "style": { - "navigationBarTitleText": "账单详情" - } - }, - { - "path": "pages/wallet/recharge/index", - "style": { - "navigationBarTitleText": "充值中心" - } - }, - { - "path": "pages/wallet/recharge/order", - "style": { - "navigationBarTitleText": "充值记录" - } - }, { "path": "pages/checkout/index", "style": { @@ -345,48 +306,6 @@ "navigationBarTitleText": "直播列表", "enablePullDownRefresh": true } - }, { - "path": "pages/invoice/index", - "style": { - "navigationBarTitleText": "我的发票抬头", - "enablePullDownRefresh": false - } - - }, { - "path": "pages/invoice/indexset", - "style": { - "navigationBarTitleText": "发票助手", - "enablePullDownRefresh": false - } - - }, { - "path": "pages/invoice/detail", - "style": { - "navigationBarTitleText": "我的发票抬头", - "enablePullDownRefresh": false - } - - }, { - "path": "pages/invoice/edit", - "style": { - "navigationBarTitleText": "申请发票", - "enablePullDownRefresh": false - } - - }, { - "path": "pages/invoice/editset", - "style": { - "navigationBarTitleText": "发票抬头", - "enablePullDownRefresh": false - } - - }, { - "path": "pages/invoice/list", - "style": { - "navigationBarTitleText": "申请记录", - "enablePullDownRefresh": false - } - }, { "path": "pages/user/vip/goods", "style": { @@ -407,18 +326,10 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } - }, - { - "path": "pages/squareDynamic/index", - "style": { - "navigationBarTitleText": "广场动态", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/squareDynamic/publish", + },{ + "path": "pages/shopList/certificate", "style": { - "navigationBarTitleText": "发布", + "navigationBarTitleText": "营业执照", "enablePullDownRefresh": false } } @@ -781,6 +692,147 @@ } ] }, + { + "root": "pages/invoice/", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "我的发票抬头", + "enablePullDownRefresh": false + } + + }, { + "path": "indexset", + "style": { + "navigationBarTitleText": "发票助手", + "enablePullDownRefresh": false + } + + }, { + "path": "detail", + "style": { + "navigationBarTitleText": "我的发票抬头", + "enablePullDownRefresh": false + } + + }, { + "path": "edit", + "style": { + "navigationBarTitleText": "申请发票", + "enablePullDownRefresh": false + } + + }, { + "path": "editset", + "style": { + "navigationBarTitleText": "发票抬头", + "enablePullDownRefresh": false + } + + }, { + "path": "list", + "style": { + "navigationBarTitleText": "申请记录", + "enablePullDownRefresh": false + } + } + ] + }, + { + "root": "pages/squareDynamic/", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "广场动态", + "enablePullDownRefresh": false + } + }, + { + "path": "publish", + "style": { + "navigationBarTitleText": "发布", + "enablePullDownRefresh": false + } + } + ] + }, + { + "root": "pages/feedback/", + "pages": [ + + { + "path": "index", + "style": { + "navigationBarTitleText": "意见反馈", + "enablePullDownRefresh": false + } + }, + { + "path": "form", + "style": { + "navigationBarTitleText": "意见反馈", + "enablePullDownRefresh": false + } + }, + { + "path": "list", + "style": { + "navigationBarTitleText": "我的反馈", + "enablePullDownRefresh": false + } + } + ] + }, + { + "root": "pages/serve/", + "pages": [ + { + "path": "index", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "服务" + } + }, + { + "path": "install", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "安装报修" + } + } + ] + }, + { + "root": "pages/wallet/", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "我的钱包" + } + }, + { + "path": "balance/log", + "style": { + "navigationBarTitleText": "账单详情" + } + }, + { + "path": "recharge/index", + "style": { + "navigationBarTitleText": "充值中心" + } + }, + { + "path": "recharge/order", + "style": { + "navigationBarTitleText": "充值记录" + } + } + ] + }, { "root": "pages/bargain/", "pages": [{ diff --git a/pages/activity/newGoods.vue b/pages/activity/newGoods.vue index 14d2260..5d02ad9 100644 --- a/pages/activity/newGoods.vue +++ b/pages/activity/newGoods.vue @@ -73,7 +73,7 @@ }, computed: { styleIndex() { - const index = 5; + const index = uni.getStorageSync('styleIndex') || ''; return index; }, }, diff --git a/pages/activity/newPeople.vue b/pages/activity/newPeople.vue index f6d63f9..7c3426f 100644 --- a/pages/activity/newPeople.vue +++ b/pages/activity/newPeople.vue @@ -89,7 +89,7 @@ }, computed: { styleIndex() { - const index = 1; + const index = uni.getStorageSync('styleIndex') || ''; return index; }, }, diff --git a/pages/activity/presale.vue b/pages/activity/presale.vue index ca1138d..32a6c73 100644 --- a/pages/activity/presale.vue +++ b/pages/activity/presale.vue @@ -55,7 +55,7 @@ }, computed: { styleIndex() { - const index = 1; + const index = uni.getStorageSync('styleIndex') || ''; return index; }, }, diff --git a/pages/activity/ranking.vue b/pages/activity/ranking.vue index 09d1e62..83dac84 100644 --- a/pages/activity/ranking.vue +++ b/pages/activity/ranking.vue @@ -101,7 +101,7 @@ }, computed: { styleIndex() { - const index = 2; + const index = uni.getStorageSync('styleIndex') || ''; return index; }, }, diff --git a/pages/activity/seckill.vue b/pages/activity/seckill.vue index fdfc5f5..8185aa5 100644 --- a/pages/activity/seckill.vue +++ b/pages/activity/seckill.vue @@ -5,7 +5,7 @@ :background="background"> - + @@ -131,7 +131,7 @@ }, computed: { styleIndex() { - const index = 5; + const index = uni.getStorageSync('styleIndex') || ''; return index; }, }, diff --git a/pages/feedback/form.vue b/pages/feedback/form.vue new file mode 100644 index 0000000..387c9c8 --- /dev/null +++ b/pages/feedback/form.vue @@ -0,0 +1,336 @@ +