From 7d3daf2f0294823603715c1eda6e774066aa635d Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Wed, 5 Aug 2026 18:07:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(distribution):=20=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E5=88=86=E9=94=80=E5=91=98=E4=B8=AD=E5=BF=83=E5=AE=8C=E6=95=B4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增分销业绩统计页面,包含时间范围筛选和自定义日期选择功能 - 重构分销认证页面,改为跳转至招募页面申请分销员身份 - 添加分销商品访问记录功能,支持分享追踪和佣金计算 - 更新分销历史记录页面,优化数据结构和显示字段 - 完全重写分销员首页,包含用户信息、收益统计、等级系统等功能 --- api/distribution.js | 215 ++ api/goods.js | 91 - components/distribution-goods-share/index.vue | 459 ++++ .../distribution-goods-share/poster-panel.vue | 539 +++++ config/api.js | 4 +- js_sdk/u-draw-poster/utils/global.js | 17 +- js_sdk/u-draw-poster/utils/utils.js | 4 +- manifest.json | 1 + pages.json | 1923 +++++++++-------- pages/mine/address/add.vue | 759 +++---- pages/mine/distribution/achievement.vue | 549 ++++- pages/mine/distribution/auth.vue | 97 +- pages/mine/distribution/bind.vue | 44 + pages/mine/distribution/customer-list.vue | 833 +++++++ pages/mine/distribution/grade.vue | 611 ++++++ pages/mine/distribution/history.vue | 19 +- pages/mine/distribution/home.vue | 1015 ++++++++- pages/mine/distribution/invite-friends.vue | 329 +++ pages/mine/distribution/invite-list.vue | 486 +++++ pages/mine/distribution/invite.vue | 425 ++++ pages/mine/distribution/join.vue | 883 ++++++-- pages/mine/distribution/list.vue | 782 +++---- pages/mine/distribution/order-detail.vue | 512 +++++ pages/mine/distribution/order-list.vue | 710 ++++++ pages/mine/distribution/poster.vue | 428 ++++ pages/mine/distribution/share.vue | 28 + pages/mine/distribution/withdrawal.vue | 2 +- pages/passport/login.vue | 122 +- pages/passport/wechatMPLogin.vue | 8 +- pages/product/goods.vue | 31 +- pages/tabbar/home/template/tpl_notice.vue | 21 +- pages/tabbar/user/utils/tool.vue | 569 ++--- utils/filters.js | 42 + vue.config.js | 25 +- 34 files changed, 10053 insertions(+), 2530 deletions(-) create mode 100644 api/distribution.js create mode 100644 components/distribution-goods-share/index.vue create mode 100644 components/distribution-goods-share/poster-panel.vue create mode 100644 pages/mine/distribution/bind.vue create mode 100644 pages/mine/distribution/customer-list.vue create mode 100644 pages/mine/distribution/grade.vue create mode 100644 pages/mine/distribution/invite-friends.vue create mode 100644 pages/mine/distribution/invite-list.vue create mode 100644 pages/mine/distribution/invite.vue create mode 100644 pages/mine/distribution/order-detail.vue create mode 100644 pages/mine/distribution/order-list.vue create mode 100644 pages/mine/distribution/poster.vue create mode 100644 pages/mine/distribution/share.vue diff --git a/api/distribution.js b/api/distribution.js new file mode 100644 index 0000000..9d2a946 --- /dev/null +++ b/api/distribution.js @@ -0,0 +1,215 @@ +/** + * 分销员相关 API + */ + +import { http, Method } from '@/utils/request.js' + +/** + * 绑定分销员 + * @param distributionId 分销员ID + */ +export function getGoodsDistribution(distributionId) { + return http.request({ + url: `/distribution/distribution/bindingDistribution/${distributionId}`, + method: Method.GET, + }) +} + +/** + * 获取当前会员的分销员信息(含待提现、冻结金额等) + */ +export function distribution() { + return http.request({ + url: `/distribution/distribution`, + method: Method.GET, + }) +} + +/** 推广海报上下文(邀请好友锁客) */ +export function getPromotionPoster() { + return http.request({ + url: `/distribution/distribution/promotion-poster`, + method: Method.GET, + }) +} + +/** 邀请卡上下文(招募下级分销员) */ +export function getInviteCard() { + return http.request({ + url: `/distribution/distribution/invite-card`, + method: Method.GET, + }) +} + +/** 我邀请的下级分销员列表 */ +export function getDistributionInvitees(params) { + return http.request({ + url: `/distribution/distribution/invite/invitees`, + method: Method.GET, + params, + }) +} + +/** 分销员业绩统计 */ +export function getDistributionPerformance(params) { + return http.request({ + url: `/distribution/distribution/performance`, + method: Method.GET, + params, + }) +} + +/** 我的客户列表 */ +export function getDistributionCustomers(params) { + return http.request({ + url: `/distribution/distribution/customers`, + method: Method.GET, + params, + }) +} + +/** 客户详情 */ +export function getDistributionCustomerDetail(id) { + return http.request({ + url: `/distribution/distribution/customers/${id}`, + method: Method.GET, + }) +} + +/** 设置/取消客户星标 */ +export function updateDistributionCustomerStarred(id, starred) { + return http.request({ + url: `/distribution/distribution/customers/${id}/starred`, + method: Method.PUT, + params: { starred }, + }) +} + +/** 分销等级列表(买家端可见时) */ +export function getDistributionGrades() { + return http.request({ + url: `/distribution/distribution/grades`, + method: Method.GET, + }) +} + +/** 分销员提现 */ +export function cash(params) { + return http.request({ + url: `/distribution/cash`, + method: Method.POST, + params, + }) +} + +/** 分销员提现历史 */ +export function cashLog(params) { + return http.request({ + url: `/distribution/cash`, + method: Method.GET, + params, + }) +} + +/** 推广/邀请订单分页列表 */ +export function getDistributionOrders(params) { + return http.request({ + url: `/distribution/order/orders`, + method: Method.GET, + params, + }) +} + +/** 推广/邀请订单详情 */ +export function getDistributionOrderDetail(params) { + return http.request({ + url: `/distribution/order/orders/detail`, + method: Method.GET, + params, + }) +} + +/** 获取分销商品设置 */ +export function getDistributionGoodsSetting() { + return http.request({ + url: `/distribution/goods/setting`, + method: Method.GET, + }) +} + +/** 获取分销员商品列表 */ +export function distributionGoods(params) { + return http.request({ + url: `/distribution/goods`, + method: Method.GET, + params, + }) +} + +/** 获取分销员中心推荐商品 */ +export function getDistributionFeaturedGoods() { + return http.request({ + url: `/distribution/goods/featured`, + method: Method.GET, + }) +} + +/** 获取分销商品分享上下文(推广图文) */ +export function getDistributionGoodsShareContext(params) { + return http.request({ + url: `/distribution/goods/share-context`, + method: Method.GET, + params, + }) +} + +/** 获取分销商品海报上下文(生成葵花码,服务端记录分享) */ +export function getDistributionGoodsPosterContext(params) { + return http.request({ + url: `/distribution/goods/poster-context`, + method: Method.GET, + params, + }) +} + +/** 分享商品访问(记录访问并绑定客户关系) */ +export function recordDistributionGoodsVisit(params) { + return http.request({ + url: `/distribution/distribution/share-visit`, + method: Method.GET, + params, + }) +} + +/** 招募页信息 */ +export function getRecruitPage() { + return http.request({ + url: `/distribution/distribution/recruit/page`, + method: Method.GET, + }) +} + +/** 提交招募申请 */ +export function submitRecruitApplication(data) { + return http.request({ + url: `/distribution/distribution/recruit/apply`, + method: Method.POST, + data, + }) +} + +/** 招募条件进度 */ +export function getRecruitProgress() { + return http.request({ + url: `/distribution/distribution/recruit/progress`, + method: Method.GET, + }) +} + +/** 上级分销员信息 */ +export function getDistributionParent() { + return http.request({ + url: `/distribution/distribution/parent`, + method: Method.GET, + }) +} diff --git a/api/goods.js b/api/goods.js index 06a2986..65bc8f1 100644 --- a/api/goods.js +++ b/api/goods.js @@ -37,18 +37,6 @@ export function getGoodsRelated(params) { }); } -/** - * 获取商品分销 - * @param distributionId 商品分销ID - */ - export function getGoodsDistribution(distributionId) { - return http.request({ - url: `/distribution/distribution/bindingDistribution/${distributionId}`, - method: Method.GET, - }); -} - - /** * 获取商品列表 * @param params @@ -118,85 +106,6 @@ export function getCategoryList(id) { }); } - - - -/** - * 获取当前会员的分销商信息 可根据分销商信息查询待提现金额以及冻结金额等信息 - */ -export function distribution() { - return http.request({ - url: `/distribution/distribution`, - method: Method.GET, - }); -} - -/** - * 申请分销商 - */ -export function applyDistribution(params) { - return http.request({ - url: `/distribution/distribution`, - method: Method.POST, - params, - }); -} - -/** - * 分销商提现 - */ -export function cash(params) { - return http.request({ - url: `/distribution/cash`, - method: Method.POST, - params, - }); -} - -/** - * 分销商提现历史 - */ -export function cashLog(params) { - return http.request({ - url: `/distribution/cash`, - method: Method.GET, - params - - }); -} - -/** - * 获取分销商分页订单列表 - */ -export function distributionOrderList(params) { - return http.request({ - url: `/distribution/distribution/distributionOrder`, - method: Method.GET, - params - }); -} - -/** - * 获取分销商商品列表 - */ -export function distributionGoods(params) { - return http.request({ - url: `/distribution/goods`, - method: Method.GET, - params, - }); -} -/** - * 选择分销商品 分销商品id - */ -export function checkedDistributionGoods(params) { - return http.request({ - url: `/distribution/goods/checked/${params.id}`, - method: Method.GET, - params - }); -} - /** * 获取 小程序码 */ diff --git a/components/distribution-goods-share/index.vue b/components/distribution-goods-share/index.vue new file mode 100644 index 0000000..ee44849 --- /dev/null +++ b/components/distribution-goods-share/index.vue @@ -0,0 +1,459 @@ + + + + + diff --git a/components/distribution-goods-share/poster-panel.vue b/components/distribution-goods-share/poster-panel.vue new file mode 100644 index 0000000..47e93dd --- /dev/null +++ b/components/distribution-goods-share/poster-panel.vue @@ -0,0 +1,539 @@ + + + + + diff --git a/config/api.js b/config/api.js index 7c5dd28..466c86e 100644 --- a/config/api.js +++ b/config/api.js @@ -3,13 +3,13 @@ */ // 开发环境 const dev = { - buyer: "https://buyer-api.pickmall.cn", + buyer: "http://127.0.0.1:8888", im: "https://im-api.pickmall.cn", mqtt: "wss://lilishop-mqtt-pull.dllll.xyz/mqtt", }; // 生产环境 const prod = { - buyer: "https://buyer-api.pickmall.cn", + buyer: "http://127.0.0.1:8888", im: "https://im-api.pickmall.cn", mqtt: "wss://lilishop-mqtt-pull.dllll.xyz/mqtt", }; diff --git a/js_sdk/u-draw-poster/utils/global.js b/js_sdk/u-draw-poster/utils/global.js index 872b77d..9914e52 100644 --- a/js_sdk/u-draw-poster/utils/global.js +++ b/js_sdk/u-draw-poster/utils/global.js @@ -1,5 +1,20 @@ var _a; -export const PLATFORM = typeof process !== 'undefined' ? (_a = process === null || process === void 0 ? void 0 : process.env) === null || _a === void 0 ? void 0 : _a.VUE_APP_PLATFORM : undefined; +function detectPlatform() { + if (typeof process !== 'undefined' && (_a = process === null || process === void 0 ? void 0 : process.env) !== null && _a !== void 0 && _a.VUE_APP_PLATFORM) { + return process.env.VUE_APP_PLATFORM; + } + if (typeof wx !== 'undefined' && typeof wx.getSystemInfoSync === 'function') { + return 'mp-weixin'; + } + if (typeof uni !== 'undefined' && typeof uni.getSystemInfoSync === 'function') { + const info = uni.getSystemInfoSync(); + if (info && info.uniPlatform === 'mp-weixin') { + return 'mp-weixin'; + } + } + return undefined; +} +export const PLATFORM = detectPlatform(); /** 全局对象 */ const _uni = (function () { if (typeof uni != "undefined") diff --git a/js_sdk/u-draw-poster/utils/utils.js b/js_sdk/u-draw-poster/utils/utils.js index 8f38812..5aa9c65 100644 --- a/js_sdk/u-draw-poster/utils/utils.js +++ b/js_sdk/u-draw-poster/utils/utils.js @@ -37,7 +37,9 @@ export const handleBuildOpts = (options) => { } const oldSelector = defaultOpts.selector; if (PLATFORM === 'mp-weixin' && defaultOpts.type2d) { - defaultOpts.selector = '#' + defaultOpts.selector; + defaultOpts.selector = oldSelector.startsWith('#') + ? oldSelector + : '#' + oldSelector; } if (!PLATFORM) { console.error('注意! draw-poster未开启uni条件编译! 当环境是微信小程序将不会动态切换为type2d模式'); diff --git a/manifest.json b/manifest.json index f87ecaf..050da72 100644 --- a/manifest.json +++ b/manifest.json @@ -210,6 +210,7 @@ }, "plugins" : {}, "libVersion" : "3.5.8", + "__usePrivacyCheck__" : true, "requiredPrivateInfos" : [ "chooseLocation", "getLocation" ] }, "h5" : { diff --git a/pages.json b/pages.json index 618ac78..dcc8154 100644 --- a/pages.json +++ b/pages.json @@ -1,917 +1,1006 @@ -{ - - "easycom": { - "autoscan": true, - "custom": { - "^u--(.*)": "uview-plus/components/u-$1/u-$1.vue", - "^up-(.*)": "uview-plus/components/u-$1/u-$1.vue", - "^u-loading$": "uview-plus/components/u-loading-icon/u-loading-icon.vue", - "^u-alert-tips$": "uview-plus/components/u-alert/u-alert.vue", - "^u-time-line-item$": "@/components/u-time-line/u-time-line-item.vue", - "^u-time-line$": "@/components/u-time-line/u-time-line.vue", - "^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue" - } - }, - "pages": [ - - { - "path": "pages/tabbar/home/index", - "style": { - "navigationBarTitleText": "首页", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "black", - "enablePullDownRefresh":true - } - }, - { - "path":"pages/tabbar/screen/fullScreen", - "style": { - "navigationStyle": "custom", // 隐藏系统导航栏 - "app-plus":{ - "animationType": "fade-in", // 设置fade-in淡入动画,为最合理的动画类型 - "background": "transparent", // 背景透明 - "backgroundColor": "rgba(0,0,0,0)", // 背景透明 - "popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能 - } - } - }, - { - "path": "pages/tabbar/home/title", - "style": { - "navigationBarTitleText": "消息" - } - }, - { - "path": "pages/tabbar/cart/cartList", - "style": { - "navigationBarTitleText": "购物车", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarBackgroundColor": "#fff", - "enablePullDownRefresh":true //实现下拉刷新样式 - - } - }, { - "path": "pages/tabbar/category/category", - "style": { - "navigationBarTitleText": "分类", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "black", - "disableScroll": true, - "app-plus": { - "bounce": "none", - "scrollIndicator": "none" - } - } - }, - - { - "path": "pages/navigation/search/searchPage", - "style": { - "navigationBarTitleText": "搜索", - "navigationStyle": "custom", - - "app-plus": { - //app页面不显示滚动条 - "scrollIndicator": "none", - "bottom": "0", - "contentAdjust": "false", - "bounce": "none", - "safearea": { - "bottom": "none" - } - } - } - }, { - "path": "pages/tabbar/user/my", - "style": { - "navigationBarTextStyle": "white", - "enablePullDownRefresh": true, - "navigationStyle": "custom" - } - }, - - { - "path": "pages/tabbar/home/web-view", - "style": { - - } - }, - { - "path": "pages/tabbar/special/special", - "style": { - "navigationBarTitleText": "专题" - } - } - - ], - "subPackages": [ - - { - "root": "pages/mine", - "pages": [ - - { - "path": "signIn", - "style": { - "navigationBarTitleText": "签到" - } - }, { - "path": "myTracks", - "style": { - "navigationBarTitleText": "我的足迹", - "enablePullDownRefresh": true, - "navigationStyle": "custom" - } - }, { - "path": "myCollect", - "style": { - "navigationBarTitleText": "收藏", - "enablePullDownRefresh": false, - "navigationStyle": "custom", - "app-plus": { - "scrollIndicator": "none" - } - } - }, - { - "path": "distribution/list", - "style": { - "navigationBarTitleText": "推广分佣", - "app-plus": { - //app页面不显示滚动条 - "scrollIndicator": "none" - } - } - }, - { - "path": "distribution/withdrawal", - "style": { - "navigationBarTitleText": "提现", - "app-plus": { - //app页面不显示滚动条 - "scrollIndicator": "none" - } - } - }, - { - "path": "distribution/join", - "style": { - "navigationBarTitleText": "推广资格申请", - "navigationBarTextStyle": "black", - "app-plus": { - //app页面不显示滚动条 - "scrollIndicator": "none" - } - } - }, - { - "path": "distribution/history", - "style": { - "navigationBarTitleText": "提现历史" - - } - }, - { - "path": "distribution/auth", - "style": { - "navigationBarTitleText": "会员实名认证" - - } - }, - { - "path": "distribution/achievement", - "style": { - "navigationBarTitleText": "我的分销业绩" - - } - }, - { - "path": "distribution/home", - "style": { - "navigationBarTitleText": "推广分佣" - - } - }, - { - "path": "deposit/index", - "style": { - "navigationStyle": "custom" - - } - }, - { - "path": "deposit/operation", - "style": { - "navigationStyle": "custom" - - } - }, - { - "path": "deposit/recharge", - "style": { - "navigationBarTitleText": "充值金额" - - } - }, - { - "path": "deposit/withdrawal", - "style": { - "navigationBarTitleText": "提现金额" - - } - }, - { - "path": "deposit/withdrawApply", - "style": { - "navigationStyle": "custom" - } - }, - - { - "path": "deposit/info", - "style": { - "navigationBarTitleText": "预存款详情" - - } - }, - { - "path": "address/address", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "地址管理" - } - }, - { - "path": "address/storeAddress", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "自提点" - } - }, - { - "path": "address/add", - "style": { - "navigationBarTitleText": "收货人" - } - }, - { - "path": "address/addressManage", - "style": { - "navigationBarTitleText": "地址管理" - } - }, - { - "path": "set/versionFunctionList", - "style": { - "navigationBarTitleText": "功能介绍" - } - }, - - { - "path": "set/securityCenter/fingerLogin", - "style": { - "navigationBarTitleText": "指纹登录" - } - }, - { - "path": "set/securityCenter/faceLogin", - "style": { - "navigationBarTitleText": "面容登录" - } - }, - - - { - "path": "set/securityCenter/editPassword", - "style": { - "navigationBarTitleText": "修改密码", - "app-plus": { - - } - } - }, - - { - "path": "set/securityCenter/bindMobile", - "style": { - "navigationBarTitleText": "绑定手机号", - "app-plus": { - - } - } - }, - - { - "path": "im/list", - "style": { - "navigationStyle": "custom", // 隐藏系统导航栏 - "enablePullDownRefresh": true, - "app-plus": { - } - - } - }, - { - "path": "im/index", - "style": { - "navigationStyle": "custom", // 隐藏系统导航栏 - "enablePullDownRefresh": true, - "app-plus": { - } - - } - }, - { - "path": "set/feedBack", - "style": { - "navigationBarTitleText": "意见反馈" - } - }, - { - "path": "set/securityCenter/updatePwdTab", - "style": { - "navigationBarTitleText": "修改密码" - } - }, - { - "path": "set/securityCenter/editLoginPassword", - "style": { - "navigationBarTitleText": "修改密码" - } - }, - { - "path": "set/securityCenter/securityCenter", - "style": { - "navigationBarTitleText": "安全中心" - } - }, - - { - "path": "set/editionIntro", - "style": { - "navigationBarTitleText": "关于我们" - } - }, - { - "path": "set/setUp", - "style": { - "navigationBarTitleText": "设置" - } - }, - { - "path": "set/personMsg", - "style": { - "navigationBarTitleText": "个人信息", - "app-plus": { - "titleNView": { - "padding-right": "12", - "buttons": [{ - "text": "保存", - "fontSize": "16", - "width": "auto", - "color": "#FFFFFF" - }] - } - } - } - }, { - "path": "help/tips", - "style": { - "navigationBarTitleText": "" - } - }, { - "path": "point/myPoint", - "style": { - "navigationBarTitleText": "我的积分" - } - }, - { - "path": "msgTips/main", - "style": { - "navigationBarTitleText": "消息中心" - } - }, - { - "path": "msgTips/sysMsg/index", - "style": { - "navigationBarTitleText": "系统消息" - } - }, - { - "path": "msgTips/serviceMsg/index", - "style": { - "navigationBarTitleText": "客服记录" - } - }, - { - "path": "msgTips/packageMsg/index", - "style": { - "navigationBarTitleText": "物流消息" - } - }, - { - "path": "msgTips/packageMsg/logisticsDetail", - "style": { - "navigationBarTitleText": "订单跟踪" - } - } - - ] - - }, - - - { - "root": "pages/product", - "pages": [{ - "path": "shopPage", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom" - } - },{ - "path": "shopList", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom" - } - },{ - "path": "licencePhoto", - "style": { - "navigationBarTitleText": "营业执照" - } - },{ - "path": "shopPageGoods", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom" - } - }, - { - "path": "goods", - "style": { - "backgroundColor": "#fff", - "navigationStyle": "custom", - "app-plus": { - // 将回弹属性关掉 - "bounce": "none", - // 禁止页面滚动 - "scrollIndicator": "none", - "safearea": { - "bottom": { - "offset": "none" - } - } - } - } - }, - { - "path": "askList", - "style": { - "navigationBarTitleText": "问答专区" - } - }, - { //商品评价 - "path": "comment", - "style": { - "navigationBarTitleText": "商品评价", - "navigationStyle": "custom", - "app-plus": { - //app页面不显示滚动条 - "scrollIndicator": "none" - } - } - }, - { // 客服 - "path": "customerservice/index", - "style": { - "navigationBarTitleText": "客服", - "usingComponents": { - // #ifdef MP-WEIXIN - "chat": "plugin://myPlugin/chat" - // #endif - } - } - } - - ] - - }, - { - "root": "pages/floor", - "pages": [{ - "path": "empty" - }] - - }, - { - "root": "pages/passport", - "pages": [{ - "path": "login", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom", - "app-plus": { - "titleNView": false, - "animationType": "slide-in-bottom", - "scrollIndicator": "none", - "safearea": { - "bottom": { - "offset": "none" - } - } - } - } - }, - - { - "path": "entry/seller/index", - "style": { - "navigationBarTitleText": "店铺入驻", - "navigationStyle": "custom" - } - }, - { - "path": "entry/seller/control", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom" - } - }, - { - "path": "article", - "style": { - "navigationBarTitleText": "文章" - } - }, - { - "path": "wechatMPLogin", - "style": { - "navigationBarTitleText": "小程序登录", - "navigationStyle": "custom", - "navigationBarTextStyle": "black" - } - }, - { - "path": "scannerCodeLoginConfirm", - "style": { - "navigationBarTitleText": "扫码登录", - "navigationStyle": "custom", - "navigationBarTextStyle": "black" - } - } - ] - - }, - - { - "root": "pages/promotion", - "pages": [ { - "path": "seckill", - "style": { - "navigationBarTitleText": "限时抢购", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "black" , - "app-plus": { - "titleNView": { - "homeButton":true - } - } - } - }, - - // #ifndef MP-WEIXIN - { - "path": "live/room", - "style": { - "navigationStyle": "custom", - "navigationBarTextStyle": "white", - "disableScroll": true - } - }, - // #endif - { - "path": "joinGroup", - "style": { - "navigationBarTitleText": "拼团活动", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "black" , - "app-plus": { - // 将回弹属性关掉 - "bounce": "none" - } - } - }, - // #ifndef MP-WEIXIN - { - "path": "lives", - "style": { - "navigationStyle": "custom", - "navigationBarTextStyle": "black" - } - }, - // #endif - { - "path": "bargain/list", - "style": { - "navigationStyle": "custom", - "navigationBarTextStyle": "white" - - } - },{ - "path": "bargain/detail", - "style": { - "navigationStyle": "custom", - "navigationBarTextStyle": "white" - - } - },{ - "path": "bargain/log", - "style": { - "navigationBarTitleText": "砍价记录" - } - },{ - "path": "point/detail", - "style": { - "navigationStyle": "custom", - "navigationBarTextStyle": "white" - - } - },{ - "path": "point/pointList", - "style": { - "navigationBarTitleText": "积分商城" - - - } - } - - ] - - }, - { - "root": "pages/cart", - "pages": [{ - "path": "coupon/myCoupon", - "style": { - "navigationBarTitleText": "我的优惠券", - "app-plus": { - "bounce": "coupon/none" - - } - } - }, - { - "path": "coupon/couponDetail", - "style": { - "navigationBarTitleText": "优惠券详情" - } - }, - { - "path": "coupon/index", - "style": { - "navigationBarTitleText": "优惠券" - } - }, - - { - "path": "coupon/couponCenter", - "style": { - "navigationBarTitleText": "领券中心", - "enablePullDownRefresh": true - - } - }, - { - "path": "payment/payOrder", - "style": { - "navigationBarTitleText": "支付订单", - "app-plus": { - "popGesture": "none" //禁止侧滑退出 - - } - } - }, - { - "path": "payment/success", - "style": { - "navigationBarTitleText": "支付成功", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white", - "app-plus": { - "popGesture": "none", //禁止侧滑退出 - "titleNView": false - } - } - }, - { - "path": "payment/error", - "style": { - "navigationBarTitleText": "支付失败", - "navigationStyle": "custom", - "navigationBarTextStyle": "black", - "app-plus": { - "popGesture": "none" - } - } - }, - { - "path": "payment/shareOrderGoods", - "style": { - "navigationBarTitleText": "", - "app-plus": { - - } - } - } - - ] - - }, - { - "root": "pages/order", - "pages": [{ - "path": "complain/complain", - "style": { - "navigationBarTitleText": "订单商品投诉" - } - }, - { - "path": "complain/complainInfo", - "style": { - "navigationBarTitleText": "投诉详情" - } - }, - { - "path": "complain/complainList", - "style": { - "navigationBarTitleText": "投诉列表" - } - }, - { - "path": "myOrder", - "style": { - "navigationBarTitleText": "我的订单", - "enablePullDownRefresh": true, - "app-plus": { - "bounce": "none" - - } - } - }, - { - "path": "invoice/invoiceDetail", - "style": { - "navigationBarTitleText": "发票详情" - } - }, - { - "path": "orderDetail", - "style": { - "navigationBarTitleText": "订单详情" - } - }, - { - "path": "deliverDetail", - "style": { - "navigationBarTitleText": "物流详情" - } - }, - { - "path": "evaluate/evaluateDetail", - "style": { - "navigationBarTitleText": "评价详情" - } - }, - - { - "path": "evaluate/releaseEvaluate", - "style": { - "navigationBarTitleText": "发布评价" - } - }, - { - "path": "evaluate/myEvaluate", - "style": { - "navigationBarTitleText": "我的评价" - } - }, - - { - "path": "afterSales/applyProgress", - "style": { - "navigationBarTitleText": "售后服务" - } - }, - { - "path": "afterSales/applyDetail", - "style": { - "navigationBarTitleText": "售后服务" - } - }, - { - "path": "afterSales/applySuccess", - "style": { - "navigationBarTitleText": "提交成功", - "app-plus": { - "bounce": "none", - "titleNView": { - "titleColor": "#FFFFFF", - "buttons": [{ - "text": "完成", - "fontSize": "14", - "color": "#FFFFFF", - "width": "36px" - // "background": "rgba(0,0,0,0)" - }] - } - } - } - }, - { - "path": "afterSales/afterSalesDetailExpress" - }, - { - "path": "afterSales/afterSalesSelect", - "style": { - "navigationBarTitleText": "申请售后" - } - }, - { - "path": "afterSales/afterSalesDetail", - "style": { - "navigationBarTitleText": "申请售后" - } - }, - { - "path": "afterSales/afterSales", - "style": { - "navigationBarTitleText": "售后管理", - "enablePullDownRefresh": true - } - }, - { - "path": "fillorder", - "style": { - "navigationBarTitleText": "填写订单" - } - } - ] - } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "Lili商城", - "navigationBarBackgroundColor": "#fff", - "backgroundColor": "#fff", - "app-plus": { - // 全局关闭回弹功能 - "bounce": "none" - - } - }, - "tabBar": { - "color": "#666", - "selectedColor": "#ff3c2a", - "borderStyle": "black", - "backgroundColor": "#ffffff", - "list": [{ - "pagePath": "pages/tabbar/home/index", - "iconPath": "static/tabbar/home.png", - "selectedIconPath": "static/tabbar/home-s.png", - "text": "首页" - }, - { - "pagePath": "pages/tabbar/category/category", - "iconPath": "static/tabbar/category.png", - "selectedIconPath": "static/tabbar/category-s.png", - "text": "分类" - }, - - { - "pagePath": "pages/tabbar/cart/cartList", - "iconPath": "static/tabbar/cart.png", - "selectedIconPath": "static/tabbar/cart-s.png", - "text": "购物车" - }, - { - "pagePath": "pages/tabbar/user/my", - "iconPath": "static/tabbar/mine.png", - "selectedIconPath": "static/tabbar/mine-s.png", - "text": "我的" - } - ] - }, - // #todo 为什么要注释condition下代码? - // IOS plus.runtime.arguments 添加 condition节点后, 框架会修改 runtime.arguments - // 会影响什么功能? - // -在h5中唤醒app会一直返回默认值 {"name":"","path":"","query":"","id":0} - "condition": { //模式配置,仅开发期间生效 - // "current": 0, //当前激活的模式(list 的索引项) - // "list": [{ - // "name": "", //模式名称 - // "path":"", //启动页面,必选 - // "query": "" //启动参数,在页面的onLoad函数里面得到 - // }] - } -} +{ + + "easycom": { + "autoscan": true, + "custom": { + "^u--(.*)": "uview-plus/components/u-$1/u-$1.vue", + "^up-(.*)": "uview-plus/components/u-$1/u-$1.vue", + "^u-loading$": "uview-plus/components/u-loading-icon/u-loading-icon.vue", + "^u-alert-tips$": "uview-plus/components/u-alert/u-alert.vue", + "^u-time-line-item$": "@/components/u-time-line/u-time-line-item.vue", + "^u-time-line$": "@/components/u-time-line/u-time-line.vue", + "^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue" + } + }, + "pages": [ + + { + "path": "pages/tabbar/home/index", + "style": { + "navigationBarTitleText": "首页", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "black", + "enablePullDownRefresh":true + } + }, + { + "path":"pages/tabbar/screen/fullScreen", + "style": { + "navigationStyle": "custom", // 隐藏系统导航栏 + "app-plus":{ + "animationType": "fade-in", // 设置fade-in淡入动画,为最合理的动画类型 + "background": "transparent", // 背景透明 + "backgroundColor": "rgba(0,0,0,0)", // 背景透明 + "popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能 + } + } + }, + { + "path": "pages/tabbar/home/title", + "style": { + "navigationBarTitleText": "消息" + } + }, + { + "path": "pages/tabbar/cart/cartList", + "style": { + "navigationBarTitleText": "购物车", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarBackgroundColor": "#fff", + "enablePullDownRefresh":true //实现下拉刷新样式 + + } + }, { + "path": "pages/tabbar/category/category", + "style": { + "navigationBarTitleText": "分类", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "black", + "disableScroll": true, + "app-plus": { + "bounce": "none", + "scrollIndicator": "none" + } + } + }, + + { + "path": "pages/navigation/search/searchPage", + "style": { + "navigationBarTitleText": "搜索", + "navigationStyle": "custom", + + "app-plus": { + //app页面不显示滚动条 + "scrollIndicator": "none", + "bottom": "0", + "contentAdjust": "false", + "bounce": "none", + "safearea": { + "bottom": "none" + } + } + } + }, { + "path": "pages/tabbar/user/my", + "style": { + "navigationBarTextStyle": "white", + "enablePullDownRefresh": true, + "navigationStyle": "custom" + } + }, + + { + "path": "pages/tabbar/home/web-view", + "style": { + + } + }, + { + "path": "pages/tabbar/special/special", + "style": { + "navigationBarTitleText": "专题" + } + } + + ], + "subPackages": [ + + { + "root": "pages/mine", + "pages": [ + + { + "path": "signIn", + "style": { + "navigationBarTitleText": "签到" + } + }, { + "path": "myTracks", + "style": { + "navigationBarTitleText": "我的足迹", + "enablePullDownRefresh": true, + "navigationStyle": "custom" + } + }, { + "path": "myCollect", + "style": { + "navigationBarTitleText": "收藏", + "enablePullDownRefresh": false, + "navigationStyle": "custom", + "app-plus": { + "scrollIndicator": "none" + } + } + }, + { + "path": "distribution/list", + "style": { + "navigationBarTitleText": "推广商品", + "app-plus": { + //app页面不显示滚动条 + "scrollIndicator": "none" + } + } + }, + { + "path": "distribution/withdrawal", + "style": { + "navigationBarTitleText": "提现", + "app-plus": { + //app页面不显示滚动条 + "scrollIndicator": "none" + } + } + }, + { + "path": "distribution/join", + "style": { + "navigationBarTitleText": "推广资格申请", + "navigationBarTextStyle": "black", + "app-plus": { + //app页面不显示滚动条 + "scrollIndicator": "none" + } + } + }, + { + "path": "distribution/history", + "style": { + "navigationBarTitleText": "提现历史" + + } + }, + { + "path": "distribution/auth", + "style": { + "navigationBarTitleText": "会员实名认证" + + } + }, + { + "path": "distribution/achievement", + "style": { + "navigationBarTitleText": "业绩统计", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black", + "backgroundColor": "#f5f6f8" + } + }, + { + "path": "distribution/grade", + "style": { + "navigationBarTitleText": "分销等级" + } + }, + { + "path": "distribution/home", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "分销员中心" + } + }, + { + "path": "distribution/invite-list", + "style": { + "navigationBarTitleText": "我的邀请", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black", + "backgroundColor": "#f5f6f8" + } + }, + { + "path": "distribution/customer-list", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "客户列表", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black", + "backgroundColor": "#f5f6f8" + } + }, + { + "path": "distribution/invite-friends", + "style": { + "navigationBarTitleText": "邀请卡", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black", + "backgroundColor": "#fff7f0" + } + }, + { + "path": "distribution/invite", + "style": { + "navigationBarTitleText": "图文邀请卡", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black", + "backgroundColor": "#f5f5f5" + } + }, + { + "path": "distribution/order-list", + "style": { + "navigationBarTitleText": "推广订单", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black", + "backgroundColor": "#f5f6f8" + } + }, + { + "path": "distribution/order-detail", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "分销订单详情", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black", + "backgroundColor": "#f5f6f8" + } + }, + { + "path": "distribution/poster", + "style": { + "navigationBarTitleText": "平台海报", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black", + "backgroundColor": "#f5f5f5" + } + }, + { + "path": "distribution/bind", + "style": { + "navigationBarTitleText": "加载中", + "navigationStyle": "custom" + } + }, + { + "path": "distribution/share", + "style": { + "navigationBarTitleText": "分享给好友", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black", + "backgroundColor": "#ffffff" + } + }, + { + "path": "deposit/index", + "style": { + "navigationStyle": "custom" + + } + }, + { + "path": "deposit/operation", + "style": { + "navigationStyle": "custom" + + } + }, + { + "path": "deposit/recharge", + "style": { + "navigationBarTitleText": "充值金额" + + } + }, + { + "path": "deposit/withdrawal", + "style": { + "navigationBarTitleText": "提现金额" + + } + }, + { + "path": "deposit/withdrawApply", + "style": { + "navigationStyle": "custom" + } + }, + + { + "path": "deposit/info", + "style": { + "navigationBarTitleText": "预存款详情" + + } + }, + { + "path": "address/address", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "地址管理" + } + }, + { + "path": "address/storeAddress", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "自提点" + } + }, + { + "path": "address/add", + "style": { + "navigationBarTitleText": "收货人" + } + }, + { + "path": "address/addressManage", + "style": { + "navigationBarTitleText": "地址管理" + } + }, + { + "path": "set/versionFunctionList", + "style": { + "navigationBarTitleText": "功能介绍" + } + }, + + { + "path": "set/securityCenter/fingerLogin", + "style": { + "navigationBarTitleText": "指纹登录" + } + }, + { + "path": "set/securityCenter/faceLogin", + "style": { + "navigationBarTitleText": "面容登录" + } + }, + + + { + "path": "set/securityCenter/editPassword", + "style": { + "navigationBarTitleText": "修改密码", + "app-plus": { + + } + } + }, + + { + "path": "set/securityCenter/bindMobile", + "style": { + "navigationBarTitleText": "绑定手机号", + "app-plus": { + + } + } + }, + + { + "path": "im/list", + "style": { + "navigationStyle": "custom", // 隐藏系统导航栏 + "enablePullDownRefresh": true, + "app-plus": { + } + + } + }, + { + "path": "im/index", + "style": { + "navigationStyle": "custom", // 隐藏系统导航栏 + "enablePullDownRefresh": true, + "app-plus": { + } + + } + }, + { + "path": "set/feedBack", + "style": { + "navigationBarTitleText": "意见反馈" + } + }, + { + "path": "set/securityCenter/updatePwdTab", + "style": { + "navigationBarTitleText": "修改密码" + } + }, + { + "path": "set/securityCenter/editLoginPassword", + "style": { + "navigationBarTitleText": "修改密码" + } + }, + { + "path": "set/securityCenter/securityCenter", + "style": { + "navigationBarTitleText": "安全中心" + } + }, + + { + "path": "set/editionIntro", + "style": { + "navigationBarTitleText": "关于我们" + } + }, + { + "path": "set/setUp", + "style": { + "navigationBarTitleText": "设置" + } + }, + { + "path": "set/personMsg", + "style": { + "navigationBarTitleText": "个人信息", + "app-plus": { + "titleNView": { + "padding-right": "12", + "buttons": [{ + "text": "保存", + "fontSize": "16", + "width": "auto", + "color": "#FFFFFF" + }] + } + } + } + }, { + "path": "help/tips", + "style": { + "navigationBarTitleText": "" + } + }, { + "path": "point/myPoint", + "style": { + "navigationBarTitleText": "我的积分" + } + }, + { + "path": "msgTips/main", + "style": { + "navigationBarTitleText": "消息中心" + } + }, + { + "path": "msgTips/sysMsg/index", + "style": { + "navigationBarTitleText": "系统消息" + } + }, + { + "path": "msgTips/serviceMsg/index", + "style": { + "navigationBarTitleText": "客服记录" + } + }, + { + "path": "msgTips/packageMsg/index", + "style": { + "navigationBarTitleText": "物流消息" + } + }, + { + "path": "msgTips/packageMsg/logisticsDetail", + "style": { + "navigationBarTitleText": "订单跟踪" + } + } + + ] + + }, + + + { + "root": "pages/product", + "pages": [{ + "path": "shopPage", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + },{ + "path": "shopList", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + },{ + "path": "licencePhoto", + "style": { + "navigationBarTitleText": "营业执照" + } + },{ + "path": "shopPageGoods", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, + { + "path": "goods", + "style": { + "backgroundColor": "#fff", + "navigationStyle": "custom", + "app-plus": { + // 将回弹属性关掉 + "bounce": "none", + // 禁止页面滚动 + "scrollIndicator": "none", + "safearea": { + "bottom": { + "offset": "none" + } + } + } + } + }, + { + "path": "askList", + "style": { + "navigationBarTitleText": "问答专区" + } + }, + { //商品评价 + "path": "comment", + "style": { + "navigationBarTitleText": "商品评价", + "navigationStyle": "custom", + "app-plus": { + //app页面不显示滚动条 + "scrollIndicator": "none" + } + } + }, + { // 客服 + "path": "customerservice/index", + "style": { + "navigationBarTitleText": "客服", + "usingComponents": { + // #ifdef MP-WEIXIN + "chat": "plugin://myPlugin/chat" + // #endif + } + } + } + + ] + + }, + { + "root": "pages/floor", + "pages": [{ + "path": "empty" + }] + + }, + { + "root": "pages/passport", + "pages": [{ + "path": "login", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "app-plus": { + "titleNView": false, + "animationType": "slide-in-bottom", + "scrollIndicator": "none", + "safearea": { + "bottom": { + "offset": "none" + } + } + } + } + }, + + { + "path": "entry/seller/index", + "style": { + "navigationBarTitleText": "店铺入驻", + "navigationStyle": "custom" + } + }, + { + "path": "entry/seller/control", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, + { + "path": "article", + "style": { + "navigationBarTitleText": "文章" + } + }, + { + "path": "wechatMPLogin", + "style": { + "navigationBarTitleText": "小程序登录", + "navigationStyle": "custom", + "navigationBarTextStyle": "black" + } + }, + { + "path": "scannerCodeLoginConfirm", + "style": { + "navigationBarTitleText": "扫码登录", + "navigationStyle": "custom", + "navigationBarTextStyle": "black" + } + } + ] + + }, + + { + "root": "pages/promotion", + "pages": [ { + "path": "seckill", + "style": { + "navigationBarTitleText": "限时抢购", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "black" , + "app-plus": { + "titleNView": { + "homeButton":true + } + } + } + }, + + // #ifndef MP-WEIXIN + { + "path": "live/room", + "style": { + "navigationStyle": "custom", + "navigationBarTextStyle": "white", + "disableScroll": true + } + }, + // #endif + { + "path": "joinGroup", + "style": { + "navigationBarTitleText": "拼团活动", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "black" , + "app-plus": { + // 将回弹属性关掉 + "bounce": "none" + } + } + }, + // #ifndef MP-WEIXIN + { + "path": "lives", + "style": { + "navigationStyle": "custom", + "navigationBarTextStyle": "black" + } + }, + // #endif + { + "path": "bargain/list", + "style": { + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + + } + },{ + "path": "bargain/detail", + "style": { + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + + } + },{ + "path": "bargain/log", + "style": { + "navigationBarTitleText": "砍价记录" + } + },{ + "path": "point/detail", + "style": { + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + + } + },{ + "path": "point/pointList", + "style": { + "navigationBarTitleText": "积分商城" + + + } + } + + ] + + }, + { + "root": "pages/cart", + "pages": [{ + "path": "coupon/myCoupon", + "style": { + "navigationBarTitleText": "我的优惠券", + "app-plus": { + "bounce": "coupon/none" + + } + } + }, + { + "path": "coupon/couponDetail", + "style": { + "navigationBarTitleText": "优惠券详情" + } + }, + { + "path": "coupon/index", + "style": { + "navigationBarTitleText": "优惠券" + } + }, + + { + "path": "coupon/couponCenter", + "style": { + "navigationBarTitleText": "领券中心", + "enablePullDownRefresh": true + + } + }, + { + "path": "payment/payOrder", + "style": { + "navigationBarTitleText": "支付订单", + "app-plus": { + "popGesture": "none" //禁止侧滑退出 + + } + } + }, + { + "path": "payment/success", + "style": { + "navigationBarTitleText": "支付成功", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white", + "app-plus": { + "popGesture": "none", //禁止侧滑退出 + "titleNView": false + } + } + }, + { + "path": "payment/error", + "style": { + "navigationBarTitleText": "支付失败", + "navigationStyle": "custom", + "navigationBarTextStyle": "black", + "app-plus": { + "popGesture": "none" + } + } + }, + { + "path": "payment/shareOrderGoods", + "style": { + "navigationBarTitleText": "", + "app-plus": { + + } + } + } + + ] + + }, + { + "root": "pages/order", + "pages": [{ + "path": "complain/complain", + "style": { + "navigationBarTitleText": "订单商品投诉" + } + }, + { + "path": "complain/complainInfo", + "style": { + "navigationBarTitleText": "投诉详情" + } + }, + { + "path": "complain/complainList", + "style": { + "navigationBarTitleText": "投诉列表" + } + }, + { + "path": "myOrder", + "style": { + "navigationBarTitleText": "我的订单", + "enablePullDownRefresh": true, + "app-plus": { + "bounce": "none" + + } + } + }, + { + "path": "invoice/invoiceDetail", + "style": { + "navigationBarTitleText": "发票详情" + } + }, + { + "path": "orderDetail", + "style": { + "navigationBarTitleText": "订单详情" + } + }, + { + "path": "deliverDetail", + "style": { + "navigationBarTitleText": "物流详情" + } + }, + { + "path": "evaluate/evaluateDetail", + "style": { + "navigationBarTitleText": "评价详情" + } + }, + + { + "path": "evaluate/releaseEvaluate", + "style": { + "navigationBarTitleText": "发布评价" + } + }, + { + "path": "evaluate/myEvaluate", + "style": { + "navigationBarTitleText": "我的评价" + } + }, + + { + "path": "afterSales/applyProgress", + "style": { + "navigationBarTitleText": "售后服务" + } + }, + { + "path": "afterSales/applyDetail", + "style": { + "navigationBarTitleText": "售后服务" + } + }, + { + "path": "afterSales/applySuccess", + "style": { + "navigationBarTitleText": "提交成功", + "app-plus": { + "bounce": "none", + "titleNView": { + "titleColor": "#FFFFFF", + "buttons": [{ + "text": "完成", + "fontSize": "14", + "color": "#FFFFFF", + "width": "36px" + // "background": "rgba(0,0,0,0)" + }] + } + } + } + }, + { + "path": "afterSales/afterSalesDetailExpress" + }, + { + "path": "afterSales/afterSalesSelect", + "style": { + "navigationBarTitleText": "申请售后" + } + }, + { + "path": "afterSales/afterSalesDetail", + "style": { + "navigationBarTitleText": "申请售后" + } + }, + { + "path": "afterSales/afterSales", + "style": { + "navigationBarTitleText": "售后管理", + "enablePullDownRefresh": true + } + }, + { + "path": "fillorder", + "style": { + "navigationBarTitleText": "填写订单" + } + } + ] + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "Lili商城", + "navigationBarBackgroundColor": "#fff", + "backgroundColor": "#fff", + "app-plus": { + // 全局关闭回弹功能 + "bounce": "none" + + } + }, + "tabBar": { + "color": "#666", + "selectedColor": "#ff3c2a", + "borderStyle": "black", + "backgroundColor": "#ffffff", + "list": [{ + "pagePath": "pages/tabbar/home/index", + "iconPath": "static/tabbar/home.png", + "selectedIconPath": "static/tabbar/home-s.png", + "text": "首页" + }, + { + "pagePath": "pages/tabbar/category/category", + "iconPath": "static/tabbar/category.png", + "selectedIconPath": "static/tabbar/category-s.png", + "text": "分类" + }, + + { + "pagePath": "pages/tabbar/cart/cartList", + "iconPath": "static/tabbar/cart.png", + "selectedIconPath": "static/tabbar/cart-s.png", + "text": "购物车" + }, + { + "pagePath": "pages/tabbar/user/my", + "iconPath": "static/tabbar/mine.png", + "selectedIconPath": "static/tabbar/mine-s.png", + "text": "我的" + } + ] + }, + // #todo 为什么要注释condition下代码? + // IOS plus.runtime.arguments 添加 condition节点后, 框架会修改 runtime.arguments + // 会影响什么功能? + // -在h5中唤醒app会一直返回默认值 {"name":"","path":"","query":"","id":0} + "condition": { //模式配置,仅开发期间生效 + // "current": 0, //当前激活的模式(list 的索引项) + // "list": [{ + // "name": "", //模式名称 + // "path":"", //启动页面,必选 + // "query": "" //启动参数,在页面的onLoad函数里面得到 + // }] + } +} diff --git a/pages/mine/address/add.vue b/pages/mine/address/add.vue index ba9f50e..326df8b 100644 --- a/pages/mine/address/add.vue +++ b/pages/mine/address/add.vue @@ -1,375 +1,386 @@ - - - \ No newline at end of file diff --git a/pages/mine/distribution/achievement.vue b/pages/mine/distribution/achievement.vue index 1977201..9bf0664 100644 --- a/pages/mine/distribution/achievement.vue +++ b/pages/mine/distribution/achievement.vue @@ -1,10 +1,555 @@ diff --git a/pages/mine/distribution/auth.vue b/pages/mine/distribution/auth.vue index 954da91..eabd78e 100644 --- a/pages/mine/distribution/auth.vue +++ b/pages/mine/distribution/auth.vue @@ -1,99 +1,24 @@ @@ -102,8 +27,8 @@ function submitForm() { padding: 32rpx; } .tips { - margin-top: 20rpx; - font-size: 24rpx; - color: #999; + font-size: 28rpx; + color: #666; + line-height: 1.6; } diff --git a/pages/mine/distribution/bind.vue b/pages/mine/distribution/bind.vue new file mode 100644 index 0000000..bcf48a0 --- /dev/null +++ b/pages/mine/distribution/bind.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/pages/mine/distribution/customer-list.vue b/pages/mine/distribution/customer-list.vue new file mode 100644 index 0000000..300b26f --- /dev/null +++ b/pages/mine/distribution/customer-list.vue @@ -0,0 +1,833 @@ + + + + + diff --git a/pages/mine/distribution/grade.vue b/pages/mine/distribution/grade.vue new file mode 100644 index 0000000..d8c09a8 --- /dev/null +++ b/pages/mine/distribution/grade.vue @@ -0,0 +1,611 @@ + + + + + diff --git a/pages/mine/distribution/history.vue b/pages/mine/distribution/history.vue index 65c5b42..be76a08 100644 --- a/pages/mine/distribution/history.vue +++ b/pages/mine/distribution/history.vue @@ -32,11 +32,10 @@ {{ item.goodsName }} - 提成金额:+{{ unitPrice(item.rebate) }} + 提成金额:+{{ unitPrice(item.commissionAmount) }} 创建时间:{{ item.createTime }} - 店铺:{{ item.storeName }} 会员名称:{{ item.memberName }} @@ -57,7 +56,7 @@ import { ref } from 'vue' import { onLoad, onReachBottom } from '@dcloudio/uni-app' import { useStore } from '@/store' -import { cashLog, distributionOrderList } from '@/api/goods' +import { cashLog, getDistributionOrders } from '@/api/distribution' import { unitPrice } from '@/utils/filters.js' const store = useStore() @@ -71,7 +70,7 @@ const listType = ref(0) const routeQuery = ref>({}) const withdrawParams = ref({ pageNumber: 1, pageSize: 10 }) -const achievementParams = ref({ pageNumber: 1, pageSize: 10 }) +const achievementParams = ref({ pageNumber: 1, pageSize: 10, orderType: 'PROMOTION' }) onLoad((option) => { const type = Number(option.type != null ? option.type : 0) @@ -100,12 +99,16 @@ function hideLoadingIfNeeded() { function fetchAchievementList() { uni.showLoading({ title: '加载中' }) - distributionOrderList(achievementParams.value).then((res) => { - if (res.data.success && res.data.result.records.length >= 1) { - achievementList.value.push(...res.data.result.records) + getDistributionOrders(achievementParams.value).then((res) => { + const records = res.data.success ? res.data.result?.records || [] : [] + if (records.length) { + achievementList.value.push(...records) + if (records.length < achievementParams.value.pageSize) { + loadStatus.value = 'nomore' + } } else { loadStatus.value = 'nomore' - isEmpty.value = true + isEmpty.value = achievementList.value.length === 0 } hideLoadingIfNeeded() }) diff --git a/pages/mine/distribution/home.vue b/pages/mine/distribution/home.vue index ee89e33..623a47f 100644 --- a/pages/mine/distribution/home.vue +++ b/pages/mine/distribution/home.vue @@ -1,107 +1,908 @@ - - - - - + + + + + diff --git a/pages/mine/distribution/invite-friends.vue b/pages/mine/distribution/invite-friends.vue new file mode 100644 index 0000000..5994910 --- /dev/null +++ b/pages/mine/distribution/invite-friends.vue @@ -0,0 +1,329 @@ + + + + + diff --git a/pages/mine/distribution/invite-list.vue b/pages/mine/distribution/invite-list.vue new file mode 100644 index 0000000..6784a7e --- /dev/null +++ b/pages/mine/distribution/invite-list.vue @@ -0,0 +1,486 @@ + + + + + diff --git a/pages/mine/distribution/invite.vue b/pages/mine/distribution/invite.vue new file mode 100644 index 0000000..1e13275 --- /dev/null +++ b/pages/mine/distribution/invite.vue @@ -0,0 +1,425 @@ + + + + + diff --git a/pages/mine/distribution/join.vue b/pages/mine/distribution/join.vue index a8b1d85..a4ebe8b 100644 --- a/pages/mine/distribution/join.vue +++ b/pages/mine/distribution/join.vue @@ -1,127 +1,756 @@ - - - - - - - + + + + + diff --git a/pages/mine/distribution/list.vue b/pages/mine/distribution/list.vue index 2548251..ce589b4 100644 --- a/pages/mine/distribution/list.vue +++ b/pages/mine/distribution/list.vue @@ -1,496 +1,402 @@ + + \ No newline at end of file + +.goods-earn { + display: inline-block; + padding: 4rpx 12rpx; + border-radius: 6rpx; + background: #fff0f0; + color: #ff4d4f; + font-size: 22rpx; + line-height: 1.4; +} + +.goods-price { + margin-top: 10rpx; + color: #222; + font-size: 34rpx; + font-weight: 700; + line-height: 1.2; +} + +.share-btn { + flex-shrink: 0; + margin-left: 12rpx; + padding: 14rpx 24rpx; + border-radius: 999rpx; + background: linear-gradient(135deg, #ff8f3f 0%, #ff6b35 100%); + color: #fff; + font-size: 24rpx; + line-height: 1; + white-space: nowrap; +} + +.load-more { + padding: 24rpx 0 40rpx; + text-align: center; + color: #bbb; + font-size: 24rpx; +} + diff --git a/pages/mine/distribution/order-detail.vue b/pages/mine/distribution/order-detail.vue new file mode 100644 index 0000000..d8f1351 --- /dev/null +++ b/pages/mine/distribution/order-detail.vue @@ -0,0 +1,512 @@ + + + + + diff --git a/pages/mine/distribution/order-list.vue b/pages/mine/distribution/order-list.vue new file mode 100644 index 0000000..1ed5197 --- /dev/null +++ b/pages/mine/distribution/order-list.vue @@ -0,0 +1,710 @@ + + + + + diff --git a/pages/mine/distribution/poster.vue b/pages/mine/distribution/poster.vue new file mode 100644 index 0000000..3b720e2 --- /dev/null +++ b/pages/mine/distribution/poster.vue @@ -0,0 +1,428 @@ + + + + + diff --git a/pages/mine/distribution/share.vue b/pages/mine/distribution/share.vue new file mode 100644 index 0000000..b8891f2 --- /dev/null +++ b/pages/mine/distribution/share.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/pages/mine/distribution/withdrawal.vue b/pages/mine/distribution/withdrawal.vue index f3fd6fe..651ff01 100644 --- a/pages/mine/distribution/withdrawal.vue +++ b/pages/mine/distribution/withdrawal.vue @@ -29,7 +29,7 @@ + + + + + diff --git a/utils/filters.js b/utils/filters.js index 32087e1..4b3a8a0 100644 --- a/utils/filters.js +++ b/utils/filters.js @@ -528,6 +528,48 @@ export function serviceStatusList (val) { return statusList[val]; } +/** + * 格式化商品规格展示(兼容 SKU JSON 与纯文本) + */ +export function formatGoodsSpecs(specs) { + if (specs === null || specs === undefined) { + return '默认' + } + const trimmed = String(specs).trim() + if (!trimmed) { + return '默认' + } + if (!trimmed.startsWith('{') && !trimmed.startsWith('[')) { + return trimmed + } + try { + const data = JSON.parse(trimmed) + if (!data || typeof data !== 'object' || Array.isArray(data)) { + return trimmed + } + const parts = [] + Object.keys(data).forEach((key) => { + if (key === 'images') { + return + } + const value = data[key] + if (value === null || value === undefined || value === '') { + return + } + if (typeof value === 'object') { + return + } + const text = String(value).trim() + if (text) { + parts.push(text) + } + }) + return parts.length ? parts.join(' ') : '默认' + } catch (e) { + return '默认' + } +} + /** * 订单状态列表 */ diff --git a/vue.config.js b/vue.config.js index 4fcbd16..c4415a1 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,20 +1,7 @@ +const path = require('path') -// module.exports = { -// /** -// * 此处为发行h5,微信小程序,app中删除console -// * 如需显示console 需要注释此处重新运行 -// */ -// chainWebpack: (config) => { -// // 发行或运行时启用了压缩时会生效 -// config.optimization.minimizer('terser').tap((args) => { -// const compress = args[0].terserOptions.compress -// // 非 App 平台移除 console 代码(包含所有 console 方法,如 log,debug,info...) -// compress.drop_console = true -// compress.pure_funcs = [ -// '__f__', // App 平台 vue 移除日志代码 -// // 'console.debug' // 可移除指定的 console 方法 -// ] -// return args -// }) -// } -// } \ No newline at end of file +module.exports = { + transpileDependencies: [ + path.join(__dirname, 'js_sdk/u-draw-poster'), + ], +}