faiz
/
settledIn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除佣金,惠美乡村产品,奖励金导出,服务列表字段更改

This commit is contained in:
faiz 2024-11-04 18:17:33 +08:00
parent 59618e7eb5
commit 69e8792b91
17 changed files with 175 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -4,7 +4,7 @@ ENV = 'development'
# http://mer.crmeb.net/admin # http://mer.crmeb.net/admin
# base api # base api
# www.shop.xyz # 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 = 'http://test.tropjoin.com'
# VUE_APP_BASE_API = 'https://api.tropjoin.com' # VUE_APP_BASE_API = 'https://api.tropjoin.com'

6
src/api/marketing.js
View File

@ -397,6 +397,12 @@ export function signLogExport(data) {
export function brokerageLogExport(data) { export function brokerageLogExport(data) {
return request.get(`user/brokerage/excel`, data) return request.get(`user/brokerage/excel`, data)
} }
/**
* @description 奖励金 -- 导出
*/
export function bonusExport(data) {
return request.get(`user/brokerage/bonus/excel`, data)
}
/** /**
* @description 签到配置 -- 列表 * @description 签到配置 -- 列表
*/ */

14
src/views/marketing/assist/assist_goods/info.vue
View File

@ -58,7 +58,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="商品规格" name="fourth"> <el-tab-pane label="商品规格" name="fourth">
<span class="sp">商品规格：{{ projectData.spec_type === 0 ? '单规格' : '多规格' }}</span> <span class="sp">商品规格：{{ projectData.spec_type === 0 ? '单规格' : '多规格' }}</span>
<span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span> <!-- <span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span> -->
<span class="sp100"> <span class="sp100">
<span class="mb15" style="display: block">商品规格:</span> <span class="mb15" style="display: block">商品规格:</span>
<template v-if="projectData.spec_type === 0"> <template v-if="projectData.spec_type === 0">
@ -78,20 +78,20 @@
<span class="priceBox" v-text="scope.row[iii]" /> <span class="priceBox" v-text="scope.row[iii]" />
</template> </template>
</el-table-column> </el-table-column>
<template v-if="projectData.extension_type === 1"> <!-- <template v-if="projectData.extension_type === 1">
<el-table-column align="center" label="一级返佣(元)" min-width="120"> <el-table-column align="center" label="一级返佣(元)" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox" v-text="scope.row.extension_one" /> <span class="priceBox" v-text="scope.row.extension_one" />
<!--<el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />--> <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="二级返佣(元)" min-width="120"> <el-table-column align="center" label="二级返佣(元)" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox" v-text="scope.row.extension_two" /> <span class="priceBox" v-text="scope.row.extension_two" />
<!--<el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />--> <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</template> </template>
<template v-if="projectData.spec_type === 1"> <template v-if="projectData.spec_type === 1">
@ -115,7 +115,7 @@
<span class="priceBox">{{ scope.row[iii] }}</span> <span class="priceBox">{{ scope.row[iii] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<template v-if="projectData.extension_type === 1"> <!-- <template v-if="projectData.extension_type === 1">
<el-table-column align="center" label="一级返佣(元)" min-width="120"> <el-table-column align="center" label="一级返佣(元)" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox">{{ scope.row.extension_one }}</span> <span class="priceBox">{{ scope.row.extension_one }}</span>
@ -126,7 +126,7 @@
<span class="priceBox">{{ scope.row.extension_two }}</span> <span class="priceBox">{{ scope.row.extension_two }}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</template> </template>
</span> </span>

14
src/views/marketing/combination/combination_goods/info.vue
View File

@ -65,7 +65,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="商品规格" name="fourth"> <el-tab-pane label="商品规格" name="fourth">
<span class="sp">商品规格：{{ projectData.spec_type === 0 ? '单规格' : '多规格' }}</span> <span class="sp">商品规格：{{ projectData.spec_type === 0 ? '单规格' : '多规格' }}</span>
<span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span> <!-- <span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span> -->
<span class="sp100"> <span class="sp100">
<span class="mb15" style="display: block">商品规格:</span> <span class="mb15" style="display: block">商品规格:</span>
<template v-if="projectData.spec_type === 0"> <template v-if="projectData.spec_type === 0">
@ -85,20 +85,20 @@
<span class="priceBox" v-text="scope.row[iii]" /> <span class="priceBox" v-text="scope.row[iii]" />
</template> </template>
</el-table-column> </el-table-column>
<template v-if="projectData.extension_type === 1"> <!-- <template v-if="projectData.extension_type === 1">
<el-table-column align="center" label="一级返佣(元)" min-width="90"> <el-table-column align="center" label="一级返佣(元)" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox" v-text="scope.row.extension_one" /> <span class="priceBox" v-text="scope.row.extension_one" />
<!--<el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />--> <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="二级返佣(元)" min-width="90"> <el-table-column align="center" label="二级返佣(元)" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox" v-text="scope.row.extension_two" /> <span class="priceBox" v-text="scope.row.extension_two" />
<!--<el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />--> <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</template> </template>
<template v-if="projectData.spec_type === 1"> <template v-if="projectData.spec_type === 1">
@ -122,7 +122,7 @@
<span class="priceBox">{{ scope.row[iii] }}</span> <span class="priceBox">{{ scope.row[iii] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<template v-if="projectData.extension_type === 1"> <!-- <template v-if="projectData.extension_type === 1">
<el-table-column align="center" label="一级返佣(元)" min-width="90"> <el-table-column align="center" label="一级返佣(元)" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox">{{ scope.row.extension_one }}</span> <span class="priceBox">{{ scope.row.extension_one }}</span>
@ -133,7 +133,7 @@
<span class="priceBox">{{ scope.row.extension_two }}</span> <span class="priceBox">{{ scope.row.extension_two }}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</template> </template>
</span> </span>

2
src/views/marketing/platformCoupon/couponRecord/index.vue
View File

@ -124,7 +124,7 @@
</el-table-column> </el-table-column>
<el-table-column label="订单号" min-width="170"> <el-table-column label="订单号" min-width="170">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.grouporder.group_order_sn }}</span> <span>{{ scope.row.grouporder&&scope.row.grouporder.group_order_sn }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

14
src/views/marketing/preSale/info.vue
View File

@ -65,7 +65,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="商品规格" name="fourth"> <el-tab-pane label="商品规格" name="fourth">
<span class="sp">商品规格：{{ projectData.spec_type === 0 ? '单规格' : '多规格' }}</span> <span class="sp">商品规格：{{ projectData.spec_type === 0 ? '单规格' : '多规格' }}</span>
<span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span> <!-- <span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span> -->
<span class="sp100"> <span class="sp100">
<span class="mb15" style="display: block">商品规格:</span> <span class="mb15" style="display: block">商品规格:</span>
<template v-if="projectData.spec_type === 0"> <template v-if="projectData.spec_type === 0">
@ -85,20 +85,20 @@
<span class="priceBox" v-text="scope.row[iii]" /> <span class="priceBox" v-text="scope.row[iii]" />
</template> </template>
</el-table-column> </el-table-column>
<template v-if="projectData.extension_type === 1"> <!-- <template v-if="projectData.extension_type === 1">
<el-table-column align="center" label="一级返佣(元)" min-width="100"> <el-table-column align="center" label="一级返佣(元)" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox" v-text="scope.row.extension_one" /> <span class="priceBox" v-text="scope.row.extension_one" />
<!--<el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />--> <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="二级返佣(元)" min-width="100"> <el-table-column align="center" label="二级返佣(元)" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox" v-text="scope.row.extension_two" /> <span class="priceBox" v-text="scope.row.extension_two" />
<!--<el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />--> <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</template> </template>
<template v-if="projectData.spec_type === 1"> <template v-if="projectData.spec_type === 1">
@ -122,7 +122,7 @@
<span class="priceBox">{{ scope.row[iii] }}</span> <span class="priceBox">{{ scope.row[iii] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<template v-if="projectData.extension_type === 1"> <!-- <template v-if="projectData.extension_type === 1">
<el-table-column align="center" label="一级返佣(元)" min-width="100"> <el-table-column align="center" label="一级返佣(元)" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox">{{ scope.row.extension_one }}</span> <span class="priceBox">{{ scope.row.extension_one }}</span>
@ -133,7 +133,7 @@
<span class="priceBox">{{ scope.row.extension_two }}</span> <span class="priceBox">{{ scope.row.extension_two }}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</template> </template>
</span> </span>

14
src/views/marketing/seckill/seckillGoods/info.vue
View File

@ -65,7 +65,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="商品规格" name="fourth"> <el-tab-pane label="商品规格" name="fourth">
<span class="sp">商品规格：{{ projectData.spec_type === 0 ? '单规格' : '多规格' }}</span> <span class="sp">商品规格：{{ projectData.spec_type === 0 ? '单规格' : '多规格' }}</span>
<span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span> <!-- <span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span> -->
<span class="sp100"> <span class="sp100">
<span class="mb15" style="display: block">商品规格:</span> <span class="mb15" style="display: block">商品规格:</span>
<template v-if="projectData.spec_type === 0"> <template v-if="projectData.spec_type === 0">
@ -85,20 +85,20 @@
<span class="priceBox" v-text="scope.row[iii]" /> <span class="priceBox" v-text="scope.row[iii]" />
</template> </template>
</el-table-column> </el-table-column>
<template v-if="projectData.extension_type === 1"> <!-- <template v-if="projectData.extension_type === 1">
<el-table-column align="center" label="一级返佣(元)" min-width="90"> <el-table-column align="center" label="一级返佣(元)" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox" v-text="scope.row.extension_one" /> <span class="priceBox" v-text="scope.row.extension_one" />
<!--<el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />--> <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="二级返佣(元)" min-width="90"> <el-table-column align="center" label="二级返佣(元)" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox" v-text="scope.row.extension_two" /> <span class="priceBox" v-text="scope.row.extension_two" />
<!--<el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />--> <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</template> </template>
<template v-if="projectData.spec_type === 1"> <template v-if="projectData.spec_type === 1">
@ -115,7 +115,7 @@
<span class="priceBox">{{ scope.row[iii] }}</span> <span class="priceBox">{{ scope.row[iii] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<template v-if="projectData.extension_type === 1"> <!-- <template v-if="projectData.extension_type === 1">
<el-table-column align="center" label="一级返佣(元)" min-width="90"> <el-table-column align="center" label="一级返佣(元)" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox">{{ scope.row.extension_one }}</span> <span class="priceBox">{{ scope.row.extension_one }}</span>
@ -126,7 +126,7 @@
<span class="priceBox">{{ scope.row.extension_two }}</span> <span class="priceBox">{{ scope.row.extension_two }}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</template> </template>
</span> </span>

28
src/views/order/list/index.vue
View File

@ -270,6 +270,34 @@
<el-option label="否" value="0" /> <el-option label="否" value="0" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="活动订单：" prop="is_activities">
<el-select
v-model="tableFrom.is_activities"
clearable
placeholder="请选择"
class="selWidth"
@change="getList(1)"
>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item
label="惠美乡村产品："
prop="is_huimei"
label-width="110px"
>
<el-select
v-model="tableFrom.is_huimei"
clearable
placeholder="请选择"
class="selWidth"
@change="getList(1)"
>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" size="small" @click="getList(1)" <el-button type="primary" size="small" @click="getList(1)"
>搜索</el-button >搜索</el-button

8
src/views/product/productExamine/editAttr.vue
View File

@ -269,7 +269,7 @@
<el-input v-model="scope.row.basis_url" type="text" /> <el-input v-model="scope.row.basis_url" type="text" />
</template> </template>
</el-table-column> </el-table-column>
<template v-if="formValidate.extension_type === 1"> <!-- <template v-if="formValidate.extension_type === 1">
<el-table-column <el-table-column
align="center" align="center"
label="一级返佣(元)" label="一级返佣(元)"
@ -298,7 +298,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -409,7 +409,7 @@
<el-input v-model="scope.row.basis_url" type="text" /> <el-input v-model="scope.row.basis_url" type="text" />
</template> </template>
</el-table-column> </el-table-column>
<template v-if="formValidate.extension_type === 1"> <!-- <template v-if="formValidate.extension_type === 1">
<el-table-column <el-table-column
align="center" align="center"
label="一级返佣(元)" label="一级返佣(元)"
@ -438,7 +438,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</el-form-item> </el-form-item>
<!-- <el-table <!-- <el-table

38
src/views/product/productExamine/index.vue
View File

@ -186,7 +186,7 @@
clearable clearable
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="是否惠美乡村：" prop="is_huimei"> <el-form-item label="惠美乡村产品：" prop="is_huimei">
<el-select <el-select
v-model="tableFrom.is_huimei" v-model="tableFrom.is_huimei"
placeholder="请选择" placeholder="请选择"
@ -197,7 +197,7 @@
<el-option label="是" value="1" /> <el-option label="是" value="1" />
<el-option label="否" value="0" /> <el-option label="否" value="0" />
</el-select> </el-select>
</el-form-item> --> </el-form-item>
<el-form-item label="审核状态：" prop="is_audited"> <el-form-item label="审核状态：" prop="is_audited">
<el-select <el-select
v-model="tableFrom.is_audited" v-model="tableFrom.is_audited"
@ -414,12 +414,18 @@
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="惠美乡村产品" min-width="80">
<template slot-scope="scope">
<span>{{ scope.row.is_huimei ? "是" : "否" }}</span>
</template>
</el-table-column>
<el-table-column prop="is_audited" label="待审核类型" min-width="90"> <el-table-column prop="is_audited" label="待审核类型" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ auditedList[scope.row.is_audited] }} {{ auditedList[scope.row.is_audited] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="price" label="商品售价" min-width="80" /> <el-table-column prop="price" label="商品售价" min-width="80" />
<el-table-column prop="hot_type" label="商品推荐" min-width="80" />
<el-table-column prop="refusal" label="拒绝/锁定原因" min-width="110" /> <el-table-column prop="refusal" label="拒绝/锁定原因" min-width="110" />
<el-table-column prop="operator" label="操作人" min-width="110" /> <el-table-column prop="operator" label="操作人" min-width="110" />
<el-table-column <el-table-column
@ -438,8 +444,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.merchant.is_huimei ? "是" : "否" }}</span> <span>{{ scope.row.merchant.is_huimei ? "是" : "否" }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="是否惠美乡村产品" min-width="80"> <!-- <el-table-column label="是否惠美乡村产品" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.is_huimei ? "是" : "否" }}</span> <span>{{ scope.row.is_huimei ? "是" : "否" }}</span>
</template> </template>
@ -903,14 +909,18 @@ const proOptions = [
name: "特惠专区", name: "特惠专区",
value: "is_benefit", value: "is_benefit",
}, },
{ // {
name: "精品推荐", // name: "精品推荐",
value: "is_best", // value: "is_best",
}, // },
{ {
name: "首发新品", name: "首发新品",
value: "is_new", value: "is_new",
}, },
{
name: "活动专区",
value: "is_activities",
},
]; ];
export default { export default {
name: "ProductExamine1", name: "ProductExamine1",
@ -969,14 +979,18 @@ export default {
name: "特惠专区", name: "特惠专区",
value: "good", value: "good",
}, },
{ // {
name: "精品推荐", // name: "精品推荐",
value: "best", // value: "best",
}, // },
{ {
name: "首发新品", name: "首发新品",
value: "new", value: "new",
}, },
{
name: "活动专区",
value: "is_activities",
},
], ],
formValidate: { formValidate: {
is_hot: 0, is_hot: 0,

28
src/views/product/productExamine/info.vue
View File

@ -72,9 +72,9 @@
</span> </span>
<span class="sp">商品简介：{{ projectData.store_info }}</span> <span class="sp">商品简介：{{ projectData.store_info }}</span>
<span class="sp">商品备注：{{ projectData.remark }}</span> <span class="sp">商品备注：{{ projectData.remark }}</span>
<!-- <span class="sp" <span class="sp"
>是否惠美乡村：{{ projectData.is_huimei ? "是" : "否" }}</span >惠美乡村产品：{{ projectData.is_huimei ? "是" : "否" }}</span
> --> >
<span class="sp100"> <span class="sp100">
商品封面图： 商品封面图：
<div class="demo-image__preview"> <div class="demo-image__preview">
@ -471,11 +471,11 @@
projectData.spec_type === 0 ? "单规格" : "多规格" projectData.spec_type === 0 ? "单规格" : "多规格"
}}</span }}</span
> >
<span class="sp" <!-- <span class="sp"
>佣金设置：{{ >佣金设置：{{
projectData.extension_type === 0 ? "默认设置" : "单独设置" projectData.extension_type === 0 ? "默认设置" : "单独设置"
}}</span }}</span
> > -->
<span class="sp100"> <span class="sp100">
<span class="mb15" style="display: block">商品规格:</span> <span class="mb15" style="display: block">商品规格:</span>
<template v-if="projectData.spec_type === 0"> <template v-if="projectData.spec_type === 0">
@ -508,7 +508,7 @@
<span v-else class="priceBox" v-text="scope.row[iii]" /> <span v-else class="priceBox" v-text="scope.row[iii]" />
</template> </template>
</el-table-column> </el-table-column>
<template v-if="projectData.extension_type === 1"> <!-- <template v-if="projectData.extension_type === 1">
<el-table-column <el-table-column
align="center" align="center"
label="一级返佣(元)" label="一级返佣(元)"
@ -527,7 +527,7 @@
<span class="priceBox" v-text="scope.row.extension_two" /> <span class="priceBox" v-text="scope.row.extension_two" />
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</template> </template>
<template v-if="projectData.spec_type === 1"> <template v-if="projectData.spec_type === 1">
@ -575,7 +575,7 @@
<span v-else class="priceBox" v-text="scope.row[iii]" /> <span v-else class="priceBox" v-text="scope.row[iii]" />
</template> </template>
</el-table-column> </el-table-column>
<template v-if="projectData.extension_type === 1"> <!-- <template v-if="projectData.extension_type === 1">
<el-table-column <el-table-column
align="center" align="center"
label="一级返佣(元)" label="一级返佣(元)"
@ -594,7 +594,7 @@
<span class="priceBox">{{ scope.row.extension_two }}</span> <span class="priceBox">{{ scope.row.extension_two }}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</template> </template>
</span> </span>
@ -617,6 +617,16 @@
> >
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="惠美乡村产品" prop="is_huimei" label-width="90px">
<el-radio-group v-model="projectData.is_huimei">
<el-radio :disabled="projectData.is_huimei == 1" :label="0"
>否</el-radio
>
<el-radio :disabled="projectData.is_huimei == 0" :label="1"
>是</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item <el-form-item
:label="projectData.status == 15 ? '解锁状态' : '审核状态'" :label="projectData.status == 15 ? '解锁状态' : '审核状态'"
prop="status" prop="status"

