diff --git a/.env.development b/.env.development index b1bd2dd..79f835e 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ ENV = 'development' # http://mer.crmeb.net/admin # base api # www.shop.xyz -VUE_APP_BASE_API = 'http://testg.tropjoin.com/' +VUE_APP_BASE_API = 'http://testg.tropjoin.com' # VUE_APP_BASE_API = 'http://test.tropjoin.com' # VUE_APP_BASE_API = 'https://api.tropjoin.com' diff --git a/src/api/marketing.js b/src/api/marketing.js index 3709ded..6e5fdc6 100644 --- a/src/api/marketing.js +++ b/src/api/marketing.js @@ -397,6 +397,12 @@ export function signLogExport(data) { export function brokerageLogExport(data) { return request.get(`user/brokerage/excel`, data) } +/** + * @description 奖励金 -- 导出 + */ +export function bonusExport(data) { + return request.get(`user/brokerage/bonus/excel`, data) +} /** * @description 签到配置 -- 列表 */ diff --git a/src/views/marketing/assist/assist_goods/info.vue b/src/views/marketing/assist/assist_goods/info.vue index 38a8514..fe9e83f 100644 --- a/src/views/marketing/assist/assist_goods/info.vue +++ b/src/views/marketing/assist/assist_goods/info.vue @@ -58,7 +58,7 @@ 商品规格:{{ projectData.spec_type === 0 ? '单规格' : '多规格' }} - 佣金设置:{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }} + 商品规格: - - + --> - diff --git a/src/views/marketing/combination/combination_goods/info.vue b/src/views/marketing/combination/combination_goods/info.vue index 5cce4de..83bb8a0 100644 --- a/src/views/marketing/combination/combination_goods/info.vue +++ b/src/views/marketing/combination/combination_goods/info.vue @@ -65,7 +65,7 @@ 商品规格:{{ projectData.spec_type === 0 ? '单规格' : '多规格' }} - 佣金设置:{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }} + 商品规格: - - + --> - diff --git a/src/views/marketing/platformCoupon/couponRecord/index.vue b/src/views/marketing/platformCoupon/couponRecord/index.vue index c8aa756..76b8962 100644 --- a/src/views/marketing/platformCoupon/couponRecord/index.vue +++ b/src/views/marketing/platformCoupon/couponRecord/index.vue @@ -124,7 +124,7 @@ diff --git a/src/views/marketing/preSale/info.vue b/src/views/marketing/preSale/info.vue index 8c157b3..bd031ac 100644 --- a/src/views/marketing/preSale/info.vue +++ b/src/views/marketing/preSale/info.vue @@ -65,7 +65,7 @@ 商品规格:{{ projectData.spec_type === 0 ? '单规格' : '多规格' }} - 佣金设置:{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }} + 商品规格: - - + --> - diff --git a/src/views/marketing/seckill/seckillGoods/info.vue b/src/views/marketing/seckill/seckillGoods/info.vue index 369dd49..b5baaeb 100644 --- a/src/views/marketing/seckill/seckillGoods/info.vue +++ b/src/views/marketing/seckill/seckillGoods/info.vue @@ -65,7 +65,7 @@ 商品规格:{{ projectData.spec_type === 0 ? '单规格' : '多规格' }} - 佣金设置:{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }} + 商品规格: - - + --> - diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue index 3751ea6..6fc88f1 100644 --- a/src/views/order/list/index.vue +++ b/src/views/order/list/index.vue @@ -270,6 +270,34 @@ + + + + + + + + + + + + 搜索 - - + + + + {{ scope.row.merchant.is_huimei ? "是" : "否" }} - - + --> + + 惠美乡村产品:{{ projectData.is_huimei ? "是" : "否" }} 商品封面图:
@@ -471,11 +471,11 @@ projectData.spec_type === 0 ? "单规格" : "多规格" }} - 佣金设置:{{ projectData.extension_type === 0 ? "默认设置" : "单独设置" }} + > --> 商品规格: - - @@ -617,6 +617,16 @@ > + + + + + + +
  • +
    惠美乡村产品:
    +
    + {{ productData.is_huimei ? "是" : "否" }} +
    +
    • @@ -315,7 +321,7 @@ - -
    diff --git a/src/views/promoter/bonusLog/index.vue b/src/views/promoter/bonusLog/index.vue index 691cc93..2d6b425 100644 --- a/src/views/promoter/bonusLog/index.vue +++ b/src/views/promoter/bonusLog/index.vue @@ -57,9 +57,9 @@ - + @@ -107,7 +107,7 @@ import { integralLogTitle, bonusLogLst, - brokerageLogExport, + bonusExport, } from "@/api/marketing"; import fileList from "@/components/exportFile/fileList"; import cardsData from "@/components/cards/index"; @@ -185,14 +185,14 @@ export default { /**列表 */ downData(excelData) { return new Promise((resolve, reject) => { - brokerageLogExport(excelData).then((res) => { + bonusExport(excelData).then((res) => { return resolve(res.data); }); }); }, // 导出 exportRecord() { - brokerageLogExport(this.tableFrom) + bonusExport(this.tableFrom) .then((res) => { const h = this.$createElement; this.$msgbox({ diff --git a/src/views/promoter/config/index.vue b/src/views/promoter/config/index.vue index f14e881..6394ed2 100644 --- a/src/views/promoter/config/index.vue +++ b/src/views/promoter/config/index.vue @@ -25,7 +25,7 @@ 关闭
    - + + + 服务限时开关: @@ -152,12 +152,12 @@ export default { extension_status: [ { required: true, message: "请选择是否启用服务", trigger: "change" }, ], - extension_one_rate: [ - { required: true, message: "请输入一级返佣比例", trigger: "blur" }, - ], - extension_two_rate: [ - { required: true, message: "请输入二级返佣比例", trigger: "blur" }, - ], + // extension_one_rate: [ + // { required: true, message: "请输入一级返佣比例", trigger: "blur" }, + // ], + // extension_two_rate: [ + // { required: true, message: "请输入二级返佣比例", trigger: "blur" }, + // ], extension_self: [ { required: true, diff --git a/src/views/promoter/membershipLevel/index.vue b/src/views/promoter/membershipLevel/index.vue index a884374..2ccd07c 100644 --- a/src/views/promoter/membershipLevel/index.vue +++ b/src/views/promoter/membershipLevel/index.vue @@ -77,7 +77,7 @@ - + /> -->