diff --git a/apis/interfaces/pin.js b/apis/interfaces/pin.js new file mode 100644 index 0000000..b1c1ee6 --- /dev/null +++ b/apis/interfaces/pin.js @@ -0,0 +1,22 @@ +/** + * Web-zdx + * moduleName: 拼团相关接口 + */ + +import { + request +} from '../index' + + + +// 拼团列表 +const pinList = (data) => { + return request({ + url: 'mall/goods/collages', + data:data + }) +} + +export { + pinList +} diff --git a/apis/interfaces/rank.js b/apis/interfaces/rank.js index a47ca85..21d592f 100644 --- a/apis/interfaces/rank.js +++ b/apis/interfaces/rank.js @@ -24,8 +24,24 @@ const week = () => { }) } +// 会员推荐帮 + +const total = () => { + return request({ + url: 'user/rank/total' + }) +} + +// 用户推荐榜 +const totaluser = () => { + return request({ + url: 'user/rank/totaluser' + }) +} export { week_mul, week, + total, + totaluser } diff --git a/components/pin-goods-item/index.vue b/components/pin-goods-item/index.vue new file mode 100644 index 0000000..0f99d71 --- /dev/null +++ b/components/pin-goods-item/index.vue @@ -0,0 +1,133 @@ + + + diff --git a/pages.json b/pages.json index 04cbae6..0950354 100644 --- a/pages.json +++ b/pages.json @@ -1,565 +1,583 @@ { - "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" + }] + } + } + } - }, { - "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" - } + }, { + "path": "pages/life/notice", + "name": "Notice", + "style": { + "navigationBarTitleText": "系统公告", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/life/noticeDetails", + "name": "noticeDetails", + "style": { + "navigationBarTitleText": "公告详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/group-book/index", + "name": "GroupBook", + "style": { + "navigationBarTitleText": " 一起拼", + "enablePullDownRefresh": false + } + + } + ], + "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" + }, + "condition" : { //模式配置,仅开发期间生效 + "current": 0, //当前激活的模式(list 的索引项) + "list": [ + { + "name": "", //模式名称 + "path": "", //启动页面,必选 + "query": "" //启动参数,在页面的onLoad函数里面得到 + } + ] + } } diff --git a/pages/account/dt.vue b/pages/account/dt.vue index 4cb66f2..f7bccdb 100644 --- a/pages/account/dt.vue +++ b/pages/account/dt.vue @@ -41,10 +41,10 @@ - + 微信充值 @@ -88,6 +88,7 @@ switch(type){ case 'wchat': this.onTransfer('AccountRecharge'); + this.dtShow = false; break; case 'wbt': wbtCheck().then(res=>{ diff --git a/pages/group-book/index.vue b/pages/group-book/index.vue new file mode 100644 index 0000000..19afa33 --- /dev/null +++ b/pages/group-book/index.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/pages/life/life.vue b/pages/life/life.vue index 57ab512..0e3cea4 100644 --- a/pages/life/life.vue +++ b/pages/life/life.vue @@ -387,7 +387,6 @@ icon: 'none' }) } - } } diff --git a/pages/rank/index.vue b/pages/rank/index.vue index 34afd9e..f57ef9b 100644 --- a/pages/rank/index.vue +++ b/pages/rank/index.vue @@ -1,48 +1,53 @@