店铺入驻bug修改
mabo
parent
25690e86e7
commit
a4f2fc1381
|
|
@ -245,6 +245,7 @@ export default {
|
|||
this.$Message.success('验证码发送成功');
|
||||
let that = this;
|
||||
this.interval = setInterval(() => {
|
||||
console.log(that.time);
|
||||
that.time--;
|
||||
if (that.time === 0) {
|
||||
that.time = 60;
|
||||
|
|
|
|||
|
|
@ -193,9 +193,7 @@ export default {
|
|||
components: { region },
|
||||
props: {
|
||||
content: {
|
||||
default () {
|
||||
return {};
|
||||
},
|
||||
default: {},
|
||||
type: Object
|
||||
}
|
||||
},
|
||||
|
|
@ -325,11 +323,13 @@ export default {
|
|||
},
|
||||
mounted () {
|
||||
this.accessToken.accessToken = storage.getItem('accessToken');
|
||||
this.form = JSON.parse(JSON.stringify(this.content));
|
||||
if (this.form.licencePhoto) {
|
||||
this.form.legalPhoto = this.content.legalPhoto.split(',');
|
||||
this.form.licencePhoto = this.content.licencePhoto.split(',');
|
||||
this.address = this.form.addressIdPath;
|
||||
if (Object.keys(this.content).length) {
|
||||
this.form = JSON.parse(JSON.stringify(this.content));
|
||||
if (this.form.licencePhoto) {
|
||||
this.form.legalPhoto = this.content.legalPhoto.split(',');
|
||||
this.form.licencePhoto = this.content.licencePhoto.split(',');
|
||||
this.address = this.form.addressIdPath;
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,12 +18,6 @@ module.exports = {
|
|||
},
|
||||
devServer: {
|
||||
port: 9999
|
||||
// proxy: {
|
||||
// '/lili': {
|
||||
// target: 'http://127.0.0.1:8888', // 请求本地 需要lili后台项目
|
||||
// ws: true
|
||||
// }
|
||||
// }
|
||||
},
|
||||
|
||||
chainWebpack: config => {
|
||||
|
|
|
|||
|
|
@ -115,12 +115,12 @@ export const otherRouter = {
|
|||
component: () =>
|
||||
import("@/views/order/after-order/reurnGoodsOrderDetail.vue")
|
||||
},
|
||||
// {
|
||||
// path: "full-cut-detail",
|
||||
// title: "添加满额活动",
|
||||
// name: "full-cut-detail",
|
||||
// component: () => import("@/views/promotion/fullCut/newFullCut.vue")
|
||||
// },
|
||||
{
|
||||
path: "full-cut-detail",
|
||||
title: "添加满额活动",
|
||||
name: "full-cut-detail",
|
||||
component: () => import("@/views/promotion/fullCut/newFullCut.vue")
|
||||
},
|
||||
{
|
||||
path: "order-detail",
|
||||
title: "订单详情",
|
||||
|
|
|
|||
|
|
@ -496,6 +496,7 @@ export default {
|
|||
this.form.promotionGoodsList.splice(index, 1);
|
||||
},
|
||||
selectedGoodsData(item) {
|
||||
console.log(item);
|
||||
// 回显已选商品
|
||||
let ids = [];
|
||||
let list = [];
|
||||
|
|
@ -509,11 +510,13 @@ export default {
|
|||
price: e.price,
|
||||
quantity: e.quantity,
|
||||
storeId: e.storeId,
|
||||
sellerName: e.sellerName,
|
||||
storeName: e.storeName,
|
||||
thumbnail: e.thumbnail,
|
||||
skuId: e.id,
|
||||
});
|
||||
}
|
||||
});
|
||||
console.log(list);
|
||||
this.form.promotionGoodsList.push(...list);
|
||||
},
|
||||
getCouponList(query) {
|
||||
|
|
|
|||
|
|
@ -68,9 +68,16 @@
|
|||
type="info"
|
||||
v-if="row.promotionStatus == 'NEW'"
|
||||
size="small"
|
||||
@click="manage(row)"
|
||||
@click="manage(row, 'manager')"
|
||||
>管理</Button
|
||||
>
|
||||
<Button
|
||||
type="info"
|
||||
v-if="row.promotionStatus !== 'NEW'"
|
||||
size="small"
|
||||
@click="manage(row, 'view')"
|
||||
>查看</Button
|
||||
>
|
||||
<Button
|
||||
type="error"
|
||||
size="small"
|
||||
|
|
@ -252,8 +259,8 @@ export default {
|
|||
edit(v) {
|
||||
this.$router.push({ name: "new-pintuan", query: { id: v.id } });
|
||||
},
|
||||
manage(v) {
|
||||
this.$router.push({ name: "pintuan-goods", query: { id: v.id } });
|
||||
manage(v, status) {
|
||||
this.$router.push({ name: "pintuan-goods", query: { id: v.id, status: status } });
|
||||
},
|
||||
open(v) {
|
||||
this.$Modal.confirm({
|
||||
|
|
|
|||
|
|
@ -3,22 +3,19 @@
|
|||
<Card>
|
||||
<Table style="margin: 10px 0" border :columns="columns" :data="data"></Table>
|
||||
|
||||
<Row class="operation">
|
||||
<Row class="operation" v-if="status == 'manager'">
|
||||
<Button type="primary" @click="openSkuList">选择商品</Button>
|
||||
<Button @click="delAll">批量删除</Button>
|
||||
<Button @click="getDataList" icon="md-refresh">刷新</Button>
|
||||
<Button type="dashed" @click="
|
||||
() => {
|
||||
openTip = !openTip;
|
||||
}
|
||||
">{{ openTip ? "关闭提示" : "开启提示" }}</Button>
|
||||
<Button type="dashed" @click="openTip = !openTip">{{ openTip ? "关闭提示" : "开启提示" }}</Button>
|
||||
</Row>
|
||||
<Row v-show="openTip">
|
||||
<Row v-show="openTip" v-if="status == 'manager'">
|
||||
<Alert show-icon>
|
||||
已选择 <span class="select-count">{{ selectCount }}</span> 项
|
||||
<a class="select-clear" @click="clearSelectAll">清空</a>
|
||||
</Alert>
|
||||
</Row>
|
||||
<h3 class="act-goods">活动商品</h3>
|
||||
<Row class="operation">
|
||||
<Table :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
|
||||
<template slot-scope="{ row, index }" slot="price">
|
||||
|
|
@ -35,7 +32,7 @@
|
|||
</Row>
|
||||
<Row class="operation">
|
||||
<Button @click="closeCurrentPage">返回</Button>
|
||||
<Button type="primary" :loading="submitLoading" @click="save">保存</Button>
|
||||
<Button v-if="status == 'manager'" type="primary" :loading="submitLoading" @click="save">保存</Button>
|
||||
</Row>
|
||||
</Card>
|
||||
|
||||
|
|
@ -57,8 +54,7 @@ export default {
|
|||
return {
|
||||
openTip: true, // 显示提示
|
||||
loading: false, // 表单加载状态
|
||||
searchForm: {
|
||||
// 搜索框初始化对象
|
||||
searchForm: { // 搜索框初始化对象
|
||||
pageNumber: 0, // 当前页数
|
||||
pageSize: 10, // 页面大小
|
||||
},
|
||||
|
|
@ -68,6 +64,7 @@ export default {
|
|||
selectCount: 0, // 多选计数
|
||||
data: [], // 表单数据
|
||||
total: 0, // 表单数据总数
|
||||
status: this.$route.query.status, // 查看还是修改
|
||||
columns: [
|
||||
{
|
||||
title: "活动名称",
|
||||
|
|
@ -326,4 +323,16 @@ export default {
|
|||
.operation {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.act-goods {
|
||||
margin: 20px 0;
|
||||
font-size: 15px;
|
||||
&::before{
|
||||
content: '';
|
||||
border: 1px solid $theme_color;
|
||||
height: 10px;
|
||||
font-weight: bold;
|
||||
font-size: 16px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -16,14 +16,7 @@ module.exports = {
|
|||
}
|
||||
},
|
||||
devServer: {
|
||||
|
||||
port: 9998,
|
||||
// proxy: {
|
||||
// '/lili': {
|
||||
// target: 'http://127.0.0.1:8888', // 请求本地 需要lili后台项目
|
||||
// ws: true
|
||||
// }
|
||||
// }
|
||||
},
|
||||
|
||||
chainWebpack: config => {
|
||||
|
|
@ -76,12 +69,9 @@ module.exports = {
|
|||
vendor: {
|
||||
test: /[\\/]node_modules[\\/]/,
|
||||
name(module) {
|
||||
// get the name. E.g. node_modules/packageName/not/this/part.js
|
||||
// or node_modules/packageName
|
||||
const packageName = module.context.match(
|
||||
/[\\/]node_modules[\\/](.*?)([\\/]|$)/
|
||||
)[1];
|
||||
// npm package names are URL-safe, but some servers don't like @ symbols
|
||||
return `npm.${packageName.replace("@", "")}`;
|
||||
}
|
||||
}
|
||||
|
|
@ -89,7 +79,6 @@ module.exports = {
|
|||
}
|
||||
}
|
||||
},
|
||||
|
||||
pluginOptions: {
|
||||
'style-resources-loader': {
|
||||
preProcessor: 'scss',
|
||||
|
|
|
|||
Loading…
Reference in New Issue