From b38b66a21775d359a2b8b97cad3996f89bbd3dc1 Mon Sep 17 00:00:00 2001 From: mactj Date: Wed, 20 Jan 2021 17:25:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mini-app/TodoList.md | 31 +++--- mini-app/project.config.json | 7 ++ mini-app/src/app.wpy | 3 +- mini-app/src/appManager.js | 11 ++- .../mall/order/order-detail-list-body.wpy | 2 +- .../components/mall/order/order-list-body.wpy | 2 +- mini-app/src/components/mall/tab/mall-bbs.wpy | 96 ++++++++++--------- .../src/components/mall/tab/mall-home.wpy | 41 ++------ mini-app/src/components/mall/tab/mall-my.wpy | 4 +- .../src/components/mall/tab/mall-shopping.wpy | 2 +- mini-app/src/pages/mall/index.wpy | 7 +- mini-app/src/pages/mall/order/order-check.wpy | 2 +- .../src/pages/mall/user/user-address-list.wpy | 5 +- mini-app/src/pages/webView/web.wpy | 43 +++++++++ mini-app/src/pages/winery/winery-list.wpy | 28 ++++-- mini-app/src/store/constant/nav/my.js | 2 +- mini-app/src/store/constant/nav/pages.js | 1 + mini-app/src/store/index.js | 3 +- 18 files changed, 172 insertions(+), 118 deletions(-) create mode 100644 mini-app/src/pages/webView/web.wpy diff --git a/mini-app/TodoList.md b/mini-app/TodoList.md index 3e1ba670e..fe0c381e4 100644 --- a/mini-app/TodoList.md +++ b/mini-app/TodoList.md @@ -1,17 +1,12 @@ 注X:完成 -域名[] +域名[x] 注册[X] 登录[X] 首页装修[x] 资讯/酒庄信息管理[x] -采集酒庄介绍(图标/图片)[0/12] -采集产品介绍(图标/图片)[0/12] - -产品追溯[] -新品推荐(就产品列表)[x] -视频直播[] - +采集酒庄介绍(图标/图片)[6/12] +采集产品介绍(图标/图片)[6/12] 商品列表[x] 商品管理[x] 商品详情[x] @@ -20,18 +15,20 @@ 订单管理[x] 生成支付[x] 支付回调[x] +紫环会[x] +发货单excel输出[x] +我的[x] +******---------------****** -紫环会[] ----这是啥 - - +公众号专题链接列表[] +产品追溯[] +视频直播[] +新品推荐[] +用户协议/隐私政策[] +小程序图标[] 退款申请[] 物流追踪[] -发货单excel输出[x] -发货单excel倒入[x] - -小程序图标[] -我的页面图标/图片[] - +发货单excel导入[] diff --git a/mini-app/project.config.json b/mini-app/project.config.json index 3517b1361..373e59553 100644 --- a/mini-app/project.config.json +++ b/mini-app/project.config.json @@ -139,6 +139,13 @@ "id": -1, "name": "订单列表", "pathName": "pages/mall/order/order-list", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "\bwebview", + "pathName": "pages/webView/web", "scene": null } ] diff --git a/mini-app/src/app.wpy b/mini-app/src/app.wpy index e0aedab91..b67dc68cf 100644 --- a/mini-app/src/app.wpy +++ b/mini-app/src/app.wpy @@ -110,7 +110,8 @@ pages: [ 'pages/mall/order/order-check', 'pages/mall/shopping-car/shopping-car-list', 'pages/winery/winery-detail', -'pages/winery/winery-list' +'pages/winery/winery-list', +'pages/webView/web' ], navigateToMiniProgramAppIdList: [ diff --git a/mini-app/src/appManager.js b/mini-app/src/appManager.js index a7922e85a..55ceb3089 100644 --- a/mini-app/src/appManager.js +++ b/mini-app/src/appManager.js @@ -1,6 +1,7 @@ import store from '@/store' import eventHub from './common/eventHub' import userApis from './apis/userApis' +import { webViewPage } from './store/constant/nav/pages' class AppManager { login(callBack) { @@ -29,8 +30,6 @@ class AppManager { self.setRemoteUserInfo(req2.userInfo) } - - wx.hideLoading() if (callBack) { @@ -95,7 +94,7 @@ class AppManager { } if (!path) { - this.showToast('建设中') + this.showToast('建设中,敬请期待.') return } @@ -107,6 +106,12 @@ class AppManager { showToast(msg) { wx.showToast({ title: msg, icon: 'none' }) } + + navWeb(url) { + store.state.currWebUrl = url + + this.navigateTo(webViewPage) + } } export default new AppManager() diff --git a/mini-app/src/components/mall/order/order-detail-list-body.wpy b/mini-app/src/components/mall/order/order-detail-list-body.wpy index 20d57a30d..4463b8b23 100644 --- a/mini-app/src/components/mall/order/order-detail-list-body.wpy +++ b/mini-app/src/components/mall/order/order-detail-list-body.wpy @@ -64,7 +64,7 @@ module.exports.parseOrderStatus = parseOrderStatus;
- +
diff --git a/mini-app/src/components/mall/order/order-list-body.wpy b/mini-app/src/components/mall/order/order-list-body.wpy index 156e0f64b..91322f456 100644 --- a/mini-app/src/components/mall/order/order-list-body.wpy +++ b/mini-app/src/components/mall/order/order-list-body.wpy @@ -63,7 +63,7 @@ module.exports.parseOrderStatus = parseOrderStatus; - +
diff --git a/mini-app/src/components/mall/tab/mall-bbs.wpy b/mini-app/src/components/mall/tab/mall-bbs.wpy index bfd132ec9..f8a7cee41 100644 --- a/mini-app/src/components/mall/tab/mall-bbs.wpy +++ b/mini-app/src/components/mall/tab/mall-bbs.wpy @@ -4,63 +4,68 @@ width: 100%; height: 536rpx; z-index: -10; - } + + +{ +navigationBarText: '详情', +navigationBarTextStyle: 'black', + +} + diff --git a/mini-app/src/pages/winery/winery-list.wpy b/mini-app/src/pages/winery/winery-list.wpy index 889fb0766..cdc3ae2fb 100644 --- a/mini-app/src/pages/winery/winery-list.wpy +++ b/mini-app/src/pages/winery/winery-list.wpy @@ -85,7 +85,16 @@ page { const parseImage = (imageKey) => { return 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/' + imageKey } +const parseAwards = (value) => { +if (!value) { +return [] +} + +return value.split(',') +} + module.exports.parseImage = parseImage; +module.exports.parseAwards = parseAwards;