diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js index 9b2d07f9..2886fc11 100644 --- a/buyer/src/config/index.js +++ b/buyer/src/config/index.js @@ -19,5 +19,9 @@ module.exports = { aMapSwitch:false, //是否开启高德定位 enableCDN: true, //生产环境 是否启用cdn加载 vue等js port: 10000, //端口 - inputMaxLength:'140' //全局输入框默认最大输入长度字 + inputMaxLength:'140', //全局输入框默认最大输入长度字 + + + PC_DOMAIN: "https://pc-b2b2c.pickmall.cn", // PC端域名 + WAP_DOMAIN: "https://m-b2b2c.pickmall.cn", // WAP端域名 }; diff --git a/buyer/src/pages/home/memberCenter/Distribution.vue b/buyer/src/pages/home/memberCenter/Distribution.vue index 019b3b1c..1933950c 100644 --- a/buyer/src/pages/home/memberCenter/Distribution.vue +++ b/buyer/src/pages/home/memberCenter/Distribution.vue @@ -24,7 +24,7 @@ 提交申请 @@ -34,7 +34,7 @@ 您提交的信息正在审核 提交认证申请后,工作人员将在三个工作日进行核对完成审核 @@ -42,11 +42,11 @@
-

分销下线付款之后会生成分销订单。

-

- 冻结金额:用户提现金额即为冻结金额,审核通过后扣除冻结金额,审核拒绝之后冻结金额返回可提现金额。 -

-

可提现金额:分销订单佣金T+1解冻后可变为可提现金额。

+

分销下线付款之后会生成分销订单。

+

+ 冻结金额:用户提现金额即为冻结金额,审核通过后扣除冻结金额,审核拒绝之后冻结金额返回可提现金额。 +

+

可提现金额:分销订单佣金T+1解冻后可变为可提现金额。

@@ -54,7 +54,7 @@
可提现金额: ¥{{ result.canRebate | unitPrice }}¥{{ result.canRebate | unitPrice }} 冻结金额: ¥{{ result.commissionFrozen | unitPrice }} @@ -65,7 +65,7 @@ size="small" class="ml_20" @click="withdrawApplyModal = true" - >申请提现申请提现
@@ -102,13 +102,13 @@ size="small" style="margin-right: 5px" @click="fenxiao(row)" - >分销商品分销商品 取消选择 @@ -156,7 +156,7 @@ size="small" style="margin-right: 5px" @click="selectGoods(row.id, true)" - >选择商品选择商品 @@ -197,8 +197,8 @@ row.distributionCashStatus == "APPLY" ? "待处理" : row.distributionCashStatus == "VIA_AUDITING" - ? "通过" - : "拒绝" + ? "通过" + : "拒绝" }} @@ -222,11 +222,27 @@ 分销功能暂未开启 提交认证申请后,工作人员将在三个工作日进行核对完成审核 + +
+ + 您的分销资格已被清退。请联系管理员或进行申诉 + + +
+ +
+ + 您提交的申诉正在审核 + + +

@@ -234,7 +250,7 @@

