faiz
/
hy-shop-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edit

This commit is contained in:
faiz 2024-05-14 17:43:18 +08:00
parent 82e0a5e75b
commit 7b003ac83f
8 changed files with 73 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/merchant/application/merInfo.vue
View File

@ -110,12 +110,12 @@
</el-image> </el-image>
</div> --> </div> -->
</li> </li>
<li class="item item100"> <!-- <li class="item item100">
<div>是否惠美乡村店铺:</div> <div>是否惠美乡村店铺:</div>
<div class="value"> <div class="value">
{{ merData.com.is_huimei? '是': '否'}} {{ merData.com.is_huimei? '是': '否'}}
</div> </div>
</li> </li> -->
<!-- <li class="item item100"> <!-- <li class="item item100">
<div>惠美乡村红头文件:</div> <div>惠美乡村红头文件:</div>
<div class="value"> <div class="value">

4
src/views/merchant/list/handle/merEditForm.vue
View File

@ -87,7 +87,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="是否惠美乡村：" prop="is_huimei"> <el-form-item label="是否惠美乡村：" prop="is_huimei">
<el-switch <el-switch
v-model="merData.is_huimei" v-model="merData.is_huimei"
@ -98,7 +98,7 @@
inactive-text="否" inactive-text="否"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否军人：" prop="is_soldier"> <el-form-item label="是否军人：" prop="is_soldier">
<el-switch <el-switch

4
src/views/merchant/list/handle/merInfo.vue
View File

@ -21,10 +21,10 @@
<div>商户类型：</div> <div>商户类型：</div>
<div class="value">{{merData.is_trader == 1 ? "自营" : "非自营"}}</div> <div class="value">{{merData.is_trader == 1 ? "自营" : "非自营"}}</div>
</li> </li>
<li class="item"> <!-- <li class="item">
<div>是否为惠美乡村:</div> <div>是否为惠美乡村:</div>
<div class="value">{{merData.is_huimei == 1 ? "是" : "否"}}</div> <div class="value">{{merData.is_huimei == 1 ? "是" : "否"}}</div>
</li> </li> -->
<li class="item"> <li class="item">
<div>是否为军人:</div> <div>是否为军人:</div>
<div class="value">{{merData.is_soldier == 1 ? "是" : "否"}}</div> <div class="value">{{merData.is_soldier == 1 ? "是" : "否"}}</div>

50
src/views/merchant/list/index.vue
View File

