diff --git a/api/agent.js b/api/agent.js new file mode 100644 index 0000000..3604b5a --- /dev/null +++ b/api/agent.js @@ -0,0 +1,20 @@ +import request from "@/utils/request.js"; + +// 代理中心 - 代理列表 +export function myAgentList(data) { + return request.get('agent/agent_list',data); +} +// 商户中心 - 供应商入驻邀请二维码 +export function inviteSupplierJoinQrCode(data) { + return request.get('agent/qr_code_invite_supplier',data); +} + + + + + + + + + + diff --git a/api/merchant.js b/api/merchant.js deleted file mode 100644 index 07e7ee3..0000000 --- a/api/merchant.js +++ /dev/null @@ -1,22 +0,0 @@ -import request from "@/utils/request.js"; - -// 商户中心 - 推广二维码 -export function promoteQrCodes(data) { - return request.get('merchant/promote_qr_code',data); -} -// 商户中心 - 买单二维码 -export function onlinePaymentQrCodes(data) { - return request.get('merchant/online_payment_qr_code',data); -} - - - - - - - - - - - - diff --git a/api/service.js b/api/service.js index a8835dd..ed95d74 100644 --- a/api/service.js +++ b/api/service.js @@ -22,7 +22,14 @@ export function delStaff(data) { } - +// 商户中心 - 推广二维码 +export function promoteQrCodes(data) { + return request.get('merchant/promote_qr_code',data); +} +// 商户中心 - 买单二维码 +export function onlinePaymentQrCodes(data) { + return request.get('merchant/online_payment_qr_code',data); +} diff --git a/pages.json b/pages.json index 6e557c0..a448d3a 100644 --- a/pages.json +++ b/pages.json @@ -125,10 +125,12 @@ } } ], - "subPackages": [{ + "subPackages": [ + { "root": "pages/users", "name": "users", - "pages": [{ + "pages": [ + { "path": "retrievePassword/index", "style": { "navigationBarTitleText": "忘记密码" @@ -140,7 +142,6 @@ "navigationBarTitleText": "设置" } }, - //协议,关于 { "path": "user_about/index", "style": { @@ -216,23 +217,23 @@ { "path": "user_grade/index", "style": { + // #ifdef MP || APP-PLUS + "navigationBarTextStyle": "#fff", + // #endif "navigationBarTitleText": "我的等级", "navigationBarBackgroundColor": "#282828" - // #ifdef MP || APP-PLUS - , - "navigationBarTextStyle": "#fff" - // #endif + } }, { "path": "user_grade_list/index", "style": { + // #ifdef MP || APP-PLUS + "navigationBarTextStyle": "#fff", + // #endif "navigationBarTitleText": "成长值记录", "navigationBarBackgroundColor": "#282828" - // #ifdef MP || APP-PLUS - , - "navigationBarTextStyle": "#fff" - // #endif + } }, { @@ -304,11 +305,11 @@ { "path": "user_pwd_edit/index", "style": { - "navigationBarTitleText": "修改密码" - // #ifdef MP || APP-PLUS - , - "navigationBarTextStyle": "#fff" + // #ifdef MP || APP-PLUS + "navigationBarTextStyle": "#fff", // #endif + "navigationBarTitleText": "修改密码" + } }, { @@ -338,7 +339,6 @@ { "path": "promoter_rank/index", "style": { - "navigationBarTitleText": "推广人排行" } }, @@ -387,12 +387,11 @@ { "path": "login/index", "style": { + // #ifdef MP || APP-PLUS + "navigationBarTextStyle": "#fff", + // #endif "navigationBarTitleText": "登录", "navigationBarBackgroundColor": "#EB5447" - // #ifdef MP || APP-PLUS - , - "navigationBarTextStyle": "#fff" - // #endif } }, { @@ -582,26 +581,24 @@ "root": "pages/store", "name": "store", "pages": [ - { - "path": "index", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "店铺diy首页" - // #ifdef MP - , - "navigationBarTextStyle": "#FFFFFF" - // #endif - } - },{ + { + "path": "index", + "style": { + // #ifdef MP + "navigationBarTextStyle": "#FFFFFF", + // #endif + "navigationStyle": "custom", + "navigationBarTitleText": "店铺diy首页" + } + }, + { "path": "home/index", "style": { + // #ifdef MP + "navigationBarTextStyle": "#FFFFFF", + // #endif "navigationStyle": "custom", "navigationBarTitleText": "店铺首页" - // #ifdef MP - , - "navigationBarTextStyle": "#FFFFFF" - // #endif - } }, { @@ -621,12 +618,14 @@ "style": { "navigationBarTitleText": "商家入驻" } - }, { + }, + { "path": "applicationRecord/index", "style": { "navigationBarTitleText": "申请记录" } - }, { + }, + { "path": "merchantDetails/index", "style": { "navigationBarTitleText": "审核通过" @@ -649,7 +648,8 @@ { "root": "pages/admin", "name": "adminOrder", - "pages": [{ + "pages": [ + { "path": "order/index", "style": { "navigationBarTitleText": "订单首页" @@ -671,7 +671,6 @@ "path": "refundList/index", "style": { "navigationBarTitleText": "申请退款" - } }, { @@ -704,7 +703,7 @@ "navigationBarTitleText": "退款单详情" } }, - { + { "path": "delivery/index", "style": { "navigationBarTitleText": "订单发货" @@ -737,12 +736,12 @@ { "path": "storeDiy/index", "style": { + // #ifdef MP + "navigationBarTextStyle": "#FFFFFF", + // #endif "navigationStyle": "custom", "navigationBarTitleText": "店铺diy首页" - // #ifdef MP - , - "navigationBarTextStyle": "#FFFFFF" - // #endif + } }, // #ifdef H5 @@ -759,15 +758,13 @@ "navigationBarTitleText": "客户管理" } } - - - ] }, { "root": "pages/product", "name": "product", - "pages": [{ + "pages": [ + { "path": "list/index", "style": { "navigationBarTitleText": "商品管理" @@ -798,13 +795,13 @@ } }, { - "path":"storeClassification/index", + "path": "storeClassification/index", "style": { "navigationBarTitleText": "店铺分类" } }, { - "path":"storeClassification/addStoreClass", + "path": "storeClassification/addStoreClass", "style": { "navigationBarTitleText": "添加店铺分类" } @@ -822,7 +819,7 @@ } }, { - "path":"addGoods/addGoodDetils", + "path": "addGoods/addGoodDetils", "style": { "navigationBarTitleText": "商品详情" } @@ -880,7 +877,7 @@ { "path": "plant_release/index", "style": { - "navigationBarTitleText": "内容发布" + "navigationBarTitleText": "内容发布" } }, { @@ -936,7 +933,8 @@ { "root": "pages/columnGoods", "name": "columnGoods", - "pages": [{ + "pages": [ + { "path": "HotNewGoods/index", "style": { "navigationBarTitleText": "精品推荐" @@ -967,18 +965,19 @@ } } ] -// , -// "plugins": { -// "live-player-plugin": { -// "version": "1.3.2", -// "provider": "wx7aac64d4d4419260" -// } -// } + // , + // "plugins": { + // "live-player-plugin": { + // "version": "1.3.2", + // "provider": "wx7aac64d4d4419260" + // } + // } }, { "root": "pages/chat", "name": "chat", - "pages": [{ + "pages": [ + { "path": "customer_list/index", "style": { "navigationBarTitleText": "消息中心" @@ -1007,7 +1006,8 @@ { "root": "pages/activity", "name": "activity", - "pages": [{ + "pages": [ + { "path": "goods_seckill/index", "style": { "enablePullDownRefresh": true, @@ -1032,12 +1032,12 @@ { "path": "presell/index", "style": { + // #ifdef MP || APP-PLUS + "navigationBarBackgroundColor": "#F2F2F2", + // #endif "enablePullDownRefresh": true, "navigationBarTitleText": "预售列表" - // #ifdef MP || APP-PLUS - , - "navigationBarBackgroundColor": "#F2F2F2" - // #endif + } }, { @@ -1050,12 +1050,11 @@ { "path": "combination/index", "style": { + // #ifdef MP || APP-PLUS + "navigationBarBackgroundColor": "#F2F2F2", + // #endif "enablePullDownRefresh": true, "navigationBarTitleText": "拼团" - // #ifdef MP || APP-PLUS - , - "navigationBarBackgroundColor": "#F2F2F2" - // #endif } }, { @@ -1126,189 +1125,230 @@ ] }, { - "root": "pages/short_video", - "name": "shortVideo", - "pages": [{ - "navigationBarTitleText": "短视频", - "enablePullDownRefresh": false, - //#ifdef APP - "path": "appSwiper/index", - //#endif - //#ifndef APP - "path": "nvueSwiper/index", - //#endif - "style": { - "navigationBarTitleText": "社区短视频", - "app-plus": { - "titleNView": false, - "bounce": "none" - } - } - }] + "root": "pages/short_video", + "name": "shortVideo", + "pages": [ + { + "navigationBarTitleText": "短视频", + "enablePullDownRefresh": false, + //#ifdef APP + "path": "appSwiper/index", + //#endif + //#ifndef APP + "path": "nvueSwiper/index", + //#endif + "style": { + "navigationBarTitleText": "社区短视频", + "app-plus": { + "titleNView": false, + "bounce": "none" + } + } + } + ] }, { - "root": "pages/points_mall", - "pages": [{ - "path": "index", - "style": { - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#333333", - "navigationBarTitleText": "积分商城", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, - { - "path": "integral_goods_list", - "style": { - "navigationBarTitleText": "商品列表", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, + "root": "pages/points_mall", + "pages": [ { - "path": "goods_selection", - "style": { - "navigationBarTitleText": "好物精选", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } + "path": "index", + "style": { + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + }, + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#333333", + "navigationBarTitleText": "积分商城" + } }, { - "path": "integral_goods_details", - "style": { - "navigationBarTitleText": "商品详情", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - // #ifdef MP - , - "disableScroll": true - // #endif - } - }, - { - "path": "integral_order", - "style": { - "navigationBarTitleText": "积分订单", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, - { - "path": "exchange_record", - "style": { - "navigationBarTitleText": "兑换记录", + "path": "integral_goods_list", + "style": { + "navigationBarTitleText": "商品列表", "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif } - } - },{ - "path": "integral_order_details", - "style": { - "navigationBarTitleText": "兑换订单详情" - } - } - ] + } + }, + { + "path": "goods_selection", + "style": { + "navigationBarTitleText": "好物精选", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, + { + "path": "integral_goods_details", + "style": { + // #ifdef MP + "disableScroll": true, + // #endif + "navigationBarTitleText": "商品详情", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, + { + "path": "integral_order", + "style": { + "navigationBarTitleText": "积分订单", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, + { + "path": "exchange_record", + "style": { + "navigationBarTitleText": "兑换记录", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, + { + "path": "integral_order_details", + "style": { + "navigationBarTitleText": "兑换订单详情" + } + } + ] }, { - "root": "pages/annex", + "root": "pages/annex", "name": "annx", - "pages": [{ - "path": "web_view/index", - "style": { - "navigationBarTitleText": "", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, { - "path": "vip_paid/index", - "style": { - "navigationBarTitleText": "开通会员", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, { - "path": "vip_center/index", - "style": { - "navigationBarTitleText": "会员中心", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, + "pages": [ { - "path": "vip_grade/index", - "style": { - "navigationBarTitleText": "会员卡", + "path": "web_view/index", + "style": { + "navigationBarTitleText": "", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, + { + "path": "vip_paid/index", + "style": { + "navigationBarTitleText": "开通会员", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, + { + "path": "vip_center/index", + "style": { + "navigationBarTitleText": "会员中心", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, + { + "path": "vip_grade/index", + "style": { + "navigationBarTitleText": "会员卡", "navigationBarTextStyle": "white", "navigationBarBackgroundColor": "#302F35", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } }, - { - "path": "vip_clause/index", - "style": { - "navigationBarTitleText": "会员协议", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - } - ] + { + "path": "vip_clause/index", + "style": { + "navigationBarTitleText": "会员协议", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + } + ] + }, + { + "root": "pages/agent", + "name": "agent", + "pages": [ + { + "path": "center", + "style": { + "navigationBarTitleText": "代理中心" + } + } + + + + + ] + }, + { + "root": "pages/supplier", + "name": "supplier", + "pages": [ + { + "path": "apply_join", + "style": { + "navigationBarTitleText": "申请入驻" + } + } + + + + + ] } + + + ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue index 70ac0ba..2cf5921 100644 --- a/pages/admin/business/index.vue +++ b/pages/admin/business/index.vue @@ -33,7 +33,7 @@ + + diff --git a/pages/supplier/apply_join.vue b/pages/supplier/apply_join.vue new file mode 100644 index 0000000..5addd4d --- /dev/null +++ b/pages/supplier/apply_join.vue @@ -0,0 +1,345 @@ + + + + + + {{ getAgentTypeText(agent_info, '暂无代理身份') }} + + + + + + + + + + {{item.title}} + + + + + + + + + + + + + + {{ getAgentTypeText(item) }} + + + + + + + + + + + + + 关闭 + + + + + + + +