@@ -243,21 +259,39 @@ 下载二维码或者复制链接分享商品 -
- - + > +
+
+ +
移动应用端
+ +
-
- 商品链接: + +
+ 商品链接:
@@ -280,6 +314,7 @@ export default { components: { vueQr }, data() { return { + config:require('@/config'), status: 0, // 申请状态,0为未申请 1 申请中 2 申请完成 3 功能暂未开启 applyForm: {}, // 申请表单 rules: { @@ -364,8 +399,10 @@ export default { order: "desc", }, qrcode: "", // 二维码 + qrcodeH5:"",//H5二维码 qrcodeShow: false, // 显示二维码 base64Img: "", // base64编码 + base64ImgH5: "", // base64H5编码 goodsNameCurr: "", // 当前分销商品名称 }; }, @@ -406,6 +443,10 @@ export default { // 二维码base64地址 this.base64Img = data64; }, + qrcodeDataH5(data64) { + // 二维码H5端base64地址 + this.base64ImgH5 = data64; + }, downloadQrcode() { // 下载二维码 let a = document.createElement("a"); // 生成一个a元素 @@ -414,6 +455,14 @@ export default { a.href = this.base64Img; // 将生成的URL设置为a.href属性 a.dispatchEvent(event); // 触发a的单击事件 }, + downloadQrcodeH5(){ + // 下载H5二维码 + let a = document.createElement("a"); // 生成一个a元素 + let event = new MouseEvent("click"); // 创建一个单击事件 + a.download = this.goodsNameCurr || "photo"; + a.href = this.base64ImgH5; // 将生成的URL设置为a.href属性 + a.dispatchEvent(event); // 触发a的单击事件 + }, tabPaneChange(tab) { // tab栏切换 if (tab === "goodsChecked") { @@ -453,7 +502,8 @@ export default { }, fenxiao(row) { // 分销商品 - this.qrcode = `${location.origin}/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}&distributionId=${this.result.id}`; + this.qrcode = `${this.config.PC_DOMAIN}/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}&distributionId=${this.result.id}`; + this.qrcodeH5 = `${this.config.WAP_DOMAIN}/pages/product/goods?skuId=${row.skuId}&goodsId=${row.goodsId}&distributionId=${this.result.id}`; this.goodsNameCurr = row.goodsName; this.qrcodeShow = true; }, @@ -469,19 +519,32 @@ export default { if (res.success) this.logData = res.result; }); }, + //申诉 + repaying(){ + applyDistribution().then((res) => { + this.applyLoading = false; + if (res.success) { + this.$Message.success("申诉已提交,请等待管理员审核"); + // this.status = 1; + } + }); + }, distribution() { // 获取分销商信息 distribution().then((res) => { if (res.result) { this.result = res.result; let type = res.result.distributionStatus; - if (type === "PASS") { this.status = 2; this.getGoodsData(); - } else if (type === "RETREAT" || type === "REFUSE") { + } else if ( type === "REFUSE") { this.status = 0; - } else { + } else if (type === "RETREAT") { + this.status = 4; + }else if (type === "APPEAL") { + this.status = 5; + }else { this.status = 1; } } else if (!res.data.success && res.data.code === 22000) { @@ -523,9 +586,11 @@ export default { } } .download-btn { - position: relative; - top: -200px; - left: 200px; + // position: relative; + // top: -200px; + // left: 200px; + margin-left: 25px; + margin-top: 5px } /deep/ .ivu-alert-message { p { @@ -540,4 +605,15 @@ export default { margin: 6px 0; } } +.qrcode{ + display: flex; + justify-content: space-evenly; + padding-top: 10px + +} +.qrcode-platform{ + text-align: center; + font-size: 14px; + margin: 5px; +} diff --git a/manager/src/api/index.js b/manager/src/api/index.js index 2c90493a..247d9fe6 100644 --- a/manager/src/api/index.js +++ b/manager/src/api/index.js @@ -261,6 +261,38 @@ export const searchPermission = (params) => { /****************************** 权限结束 */ +/****************************** 店铺权限 */ +// 获取全部权限数据 +export const getStoreAllPermissionList = (params) => { + return getRequest("/permission/storeMenu/tree", params); +}; + +// 获取全部权限数据 +export const getStoreCurrentPermissionList = (params) => { + return getRequest("/permission/storeMenu/memberMenu", params); +}; + +// 添加权限 +export const addStorePermission = (params) => { + return postRequest("/permission/storeMenu", params); +}; + +// 编辑权限 +export const editStorePermission = (params) => { + return putRequest(`/permission/storeMenu/${params.id}`, params); +}; +// 删除权限 +export const deleteStorePermission = (ids, params) => { + return deleteRequest(`/permission/storeMenu/${ids}`, params); +}; +// 搜索权限 +export const searchStorePermission = (params) => { + return getRequest("/permission/storeMenu", params); +}; + +/****************************** 权限结束 */ + + // 分页获取日志数据 export const getLogListData = (params) => { return getRequest("/setting/log/getAllByPage", params); diff --git a/manager/src/views/sys/menu-manage/menu.vue b/manager/src/views/sys/menu-manage/menu.vue new file mode 100644 index 00000000..cb893773 --- /dev/null +++ b/manager/src/views/sys/menu-manage/menu.vue @@ -0,0 +1,576 @@ + + + + diff --git a/manager/src/views/sys/menu-manage/menuManage.vue b/manager/src/views/sys/menu-manage/menuManage.vue index 930e2b89..092b201a 100644 --- a/manager/src/views/sys/menu-manage/menuManage.vue +++ b/manager/src/views/sys/menu-manage/menuManage.vue @@ -1,576 +1,24 @@ - - diff --git a/manager/src/views/sys/menu-manage/storeMenu.vue b/manager/src/views/sys/menu-manage/storeMenu.vue new file mode 100644 index 00000000..6eeae686 --- /dev/null +++ b/manager/src/views/sys/menu-manage/storeMenu.vue @@ -0,0 +1,576 @@ + + + +