@ -33,7 +33,7 @@
<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_huimei"> <!-- <el-form-item label="是否惠美乡村：" prop="is_huimei">
<el-select <el-select
v-model="tableFrom.is_huimei" v-model="tableFrom.is_huimei"
placeholder="请选择" placeholder="请选择"
@ -44,7 +44,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_soldier"> <el-form-item label="是否退伍军人：" prop="is_soldier">
<el-select <el-select
v-model="tableFrom.is_soldier" v-model="tableFrom.is_soldier"
@ -103,27 +103,27 @@
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="姓名关键字：" prop="keyword"> <el-form-item label="姓名关键字：" prop="name">
<el-input <el-input
v-model="tableFrom.keyword" v-model="tableFrom.name"
@keyup.enter.native="getList(1)" @keyup.enter.native="getList(1)"
placeholder="请输入法人/对接人姓名" placeholder="请输入法人/对接人姓名"
class="selWidth" class="selWidth"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="对接人电话:" prop="keyword"> <el-form-item label="对接人电话:" prop="phone">
<el-input <el-input
v-model="tableFrom.keyword" v-model="tableFrom.phone"
@keyup.enter.native="getList(1)" @keyup.enter.native="getList(1)"
placeholder="请输入对接人电话" placeholder="请输入对接人电话"
class="selWidth" class="selWidth"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="对接人身份证：" prop="keyword"> <el-form-item label="对接人身份证：" prop="id_card">
<el-input <el-input
v-model="tableFrom.keyword" v-model="tableFrom.id_card"
@keyup.enter.native="getList(1)" @keyup.enter.native="getList(1)"
placeholder="请输入对接人身份证" placeholder="请输入对接人身份证"
class="selWidth" class="selWidth"
@ -163,7 +163,7 @@
<div class="mb20"> <div class="mb20">
<el-tabs <el-tabs
v-if="headeNum.length > 0" v-if="headeNum.length > 0"
v-model="tableFrom.status" v-model="isStatus"
@tab-click="getList(1), getHeadNum()" @tab-click="getList(1), getHeadNum()"
> >
<el-tab-pane <el-tab-pane
@ -194,11 +194,11 @@
label="店铺类型" label="店铺类型"
min-width="150" min-width="150"
/> />
<el-table-column prop="is_huimei" label="是否惠美乡村" min-width="100"> <!-- <el-table-column prop="is_huimei" label="是否惠美乡村" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.is_huimei == 1 ? "是" : "否" }}</span> <span>{{ scope.row.is_huimei == 1 ? "是" : "否" }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column prop="is_soldier" label="是否军人" min-width="80"> <el-table-column prop="is_soldier" label="是否军人" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.is_soldier == 1 ? "是" : "否" }}</span> <span>{{ scope.row.is_soldier == 1 ? "是" : "否" }}</span>
@ -240,7 +240,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="lock" label="退店(开启/关闭)" min-width="120"> <el-table-column prop="lock" label="退店(开启/关闭)" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.lock" v-model="scope.row.lock"
@ -252,7 +252,7 @@
@click.native="onchangeIsClose(scope.row, 'lock')" @click.native="onchangeIsClose(scope.row, 'lock')"
/> />
</template> </template>
</el-table-column> --> </el-table-column>
<el-table-column prop="real_name" label="对接人姓名" min-width="100" /> <el-table-column prop="real_name" label="对接人姓名" min-width="100" />
<el-table-column prop="mer_phone" label="对接人电话" min-width="100" /> <el-table-column prop="mer_phone" label="对接人电话" min-width="100" />
<el-table-column <el-table-column
@ -290,7 +290,7 @@
<el-table-column label="操作" min-width="180" fixed="right"> <el-table-column label="操作" min-width="180" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-if="tableFrom.status === '1'" v-if="isStatus=== '1'"
type="text" type="text"
size="small" size="small"
@click="onLogo(scope.row.mer_id)" @click="onLogo(scope.row.mer_id)"
@ -315,7 +315,7 @@
>详情</el-button >详情</el-button
> >
<el-button <el-button
v-if="tableFrom.status === '0'" v-if="isStatus === '0'"
type="text" type="text"
size="small" size="small"
@click="handleDelete(scope.row.mer_id, scope.$index)" @click="handleDelete(scope.row.mer_id, scope.$index)"
@ -400,11 +400,11 @@ export default {
type: "0", type: "0",
title: "已关闭商户", title: "已关闭商户",
}, },
// { {
// count: "", count: "",
// type: "2", type: "2",
// title: "已退店商户", title: "已退店商户",
// }, },
], ],
tableData: { tableData: {
data: [], data: [],
@ -422,7 +422,11 @@ export default {
type_id: "", type_id: "",
city_code: "", city_code: "",
city: "", city: "",
phone:'',
name:'',
mark:''
}, },
isStatus:'1',
autoUpdate: true, autoUpdate: true,
merId: "", merId: "",
drawer: false, drawer: false,
@ -516,6 +520,7 @@ export default {
.then((res) => { .then((res) => {
this.headeNum[0]["count"] = res.data.valid; this.headeNum[0]["count"] = res.data.valid;
this.headeNum[1]["count"] = res.data.invalid; this.headeNum[1]["count"] = res.data.invalid;
this.headeNum[2]["count"] = res.data.lock;
}) })
.catch((res) => {}); .catch((res) => {});
}, },
@ -541,6 +546,11 @@ export default {
// 列表 // 列表
getList(num) { getList(num) {
this.listLoading = true; this.listLoading = true;
if(this.isStatus==2){
this.tableFrom = {...this.tableFrom,lock:'1',status:''}
}else{
this.tableFrom = {...this.tableFrom,status:this.isStatus,lock:''}
}
this.tableFrom.page = num ? num : this.tableFrom.page; this.tableFrom.page = num ? num : this.tableFrom.page;
merchantListApi(this.tableFrom) merchantListApi(this.tableFrom)
.then((res) => { .then((res) => {

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

@ -18,7 +18,7 @@
@change="getList(1)" @change="getList(1)"
/> />
</el-form-item> </el-form-item>
<el-form-item label="商户名称：" prop="mer_id"> <el-form-item label="店铺名称：" prop="mer_id">
<el-select <el-select
v-model="tableFrom.mer_id" v-model="tableFrom.mer_id"
clearable clearable
@ -168,7 +168,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="请选择"
@ -179,7 +179,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"
@ -231,7 +231,7 @@
/> />
</el-tabs> </el-tabs>
<div class="mt5 mb20"> <div class="mt5 mb20">
<!-- <el-button v-show="tableFrom.type === '6'" size="small" :disabled="multipleSelection.length==0" @click="batch">批量审核</el-button> --> <el-button v-show="tableFrom.type === '11'" size="small" :disabled="multipleSelection.length==0" @click="batch">批量审核</el-button>
<el-button <el-button
size="small" size="small"
:disabled="multipleSelection.length == 0" :disabled="multipleSelection.length == 0"
@ -276,7 +276,7 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column <el-table-column
v-if="Number(tableFrom.type) < 7" v-if="Number(tableFrom.type) < 7 || Number(tableFrom.type) == 11"
key="2" key="2"
type="selection" type="selection"
width="55" width="55"
@ -350,15 +350,15 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="商户名称" min-width="100"> <el-table-column label="店铺名称" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
scope.row.merchant ? scope.row.merchant.mer_name : "" scope.row.merchant ? scope.row.merchant.mer_name : ""
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="merchant.mark" label="商家备注" min-width="100" /> <el-table-column prop="remark" label="商家备注" min-width="100" />
<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.merchant.is_huimei ? "是" : "否" }}</span> <span>{{ scope.row.merchant.is_huimei ? "是" : "否" }}</span>
</template> </template>
@ -367,7 +367,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.is_huimei ? "是" : "否" }}</span> <span>{{ scope.row.is_huimei ? "是" : "否" }}</span>
</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="sales" label="销量" min-width="70" /> <el-table-column prop="sales" label="销量" min-width="70" />
<el-table-column prop="stock" label="库存" min-width="70" /> <el-table-column prop="stock" label="库存" min-width="70" />

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

@ -10,7 +10,7 @@
:before-close="handleClose" :before-close="handleClose"
class="projectInfo" class="projectInfo"
> >
<div class="acea-row mt10"> <div class="acea-row mt10" v-if="isShow">
<span class="sp" <span class="sp"
>店铺名称：{{ >店铺名称：{{
projectData.merchant && projectData.merchant.mer_name projectData.merchant && projectData.merchant.mer_name
@ -47,7 +47,7 @@
>上传拒绝原因：{{ projectData.refusal }}</span >上传拒绝原因：{{ projectData.refusal }}</span
> >
</div> </div>
<div class="acea-row"> <div class="acea-row" v-if="isShow">
<span class="sp">商品id：{{ projectData.product_id }}</span> <span class="sp">商品id：{{ projectData.product_id }}</span>
<span class="sp">商品名称：{{ projectData.store_name }}</span> <span class="sp">商品名称：{{ projectData.store_name }}</span>
<span class="sp" <span class="sp"
@ -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">
@ -962,17 +962,21 @@ export default {
}; };
this.$refs.ruleForm.validate((valid) => { this.$refs.ruleForm.validate((valid) => {
if (valid) { if (valid) {
this.isShow let params = {};
? (this.ruleForm.id = this.proId) if(this.isShow){
: (this.ruleForm.id = this.ids); params = {
let params = {
...this.ruleForm, ...this.ruleForm,
status: id:this.proId,
this.ruleForm.status == -1 status:this.ruleForm.status == -1? -1: mode[this.projectData.status].status,
? -1
: mode[this.projectData.status].status,
}; };
mode[this.projectData.status] }else{
params = {
...this.ruleForm,
id:this.ids,
status:this.ruleForm.status == -1? -1:1
};
}
mode[this.isShow?this.projectData.status:11]
.api(params) .api(params)
.then((res) => { .then((res) => {
this.$message.success(res.message); this.$message.success(res.message);

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

@ -713,7 +713,7 @@
<div class="section"> <div class="section">
<ul class="list"> <ul class="list">
<li class="item"> <li class="item">
<div class="item-title">商户名称：</div> <div class="item-title">店铺名称：</div>
<div class="value">{{ productData.merchant.mer_name }}</div> <div class="value">{{ productData.merchant.mer_name }}</div>
</li> </li>
<li class="item"> <li class="item">
@ -728,6 +728,10 @@
<div class="item-title">店铺类型：</div> <div class="item-title">店铺类型：</div>
<div class="value">{{ productData.merchant.type_name }}</div> <div class="value">{{ productData.merchant.type_name }}</div>
</li> </li>
<li class="item">
<div class="item-title">企业名称：</div>
<div class="value">{{productData.merchant && productData.merchant.ext.com &&productData.merchant.ext.com.name}}</div>
</li>
</ul> </ul>
</div> </div>
</el-tab-pane> </el-tab-pane>
@ -827,12 +831,12 @@
<div class="section"> <div class="section">
<ul class="list"> <ul class="list">
<li class="audit" v-if="productData.refusal"> <li class="audit" v-if="productData.refusal">
<div class="item-title">审核拒绝原因：</div> <div class="item-title">{{productData.status==0?'锁定原因':'审核拒绝原因'}}：</div>
<div style="margin-left: 100px" class="value"> <div style="margin-left: 100px" class="value">
<pre>{{ productData.refusal || "" }}</pre> <pre>{{ productData.refusal || "" }}</pre>
</div> </div>
</li> </li>
<li class="item item100"> <li class="item item100" v-if="productData.status!=0">
<div class="item-title">佐证图片：</div> <div class="item-title">佐证图片：</div>
<el-image <el-image
v-for="(item, index) in productData.status_img" v-for="(item, index) in productData.status_img"

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

@ -78,10 +78,10 @@
<div class="title">铸源星余额</div> <div class="title">铸源星余额</div>
<div>{{psInfo.integral}}</div> <div>{{psInfo.integral}}</div>
</li> </li>
<li class="item"> <!-- <li class="item">
<div class="title">用户成长值</div> <div class="title">用户成长值</div>
<div>{{psInfo.member_value}}</div> <div>{{psInfo.member_value}}</div>
</li> </li> -->
</ul> </ul>
</div> </div>
</div> </div>