14
src/views/product/productExamine/proDetails.vue
View File

@ -209,6 +209,12 @@
{{ productData.is_customize ? "是" : "否" }} {{ productData.is_customize ? "是" : "否" }}
</div> </div>
</li> </li>
<li class="item">
<div class="item-title">惠美乡村产品：</div>
<div class="value">
{{ productData.is_huimei ? "是" : "否" }}
</div>
</li>
</ul> </ul>
<ul v-if="productData.video_link" class="list"> <ul v-if="productData.video_link" class="list">
<li class="item item100"> <li class="item item100">
@ -315,7 +321,7 @@
<span v-else class="priceBox" v-text="scope.row[iii]" /> <span v-else class="priceBox" v-text="scope.row[iii]" />
</template> </template>
</el-table-column> </el-table-column>
<template v-if="productData.extension_type === 1"> <!-- <template v-if="productData.extension_type === 1">
<el-table-column <el-table-column
align="center" align="center"
label="一级返佣(元)" label="一级返佣(元)"
@ -340,7 +346,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</template> </template>
<template v-if="productData.spec_type === 1"> <template v-if="productData.spec_type === 1">
@ -391,7 +397,7 @@
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<template v-if="productData.extension_type === 1"> <!-- <template v-if="productData.extension_type === 1">
<el-table-column <el-table-column
align="center" align="center"
label="一级返佣(元)" label="一级返佣(元)"
@ -414,7 +420,7 @@
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template> -->
</el-table> </el-table>
</template> </template>
</div> </div>

