diff --git a/apis/interfaces/life.js b/apis/interfaces/life.js index eff9eaf..8884c90 100644 --- a/apis/interfaces/life.js +++ b/apis/interfaces/life.js @@ -34,3 +34,4 @@ export { glz, sign } + diff --git a/apis/interfaces/notice.js b/apis/interfaces/notice.js new file mode 100644 index 0000000..3a1ae4c --- /dev/null +++ b/apis/interfaces/notice.js @@ -0,0 +1,27 @@ +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + * moduleName: 通知公告 + */ + +import { request } from '../index' + +// 列表 +const list = () =>{ + return request({ + url: "cms/articles/notice" + }) +} + +// 详情 +const info = (id) =>{ + return request({ + url: "cms/articles/" + id + }) +} + +export { + list, + info +} diff --git a/pages.json b/pages.json index deb0c6f..04cbae6 100644 --- a/pages.json +++ b/pages.json @@ -1,549 +1,565 @@ { - "pages": [{ - "path": "pages/auth/auth", - "name": "Auth", - "style": { - "navigationBarTitleText": "登录", - "navigationStyle": "custom" - } - }, - { - "path": "pages/auth/role", - "name": "AuthRole", - "style": { - "navigationBarTitleText": "角色创建", - "navigationBarBackgroundColor": "#FFF", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "退出登录", - "fontSize": "14", - "width": "80px", - "color": "#34CE98" - }] - } - } - } - }, { - "path": "pages/life/life", - "name": "Life", - "style": { - "navigationBarTitleText": "共力人生", - "navigationStyle": "custom", - "app-plus": { - "titleNView": { - "type": "transparent" - } - } - } - }, - { - "path": "pages/store/index", - "name": "Store", - "style": { - "navigationBarTitleText": "DT商城", - "enablePullDownRefresh": true, - "app-plus": { - "titleNView": { - "backgroundColor": "#fff", - "buttons": [{ - "float": "right", - "text": "\ue603", - "fontSrc": "/static/iconfont.ttf", - "color": "#000", - "fontSize": "20px" - }] - } - } - } - }, - { - "path": "pages/user/index", - "name": "User", - "style": { - "navigationBarTitleText": "我的", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "backgroundColor": "#34CE98", - "type": "transparent" - } - } - } - }, - { - "path": "pages/setting/setting", - "name": "Setting", - "style": { - "navigationBarTitleText": "设置中心", - "navigationBarBackgroundColor": "#34CE98", - "navigationBarTextStyle": "white" - } - }, - { - "path": "pages/store/goods", - "name": "StoreGoods", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "详情", - "app-plus": { - "titleNView": { - "backgroundColor": "#FFFFFF", - "type": "transparent" - } - } - } - }, - { - "path": "pages/store/buy", - "name": "StoreBuy", - "style": { - "navigationBarTitleText": "确认订单", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/order/index", - "name": "Order", - "style": { - "navigationBarTitleText": "我的订单", - "navigationBarBackgroundColor": "#FFFFFF", - "enablePullDownRefresh": false - } - }, { - "path": "pages/order/logistics", - "name": "OrderLogistics", - "style": { - "navigationBarTitleText": "物流进度", - "navigationBarBackgroundColor": "#FFFFFF", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/order/details", - "name": "OrderDetails", - "style": { - "navigationBarTitleText": "订单详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/address/index", - "name": "Address", - "style": { - "navigationBarTitleText": "收货地址" - } - }, - { - "path": "pages/address/edit", - "name": "AddressEdit", - "style": { - "navigationBarTitleText": "编辑", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/pay/pay", - "name": "Pay", - "style": { - "navigationBarTitleText": "收银台", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, - { - "path": "pages/store/list", - "name": "StoreList", - "style": { - "navigationBarTitleText": "商品", - "navigationBarBackgroundColor": "#FFFFFF", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/store/meals", - "name": "StoreMeals", - "style": { - "navigationBarTitleText": "套餐", - "navigationBarBackgroundColor": "#FFFFFF", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/store/search", - "name": "StoreSearch", - "style": { - "navigationBarTitleText": "搜索", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, - { - "path": "pages/refund/list", - "name": "OrderRefund", - "style": { - "navigationBarTitleText": "退换货", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, { - "path": "pages/refund/exchange", - "name": "Exchange", - "style": { - "navigationBarTitleText": "换货", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, + "pages": [{ + "path": "pages/auth/auth", + "name": "Auth", + "style": { + "navigationBarTitleText": "登录", + "navigationStyle": "custom" + } + }, + { + "path": "pages/auth/role", + "name": "AuthRole", + "style": { + "navigationBarTitleText": "角色创建", + "navigationBarBackgroundColor": "#FFF", + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "退出登录", + "fontSize": "14", + "width": "80px", + "color": "#34CE98" + }] + } + } + } + }, { + "path": "pages/life/life", + "name": "Life", + "style": { + "navigationBarTitleText": "共力人生", + "navigationStyle": "custom", + "app-plus": { + "titleNView": { + "type": "transparent" + } + } + } + }, + { + "path": "pages/store/index", + "name": "Store", + "style": { + "navigationBarTitleText": "DT商城", + "enablePullDownRefresh": true, + "app-plus": { + "titleNView": { + "backgroundColor": "#fff", + "buttons": [{ + "float": "right", + "text": "\ue603", + "fontSrc": "/static/iconfont.ttf", + "color": "#000", + "fontSize": "20px" + }] + } + } + } + }, + { + "path": "pages/user/index", + "name": "User", + "style": { + "navigationBarTitleText": "我的", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "backgroundColor": "#34CE98", + "type": "transparent" + } + } + } + }, + { + "path": "pages/setting/setting", + "name": "Setting", + "style": { + "navigationBarTitleText": "设置中心", + "navigationBarBackgroundColor": "#34CE98", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/store/goods", + "name": "StoreGoods", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "详情", + "app-plus": { + "titleNView": { + "backgroundColor": "#FFFFFF", + "type": "transparent" + } + } + } + }, + { + "path": "pages/store/buy", + "name": "StoreBuy", + "style": { + "navigationBarTitleText": "确认订单", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/order/index", + "name": "Order", + "style": { + "navigationBarTitleText": "我的订单", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": false + } + }, { + "path": "pages/order/logistics", + "name": "OrderLogistics", + "style": { + "navigationBarTitleText": "物流进度", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/order/details", + "name": "OrderDetails", + "style": { + "navigationBarTitleText": "订单详情", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/address/index", + "name": "Address", + "style": { + "navigationBarTitleText": "收货地址" + } + }, + { + "path": "pages/address/edit", + "name": "AddressEdit", + "style": { + "navigationBarTitleText": "编辑", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/pay/pay", + "name": "Pay", + "style": { + "navigationBarTitleText": "收银台", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "pages/store/list", + "name": "StoreList", + "style": { + "navigationBarTitleText": "商品", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/meals", + "name": "StoreMeals", + "style": { + "navigationBarTitleText": "套餐", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/store/search", + "name": "StoreSearch", + "style": { + "navigationBarTitleText": "搜索", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "pages/refund/list", + "name": "OrderRefund", + "style": { + "navigationBarTitleText": "退换货", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/refund/exchange", + "name": "Exchange", + "style": { + "navigationBarTitleText": "换货", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, - { - "path": "pages/refund/detail", - "name": "OrderRefundDetail", - "style": { - "navigationBarTitleText": "退货退款详情", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, - { - "path": "pages/refund/aftersale", - "name": "AfterSale", - "style": { - "navigationBarTitleText": " 选择售后类型", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, - { - "path": "pages/refund/refund_history", - "name": "RefundHistory", - "style": { - "navigationBarTitleText": "售后历史", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, - { - "path": "pages/refund/deliver_form", - "name": "DeliverForm", - "style": { - "navigationBarTitleText": "填写物流信息", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, - { - "path": "pages/refund/refund_or_exchange_apply", - "name": "RefundOrExchangeApply", - "style": { - "navigationBarTitleText": "退换货申请", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, - { - "path": "pages/refund/refund_money", - "name": "RefundMoney", - "style": { - "navigationBarTitleText": "申请退款", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, - { - "path": "pages/account/integral", - "name": "AccountIntegral", - "style": { - "navigationBarTitleText": "共力分", - "navigationBarBackgroundColor": "#34CE98", - "navigationBarTextStyle": "white" - } - },{ - "path": "pages/account/wbtBind", - "name": "WbtBind", - "style": { - "navigationBarTitleText": "绑定文版通账户", - "navigationBarBackgroundColor": "#34CE98", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/account/dt", - "name": "AccountDt", - "style": { - "navigationBarTitleText": "DT积分", - "navigationBarBackgroundColor": "#34CE98", - "backgroundColorTop": "#34CE98", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "收款", - "width": "60", - "fontSize": "14" - }] - } - } - } - }, { - "path": "pages/account/recharge", - "name": "AccountRecharge", - "style": { - "navigationBarTitleText": "充值", - "navigationBarBackgroundColor": "#FFFFFF", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "充值记录", - "width": "80", - "fontSize": "14" - }] - } - } - } - }, { - "path": "pages/vip/vip", - "name": "Vip", - "style": { - "navigationBarTitleText": "共力会员", - "navigationBarBackgroundColor": "#242430", - "navigationBarTextStyle": "white", - "backgroundColorTop": "#242430" - } - }, { - "path": "pages/vip/agreement", - "style": { - "navigationBarTitleText": "共力会员协议", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, { - "path": "pages/team/index", - "name": "Team", - "style": { - "navigationBarTitleText": "共力团队" - } - }, - { - "path": "pages/store/shop/shopDetail", - "name": "ShopDetail", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/store/shop/shopList", - "name": "ShopList", - "style": { - "navigationBarTitleText": "店铺", - "navigationBarBackgroundColor": "#FFFFFF", - "enablePullDownRefresh": true - } - }, { - "path": "pages/account/log", - "name": "AccountLog", - "style": { - "navigationBarTitleText": "充值记录", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, { - "path": "pages/account/transfer", - "name": "AccountTransfer", - "style": { - "navigationBarTitleText": "转账", - "navigationBarBackgroundColor": "#F3F6FB" - } - }, { - "path": "pages/account/resetPassword", - "name": "AccountResetPassword", - "style": { - "navigationBarTitleText": "钱包密码", - "navigationBarBackgroundColor": "#F3F6FB" - } - }, { - "path": "pages/account/results", - "name": "Accountresults", - "style": { - "navigationBarTitleText": "转账结果", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, { - "path": "pages/account/code", - "name": "AccountCode", - "style": { - "navigationBarTitleText": "收款码", - "navigationBarBackgroundColor": "#34CE98", - "backgroundColorTop": "#34CE98", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/invitation/invitation", - "name": "Invitation", - "style": { - "navigationStyle": "custom", - "disableScroll": true - } - }, { - "path": "pages/life/capacity", - "name": "Capacity", - "style": { - "navigationBarTitleText": "-", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "重置签到", - "fontSize": "14", - "width": "80px", - "color": "#34CE98" - }] - } - } - } - }, { - "path": "pages/feedback/feedback", - "name": "Feedback", - "style": { - "navigationBarTitleText": "意见反馈", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#FFFFFF", - "app-plus": { - "titleNView": { - "type": "default", - "buttons": [{ - "float": "right", - "text": "微信客服", - "width": "80px", - "fontSize": "14px", - "color": "#34CE98" - }] - } - } - } - }, { - "path": "pages/vip/growth", - "style": { - "navigationBarTitleText": "成长体系", - "navigationBarBackgroundColor": "#FFFFFF", - "enablePullDownRefresh": false - } - }, { - "path": "pages/supplier/supplier", - "name": "Supplier", - "style": { - "navigationBarTitleText": "供应商入驻", - "enablePullDownRefresh": false, - "backgroundColorTop": "#201f48", - "navigationBarBackgroundColor": "#201f48", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/board/board", - "name": "DataBoard", - "style": { - "navigationBarTitleText": "平台数据看板", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#FFFFFF" - } - }, - { - "path": "pages/chat/index", - "style": { - "navigationBarTitleText": "我的圈子", - "enablePullDownRefresh": true, - "app-plus": { - "bounce": "none", - "titleNView": { - "type": "transparent", - "buttons": [{ - "background": "rgba(255,255,255,0.2)", - "color": "#696969", - "type": "none", - "fontSrc": "/static/fonts/iconfont1.ttf", - "text": "\ue608" //小相机 - }] - } - } - } - }, - { - "path": "pages/chat/publish", - "style": { - "navigationBarTitleText": "发布" - } - }, { - "path": "pages/rank/index", - "style": { - "navigationBarTitleText": "会员推荐", - "enablePullDownRefresh": false, - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#34CE98" - } + { + "path": "pages/refund/detail", + "name": "OrderRefundDetail", + "style": { + "navigationBarTitleText": "退货退款详情", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "pages/refund/aftersale", + "name": "AfterSale", + "style": { + "navigationBarTitleText": " 选择售后类型", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "pages/refund/refund_history", + "name": "RefundHistory", + "style": { + "navigationBarTitleText": "售后历史", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "pages/refund/deliver_form", + "name": "DeliverForm", + "style": { + "navigationBarTitleText": "填写物流信息", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "pages/refund/refund_or_exchange_apply", + "name": "RefundOrExchangeApply", + "style": { + "navigationBarTitleText": "退换货申请", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "pages/refund/refund_money", + "name": "RefundMoney", + "style": { + "navigationBarTitleText": "申请退款", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "pages/account/integral", + "name": "AccountIntegral", + "style": { + "navigationBarTitleText": "共力分", + "navigationBarBackgroundColor": "#34CE98", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/account/wbtBind", + "name": "WbtBind", + "style": { + "navigationBarTitleText": "绑定文版通账户", + "navigationBarBackgroundColor": "#34CE98", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/account/dt", + "name": "AccountDt", + "style": { + "navigationBarTitleText": "DT积分", + "navigationBarBackgroundColor": "#34CE98", + "backgroundColorTop": "#34CE98", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "收款", + "width": "60", + "fontSize": "14" + }] + } + } + } + }, { + "path": "pages/account/recharge", + "name": "AccountRecharge", + "style": { + "navigationBarTitleText": "充值", + "navigationBarBackgroundColor": "#FFFFFF", + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "充值记录", + "width": "80", + "fontSize": "14" + }] + } + } + } + }, { + "path": "pages/vip/vip", + "name": "Vip", + "style": { + "navigationBarTitleText": "共力会员", + "navigationBarBackgroundColor": "#242430", + "navigationBarTextStyle": "white", + "backgroundColorTop": "#242430" + } + }, { + "path": "pages/vip/agreement", + "style": { + "navigationBarTitleText": "共力会员协议", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/team/index", + "name": "Team", + "style": { + "navigationBarTitleText": "共力团队" + } + }, + { + "path": "pages/store/shop/shopDetail", + "name": "ShopDetail", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/store/shop/shopList", + "name": "ShopList", + "style": { + "navigationBarTitleText": "店铺", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } + }, { + "path": "pages/account/log", + "name": "AccountLog", + "style": { + "navigationBarTitleText": "充值记录", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/account/transfer", + "name": "AccountTransfer", + "style": { + "navigationBarTitleText": "转账", + "navigationBarBackgroundColor": "#F3F6FB" + } + }, { + "path": "pages/account/resetPassword", + "name": "AccountResetPassword", + "style": { + "navigationBarTitleText": "钱包密码", + "navigationBarBackgroundColor": "#F3F6FB" + } + }, { + "path": "pages/account/results", + "name": "Accountresults", + "style": { + "navigationBarTitleText": "转账结果", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/account/code", + "name": "AccountCode", + "style": { + "navigationBarTitleText": "收款码", + "navigationBarBackgroundColor": "#34CE98", + "backgroundColorTop": "#34CE98", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/invitation/invitation", + "name": "Invitation", + "style": { + "navigationStyle": "custom", + "disableScroll": true + } + }, { + "path": "pages/life/capacity", + "name": "Capacity", + "style": { + "navigationBarTitleText": "-", + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "重置签到", + "fontSize": "14", + "width": "80px", + "color": "#34CE98" + }] + } + } + } + }, { + "path": "pages/feedback/feedback", + "name": "Feedback", + "style": { + "navigationBarTitleText": "意见反馈", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF", + "app-plus": { + "titleNView": { + "type": "default", + "buttons": [{ + "float": "right", + "text": "微信客服", + "width": "80px", + "fontSize": "14px", + "color": "#34CE98" + }] + } + } + } + }, { + "path": "pages/vip/growth", + "style": { + "navigationBarTitleText": "成长体系", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": false + } + }, { + "path": "pages/supplier/supplier", + "name": "Supplier", + "style": { + "navigationBarTitleText": "供应商入驻", + "enablePullDownRefresh": false, + "backgroundColorTop": "#201f48", + "navigationBarBackgroundColor": "#201f48", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/board/board", + "name": "DataBoard", + "style": { + "navigationBarTitleText": "平台数据看板", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "pages/chat/index", + "style": { + "navigationBarTitleText": "我的圈子", + "enablePullDownRefresh": true, + "app-plus": { + "bounce": "none", + "titleNView": { + "type": "transparent", + "buttons": [{ + "background": "rgba(255,255,255,0.2)", + "color": "#696969", + "type": "none", + "fontSrc": "/static/fonts/iconfont1.ttf", + "text": "\ue608" //小相机 + }] + } + } + } + }, + { + "path": "pages/chat/publish", + "style": { + "navigationBarTitleText": "发布" + } + }, { + "path": "pages/rank/index", + "style": { + "navigationBarTitleText": "会员推荐", + "enablePullDownRefresh": false, + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#34CE98" + } - }, { - "path": "pages/news/index", - "name": "newsIndex", - "style": { - "navigationBarTitleText": "消息中心", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": { - "type": "default", - "buttons": [{ - "float": "right", - "text": " 全部已读", - "width": "80px", - "fontSize": "14px", - "color": "#34CE98" - }] - } - } - } - }, { - "path": "pages/news/detail", - "name": "newsDetail", - "style": { - "navigationBarTitleText": "反馈详情", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": { - "type": "default", - "buttons": [{ - "float": "right", - "text": "微信客服", - "width": "80px", - "fontSize": "14px", - "color": "#34CE98" - }] - } - } - } + }, { + "path": "pages/news/index", + "name": "newsIndex", + "style": { + "navigationBarTitleText": "消息中心", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "type": "default", + "buttons": [{ + "float": "right", + "text": " 全部已读", + "width": "80px", + "fontSize": "14px", + "color": "#34CE98" + }] + } + } + } + }, { + "path": "pages/news/detail", + "name": "newsDetail", + "style": { + "navigationBarTitleText": "反馈详情", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "type": "default", + "buttons": [{ + "float": "right", + "text": "微信客服", + "width": "80px", + "fontSize": "14px", + "color": "#34CE98" + }] + } + } + } - } - ], - "tabBar": { - "borderStyle": "white", - "selectedColor": "#34CE98", - "list": [{ - "iconPath": "static/tabBar/tabBar_00.png", - "selectedIconPath": "static/tabBar/tabBar_show_00.png", - "pagePath": "pages/life/life", - "text": "共力人生" - }, { - "iconPath": "static/tabBar/tabBar_02.png", - "selectedIconPath": "static/tabBar/tabBar_show_02.png", - "pagePath": "pages/store/index", - "text": "DT商城" - }, - { - "iconPath": "static/tabBar/tabBar_05.png", - "selectedIconPath": "static/tabBar/tabBar_show_05.png", - "pagePath": "pages/rank/index", - "text": "周排行榜" - }, - { - "iconPath": "static/tabBar/tabBar_03.png", - "selectedIconPath": "static/tabBar/tabBar_show_03.png", - "pagePath": "pages/user/index", - "text": "我的" - } - ] - }, - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "ZH健康", - "navigationBarBackgroundColor": "#F3F6FB", - "backgroundColorTop": "#F3F6FB", - "backgroundColorBottom": "#F3F6FB" - }, - "easycom": { - "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" - } + }, { + "path": "pages/life/notice", + "name": "Notice", + "style": { + "navigationBarTitleText": "系统公告", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/life/noticeDetails", + "name": "noticeDetails", + "style": { + "navigationBarTitleText": "公告详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + } + ], + "tabBar": { + "borderStyle": "white", + "selectedColor": "#34CE98", + "list": [{ + "iconPath": "static/tabBar/tabBar_00.png", + "selectedIconPath": "static/tabBar/tabBar_show_00.png", + "pagePath": "pages/life/life", + "text": "共力人生" + }, { + "iconPath": "static/tabBar/tabBar_02.png", + "selectedIconPath": "static/tabBar/tabBar_show_02.png", + "pagePath": "pages/store/index", + "text": "DT商城" + }, + { + "iconPath": "static/tabBar/tabBar_05.png", + "selectedIconPath": "static/tabBar/tabBar_show_05.png", + "pagePath": "pages/rank/index", + "text": "周排行榜" + }, + { + "iconPath": "static/tabBar/tabBar_03.png", + "selectedIconPath": "static/tabBar/tabBar_show_03.png", + "pagePath": "pages/user/index", + "text": "我的" + } + ] + }, + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "ZH健康", + "navigationBarBackgroundColor": "#F3F6FB", + "backgroundColorTop": "#F3F6FB", + "backgroundColorBottom": "#F3F6FB" + }, + "easycom": { + "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" + } } diff --git a/pages/life/capacity.vue b/pages/life/capacity.vue index ab26dfe..0d990df 100644 --- a/pages/life/capacity.vue +++ b/pages/life/capacity.vue @@ -2,6 +2,12 @@ 共力分总产率/小时{{baseHour}}GLF/h 总产率=角色产率+团队产率+共建产率+共力值产率 + + + 平台数据 + + 平台注册人数{{userData.login}}活跃人数{{userData.online}} + 我的角色 @@ -11,12 +17,11 @@ - 成员产率({{group.effect}}/{{group.count}}) - + 成员产率({{group.effect}}/{{group.count}}) {{group.capacity}}GLF/h - + 家族成员产率 @@ -104,7 +109,11 @@ build: {}, together: {}, other: {}, - can_repeat_sign: false + can_repeat_sign: false, + userData: { + login : '-', + online : '-' + } }; }, created() { @@ -174,6 +183,7 @@ methods: { glz(){ glz().then(res => { + this.userData = res.userData this.nickname = res.nickname this.identityText = res.identity_text this.baseHour = res.base_hour @@ -339,24 +349,22 @@ color: gray; font-size: 30rpx; } - } - + } &-text { font-size: 28rpx; color: gray; line-height: 40rpx; - padding-top: 30rpx; + padding-top: 10rpx; + text{ + color: $main-color; + font-weight: bold; + padding: 0 10rpx; + } } &-table { border: solid 1px $border-color; - margin-bottom: 20rpx; - padding-top: 30rpx; - - &:last-child { - margin-top: 0; - } - + margin-top: 20rpx; .header { background: $border-color; line-height: 50rpx; @@ -364,7 +372,6 @@ font-size: 26rpx; color: gray; } - .flex { display: flex; border-top: solid 1rpx $border-color; diff --git a/pages/life/life.vue b/pages/life/life.vue index 5c04387..57ab512 100644 --- a/pages/life/life.vue +++ b/pages/life/life.vue @@ -51,7 +51,26 @@ - + + + + + + + + + {{item.title}} + + + + 更多 + + DT商城 @@ -150,7 +169,8 @@ timeData: {}, isSign: false, isAccount: false, - isOver : false, + isOver : false, + notices : [] }; }, onShow() { @@ -171,7 +191,8 @@ }, // 共力人生 getLife() { - life().then(res => { + life().then(res => { + this.notices = res.notices this.glz = res.account.glz this.base_hour = res.account.base_hour this.base_seconds = res.account.base_seconds @@ -408,7 +429,39 @@ flex-wrap: wrap; position: relative; z-index: 1; - + .life-notice{ + width: calc(100% - 20rpx); + margin: 10rpx; + &-bar{ + position: relative; + background-color: white; + border-radius: 20rpx; + padding: 0 150rpx 0 80rpx; + height: 90rpx; + } + &-icon{ + position: absolute; + left: 30rpx; + top: 26rpx; + } + &-more{ + position: absolute; + right: 30rpx; + top: 0; + line-height: 90rpx; + font-size: 28rpx; + color: $main-color; + } + &-swiper{ + height: 90rpx; + } + &-item{ + line-height: 90rpx; + font-size: 28rpx; + color: #333; + @extend .nowrap; + } + } .life-flex-item { background: white; border-radius: 20rpx; diff --git a/pages/life/notice.vue b/pages/life/notice.vue new file mode 100644 index 0000000..a783c0c --- /dev/null +++ b/pages/life/notice.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/pages/life/noticeDetails.vue b/pages/life/noticeDetails.vue new file mode 100644 index 0000000..930c93b --- /dev/null +++ b/pages/life/noticeDetails.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/pages/refund/detail.vue b/pages/refund/detail.vue index 15e94e9..52502d8 100644 --- a/pages/refund/detail.vue +++ b/pages/refund/detail.vue @@ -3,7 +3,6 @@ 本次售后服务将由DT生态平台为您提供服务 - {{refundInfo.state.remark}} - @@ -25,8 +23,6 @@ - - 申请金额{{refundInfo.refund_total || '0.00'}} DT @@ -89,11 +85,21 @@ 申请时间 {{refundInfo.created_at}} - - - + + + 店铺名称 + {{refundInfo.shop.name || '-'}} + + + 联系电话 + {{refundInfo.shop.mobile || '-'}} + + + + 联系商家 + - +