Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
# Conflicts: # seller/src/views/promotion/seckill/seckill.vuemaster
Chopper
commit
2d2448ebba
|
|
@ -14,8 +14,8 @@
|
|||
<div class="remarks-container" ref="itemGoodsComment">
|
||||
<div class="remarks-analyse-box">
|
||||
<div class="remarks-analyse-goods">
|
||||
<i-circle :percent="skuDetail.grade || 100" stroke-color="#5cb85c">
|
||||
<span class="remarks-analyse-num">{{skuDetail.grade || 100}}%</span>
|
||||
<i-circle :percent="skuDetail.grade" stroke-color="#5cb85c">
|
||||
<span class="remarks-analyse-num">{{skuDetail.grade}}%</span>
|
||||
<p class="remarks-analyse-title">好评率</p>
|
||||
</i-circle>
|
||||
</div>
|
||||
|
|
@ -206,6 +206,9 @@ export default {
|
|||
});
|
||||
window.addEventListener('scroll', this.handleScroll)
|
||||
this.getList();
|
||||
if (this.skuDetail.grade === null || this.skuDetail.grade === undefined) {
|
||||
this.skuDetail.grade = 100
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@ export default {
|
|||
* @description api请求基础路径
|
||||
*/
|
||||
api_dev: {
|
||||
// common: 'http://192.168.0.100:8890',
|
||||
// buyer: 'http://192.168.0.100:8888',
|
||||
// seller: 'http://192.168.0.100:8889',
|
||||
// manager: 'http://192.168.0.100:8887'
|
||||
// common: 'http://192.168.0.101:8890',
|
||||
// buyer: 'http://192.168.0.101:8888',
|
||||
// seller: 'http://192.168.0.101:8889',
|
||||
// manager: 'http://192.168.0.101:8887'
|
||||
|
||||
common: 'https://common-api.pickmall.cn',
|
||||
buyer: 'https://buyer-api.pickmall.cn',
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<!-- 店铺logo -->
|
||||
<div class="shop-logo">
|
||||
<div>
|
||||
<img :src="storeMsg.storeLogo" height="50" alt="">
|
||||
<img :src="storeMsg.storeLogo" height="80" alt="">
|
||||
<div>
|
||||
<p>{{storeMsg.storeName || 'xx店铺'}}</p>
|
||||
<p class="ellipsis" :alt="storeMsg.storeDesc" v-html="storeMsg.storeDesc"></p>
|
||||
|
|
@ -199,10 +199,6 @@ export default {
|
|||
margin: 0 auto;
|
||||
align-items: center;
|
||||
|
||||
img {
|
||||
width: 80px;
|
||||
}
|
||||
|
||||
>div:nth-child(2){
|
||||
margin-left: 10px;
|
||||
flex: 1;
|
||||
|
|
@ -212,9 +208,6 @@ export default {
|
|||
width: 200px;
|
||||
}
|
||||
}
|
||||
img {
|
||||
height: 80px;
|
||||
}
|
||||
p:nth-child(1) {
|
||||
font-size: 20px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -240,6 +240,7 @@ export default {
|
|||
if (res.success) {
|
||||
this.$Message.success('申请已提交，请等待审核')
|
||||
this.distribution()
|
||||
this.getLog()
|
||||
} else {
|
||||
this.$Message.error(res.message)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
>
|
||||
<template slot-scope="{ row }" slot="goodsName">
|
||||
<div style="padding:5px;display:flex;">
|
||||
<img :src="row.image" style="vertical-align: top;" width="60" alt=""> <span class="ml_10">{{row.goodsName}}</span>
|
||||
<img :src="row.image" style="vertical-align: top;" width="60" height="60" alt=""> <span class="ml_10">{{row.goodsName}}</span>
|
||||
</div>
|
||||
</template>
|
||||
<template slot-scope="{ row }" slot="goodsPrice">
|
||||
|
|
|
|||
|
|
@ -101,6 +101,8 @@ export default {
|
|||
this.spinShow = false
|
||||
if (res.success && res.result) {
|
||||
this.list = res.result;
|
||||
} else {
|
||||
this.list = []
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
<FormItem label="分类名称" prop="name">
|
||||
<Input v-model="formAdd.name" clearable style="width: 100%" />
|
||||
</FormItem>
|
||||
<FormItem label="分类图标" prop="image">
|
||||
<FormItem label="分类图标" prop="image" v-if="formAdd.level === 2">
|
||||
<upload-pic-input v-model="formAdd.image" style="width: 100%"></upload-pic-input>
|
||||
</FormItem>
|
||||
<FormItem label="排序值" prop="sortOrder" style="width: 345px">
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
|
||||
<Modal :title="modalBrandTitle" v-model="modalBrandVisible" :mask-closable="false" :width="500">
|
||||
<Form ref="brandForm" :model="brandForm" :label-width="100">
|
||||
<Select v-model="brandForm.categoryBrands" multiple>
|
||||
<Select v-model="brandForm.categoryBrands" filterable multiple>
|
||||
<Option v-for="item in brandWay" :value="item.id" :key="item.id">{{ item.name }}</Option>
|
||||
|
||||
</Select>
|
||||
|
|
@ -266,10 +266,12 @@ export default {
|
|||
},
|
||||
// 添加子分类
|
||||
addChildren(v) {
|
||||
console.log(v);
|
||||
this.modalType = 0;
|
||||
this.modalTitle = "添加子分类";
|
||||
this.parentTitle = v.name;
|
||||
this.formAdd.level = eval(v.level + "+1");
|
||||
this.formAdd.commissionRate = v.commissionRate;
|
||||
this.showParent = true;
|
||||
delete this.formAdd.id;
|
||||
this.formAdd.parentId = v.id;
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
</DatePicker>
|
||||
</Form-item>
|
||||
<Form-item label="筛选状态">
|
||||
<Select v-model="searchForm.billStatus" style="width:160px">
|
||||
<Option value="">全部</Option>
|
||||
<Select v-model="searchForm.billStatus" clearable style="width:160px">
|
||||
<Option value="OUT">已出账</Option>
|
||||
<Option value="CHECK">已核对</Option>
|
||||
<Option value="COMPLETE">已完成</Option>
|
||||
<Option value="CHECK">已对账</Option>
|
||||
<Option value="EXAMINE">已审核</Option>
|
||||
<Option value="COMPLETE">已付款</Option>
|
||||
</Select>
|
||||
</Form-item>
|
||||
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
|
||||
|
|
|
|||
|
|
@ -37,9 +37,7 @@
|
|||
<script>
|
||||
import {
|
||||
getShopListData,
|
||||
disableShop,
|
||||
enableBrand,
|
||||
shopAudit,
|
||||
shopAudit
|
||||
} from "@/api/shops";
|
||||
import shopOperation from "./shopOperation";
|
||||
export default {
|
||||
|
|
@ -99,7 +97,7 @@
|
|||
"Tag",
|
||||
{
|
||||
props: {
|
||||
color: params.row.selfOperated ? "default" : "primary",
|
||||
color: params.row.selfOperated ? "default" : "success",
|
||||
},
|
||||
},
|
||||
params.row.selfOperated ? "自营" : "非自营"
|
||||
|
|
@ -121,48 +119,8 @@
|
|||
align: "center",
|
||||
fixed: "right",
|
||||
render: (h, params) => {
|
||||
let enableOrDisable = "";
|
||||
if (params.row.storeDisable == "OPEN") {
|
||||
enableOrDisable = h(
|
||||
"Button",
|
||||
{
|
||||
props: {
|
||||
size: "small",
|
||||
type: "error"
|
||||
},
|
||||
style: {
|
||||
marginRight: "5px",
|
||||
},
|
||||
on: {
|
||||
click: () => {
|
||||
this.disable(params.row);
|
||||
},
|
||||
},
|
||||
},
|
||||
"关闭"
|
||||
);
|
||||
} else if (params.row.storeDisable == "CLOSED") {
|
||||
enableOrDisable = h(
|
||||
"Button",
|
||||
{
|
||||
props: {
|
||||
type: "success",
|
||||
size: "small",
|
||||
},
|
||||
style: {
|
||||
marginRight: "5px",
|
||||
},
|
||||
on: {
|
||||
click: () => {
|
||||
this.enable(params.row);
|
||||
},
|
||||
},
|
||||
},
|
||||
"开启"
|
||||
);
|
||||
} else if (params.row.storeDisable == "APPLYING") {
|
||||
return h("div", [
|
||||
h(
|
||||
if (params.row.storeDisable == "APPLYING") {
|
||||
return h(
|
||||
"Button",
|
||||
{
|
||||
props: {
|
||||
|
|
@ -172,80 +130,20 @@
|
|||
style: {
|
||||
marginRight: "5px",
|
||||
},
|
||||
on: {
|
||||
click: () => {
|
||||
this.audit(params.row);
|
||||
},
|
||||
},
|
||||
},
|
||||
"审核"
|
||||
),
|
||||
h(
|
||||
"Button",
|
||||
{
|
||||
props: {
|
||||
type: "primary",
|
||||
size: "small",
|
||||
},
|
||||
style: {
|
||||
marginRight: "5px",
|
||||
},
|
||||
on: {
|
||||
click: () => {
|
||||
this.edit(params.row);
|
||||
},
|
||||
},
|
||||
},
|
||||
"修改"
|
||||
),
|
||||
]);
|
||||
"查看"
|
||||
)
|
||||
}
|
||||
|
||||
return h("div", [
|
||||
h(
|
||||
"Button",
|
||||
{
|
||||
props: {
|
||||
size: "small",
|
||||
},
|
||||
style: {
|
||||
marginRight: "5px",
|
||||
display: this.selectedShop ? "inline-block" : "none",
|
||||
},
|
||||
on: {
|
||||
click: () => {
|
||||
this.callback(params.row);
|
||||
},
|
||||
},
|
||||
},
|
||||
"选择"
|
||||
),
|
||||
h(
|
||||
"Button",
|
||||
{
|
||||
props: {
|
||||
type: "info",
|
||||
size: "small",
|
||||
},
|
||||
style: {
|
||||
marginRight: "5px",
|
||||
},
|
||||
on: {
|
||||
click: () => {
|
||||
this.edit(params.row);
|
||||
},
|
||||
},
|
||||
},
|
||||
"修改"
|
||||
),
|
||||
enableOrDisable,
|
||||
]);
|
||||
},
|
||||
},
|
||||
],
|
||||
data: [], // 表单数据
|
||||
total: 0, // 表单数据总数
|
||||
selectedShop: false, //用于是否选择店铺
|
||||
total: 0 // 表单数据总数
|
||||
};
|
||||
},
|
||||
|
||||
|
|
@ -296,76 +194,11 @@
|
|||
this.total = this.data.length;
|
||||
this.loading = false;
|
||||
},
|
||||
// 添加店铺
|
||||
add() {
|
||||
this.$router.push({ path: '/shop-operation'});
|
||||
},
|
||||
// 修改店铺
|
||||
// 查看店铺
|
||||
edit(v) {
|
||||
this.$router.push({ path: '/shop-operation', query: { shopId: v.id } });
|
||||
},
|
||||
// 关闭店铺
|
||||
disable(v) {
|
||||
this.$Modal.confirm({
|
||||
title: "确认关闭",
|
||||
content: "您确认要关闭店铺 " + v.storeName + " ?",
|
||||
loading: true,
|
||||
onOk: () => {
|
||||
disableShop(v.id).then((res) => {
|
||||
this.$Modal.remove();
|
||||
if (res.success) {
|
||||
this.$Message.success("操作成功");
|
||||
this.getDataList();
|
||||
}
|
||||
});
|
||||
},
|
||||
});
|
||||
},
|
||||
// 审核店铺
|
||||
audit(v) {
|
||||
this.$Modal.confirm({
|
||||
title: "审核店铺",
|
||||
content: "您确认要审核通过店铺 " + v.storeName + " ?",
|
||||
okText: "通过",
|
||||
cancelText: "驳回",
|
||||
loading: true,
|
||||
onOk: () => {
|
||||
shopAudit(v.id, 0).then((res) => {
|
||||
this.$Modal.remove();
|
||||
if (res.success) {
|
||||
this.$Message.success("操作成功");
|
||||
this.getDataList();
|
||||
}
|
||||
});
|
||||
},
|
||||
onCancel: () => {
|
||||
shopAudit(v.id, 1).then((res) => {
|
||||
this.$Modal.remove();
|
||||
if (res.success) {
|
||||
this.$Message.success("操作成功");
|
||||
this.getDataList();
|
||||
}
|
||||
});
|
||||
},
|
||||
});
|
||||
},
|
||||
// 开启店铺
|
||||
enable(v) {
|
||||
this.$Modal.confirm({
|
||||
title: "确认开启",
|
||||
content: "您确认要开启店铺 " + v.storeName + " ?",
|
||||
loading: true,
|
||||
onOk: () => {
|
||||
enableBrand(v.id).then((res) => {
|
||||
this.$Modal.remove();
|
||||
if (res.success) {
|
||||
this.$Message.success("操作成功");
|
||||
this.getDataList();
|
||||
}
|
||||
});
|
||||
},
|
||||
});
|
||||
},
|
||||
|
||||
},
|
||||
mounted() {
|
||||
this.init();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<template>
|
||||
<div>
|
||||
<Card>
|
||||
<Button class="mb_10" v-if="shopForm.storeDisable === 'APPLYING'" type="primary" @click="audit">审核</Button>
|
||||
<Tabs v-model="tabName" :animated="false" style="overflow: visible">
|
||||
<Form ref="shopForm" :model="shopForm" :label-width="130" label-position="right" :rules="shopValidate">
|
||||
<TabPane label="基本信息" class="tab" name="base">
|
||||
|
|
@ -86,7 +87,7 @@
|
|||
</div>
|
||||
</TabPane>
|
||||
<!-- 入驻信息 -->
|
||||
<TabPane label="入驻信息" class="tab" name="sms">
|
||||
<TabPane label="入驻信息" class="tab" name="entry">
|
||||
<!-- 遮罩层 -->
|
||||
<div v-if="isRead" class="mask">只读不可修改</div>
|
||||
<Divider orientation="left">公司信息</Divider>
|
||||
|
|
@ -190,7 +191,7 @@
|
|||
</FormItem>
|
||||
</TabPane>
|
||||
|
||||
<TabPane label="配送信息" class="tab" name="distribution">
|
||||
<TabPane label="配送信息" class="tab" name="send">
|
||||
|
||||
<!-- 遮罩层 -->
|
||||
<FormItem label="达达编码" prop="ddCode">
|
||||
|
|
@ -199,11 +200,12 @@
|
|||
</TabPane>
|
||||
|
||||
<TabPane label="结算信息" class="tab" name="settlement">
|
||||
<Alert type="error">已添加<span class="theme_color">{{settlementCycle.length}}</span>个结算日，最多可添加5个结算日，当月不包含所设日期时，将会顺延到下一个结算日</Alert>
|
||||
<FormItem label="结算周期">
|
||||
<Tag v-for="item in settlementCycle" :key="item" :name="item" closable style="marrgin-left: 10px" @on-close="removesettlementCycle">{{ item }}
|
||||
</Tag>
|
||||
<InputNumber :max="28" :min="1" v-model="day" v-show="settlementShow"></InputNumber>
|
||||
<Button type="default" @click="addsettlementCycle" size="small" v-if="addSettlementBtn" style="margin-left: 8px">添加结算周期
|
||||
<InputNumber size="small" :max="31" :min="1" v-model="day" v-show="settlementShow"></InputNumber>
|
||||
<Button type="default" @click="addsettlementCycle" size="small" v-if="addSettlementBtn && settlementCycle.length < 5" style="margin-left: 8px">添加结算周期
|
||||
</Button>
|
||||
<Button v-if="addSettlementConfirmBtn" type="default" @click="addsettlementCycleConfirm" size="small" style="margin-left: 8px">确认
|
||||
</Button>
|
||||
|
|
@ -212,8 +214,11 @@
|
|||
</Form>
|
||||
</Tabs>
|
||||
<div align="center">
|
||||
<Button type="primary" @click="save" v-if="!isRead" style="width: 100px; margin-right: 5px">{{ shopId ? "修改" :
|
||||
"保存" }}
|
||||
|
||||
<Button type="info" v-show="tabNameList.indexOf(tabName)>0" class="mr_10" @click="prev">上一步</Button>
|
||||
<Button type="primary" v-show="tabNameList.indexOf(tabName)<4" @click="next">下一步</Button>
|
||||
<Button type="primary" v-show="tabNameList.indexOf(tabName) === 4" @click="save" v-if="!isRead">
|
||||
{{ shopId ? "修改" : "保存" }}
|
||||
</Button>
|
||||
</div>
|
||||
</Card>
|
||||
|
|
@ -233,7 +238,7 @@
|
|||
import memberLayout from "@/views/member/list/index";
|
||||
import ossManage from "@/views/sys/oss-manage/ossManage";
|
||||
import { getCategoryTree } from "@/api/goods";
|
||||
import { shopDetail, shopAdd, shopEdit, getShopByMemberId } from "@/api/shops";
|
||||
import { shopDetail, shopAdd, shopEdit, getShopByMemberId,shopAudit } from "@/api/shops";
|
||||
import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
|
||||
import region from "@/views/lili-components/region";
|
||||
import liliMap from "@/views/my-components/map/index";
|
||||
|
|
@ -258,7 +263,9 @@ export default {
|
|||
settlementShow: false, // 是否展示结算日输入框
|
||||
addSettlementConfirmBtn: false, // 添加结算日确认按钮
|
||||
addSettlementBtn: true, // 添加结算日按钮
|
||||
day: 0, //结算日
|
||||
day: 1, //结算日
|
||||
tabName: 'base', // tab栏name值
|
||||
tabNameList: ['base', 'entry', 'category', 'send' ,'settlement'], // tab栏name值数组
|
||||
shopValidate: {
|
||||
// 表单验证规则
|
||||
memberName: [
|
||||
|
|
@ -433,14 +440,20 @@ export default {
|
|||
},
|
||||
//添加结算日
|
||||
addsettlementCycleConfirm() {
|
||||
console.warn(this.settlementCycle.includes(this.day + ""));
|
||||
if (this.day !== null && !this.settlementCycle.includes(this.day + "")) {
|
||||
this.settlementCycle.push(this.day);
|
||||
if (!this.day) {
|
||||
this.$Message.warning('请输入正确的结算周期，1-31的整数')
|
||||
return
|
||||
}
|
||||
if (this.settlementCycle.includes(this.day)) {
|
||||
this.$Message.warning('已有该结算周期，不能重复输入')
|
||||
return
|
||||
}
|
||||
this.settlementCycle.push(this.day);
|
||||
this.addSettlementConfirmBtn = false;
|
||||
this.addSettlementBtn = true;
|
||||
this.settlementShow = false;
|
||||
this.day = 1;
|
||||
|
||||
},
|
||||
// 选择地址
|
||||
selectedRegion(val) {
|
||||
|
|
@ -470,6 +483,14 @@ export default {
|
|||
this.getShopDetail();
|
||||
}
|
||||
},
|
||||
next () { // 下一步
|
||||
let index = this.tabNameList.indexOf(this.tabName) + 1
|
||||
this.tabName = this.tabNameList[index]
|
||||
},
|
||||
prev () { // 上一步
|
||||
let index = this.tabNameList.indexOf(this.tabName) - 1
|
||||
this.tabName = this.tabNameList[index]
|
||||
},
|
||||
// 获取店铺详情
|
||||
getShopDetail() {
|
||||
shopDetail(this.shopId).then((res) => {
|
||||
|
|
@ -576,6 +597,35 @@ export default {
|
|||
}
|
||||
});
|
||||
},
|
||||
// 审核店铺
|
||||
audit() {
|
||||
let id = this.$route.query.shopId
|
||||
this.$Modal.confirm({
|
||||
title: "审核店铺",
|
||||
content: "您确认要审核通过该店铺?",
|
||||
okText: "通过",
|
||||
cancelText: "驳回",
|
||||
loading: true,
|
||||
onOk: () => {
|
||||
shopAudit(id, 0).then((res) => {
|
||||
this.$Modal.remove();
|
||||
if (res.success) {
|
||||
this.$Message.success("操作成功");
|
||||
this.$router.push({name: 'shopAuth'})
|
||||
}
|
||||
});
|
||||
},
|
||||
onCancel: () => {
|
||||
shopAudit(id, 1).then((res) => {
|
||||
this.$Modal.remove();
|
||||
if (res.success) {
|
||||
this.$Message.success("操作成功");
|
||||
this.$router.push({name: 'shopAuth'})
|
||||
}
|
||||
});
|
||||
},
|
||||
});
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.init();
|
||||
|
|
|
|||
|
|
@ -325,15 +325,8 @@ util.initRouter = function (vm) { // 初始化路由
|
|||
}
|
||||
|
||||
if (!vm.$store.state.app.added) {
|
||||
// 第一次加载 读取数据
|
||||
let accessToken = window.localStorage.getItem('accessToken');
|
||||
// 加载菜单
|
||||
// axios.get(getMenuList, { headers: { 'accessToken': accessToken } }).then(res => {
|
||||
// let menuData = res.result;
|
||||
let menuData = result;
|
||||
if (!menuData) {
|
||||
return;
|
||||
}
|
||||
// 格式化数据，设置 空children 为 null
|
||||
for(let i =0;i<menuData.length;i++){
|
||||
let t = menuData[i].children
|
||||
|
|
@ -357,7 +350,6 @@ util.initRouter = function (vm) { // 初始化路由
|
|||
// 缓存数据 修改加载标识
|
||||
window.localStorage.setItem('menuData', JSON.stringify(menuData));
|
||||
vm.$store.commit('setAdded', true);
|
||||
// });
|
||||
} else {
|
||||
// 读取缓存数据
|
||||
let data = window.localStorage.getItem('menuData');
|
||||
|
|
|
|||
Loading…
Reference in New Issue