diff --git a/pages.json b/pages.json index 70ff2492..86e6c272 100644 --- a/pages.json +++ b/pages.json @@ -1,675 +1,704 @@ { - "easycom": { - "autoscan": true, - "custom": { - "^s-(.*)": "@/sheep/components/s-$1/s-$1.vue", - "^su-(.*)": "@/sheep/ui/su-$1/su-$1.vue" - } - }, - "pages": [ - { - "path": "pages/index/index", - "aliasPath": "/", - "style": { - "navigationBarTitleText": "首页", - "enablePullDownRefresh": true - }, - "meta": { - "auth": false, - "sync": true, - "title": "首页", - "group": "商城" - } - }, - { - "path": "pages/index/user", - "style": { - "navigationBarTitleText": "个人中心", - "enablePullDownRefresh": true - }, - "meta": { - "sync": true, - "title": "个人中心", - "group": "商城" - } - }, - { - "path": "pages/index/category", - "style": { - "navigationBarTitleText": "商品分类" - }, - "meta": { - "sync": true, - "title": "商品分类", - "group": "商城" - } - }, - { - "path": "pages/index/cart", - "style": { - "navigationBarTitleText": "购物车" - }, - "meta": { - "sync": true, - "title": "购物车", - "group": "商城" - } - }, - { - "path": "pages/index/login", - "style": { - "navigationBarTitleText": "登录" - } - }, - { - "path": "pages/index/search", - "style": { - "navigationBarTitleText": "搜索" - }, - "meta": { - "sync": true, - "title": "搜索", - "group": "商城" - } - }, - { - "path": "pages/index/page", - "style": { - "navigationBarTitleText": "" - }, - "meta": { - "auth": false, - "sync": true, - "title": "自定义页面", - "group": "商城" - } - } - ], - "subPackages": [ - { - "root": "pages/goods", - "pages": [ - { - "path": "index", - "style": { - "navigationBarTitleText": "商品详情" - }, - "meta": { - "sync": true, - "title": "普通商品", - "group": "商品" - } - }, - { - "path": "groupon", - "style": { - "navigationBarTitleText": "拼团商品" - }, - "meta": { - "sync": true, - "title": "拼团商品", - "group": "商品" - } - }, + "easycom": { + "autoscan": true, + "custom": { + "^s-(.*)": "@/sheep/components/s-$1/s-$1.vue", + "^su-(.*)": "@/sheep/ui/su-$1/su-$1.vue" + } + }, + "pages": [{ + "path": "pages/index/index", + "aliasPath": "/", + "style": { + "navigationBarTitleText": "首页", + "enablePullDownRefresh": true + }, + "meta": { + "auth": false, + "sync": true, + "title": "首页", + "group": "商城" + } + }, + { + "path": "pages/index/user", + "style": { + "navigationBarTitleText": "个人中心", + "enablePullDownRefresh": true + }, + "meta": { + "sync": true, + "title": "个人中心", + "group": "商城" + } + }, + { + "path": "pages/index/category", + "style": { + "navigationBarTitleText": "商品分类" + }, + "meta": { + "sync": true, + "title": "商品分类", + "group": "商城" + } + }, + { + "path": "pages/index/cart", + "style": { + "navigationBarTitleText": "购物车" + }, + "meta": { + "sync": true, + "title": "购物车", + "group": "商城" + } + }, + { + "path": "pages/index/login", + "style": { + "navigationBarTitleText": "登录" + } + }, + { + "path": "pages/index/search", + "style": { + "navigationBarTitleText": "搜索" + }, + "meta": { + "sync": true, + "title": "搜索", + "group": "商城" + } + }, + { + "path": "pages/index/page", + "style": { + "navigationBarTitleText": "" + }, + "meta": { + "auth": false, + "sync": true, + "title": "自定义页面", + "group": "商城" + } + } + ], + "subPackages": [{ + "root": "pages/goods", + "pages": [{ + "path": "index", + "style": { + "navigationBarTitleText": "商品详情" + }, + "meta": { + "sync": true, + "title": "普通商品", + "group": "商品" + } + }, + { + "path": "groupon", + "style": { + "navigationBarTitleText": "拼团商品" + }, + "meta": { + "sync": true, + "title": "拼团商品", + "group": "商品" + } + }, - { - "path": "seckill", - "style": { - "navigationBarTitleText": "秒杀商品" - }, - "meta": { - "sync": true, - "title": "秒杀商品", - "group": "商品" - } - }, - { - "path": "list", - "style": { - "navigationBarTitleText": "商品列表" - }, - "meta": { - "sync": true, - "title": "商品列表", - "group": "商品" - } - }, - { - "path": "comment/add", - "style": { - "navigationBarTitleText": "评价商品" - }, - "meta": { - "auth": true - } - }, - { - "path": "comment/list", - "style": { - "navigationBarTitleText": "商品评价" - } - } - ] - }, - { - "root": "pages/order", - "pages": [ - { - "path": "detail", - "style": { - "navigationBarTitleText": "订单详情" - }, - "meta": { - "auth": true, - "title": "订单详情" - } - }, - { - "path": "confirm", - "style": { - "navigationBarTitleText": "确认订单" - }, - "meta": { - "auth": true, - "title": "确认订单" - } - }, - { - "path": "list", - "style": { - "navigationBarTitleText": "我的订单", - "enablePullDownRefresh": true - }, - "meta": { - "auth": true, - "sync": true, - "title": "用户订单", - "group": "订单中心" - } - }, - { - "path": "aftersale/apply", - "style": { - "navigationBarTitleText": "申请售后" - }, - "meta": { - "auth": true, - "title": "申请售后" - } - }, - { - "path": "aftersale/list", - "style": { - "navigationBarTitleText": "售后列表" - }, - "meta": { - "auth": true, - "sync": true, - "title": "售后订单", - "group": "订单中心" - } - }, - { - "path": "aftersale/detail", - "style": { - "navigationBarTitleText": "售后详情" - }, - "meta": { - "auth": true, - "title": "售后详情" - } - }, - { - "path": "aftersale/log", - "style": { - "navigationBarTitleText": "售后进度" - }, - "meta": { - "auth": true, - "title": "售后进度" - } - }, - { - "path": "express/log", - "style": { - "navigationBarTitleText": "物流轨迹" - }, - "meta": { - "auth": true, - "title": "物流轨迹" - } - } - ] - }, - { - "root": "pages/user", - "pages": [ - { - "path": "info", - "style": { - "navigationBarTitleText": "我的信息" - }, - "meta": { - "auth": true, - "sync": true, - "title": "用户信息", - "group": "用户中心" - } - }, - { - "path": "goods-collect", - "style": { - "navigationBarTitleText": "我的收藏" - }, - "meta": { - "auth": true, - "sync": true, - "title": "商品收藏", - "group": "用户中心" - } - }, - { - "path": "goods-log", - "style": { - "navigationBarTitleText": "我的足迹" - }, - "meta": { - "auth": true, - "sync": true, - "title": "浏览记录", - "group": "用户中心" - } - }, - { - "path": "address/list", - "style": { - "navigationBarTitleText": "收货地址" - }, - "meta": { - "auth": true, - "sync": true, - "title": "地址管理", - "group": "用户中心" - } - }, - { - "path": "address/edit", - "style": { - "navigationBarTitleText": "编辑地址" - }, - "meta": { - "auth": true, - "title": "编辑地址" - } - }, - { - "path": "wallet/money", - "style": { - "navigationBarTitleText": "我的余额" - }, - "meta": { - "auth": true, - "sync": true, - "title": "用户余额", - "group": "用户中心" - } - }, - { - "path": "wallet/commission", - "style": { - "navigationBarTitleText": "我的佣金" - }, - "meta": { - "auth": true, - "sync": true, - "title": "用户佣金", - "group": "分销中心" - } - }, - { - "path": "wallet/score", - "style": { - "navigationBarTitleText": "我的积分" - }, - "meta": { - "auth": true, - "sync": true, - "title": "用户积分", - "group": "用户中心" - } - } - ] - }, - { - "root": "pages/commission", - "pages": [ - { - "path": "index", - "style": { - "navigationBarTitleText": "分销" - }, - "meta": { - "auth": true, - "sync": true, - "title": "分销中心", - "group": "分销商城" - } - }, - { - "path": "apply", - "style": { - "navigationBarTitleText": "申请分销商" - }, - "meta": { - "auth": true, - "sync": true, - "title": "申请分销商", - "group": "分销商城" - } - }, - { - "path": "goods", - "style": { - "navigationBarTitleText": "推广商品" - }, - "meta": { - "auth": true, - "sync": true, - "title": "推广商品", - "group": "分销商城" - } - }, - { - "path": "order", - "style": { - "navigationBarTitleText": "分销订单" - }, - "meta": { - "auth": true, - "sync": true, - "title": "分销订单", - "group": "分销商城" - } - }, - { - "path": "share-log", - "style": { - "navigationBarTitleText": "分享记录" - }, - "meta": { - "auth": true, - "sync": true, - "title": "分享记录", - "group": "分销商城" - } - }, - { - "path": "team", - "style": { - "navigationBarTitleText": "我的团队" - }, - "meta": { - "auth": true, - "sync": true, - "title": "我的团队", - "group": "分销商城" - } - } - ] - }, - { - "root": "pages/app", - "pages": [ - { - "path": "sign", - "style": { - "navigationBarTitleText": "签到中心" - }, - "meta": { - "auth": true, - "sync": true, - "title": "签到中心", - "group": "应用" - } - } - ] - }, - { - "root": "pages/public", - "pages": [ - { - "path": "setting", - "style": { - "navigationBarTitleText": "系统设置" - }, - "meta": { - "sync": true, - "title": "系统设置", - "group": "通用" - } - }, - { - "path": "richtext", - "style": { - "navigationBarTitleText": "富文本" - }, - "meta": { - "sync": true, - "title": "富文本", - "group": "通用" - } - }, - { - "path": "faq", - "style": { - "navigationBarTitleText": "常见问题" - }, - "meta": { - "sync": true, - "title": "常见问题", - "group": "通用" - } - }, - { - "path": "error", - "style": { - "navigationBarTitleText": "错误页面" - } - }, - { - "path": "webview", - "style": { - "navigationBarTitleText": "" - } - } - ] - }, - { - "root": "pages/coupon", - "pages": [ - { - "path": "list", - "style": { - "navigationBarTitleText": "领券中心" - }, - "meta": { - "sync": true, - "title": "领券中心", - "group": "优惠券" - } - }, - { - "path": "detail", - "style": { - "navigationBarTitleText": "优惠券" - }, - "meta": { - "auth": false, - "sync": true, - "title": "优惠券详情", - "group": "优惠券" - } - } - ] - }, - { - "root": "pages/chat", - "pages": [ - { - "path": "index", - "style": { - "navigationBarTitleText": "客服" - }, - "meta": { - "auth": true, - "sync": true, - "title": "客服", - "group": "客服" - } - } - ] - }, - { - "root": "pages/pay", - "pages": [ - { - "path": "index", - "style": { - "navigationBarTitleText": "收银台" - } - }, - { - "path": "result", - "style": { - "navigationBarTitleText": "支付结果" - } - }, - { - "path": "recharge", - "style": { - "navigationBarTitleText": "充值余额" - }, - "meta": { - "auth": true, - "sync": true, - "title": "充值余额", - "group": "支付" - } - }, - { - "path": "recharge-log", - "style": { - "navigationBarTitleText": "充值记录" - }, - "meta": { - "auth": true, - "sync": true, - "title": "充值记录", - "group": "支付" - } - }, - { - "path": "withdraw", - "style": { - "navigationBarTitleText": "申请提现" - }, - "meta": { - "auth": true, - "sync": true, - "title": "申请提现", - "group": "支付" - } - }, - { - "path": "withdraw-log", - "style": { - "navigationBarTitleText": "提现记录" - }, - "meta": { - "auth": true, - "sync": true, - "title": "提现记录", - "group": "支付" - } - } - ] - }, - { - "root": "pages/activity", - "pages": [ - { - "path": "groupon/detail", - "style": { - "navigationBarTitleText": "拼团详情" - } - }, - { - "path": "groupon/order", - "style": { - "navigationBarTitleText": "我的拼团", - "enablePullDownRefresh": true - }, - "meta": { - "auth": true, - "sync": true, - "title": "拼团订单", - "group": "营销活动" - } - }, - { - "path": "index", - "style": { - "navigationBarTitleText": "营销商品" - }, - "meta": { - "sync": true, - "title": "营销商品", - "group": "营销活动" - } - }, - { - "path": "groupon/list", - "style": { - "navigationBarTitleText": "拼团活动" - }, - "meta": { - "sync": true, - "title": "拼团活动", - "group": "营销活动" - } - }, - { - "path": "seckill/list", - "style": { - "navigationBarTitleText": "秒杀活动" - }, - "meta": { - "sync": true, - "title": "秒杀活动", - "group": "营销活动" - } - } - ] - } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "星品购", - "navigationBarBackgroundColor": "#FFFFFF", - "backgroundColor": "#FFFFFF", - "navigationStyle": "custom" - }, - "tabBar": { - "list": [ - { - "pagePath": "pages/index/index" - }, - { - "pagePath": "pages/index/cart" - }, - { - "pagePath": "pages/index/user" - } - ] - } -} + { + "path": "seckill", + "style": { + "navigationBarTitleText": "秒杀商品" + }, + "meta": { + "sync": true, + "title": "秒杀商品", + "group": "商品" + } + }, + { + "path": "list", + "style": { + "navigationBarTitleText": "商品列表" + }, + "meta": { + "sync": true, + "title": "商品列表", + "group": "商品" + } + }, + { + "path": "comment/add", + "style": { + "navigationBarTitleText": "评价商品" + }, + "meta": { + "auth": true + } + }, + { + "path": "comment/list", + "style": { + "navigationBarTitleText": "商品评价" + } + } + ] + }, + { + "root": "pages/order", + "pages": [{ + "path": "detail", + "style": { + "navigationBarTitleText": "订单详情" + }, + "meta": { + "auth": true, + "title": "订单详情" + } + }, + { + "path": "confirm", + "style": { + "navigationBarTitleText": "确认订单" + }, + "meta": { + "auth": true, + "title": "确认订单" + } + }, + { + "path": "list", + "style": { + "navigationBarTitleText": "我的订单", + "enablePullDownRefresh": true + }, + "meta": { + "auth": true, + "sync": true, + "title": "用户订单", + "group": "订单中心" + } + }, + { + "path": "aftersale/apply", + "style": { + "navigationBarTitleText": "申请售后" + }, + "meta": { + "auth": true, + "title": "申请售后" + } + }, + { + "path": "aftersale/list", + "style": { + "navigationBarTitleText": "售后列表" + }, + "meta": { + "auth": true, + "sync": true, + "title": "售后订单", + "group": "订单中心" + } + }, + { + "path": "aftersale/detail", + "style": { + "navigationBarTitleText": "售后详情" + }, + "meta": { + "auth": true, + "title": "售后详情" + } + }, + { + "path": "aftersale/log", + "style": { + "navigationBarTitleText": "售后进度" + }, + "meta": { + "auth": true, + "title": "售后进度" + } + }, + { + "path": "express/log", + "style": { + "navigationBarTitleText": "物流轨迹" + }, + "meta": { + "auth": true, + "title": "物流轨迹" + } + } + ] + }, + { + "root": "pages/user", + "pages": [{ + "path": "info", + "style": { + "navigationBarTitleText": "我的信息" + }, + "meta": { + "auth": true, + "sync": true, + "title": "用户信息", + "group": "用户中心" + } + }, + { + "path": "goods-collect", + "style": { + "navigationBarTitleText": "我的收藏" + }, + "meta": { + "auth": true, + "sync": true, + "title": "商品收藏", + "group": "用户中心" + } + }, + { + "path": "goods-log", + "style": { + "navigationBarTitleText": "我的足迹" + }, + "meta": { + "auth": true, + "sync": true, + "title": "浏览记录", + "group": "用户中心" + } + }, + { + "path": "address/list", + "style": { + "navigationBarTitleText": "收货地址" + }, + "meta": { + "auth": true, + "sync": true, + "title": "地址管理", + "group": "用户中心" + } + }, + { + "path": "address/edit", + "style": { + "navigationBarTitleText": "编辑地址" + }, + "meta": { + "auth": true, + "title": "编辑地址" + } + }, + { + "path": "wallet/money", + "style": { + "navigationBarTitleText": "我的余额" + }, + "meta": { + "auth": true, + "sync": true, + "title": "用户余额", + "group": "用户中心" + } + }, + { + "path": "wallet/commission", + "style": { + "navigationBarTitleText": "我的佣金" + }, + "meta": { + "auth": true, + "sync": true, + "title": "用户佣金", + "group": "分销中心" + } + }, + { + "path": "wallet/score", + "style": { + "navigationBarTitleText": "我的积分" + }, + "meta": { + "auth": true, + "sync": true, + "title": "用户积分", + "group": "用户中心" + } + } + ] + }, + { + "root": "pages/commission", + "pages": [{ + "path": "index", + "style": { + "navigationBarTitleText": "分销" + }, + "meta": { + "auth": true, + "sync": true, + "title": "分销中心", + "group": "分销商城" + } + }, + { + "path": "apply", + "style": { + "navigationBarTitleText": "申请分销商" + }, + "meta": { + "auth": true, + "sync": true, + "title": "申请分销商", + "group": "分销商城" + } + }, + { + "path": "goods", + "style": { + "navigationBarTitleText": "推广商品" + }, + "meta": { + "auth": true, + "sync": true, + "title": "推广商品", + "group": "分销商城" + } + }, + { + "path": "order", + "style": { + "navigationBarTitleText": "分销订单" + }, + "meta": { + "auth": true, + "sync": true, + "title": "分销订单", + "group": "分销商城" + } + }, + { + "path": "share-log", + "style": { + "navigationBarTitleText": "分享记录" + }, + "meta": { + "auth": true, + "sync": true, + "title": "分享记录", + "group": "分销商城" + } + }, + { + "path": "team", + "style": { + "navigationBarTitleText": "我的团队" + }, + "meta": { + "auth": true, + "sync": true, + "title": "我的团队", + "group": "分销商城" + } + }, { + "path": "promoter", + "style": { + "navigationBarTitleText": "推广人排行榜" + }, + "meta": { + "auth": true, + "sync": true, + "title": "推广人排行榜", + "group": "分销商城" + } + }, { + "path": "commission-ranking", + "style": { + "navigationBarTitleText": "佣金排行榜" + }, + "meta": { + "auth": true, + "sync": true, + "title": "佣金排行榜", + "group": "分销商城" + } + } + ] + }, + { + "root": "pages/app", + "pages": [{ + "path": "sign", + "style": { + "navigationBarTitleText": "签到中心" + }, + "meta": { + "auth": true, + "sync": true, + "title": "签到中心", + "group": "应用" + } + }] + }, + { + "root": "pages/public", + "pages": [{ + "path": "setting", + "style": { + "navigationBarTitleText": "系统设置" + }, + "meta": { + "sync": true, + "title": "系统设置", + "group": "通用" + } + }, + { + "path": "richtext", + "style": { + "navigationBarTitleText": "富文本" + }, + "meta": { + "sync": true, + "title": "富文本", + "group": "通用" + } + }, + { + "path": "faq", + "style": { + "navigationBarTitleText": "常见问题" + }, + "meta": { + "sync": true, + "title": "常见问题", + "group": "通用" + } + }, + { + "path": "error", + "style": { + "navigationBarTitleText": "错误页面" + } + }, + { + "path": "webview", + "style": { + "navigationBarTitleText": "" + } + } + ] + }, + { + "root": "pages/coupon", + "pages": [{ + "path": "list", + "style": { + "navigationBarTitleText": "领券中心" + }, + "meta": { + "sync": true, + "title": "领券中心", + "group": "优惠券" + } + }, + { + "path": "detail", + "style": { + "navigationBarTitleText": "优惠券" + }, + "meta": { + "auth": false, + "sync": true, + "title": "优惠券详情", + "group": "优惠券" + } + } + ] + }, + { + "root": "pages/chat", + "pages": [{ + "path": "index", + "style": { + "navigationBarTitleText": "客服" + }, + "meta": { + "auth": true, + "sync": true, + "title": "客服", + "group": "客服" + } + }] + }, + { + "root": "pages/pay", + "pages": [{ + "path": "index", + "style": { + "navigationBarTitleText": "收银台" + } + }, + { + "path": "result", + "style": { + "navigationBarTitleText": "支付结果" + } + }, + { + "path": "recharge", + "style": { + "navigationBarTitleText": "充值余额" + }, + "meta": { + "auth": true, + "sync": true, + "title": "充值余额", + "group": "支付" + } + }, + { + "path": "recharge-log", + "style": { + "navigationBarTitleText": "充值记录" + }, + "meta": { + "auth": true, + "sync": true, + "title": "充值记录", + "group": "支付" + } + }, + { + "path": "withdraw", + "style": { + "navigationBarTitleText": "申请提现" + }, + "meta": { + "auth": true, + "sync": true, + "title": "申请提现", + "group": "支付" + } + }, + { + "path": "withdraw-log", + "style": { + "navigationBarTitleText": "提现记录" + }, + "meta": { + "auth": true, + "sync": true, + "title": "提现记录", + "group": "支付" + } + } + ] + }, + { + "root": "pages/activity", + "pages": [{ + "path": "groupon/detail", + "style": { + "navigationBarTitleText": "拼团详情" + } + }, + { + "path": "groupon/order", + "style": { + "navigationBarTitleText": "我的拼团", + "enablePullDownRefresh": true + }, + "meta": { + "auth": true, + "sync": true, + "title": "拼团订单", + "group": "营销活动" + } + }, + { + "path": "index", + "style": { + "navigationBarTitleText": "营销商品" + }, + "meta": { + "sync": true, + "title": "营销商品", + "group": "营销活动" + } + }, + { + "path": "groupon/list", + "style": { + "navigationBarTitleText": "拼团活动" + }, + "meta": { + "sync": true, + "title": "拼团活动", + "group": "营销活动" + } + }, + { + "path": "seckill/list", + "style": { + "navigationBarTitleText": "秒杀活动" + }, + "meta": { + "sync": true, + "title": "秒杀活动", + "group": "营销活动" + } + }, + { + "path": "bargainingList", + "style": { + "navigationBarTitleText": "砍价列表" + }, + "meta": { + "sync": true, + "title": "砍价列表", + "group": "营销活动" + } + }, + { + "path": "bargainingDetail", + "style": { + "navigationBarTitleText": "砍价详情" + }, + "meta": { + "sync": true, + "title": "砍价详情", + "group": "营销活动" + } + } + ] + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "星品购", + "navigationBarBackgroundColor": "#FFFFFF", + "backgroundColor": "#FFFFFF", + "navigationStyle": "custom" + }, + "tabBar": { + "list": [{ + "pagePath": "pages/index/index" + }, + { + "pagePath": "pages/index/cart" + }, + { + "pagePath": "pages/index/user" + } + ] + } +} \ No newline at end of file diff --git a/pages/activity/bargainingDetail.vue b/pages/activity/bargainingDetail.vue new file mode 100644 index 00000000..a919c6a3 --- /dev/null +++ b/pages/activity/bargainingDetail.vue @@ -0,0 +1,939 @@ + + + + + + \ No newline at end of file diff --git a/pages/activity/bargainingList.vue b/pages/activity/bargainingList.vue new file mode 100644 index 00000000..a15b3fb8 --- /dev/null +++ b/pages/activity/bargainingList.vue @@ -0,0 +1,372 @@ + + + + + \ No newline at end of file diff --git a/pages/commission/commission-ranking.vue b/pages/commission/commission-ranking.vue new file mode 100644 index 00000000..e1384006 --- /dev/null +++ b/pages/commission/commission-ranking.vue @@ -0,0 +1,241 @@ + + + + + \ No newline at end of file diff --git a/pages/commission/components/commission-log.vue b/pages/commission/components/commission-log.vue index 15b83853..525302c5 100644 --- a/pages/commission/components/commission-log.vue +++ b/pages/commission/components/commission-log.vue @@ -1,184 +1,174 @@ + .cicon-forward { + font-size: 30rpx; + font-weight: 400; + color: #ffffff; + line-height: 30rpx; + } + } + + .log-scroll { + height: 600rpx; + background: #fdfae9; + padding: 10rpx 20rpx 0; + box-sizing: border-box; + border-radius: 0 0 12rpx 12rpx; + + .log-item-box { + margin-bottom: 20rpx; + + .log-time { + // margin-left: 30rpx; + text-align: right; + font-size: 24rpx; + font-family: OPPOSANS; + font-weight: 400; + color: #c4c4c4; + } + } + + .loadmore-wrap { + // line-height: 80rpx; + } + + .log-item { + // background: rgba(#ffffff, 0.2); + border-radius: 24rpx; + padding: 6rpx 20rpx 6rpx 12rpx; + + .log-img { + width: 40rpx; + height: 40rpx; + border-radius: 50%; + margin-right: 10rpx; + } + + .log-text { + max-width: 480rpx; + font-size: 24rpx; + font-weight: 500; + color: #333333; + } + } + } + } + \ No newline at end of file diff --git a/pages/commission/components/commission-menu.vue b/pages/commission/components/commission-menu.vue index 5a16c451..624d6182 100644 --- a/pages/commission/components/commission-menu.vue +++ b/pages/commission/components/commission-menu.vue @@ -1,30 +1,22 @@ + .header-title { + position: absolute; + left: 20rpx; + top: 24rpx; + } + + .title { + font-size: 28rpx; + font-weight: 500; + color: #ffffff; + line-height: 30rpx; + } + + .cicon-forward { + font-size: 30rpx; + font-weight: 400; + color: #ffffff; + line-height: 30rpx; + } + } + + .menu-list { + padding: 50rpx 0 10rpx 0; + background: #fdfae9; + border-radius: 0 0 12rpx 12rpx; + } + + .item-box { + width: 25%; + margin-bottom: 40rpx; + } + + .menu-icon { + width: 68rpx; + height: 68rpx; + background: #ffffff; + border-radius: 50%; + } + + .menu-title { + font-size: 26rpx; + font-weight: 500; + color: #ffffff; + } + \ No newline at end of file diff --git a/pages/commission/index.vue b/pages/commission/index.vue index 809e74f4..df40fe14 100644 --- a/pages/commission/index.vue +++ b/pages/commission/index.vue @@ -1,61 +1,69 @@ + :deep(.page-main) { + background-size: 100% 100% !important; + } + \ No newline at end of file diff --git a/pages/commission/order.vue b/pages/commission/order.vue index 56ceb786..3de1c879 100644 --- a/pages/commission/order.vue +++ b/pages/commission/order.vue @@ -8,15 +8,15 @@ }, ]"> - - - - 团队订单数量(单) - - {{ state.agentInfo.child_order_count_all || 0 }} + + + + 累计推广订单(单) + + {{ state.totals||state.pagination.total|| 0 }} - + - + - + @@ -131,7 +131,7 @@ } from '@dcloudio/uni-app'; import { computed, - reactive + reactive, } from 'vue'; import _ from 'lodash'; import { @@ -149,10 +149,11 @@ }); const state = reactive({ + totals: 0, pagination: { data: [], current_page: 1, - total: 1, + total: '', last_page: 1, }, loadStatus: '', @@ -170,24 +171,24 @@ // value: 'no' // }, { - name: '已计入', + name: '待结算', value: 'yes', }, { - name: '已扣除', + name: '已结算', value: 'back', }, - { - name: '已取消', - value: 'cancel', - }, + // { + // name: '已取消', + // value: 'cancel', + // }, ]; // 切换选项卡 function onTabsChange(e) { state.pagination = { data: [], current_page: 1, - total: 1, + total: 0, last_page: 1, }; state.currentTab = e.index; @@ -196,19 +197,24 @@ // 获取订单列表 async function getOrderList(page = 1, list_rows = 5) { + // todo @芋艿:没有测试数据,还需对接请求参数,和返回的数据字段 state.loadStatus = 'loading'; let res = await sheep.$api.commission.order({ - type: tabMaps[state.currentTab].value, - list_rows, - page, + // type: tabMaps[state.currentTab].value, + pageSize: list_rows, + pageNo: page, + // status + // bizType }); - if (res.error === 0) { - let orderList = _.concat(state.pagination.data, res.data.data); + if (res.code === 0) { + let orderList = _.concat(state.pagination.data, res.data.list); state.pagination = { ...res.data, data: orderList, }; - if (state.pagination.current_page < state.pagination.last_page) { + state.totals = res.data.total; + console.log(state) + if (state.pagination.data.length < state.totals) { state.loadStatus = 'more'; } else { state.loadStatus = 'noMore'; @@ -228,7 +234,7 @@ } onLoad(() => { - getAgentInfo(); + // getAgentInfo(); getOrderList(); }); diff --git a/pages/commission/promoter.vue b/pages/commission/promoter.vue new file mode 100644 index 00000000..d598a025 --- /dev/null +++ b/pages/commission/promoter.vue @@ -0,0 +1,298 @@ + + + + + \ No newline at end of file diff --git a/pages/commission/team.vue b/pages/commission/team.vue index 8ee4d95b..e05f623f 100644 --- a/pages/commission/team.vue +++ b/pages/commission/team.vue @@ -1,257 +1,266 @@ + .tag-img { + width: 34rpx; + height: 34rpx; + margin-right: 6rpx; + border-radius: 50%; + } + + .tag-title { + font-size: 18rpx; + font-weight: 500; + color: rgba(255, 255, 255, 1); + line-height: 20rpx; + } + } + } + + // 推荐人 + .referrer-box { + font-size: 28rpx; + font-weight: 500; + color: #ffffff; + padding: 20rpx; + + .referrer-avatar { + width: 34rpx; + height: 34rpx; + border-radius: 50%; + } + } + \ No newline at end of file diff --git a/pages/pay/components/account-type-select.vue b/pages/pay/components/account-type-select.vue index 8bb351cb..81326c69 100644 --- a/pages/pay/components/account-type-select.vue +++ b/pages/pay/components/account-type-select.vue @@ -1,178 +1,175 @@ + image { + width: 100%; + height: 100%; + } + \ No newline at end of file diff --git a/pages/pay/withdraw.vue b/pages/pay/withdraw.vue index d09cd588..518778ef 100644 --- a/pages/pay/withdraw.vue +++ b/pages/pay/withdraw.vue @@ -1,380 +1,408 @@ + .draw-list { + font-size: 24rpx; + color: #999999; + line-height: 46rpx; + } + } + \ No newline at end of file diff --git a/pages/user/wallet/commission.vue b/pages/user/wallet/commission.vue index dc35b0dc..9b458223 100644 --- a/pages/user/wallet/commission.vue +++ b/pages/user/wallet/commission.vue @@ -1,510 +1,484 @@ + .unit { + font-size: 48rpx; + color: #333; + font-weight: 500; + line-height: normal; + } + + .uni-easyinput__placeholder-class { + font-size: 30rpx; + height: 40rpx; + line-height: normal; + } + } + \ No newline at end of file diff --git a/sheep/api/activity.js b/sheep/api/activity.js index c8096f34..e977ad9d 100644 --- a/sheep/api/activity.js +++ b/sheep/api/activity.js @@ -60,5 +60,21 @@ export default { url: '/app-api/member/sign-in/record/get-summary', method: 'GET', }), + getBargainRecordSummary: () => + request({ + url: '/app-api/promotion/bargain-record/get-summary', + method: 'GET', + }), + getBargainActivityPage: () => + request({ + url: '/app-api/promotion/bargain-activity/page', + method: 'GET', + }), + getBargainActivityDetail: (params) => + request({ + url: '/app-api/promotion/bargain-activity/get-detail', + method: 'GET', + params + }), }; \ No newline at end of file diff --git a/sheep/api/commission.js b/sheep/api/commission.js index 35c18d3b..63601381 100644 --- a/sheep/api/commission.js +++ b/sheep/api/commission.js @@ -37,7 +37,7 @@ export default { // 分销订单 order: (params) => request({ - url: 'commission/order', + url: '/app-api/trade/brokerage-record/page', method: 'GET', params, }), @@ -52,7 +52,7 @@ export default { // 我的团队 team: (params) => request({ - url: 'commission/agent/team', + url: '/app-api/trade/brokerage-user/child-summary-page', method: 'GET', params, }), @@ -68,4 +68,22 @@ export default { url: '/app-api/trade/brokerage-user/get-summary', method: 'GET', }), + getBrokerageRankNumber: (params) => + request({ + url: '/app-api/trade/brokerage-user/get-rank-by-price', + method: 'GET', + params + }), + getBrokerageRankList: (params) => + request({ + url: '/app-api/trade/brokerage-user/rank-page-by-price', + method: 'GET', + params + }), + getRanklist: (params) => + request({ + url: '/app-api/trade/brokerage-user/rank-page-by-user-count', + method: 'GET', + params + }), }; \ No newline at end of file diff --git a/sheep/api/pay.js b/sheep/api/pay.js index 8cee0205..bcc17425 100644 --- a/sheep/api/pay.js +++ b/sheep/api/pay.js @@ -1,44 +1,54 @@ import request from '@/sheep/request'; export default { - // 预支付 - prepay: (data) => - request({ - url: 'pay/prepay', - method: 'POST', - data, - custom: { - loadingMsg: '支付中', - }, - }), - // 发起提现 - withdraw: { - list: (params) => - request({ - url: 'withdraw', - method: 'GET', - params, - custom: { - auth: true, - }, - }), - rules: () => - request({ - url: 'withdraw/rules', - method: 'GET', - custom: { - auth: true, - }, - }), - apply: (data) => - request({ - url: 'withdraw/apply', - method: 'POST', - data, - custom: { - loadingMsg: '申请中', - auth: true, - }, - }), - }, -}; + // 预支付 + prepay: (data) => + request({ + url: 'pay/prepay', + method: 'POST', + data, + custom: { + loadingMsg: '支付中', + }, + }), + // 发起提现 + withdraw: { + list: (params) => + request({ + url: 'withdraw', + method: 'GET', + params, + custom: { + auth: true, + }, + }), + rules: () => + request({ + url: 'withdraw/rules', + method: 'GET', + custom: { + auth: true, + }, + }), + apply: (data) => + request({ + url: '/app-api/trade/brokerage-withdraw/create', + method: 'POST', + data, + custom: { + loadingMsg: '申请中', + // auth: true, + }, + }), + userGet: (params) => + request({ + url: '/app-api/trade/brokerage-user/get', + method: 'GET', + params, + // custom: { + // loadingMsg: '申请中', + // auth: true, + // }, + }), + }, +}; \ No newline at end of file diff --git a/sheep/api/promotion/diy/template.js b/sheep/api/promotion/diy/template.js index 054dffae..092c51dc 100644 --- a/sheep/api/promotion/diy/template.js +++ b/sheep/api/promotion/diy/template.js @@ -1,20 +1,22 @@ import request from '@/sheep/request'; - const DiyTemplateApi = { - // TODO 芋艿:测试 - getUsedDiyTemplate: () => { - return request({ - url: '/app-api/promotion/diy-template/used', - method: 'GET', - }); - }, - getDiyTemplate: (id) => { - return request({ - url: '/app-api/promotion/diy-template/get', - method: 'GET', - params: { id } - }); - }, +const DiyTemplateApi = { + // TODO 芋艿:测试 + // getUsedDiyTemplate: () => { + // return request({ + // url: '/app-api/promotion/diy-template/used', + // method: 'GET', + // }); + // }, + getDiyTemplate: (id) => { + return request({ + url: '/app-api/promotion/diy-template/get', + method: 'GET', + params: { + id + } + }); + }, }; -export default DiyTemplateApi; +export default DiyTemplateApi; \ No newline at end of file diff --git a/sheep/api/user.js b/sheep/api/user.js index 9c2e862b..5cf51024 100644 --- a/sheep/api/user.js +++ b/sheep/api/user.js @@ -293,6 +293,13 @@ export default { params, custom: {}, }), + log3: (params) => + request({ + url: '/app-api/trade/brokerage-record/page', + // url: 'pay/wallet-transaction/page', + method: 'GET', + params, + }), }, account: { info: (params) => diff --git a/sheep/components/s-count-down/s-count-down.vue b/sheep/components/s-count-down/s-count-down.vue new file mode 100644 index 00000000..98b3a1fa --- /dev/null +++ b/sheep/components/s-count-down/s-count-down.vue @@ -0,0 +1,173 @@ + + + + + \ No newline at end of file diff --git a/sheep/request/index.js b/sheep/request/index.js index 7ec6d3cd..a0f41207 100644 --- a/sheep/request/index.js +++ b/sheep/request/index.js @@ -94,7 +94,7 @@ http.interceptors.request.use( if (config.url.indexOf('/app-api/') !== -1) { config.header['Accept'] = '*/*' config.header['tenant-id'] = '1'; - config.header['terminal'] = '20'; + config.header['terminal'] = '20'; config.header['Authorization'] = 'Bearer test247'; } return config; @@ -113,7 +113,7 @@ http.interceptors.response.use( if (response.header.authorization || response.header.Authorization) { $store('user').setToken(response.header.authorization || response.header.Authorization); } - // TODO 芋艿:如果是登录的 API,则自动设置 token + // TODO 芋艿:如果是登录的 API,则自动设置 token response.config.custom.showLoading && closeLoading(); if (response.data.error !== 0 && response.data.code !== 0) { @@ -125,10 +125,10 @@ http.interceptors.response.use( }); return Promise.resolve(response.data); } - // 成功时的提示 + // 成功时的提示 if ( (response.data.error === 0 || response.data.code === 0) && - ( response.data.msg !== '' || response.config.custom.successMsg !== '' ) && + (response.data.msg !== '' || response.config.custom.successMsg !== '') && response.config.custom.showSuccess ) { uni.showToast({ @@ -215,8 +215,8 @@ const request = (config) => { } // TODO 芋艿:额外拼接 if (config.url.indexOf('/app-api/') >= 0) { - // config.url = 'http://api-dashboard.yudao.iocoder.cn' + config.url; // 调用【云端】 - config.url = 'http://127.0.0.1:48080' + config.url; // 调用【本地】 + config.url = 'http://api-dashboard.yudao.iocoder.cn' + config.url; // 调用【云端】 + // config.url = 'http://127.0.0.1:48080' + config.url; // 调用【本地】 } return http.middleware(config); }; diff --git a/sheep/request2/index.js b/sheep/request2/index.js index 56b19a33..1947e352 100644 --- a/sheep/request2/index.js +++ b/sheep/request2/index.js @@ -215,9 +215,9 @@ const request = (config) => { // TODO 芋艿:额外拼接 if (config.url.indexOf('/app-api/') >= 0) { // 设置接口地址 - // config.url = 'http://api-dashboard.yudao.iocoder.cn' + config.url; // 调用【云端】 + config.url = 'http://api-dashboard.yudao.iocoder.cn' + config.url; // 调用【云端】 // config.url = 'https://app.test.huizhizao.vip/prod-api' + config.url; // 调用【云端】 - config.url = 'http://127.0.0.1:48080' + config.url; // 调用【本地】 + // config.url = 'http://127.0.0.1:48080' + config.url; // 调用【本地】 } return http.middleware(config); };