10
src/views/promoter/bonusLog/index.vue
View File

@ -57,9 +57,9 @@
</div> </div>
<!-- <cards-data v-if="cardLists.length > 0" :card-lists="cardLists" /> --> <!-- <cards-data v-if="cardLists.length > 0" :card-lists="cardLists" /> -->
<el-card> <el-card>
<!-- <div class="mb20"> <div class="mb20">
<el-button size="small" type="primary" @click="exports">导出</el-button> <el-button size="small" type="primary" @click="exports">导出</el-button>
</div> --> </div>
<el-table v-loading="listLoading" :data="tableData.data" size="small"> <el-table v-loading="listLoading" :data="tableData.data" size="small">
<el-table-column prop="bill_id" label="ID" min-width="50" /> <el-table-column prop="bill_id" label="ID" min-width="50" />
<el-table-column label="用户昵称" prop="nickname" min-width="150" /> <el-table-column label="用户昵称" prop="nickname" min-width="150" />
@ -107,7 +107,7 @@
import { import {
integralLogTitle, integralLogTitle,
bonusLogLst, bonusLogLst,
brokerageLogExport, bonusExport,
} from "@/api/marketing"; } from "@/api/marketing";
import fileList from "@/components/exportFile/fileList"; import fileList from "@/components/exportFile/fileList";
import cardsData from "@/components/cards/index"; import cardsData from "@/components/cards/index";
@ -185,14 +185,14 @@ export default {
/**列表 */ /**列表 */
downData(excelData) { downData(excelData) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
brokerageLogExport(excelData).then((res) => { bonusExport(excelData).then((res) => {
return resolve(res.data); return resolve(res.data);
}); });
}); });
}, },
// 导出 // 导出
exportRecord() { exportRecord() {
brokerageLogExport(this.tableFrom) bonusExport(this.tableFrom)
.then((res) => { .then((res) => {
const h = this.$createElement; const h = this.$createElement;
this.$msgbox({ this.$msgbox({

24
src/views/promoter/config/index.vue
View File

@ -25,7 +25,7 @@
<el-radio :label="0">关闭</el-radio> <el-radio :label="0">关闭</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item prop="extension_one_rate"> <!-- <el-form-item prop="extension_one_rate">
<span slot="label"> <span slot="label">
<span>一级返佣比例：</span> <span>一级返佣比例：</span>
<el-tooltip <el-tooltip
@ -45,8 +45,8 @@
class="selWidth" class="selWidth"
></el-input-number> ></el-input-number>
<span>%</span> <span>%</span>
</el-form-item> </el-form-item> -->
<el-form-item prop="extension_two_rate"> <!-- <el-form-item prop="extension_two_rate">
<span slot="label"> <span slot="label">
<span>二级返佣比例：</span> <span>二级返佣比例：</span>
<el-tooltip <el-tooltip
@ -66,8 +66,8 @@
class="selWidth" class="selWidth"
></el-input-number> ></el-input-number>
<span>%</span> <span>%</span>
</el-form-item> </el-form-item> -->
<el-form-item prop="extension_self" required> <!-- <el-form-item prop="extension_self" required>
<span slot="label"> <span slot="label">
<span>服务内购：</span> <span>服务内购：</span>
</span> </span>
@ -80,7 +80,7 @@
>开启服务内购，服务员自己购买商品，享受一级返佣，上级享受二级返佣； >开启服务内购，服务员自己购买商品，享受一级返佣，上级享受二级返佣；
<span class="title">关闭：</span>服务员自己购买商品没有返佣 <span class="title">关闭：</span>服务员自己购买商品没有返佣
</div> </div>
</el-form-item> </el-form-item> -->
<el-form-item prop="extension_limit" required> <el-form-item prop="extension_limit" required>
<span slot="label"> <span slot="label">
<span>服务限时开关：</span> <span>服务限时开关：</span>
@ -152,12 +152,12 @@ export default {
extension_status: [ extension_status: [
{ required: true, message: "请选择是否启用服务", trigger: "change" }, { required: true, message: "请选择是否启用服务", trigger: "change" },
], ],
extension_one_rate: [ // extension_one_rate: [
{ required: true, message: "请输入一级返佣比例", trigger: "blur" }, // { required: true, message: "请输入一级返佣比例", trigger: "blur" },
], // ],
extension_two_rate: [ // extension_two_rate: [
{ required: true, message: "请输入二级返佣比例", trigger: "blur" }, // { required: true, message: "请输入二级返佣比例", trigger: "blur" },
], // ],
extension_self: [ extension_self: [
{ {
required: true, required: true,

24
src/views/promoter/membershipLevel/index.vue
View File

@ -77,7 +77,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="服务员人数" min-width="100" prop="user_num" /> <el-table-column label="服务员人数" min-width="100" prop="user_num" />
<el-table-column <!-- <el-table-column
prop="extension_one" prop="extension_one"
label="一级返佣上浮比例(%)" label="一级返佣上浮比例(%)"
min-width="120" min-width="120"
@ -86,7 +86,7 @@
prop="extension_two" prop="extension_two"
label="二级返佣上浮比例(%)" label="二级返佣上浮比例(%)"
min-width="120" min-width="120"
/> /> -->
<el-table-column label="操作" min-width="120" fixed="right"> <el-table-column label="操作" min-width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -273,7 +273,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="extension_one"> <!-- <el-form-item prop="extension_one">
<span slot="label"> <span slot="label">
<span>一级返佣(上浮比例)：</span> <span>一级返佣(上浮比例)：</span>
<el-tooltip <el-tooltip
@ -316,7 +316,7 @@
class="selWidth" class="selWidth"
></el-input-number> ></el-input-number>
<span>%</span> <span>%</span>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
@ -401,14 +401,14 @@
:src="formValidate.brokerage_icon" :src="formValidate.brokerage_icon"
/> />
</div> </div>
<div class="list sp100"> <!-- <div class="list sp100">
<label class="name">一级返佣(上浮比例)：</label <label class="name">一级返佣(上浮比例)：</label
>{{ formValidate.extension_one }}% >{{ formValidate.extension_one }}%
</div> </div>
<div class="list sp100"> <div class="list sp100">
<label class="name">二级返佣(上浮比例)：</label <label class="name">二级返佣(上浮比例)：</label
>{{ formValidate.extension_two }}% >{{ formValidate.extension_two }}%
</div> </div> -->
</div> </div>
</div> </div>
</div> </div>
@ -477,12 +477,12 @@ export default {
brokerage_icon: [ brokerage_icon: [
{ required: true, message: "请上传图标", trigger: "change" }, { required: true, message: "请上传图标", trigger: "change" },
], ],
extension_one: [ // extension_one: [
{ required: true, message: "请输入一级返佣比例", trigger: "change" }, // { required: true, message: "请输入一级返佣比例", trigger: "change" },
], // ],
extension_two: [ // extension_two: [
{ required: true, message: "请输入二级返佣比例", trigger: "change" }, // { required: true, message: "请输入二级返佣比例", trigger: "change" },
], // ],
}, },
}; };
}, },

8
src/views/promoter/user/index.vue
View File

@ -111,10 +111,10 @@
sortable sortable
:sort-method=" :sort-method="
(a, b) => { (a, b) => {
return a.total_brokerage_price - b.total_brokerage_price; return a.total_bonus_price - b.total_bonus_price;
} }
" "
prop="total_brokerage_price" prop="total_bonus_price"
/> />
<el-table-column <el-table-column
label="已提现金额" label="已提现金额"
@ -138,10 +138,10 @@
sortable sortable
:sort-method=" :sort-method="
(a, b) => { (a, b) => {
return a.brokerage_price - b.brokerage_price; return a.bonus_price - b.bonus_price;
} }
" "
prop="brokerage_price" prop="bonus_price"
/> />
<el-table-column <el-table-column
prop="spread.nickname" prop="spread.nickname"

18
src/views/user/list/userDetails.vue
View File

@ -206,6 +206,10 @@
<div>用户ID：</div> <div>用户ID：</div>
<div class="value">{{ psInfo.spread.uid }}</div> <div class="value">{{ psInfo.spread.uid }}</div>
</li> </li>
<li class="item">
<div>ID号：</div>
<div class="value">{{ psInfo.spread.number }}</div>
</li>
<li class="item"> <li class="item">
<div>用户姓名：</div> <div>用户姓名：</div>
<div class="value">{{ psInfo.spread.real_name }}</div> <div class="value">{{ psInfo.spread.real_name }}</div>
@ -218,6 +222,20 @@
<div>用户电话：</div> <div>用户电话：</div>
<div class="value">{{ psInfo.spread.phone }}</div> <div class="value">{{ psInfo.spread.phone }}</div>
</li> </li>
<li class="item">
<div>绑定状态：</div>
<div class="value">
{{ psInfo.activation_promoter_name }}
</div>
</li>
<li class="item">
<div>绑定时间：</div>
<div class="value">{{ psInfo.spread.activation_time }}</div>
</li>
<li class="item">
<div>邀请时间：</div>
<div class="value">{{ psInfo.spread_time }}</div>
</li>
</ul> </ul>
</div> </div>
<div class="section"> <div class="section">