edit
This commit is contained in:
parent
7707c44cf0
commit
ff61ce7f49
|
|
@ -44,9 +44,9 @@
|
|||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属城市：" prop="city_code">
|
||||
<el-form-item label="所属城市：" prop="city">
|
||||
<el-input
|
||||
v-model="tableFrom.city_code"
|
||||
v-model="tableFrom.city"
|
||||
@keyup.enter.native="getList(1)"
|
||||
placeholder="请输入所属城市"
|
||||
class="selWidth"
|
||||
|
|
|
|||
|
|
@ -57,9 +57,9 @@
|
|||
<el-option label="否" value="0" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属城市：" prop="city_code">
|
||||
<el-form-item label="所属城市：" prop="city">
|
||||
<el-input
|
||||
v-model="tableFrom.city_code"
|
||||
v-model="tableFrom.city"
|
||||
@keyup.enter.native="getList(1)"
|
||||
placeholder="请输入所属城市"
|
||||
class="selWidth"
|
||||
|
|
@ -154,6 +154,18 @@
|
|||
<el-option key="0" label="否" value="0" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否签署：" prop="is_sign">
|
||||
<el-select
|
||||
v-model="tableFrom.is_sign"
|
||||
clearable
|
||||
placeholder="请选择"
|
||||
class="selWidth"
|
||||
@change="getList(1)"
|
||||
>
|
||||
<el-option key="1" label="是" value="1" />
|
||||
<el-option key="0" label="否" value="0" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注：" prop="mark">
|
||||
<el-input
|
||||
v-model="tableFrom.mark"
|
||||
|
|
@ -249,7 +261,7 @@
|
|||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="status" label="开启/关闭权限" min-width="110">
|
||||
<el-table-column prop="status" label="退店(开启/关闭)" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
v-model="scope.row.status"
|
||||
|
|
@ -262,7 +274,7 @@
|
|||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="lock" label="退店(开启/关闭)" min-width="120">
|
||||
<el-table-column prop="lock" label="开启/关闭权限" min-width="110">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
v-model="scope.row.lock"
|
||||
|
|
@ -427,12 +439,12 @@ export default {
|
|||
},
|
||||
{
|
||||
count: "",
|
||||
type: "0",
|
||||
type: "2",
|
||||
title: "已关闭权限商户",
|
||||
},
|
||||
{
|
||||
count: "",
|
||||
type: "2",
|
||||
type: "0",
|
||||
title: "已退店商户",
|
||||
},
|
||||
],
|
||||
|
|
@ -449,8 +461,8 @@ export default {
|
|||
is_trader: "",
|
||||
is_best: "",
|
||||
category_id: "",
|
||||
is_sign:'',
|
||||
type_id: "",
|
||||
city_code: "",
|
||||
city: "",
|
||||
phone:'',
|
||||
name:'',
|
||||
|
|
@ -528,6 +540,7 @@ export default {
|
|||
this.$refs.searchForm.resetFields();
|
||||
this.getList(1);
|
||||
},
|
||||
// 签署
|
||||
handleSign(id) {
|
||||
merchantContactApi(id)
|
||||
.then((res) => {
|
||||
|
|
@ -560,8 +573,8 @@ export default {
|
|||
merchantCountApi()
|
||||
.then((res) => {
|
||||
this.headeNum[0]["count"] = res.data.valid;
|
||||
this.headeNum[1]["count"] = res.data.invalid;
|
||||
this.headeNum[2]["count"] = res.data.lock;
|
||||
this.headeNum[1]["count"] = res.data.lock;
|
||||
this.headeNum[2]["count"] = res.data.invalid;
|
||||
})
|
||||
.catch((res) => {});
|
||||
},
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@
|
|||
<div>支付运费：</div>
|
||||
<div class="value">{{ orderDetailList.pay_postage }}</div>
|
||||
</li>
|
||||
<li class="item">
|
||||
<!-- <li class="item">
|
||||
<div>一级佣金：</div>
|
||||
<div class="value">
|
||||
{{ parseFloat(orderDetailList.extension_one) + parseFloat(orderDetailList.refund_extension_one) }}
|
||||
|
|
@ -147,7 +147,7 @@
|
|||
<li class="item">
|
||||
<div>上级推广人：</div>
|
||||
<div class="value">{{ orderDetailList.TopSpread&&orderDetailList.TopSpread.nickname || "无" }}</div>
|
||||
</li>
|
||||
</li> -->
|
||||
<li class="item">
|
||||
<div>商品类型：</div>
|
||||
<div class="value">{{ orderDetailList.is_virtual==1 ? '虚拟商品' : orderDetailList.is_virtual==2 ? '卡密商品' : '普通商品' }}</div>
|
||||
|
|
|
|||
|
|
@ -474,12 +474,12 @@
|
|||
</span>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item
|
||||
v-if="Number(tableFrom.type) < 7"
|
||||
v-if="Number(tableFrom.type) < 7 || tableFrom.type === '9'"
|
||||
@click.native="onEdit(scope.row.product_id)"
|
||||
>编辑商品</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
v-if="Number(tableFrom.type) < 7"
|
||||
v-if="Number(tableFrom.type) < 7 || tableFrom.type === '9'"
|
||||
@click.native="onAuditFree(scope.row)"
|
||||
>价格编辑</el-dropdown-item
|
||||
>
|
||||
|
|
@ -502,7 +502,7 @@
|
|||
>编辑标记</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
v-if="tableFrom.type === '6' || tableFrom.type === '1'"
|
||||
v-if="tableFrom.type === '6' || tableFrom.type === '1' || tableFrom.type === '9'"
|
||||
@click.native="toVirtualSales(scope.row.product_id)"
|
||||
>已售数量</el-dropdown-item
|
||||
>
|
||||
|
|
@ -1029,6 +1029,7 @@ export default {
|
|||
let excelData = JSON.parse(JSON.stringify(this.tableFrom)),
|
||||
data = [];
|
||||
excelData.page = 1;
|
||||
excelData.limit = 40;
|
||||
let pageCount = 1;
|
||||
let lebData = {};
|
||||
for (let i = 0; i < pageCount; i++) {
|
||||
|
|
|
|||
|
|
@ -266,10 +266,10 @@
|
|||
<el-dropdown-item v-if="scope.row.vip_name && !scope.row.cancel_time">清除等级</el-dropdown-item>
|
||||
<el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setGroup(scope.row)">设置分组</el-dropdown-item>
|
||||
<el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setLabel(scope.row)">设置标签</el-dropdown-item>
|
||||
<el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setModify(scope.row)">修改推荐人</el-dropdown-item>
|
||||
<!-- <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setModify(scope.row)">修改推荐人</el-dropdown-item> -->
|
||||
<el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setPassword(scope.row)">修改密码</el-dropdown-item>
|
||||
<el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setMember(scope.row)">编辑会员等级</el-dropdown-item>
|
||||
<el-dropdown-item v-if="!scope.row.cancel_time" @click.native="giveMember(scope.row)">付费会员设置</el-dropdown-item>
|
||||
<!-- <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setMember(scope.row)">编辑会员等级</el-dropdown-item> -->
|
||||
<!-- <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="giveMember(scope.row)">付费会员设置</el-dropdown-item> -->
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -117,12 +117,12 @@
|
|||
<el-radio :label="1">正常</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="推广员：" required>
|
||||
<!-- <el-form-item label="推广员：" required>
|
||||
<el-radio-group v-model="userInfo.is_promoter">
|
||||
<el-radio :label="0">关闭</el-radio>
|
||||
<el-radio :label="1">开启</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
</el-form>
|
||||
</el-col>
|
||||
<el-col :span="23">
|
||||
|
|
|
|||
|
|
@ -50,10 +50,10 @@
|
|||
<el-dropdown-item command="balance">设置余额</el-dropdown-item>
|
||||
<el-dropdown-item command="group">设置分组</el-dropdown-item>
|
||||
<el-dropdown-item command="label">设置标签</el-dropdown-item>
|
||||
<el-dropdown-item command="reference">修改推荐人</el-dropdown-item>
|
||||
<!-- <el-dropdown-item command="reference">修改推荐人</el-dropdown-item> -->
|
||||
<el-dropdown-item command="password">修改密码</el-dropdown-item>
|
||||
<el-dropdown-item command="svipLevel">编辑会员等级</el-dropdown-item>
|
||||
<el-dropdown-item command="svipSet">付费会员设置</el-dropdown-item>
|
||||
<!-- <el-dropdown-item command="svipLevel">编辑会员等级</el-dropdown-item>
|
||||
<el-dropdown-item command="svipSet">付费会员设置</el-dropdown-item> -->
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</div>
|
||||
|
|
@ -91,10 +91,10 @@
|
|||
<div class="section">
|
||||
<div class="title">基本信息</div>
|
||||
<ul class="list">
|
||||
<li class="item">
|
||||
<!-- <li class="item">
|
||||
<div>用户ID：</div>
|
||||
<div class="value">{{ psInfo.uid || '-' }}</div>
|
||||
</li>
|
||||
</li> -->
|
||||
<!-- <li class="item">
|
||||
<div>真实姓名：</div>
|
||||
<div class="value">{{ psInfo.real_name || '-' }}</div>
|
||||
|
|
@ -120,10 +120,10 @@
|
|||
<div class="section">
|
||||
<div class="title">用户概况</div>
|
||||
<ul class="list">
|
||||
<li class="item">
|
||||
<!-- <li class="item">
|
||||
<div>推广员：</div>
|
||||
<div class="value">{{psInfo.is_promoter == 1 ? '是' : '否'}}</div>
|
||||
</li>
|
||||
</li> -->
|
||||
<li class="item">
|
||||
<div>用户状态：</div>
|
||||
<div class="value">{{psInfo.status == 1 ? '开启' : '关闭'}}</div>
|
||||
|
|
@ -144,10 +144,10 @@
|
|||
<div>用户分组：</div>
|
||||
<div class="value">{{psInfo.group && psInfo.group.group_name || '无'}}</div>
|
||||
</li>
|
||||
<li class="item">
|
||||
<!-- <li class="item">
|
||||
<div>推广人：</div>
|
||||
<div class="value">{{psInfo.spread && psInfo.spread.nickname || '无'}}</div>
|
||||
</li>
|
||||
</li> -->
|
||||
<li class="item">
|
||||
<div>注册时间：</div>
|
||||
<div class="value">{{psInfo.create_time}}</div>
|
||||
|
|
@ -201,7 +201,7 @@
|
|||
<div class="section">
|
||||
<div class="title">基本信息</div>
|
||||
<el-row :gutter="24" class="mt20">
|
||||
<el-col :span="12">
|
||||
<!-- <el-col :span="12">
|
||||
<el-form-item label="用户ID：" prop="uid">
|
||||
<el-input
|
||||
type="text"
|
||||
|
|
@ -211,7 +211,7 @@
|
|||
class="selWidth"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
<!-- <el-col :span="12">
|
||||
<el-form-item label="真实姓名：">
|
||||
<el-input
|
||||
|
|
@ -313,7 +313,7 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<!-- <el-row :gutter="24">
|
||||
<el-form-item label="推广员：" prop="is_promoter">
|
||||
<el-radio-group
|
||||
v-model="psInfo.is_promoter"
|
||||
|
|
@ -322,7 +322,7 @@
|
|||
<el-radio :label="0">关闭</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
</el-row> -->
|
||||
<el-row :gutter="24">
|
||||
<el-form-item label="用户状态：" prop="status">
|
||||
<el-radio-group
|
||||
|
|
@ -624,7 +624,7 @@
|
|||
</div>
|
||||
</template>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="推荐人变更记录" name="recommend">
|
||||
<!-- <el-tab-pane label="推荐人变更记录" name="recommend">
|
||||
<template v-if="activeName == 'recommend'">
|
||||
<el-table :data="tableData.data" size="small">
|
||||
<el-table-column prop="spread.uid" label="上级推荐人ID" min-width="100">
|
||||
|
|
@ -650,7 +650,7 @@
|
|||
/>
|
||||
</div>
|
||||
</template>
|
||||
</el-tab-pane>
|
||||
</el-tab-pane> -->
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-drawer>
|
||||
|
|
|
|||
Loading…
Reference in New Issue