Compare commits
No commits in common. "579e4d860ee21a374590f80c97b02847c8d41a2e" and "637303fc1a3f96f578854cb53026fa332eaade2f" have entirely different histories.
579e4d860e
...
637303fc1a
|
|
@ -54,8 +54,8 @@
|
|||
"jsencrypt": "3.0.0-rc.1",
|
||||
"mockjs": "^1.1.0",
|
||||
"nprogress": "0.2.0",
|
||||
"obj-modal": "^1.2.0",
|
||||
"obj-table-plus": "^2.3.0",
|
||||
"obj-modal": "^1.1.2",
|
||||
"obj-table-plus": "^2.2.1",
|
||||
"quill": "1.3.7",
|
||||
"screenfull": "5.0.2",
|
||||
"signature_pad": "^3.0.0-beta.4",
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ export const mer_admin = {
|
|||
loginByAccount: (params) => {
|
||||
return $http.post(`/auth/login`, {
|
||||
...params,
|
||||
type: 1
|
||||
})
|
||||
type: 1,
|
||||
});
|
||||
},
|
||||
loginByMobile: (params) => {
|
||||
return $http.post(`/merchant-api/auth/sms/login`, {
|
||||
...params,
|
||||
type: 2
|
||||
})
|
||||
type: 2,
|
||||
});
|
||||
},
|
||||
getYZM(mobile) {
|
||||
return $http.get(`/merchant-api/auth/login/code?mobile=${mobile}`);
|
||||
|
|
@ -46,64 +46,45 @@ export const mer_admin = {
|
|||
},
|
||||
//商品分页
|
||||
getProductPage: (data) => {
|
||||
return $http.post(`/merchant-api/product/page`, data);
|
||||
return $http.post(
|
||||
`/merchant-api/product/page?pageNumber=${data.p.pageNumber}&pageSize=${data.p.pageSize}`,
|
||||
data
|
||||
);
|
||||
},
|
||||
//商户商品分类
|
||||
getProductCategory: () => {
|
||||
return $http.get(`/merchant-api/product/category/list?shopId=${JSON.parse(sessionStorage.getItem('userInfo')).shopId}`);
|
||||
return $http.get(
|
||||
`/merchant-api/product/category/list?shopId=${
|
||||
JSON.parse(sessionStorage.getItem("userInfo")).shopId
|
||||
}`
|
||||
);
|
||||
},
|
||||
//批量删除商品
|
||||
BatchDeleteProducts: (data) => {
|
||||
return $http.post(`/merchant-api/product/batch/delete`, data);
|
||||
},
|
||||
//打折扣
|
||||
setDiscounts: (data) => {
|
||||
return $http.post(`merchant-api/activity/save`, data);
|
||||
},
|
||||
//上架或下架商品
|
||||
putOnShelvesProducts: (data) => {
|
||||
return $http.post(`/merchant-api/product/batch/update/status`, data);
|
||||
},
|
||||
//获取销售单位
|
||||
getSaleUnit: (data) => {
|
||||
return $http.request({ url: `/merchant-api/product/unit/list`, method: 'get', params: data });
|
||||
return $http.request({
|
||||
url: `/merchant-api/product/unit/list`,
|
||||
method: "get",
|
||||
params: data,
|
||||
});
|
||||
},
|
||||
//文件上传
|
||||
uploadFile: () => {
|
||||
return `${window.SITE_CONFIG['baseUrl']}/merchant-api/file/upload`
|
||||
return `${window.SITE_CONFIG["baseUrl"]}/merchant-api/file/upload`;
|
||||
},
|
||||
//直接获取城市数据
|
||||
getCityOptions: () => {
|
||||
return city_data;
|
||||
},
|
||||
//省市县数据
|
||||
getCity: () => {
|
||||
return $http.get(`/merchant-api/common/pca`);
|
||||
},
|
||||
//添加运费模板
|
||||
addShippingTemplate: (data) => {
|
||||
return $http.post(`/merchant-api/shippingTemplates/add`, data);
|
||||
},
|
||||
//删除模板
|
||||
removeShippingTemplate: (id) => {
|
||||
return $http.post(`/merchant-api/shippingTemplates/delete`, {
|
||||
id
|
||||
})
|
||||
},
|
||||
//更新模板
|
||||
updateShippingTemplate: (data) => {
|
||||
return $http.post(`/merchant-api/shippingTemplates/update`, data);
|
||||
},
|
||||
//获取模板分页
|
||||
getShippingTemplatePage: (data) => {
|
||||
return $http.request({
|
||||
method: 'get',
|
||||
url: '/merchant-api/shippingTemplates/page',
|
||||
params: data
|
||||
})
|
||||
},
|
||||
//获取配送模板列表
|
||||
getShippingTemplateList: (data) => {
|
||||
return $http.request({
|
||||
method: 'get',
|
||||
url: '/merchant-api/shippingTemplates/list',
|
||||
params: data
|
||||
})
|
||||
},
|
||||
//获取模板详情
|
||||
getShippingTemplateInfo: (id) => {
|
||||
return $http.request({
|
||||
method: 'get',
|
||||
url: '/merchant-api/shippingTemplates/list',
|
||||
params: { id }
|
||||
})
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,14 +1,7 @@
|
|||
<template>
|
||||
<div>
|
||||
<obj-modal
|
||||
class="obj-modal"
|
||||
ref="modal"
|
||||
labelWidth="100px"
|
||||
:modalCols="modalCols"
|
||||
:modalConfig="modalConfig"
|
||||
:modalData="modalData"
|
||||
:modalHandles="modalHandles"
|
||||
>
|
||||
<obj-modal class="obj-modal" ref="modal" labelWidth="100px" :modalCols="modalCols" :modalConfig="modalConfig"
|
||||
:modalData="modalData" :modalHandles="modalHandles">
|
||||
<template slot="dialog__before">
|
||||
<!-- <el-tabs v-model="currentPanel">
|
||||
<el-tab-pane label="基础信息" name="基础信息"></el-tab-pane>
|
||||
|
|
@ -21,40 +14,12 @@
|
|||
</template>
|
||||
<script>
|
||||
import { debounce, cloneDeep } from "lodash";
|
||||
const BASE_DATA = {
|
||||
calculateMethod: "按重量",
|
||||
fareConfig: "全国包邮",
|
||||
//为指定地区城市设置运费
|
||||
shippingTemplatesRegionList: [
|
||||
{
|
||||
//默认运费，不限制城市
|
||||
cityCodes: "0",
|
||||
//首重
|
||||
first: "",
|
||||
//首重价格
|
||||
firstPrice: "",
|
||||
//续重
|
||||
renewal: "",
|
||||
//续重价格
|
||||
renewalPrice: "",
|
||||
},
|
||||
],
|
||||
//追加
|
||||
shippingTemplatesRegionListAppend: [],
|
||||
//指定包邮条件
|
||||
shippingTemplatesConditionList: [
|
||||
// {
|
||||
// cityCodes: "",
|
||||
// price: "",
|
||||
// number: "",
|
||||
// },
|
||||
],
|
||||
};
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
currentPanel: "基础信息",
|
||||
modalData: {},
|
||||
modalData: {
|
||||
},
|
||||
modalConfig: {
|
||||
title: "添加运费模板",
|
||||
show: false,
|
||||
|
|
@ -65,7 +30,7 @@ export default {
|
|||
place: "", //场地
|
||||
};
|
||||
},
|
||||
mounted() {},
|
||||
mounted() { },
|
||||
methods: {
|
||||
toggle(e) {
|
||||
if (this.modalConfig.show == false) {
|
||||
|
|
@ -81,7 +46,8 @@ export default {
|
|||
add: (item) => {
|
||||
console.log(item);
|
||||
this.$nextTick(() => {
|
||||
this.modalData = BASE_DATA;
|
||||
this.modalData = {
|
||||
};
|
||||
});
|
||||
this.isAdd = true;
|
||||
},
|
||||
|
|
@ -91,7 +57,7 @@ export default {
|
|||
},
|
||||
};
|
||||
},
|
||||
init(row) {},
|
||||
init(row) { },
|
||||
},
|
||||
computed: {
|
||||
modalCols() {
|
||||
|
|
@ -99,19 +65,16 @@ export default {
|
|||
{
|
||||
label: "模板名称",
|
||||
prop: "templateName",
|
||||
type: "Input",
|
||||
maxlength: "30",
|
||||
placeholder: "请输入模板名称",
|
||||
rules: {
|
||||
required: true,
|
||||
message: "请输入模板名称",
|
||||
trigger: "blur,change",
|
||||
},
|
||||
type: "Input",
|
||||
maxlength:"30",
|
||||
placeholder: "请输入模板名称"
|
||||
},
|
||||
{
|
||||
label: "计价方式",
|
||||
prop: "calculateMethod",
|
||||
type: "jsx",
|
||||
required: true,
|
||||
rules: {
|
||||
required: true,
|
||||
message: "请选择计价方式",
|
||||
|
|
@ -144,448 +107,7 @@ export default {
|
|||
</el-radio-group>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
label: "自定义运费配置",
|
||||
type: "jsx-out",
|
||||
show: this.modalData.fareConfig == "自定义运费",
|
||||
render: () => {
|
||||
const tableCols = [
|
||||
{
|
||||
title: "运送到",
|
||||
width: "300px",
|
||||
field: "cityCodes",
|
||||
type: "jsx",
|
||||
render: ({ row }) => {
|
||||
const change = (e) => {
|
||||
console.log(e);
|
||||
};
|
||||
return (
|
||||
<el-cascader
|
||||
style="width:100%;"
|
||||
v-model={row.cityCodes}
|
||||
onChange={change}
|
||||
options={this.$api.mer_admin.getCityOptions()}
|
||||
show-all-levels={false}
|
||||
collapse-tags={true}
|
||||
props={{
|
||||
props: {
|
||||
multiple: true,
|
||||
checkStrictly: false,
|
||||
emitPath: true,
|
||||
label: "name",
|
||||
value: "code",
|
||||
},
|
||||
}}
|
||||
clearable
|
||||
filterable
|
||||
></el-cascader>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: "首重（kg）",
|
||||
field: "first",
|
||||
type: "jsx",
|
||||
render: ({ row }) => {
|
||||
return (
|
||||
<el-input-number
|
||||
style="width:100%;"
|
||||
min={0}
|
||||
controls={false}
|
||||
precision={2}
|
||||
v-model={row.first}
|
||||
></el-input-number>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: "首费（元）",
|
||||
field: "firstPrice",
|
||||
type: "jsx",
|
||||
render: ({ row }) => {
|
||||
return (
|
||||
<el-input-number
|
||||
style="width:100%;"
|
||||
min={0}
|
||||
controls={false}
|
||||
precision={2}
|
||||
v-model={row.firstPrice}
|
||||
></el-input-number>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: "续重（kg）",
|
||||
field: "renewal",
|
||||
type: "jsx",
|
||||
render: ({ row }) => {
|
||||
return (
|
||||
<el-input-number
|
||||
style="width:100%;"
|
||||
min={0}
|
||||
controls={false}
|
||||
precision={2}
|
||||
v-model={row.renewal}
|
||||
></el-input-number>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: "续费（元）",
|
||||
field: "renewalPrice",
|
||||
type: "jsx",
|
||||
render: ({ row }) => {
|
||||
return (
|
||||
<el-input-number
|
||||
style="width:100%;"
|
||||
min={0}
|
||||
max={row.firstPrice}
|
||||
controls={false}
|
||||
precision={2}
|
||||
v-model={row.renewalPrice}
|
||||
></el-input-number>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: "操作",
|
||||
type: "jsx",
|
||||
render: (e) => {
|
||||
const remove = () => {
|
||||
console.log(e);
|
||||
this.modalData.shippingTemplatesRegionListAppend.splice(
|
||||
e.rowIndex,
|
||||
1
|
||||
);
|
||||
};
|
||||
const add = () => {
|
||||
console.log(e);
|
||||
this.modalData.shippingTemplatesRegionListAppend.splice(
|
||||
e.rowIndex + 1,
|
||||
0,
|
||||
{
|
||||
//默认运费，不限制城市
|
||||
cityCodes: "",
|
||||
//首重
|
||||
first: "",
|
||||
//首重价格
|
||||
firstPrice: "",
|
||||
//续重
|
||||
renewal: "",
|
||||
//续重价格
|
||||
renewalPrice: "",
|
||||
}
|
||||
);
|
||||
};
|
||||
return (
|
||||
<div>
|
||||
<el-button type="primary" size="mini" onClick={add}>
|
||||
向下添加
|
||||
</el-button>
|
||||
<el-button type="danger" size="mini" onClick={remove}>
|
||||
删除
|
||||
</el-button>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
];
|
||||
const addAreaFare = () => {
|
||||
this.modalData.shippingTemplatesRegionListAppend.push({
|
||||
//默认运费，不限制城市
|
||||
cityCodes: "",
|
||||
//首重
|
||||
first: "",
|
||||
//首重价格
|
||||
firstPrice: "",
|
||||
//续重
|
||||
renewal: "",
|
||||
//续重价格
|
||||
renewalPrice: "",
|
||||
});
|
||||
};
|
||||
return (
|
||||
<div>
|
||||
<div class="d-flex no-warp justify-start items-center">
|
||||
<el-form-item
|
||||
prop="shippingTemplatesRegionList[0].first"
|
||||
rules={{
|
||||
required: true,
|
||||
message: "请填写默认运费",
|
||||
trigger: "change",
|
||||
}}
|
||||
label="默认运费"
|
||||
>
|
||||
<el-input
|
||||
v-model={
|
||||
this.modalData.shippingTemplatesRegionList[0].first
|
||||
}
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<span style="transform:translateY(-12px);">
|
||||
kg内
|
||||
</span>
|
||||
<el-form-item
|
||||
label-width="0"
|
||||
prop="shippingTemplatesRegionList[0].firstPrice"
|
||||
rules={{
|
||||
required: true,
|
||||
message: "请填写默认运费",
|
||||
trigger: "change",
|
||||
}}
|
||||
label=""
|
||||
>
|
||||
<el-input
|
||||
v-model={
|
||||
this.modalData.shippingTemplatesRegionList[0].firstPrice
|
||||
}
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<span style="transform:translateY(-12px);">
|
||||
元，每增加
|
||||
</span>
|
||||
<el-form-item
|
||||
label-width="0"
|
||||
prop="shippingTemplatesRegionList[0].renewal"
|
||||
rules={{
|
||||
required: true,
|
||||
message: "请填写默认运费",
|
||||
trigger: "change",
|
||||
}}
|
||||
label=""
|
||||
>
|
||||
<el-input
|
||||
v-model={
|
||||
this.modalData.shippingTemplatesRegionList[0].renewal
|
||||
}
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<span style="transform:translateY(-12px);">
|
||||
kg，增加运费
|
||||
</span>
|
||||
<el-form-item
|
||||
label-width="0"
|
||||
prop="shippingTemplatesRegionList[0].renewalPrice"
|
||||
rules={{
|
||||
required: true,
|
||||
message: "请填写默认运费",
|
||||
trigger: "change",
|
||||
}}
|
||||
label=""
|
||||
>
|
||||
<el-input
|
||||
v-model={
|
||||
this.modalData.shippingTemplatesRegionList[0]
|
||||
.renewalPrice
|
||||
}
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<span style="transform:translateY(-12px);">
|
||||
元
|
||||
</span>
|
||||
</div>
|
||||
<div>
|
||||
<obj-table-plus
|
||||
style="height:50vh;"
|
||||
enable-auto-query={false}
|
||||
v-model={this.modalData.shippingTemplatesRegionListAppend}
|
||||
tableCols={tableCols}
|
||||
isPagination={false}
|
||||
>
|
||||
<template slot="empty">
|
||||
<el-button
|
||||
onClick={addAreaFare}
|
||||
type="text"
|
||||
icon="el-icon-plus"
|
||||
>
|
||||
为指定地区城市设置运费（除指定地区外，其余地区的运费按照“默认运费”）
|
||||
</el-button>
|
||||
</template>
|
||||
</obj-table-plus>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
//指定包邮条件
|
||||
{
|
||||
label: "",
|
||||
prop: "",
|
||||
type: "jsx-out",
|
||||
show: this.modalData.fareConfig == "自定义运费",
|
||||
render: () => {
|
||||
const tableCols = [
|
||||
{
|
||||
title: "运送到",
|
||||
width: "300px",
|
||||
field: "cityCodes",
|
||||
type: "jsx",
|
||||
render: ({ row }) => {
|
||||
const change = (e) => {
|
||||
console.log(e);
|
||||
};
|
||||
return (
|
||||
<el-cascader
|
||||
style="width:100%;"
|
||||
v-model={row.cityCodes}
|
||||
onChange={change}
|
||||
options={this.$api.mer_admin.getCityOptions()}
|
||||
show-all-levels={false}
|
||||
collapse-tags={true}
|
||||
props={{
|
||||
props: {
|
||||
multiple: true,
|
||||
checkStrictly: false,
|
||||
emitPath: true,
|
||||
label: "name",
|
||||
value: "code",
|
||||
},
|
||||
}}
|
||||
clearable
|
||||
filterable
|
||||
></el-cascader>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: "包邮条件",
|
||||
field: "conditions",
|
||||
type: "jsx",
|
||||
render: ({ row }) => {
|
||||
const _conditionMapper = {
|
||||
件数: (
|
||||
<div>
|
||||
<el-input-number
|
||||
style="width:150px;"
|
||||
min={0}
|
||||
controls={false}
|
||||
precision={0}
|
||||
v-model={row.number}
|
||||
></el-input-number>
|
||||
<span> 件包邮 </span>
|
||||
</div>
|
||||
),
|
||||
金额: (
|
||||
<div>
|
||||
<el-input-number
|
||||
style="width:150px;"
|
||||
min={0}
|
||||
controls={false}
|
||||
precision={2}
|
||||
v-model={row.price}
|
||||
></el-input-number>
|
||||
<span> 元包邮 </span>
|
||||
</div>
|
||||
),
|
||||
"件数+金额": (
|
||||
<div>
|
||||
<el-input-number
|
||||
style="width:150px;"
|
||||
min={0}
|
||||
controls={false}
|
||||
precision={0}
|
||||
v-model={row.number}
|
||||
></el-input-number>
|
||||
<span> 件，且 </span>
|
||||
<el-input-number
|
||||
style="width:150px;"
|
||||
min={0}
|
||||
controls={false}
|
||||
precision={2}
|
||||
v-model={row.price}
|
||||
></el-input-number>
|
||||
<span> 元以上包邮 </span>
|
||||
</div>
|
||||
),
|
||||
};
|
||||
return (
|
||||
<div class="flex justify-start items-center">
|
||||
<el-select
|
||||
style="width:80px;"
|
||||
v-model={row.conditionType}
|
||||
>
|
||||
<el-option label="件数" value="件数"></el-option>
|
||||
<el-option label="金额" value="金额"></el-option>
|
||||
<el-option
|
||||
label="件数+金额"
|
||||
value="件数+金额"
|
||||
></el-option>
|
||||
</el-select>
|
||||
<span> 满 </span>
|
||||
{_conditionMapper[row.conditionType]}
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: "操作",
|
||||
width: "200px",
|
||||
type: "jsx",
|
||||
render: (e) => {
|
||||
const remove = () => {
|
||||
console.log(e);
|
||||
this.modalData.shippingTemplatesConditionList.splice(
|
||||
e.rowIndex,
|
||||
1
|
||||
);
|
||||
};
|
||||
const add = () => {
|
||||
console.log(e);
|
||||
this.modalData.shippingTemplatesConditionList.splice(
|
||||
e.rowIndex + 1,
|
||||
0,
|
||||
{
|
||||
cityCodes: "",
|
||||
price: "",
|
||||
number: "",
|
||||
conditionType: "件数",
|
||||
}
|
||||
);
|
||||
};
|
||||
return (
|
||||
<div>
|
||||
<el-button type="primary" size="mini" onClick={add}>
|
||||
向下添加
|
||||
</el-button>
|
||||
<el-button type="danger" size="mini" onClick={remove}>
|
||||
删除
|
||||
</el-button>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
];
|
||||
const addAreaFare = () => {
|
||||
this.modalData.shippingTemplatesConditionList.push({
|
||||
cityCodes: "",
|
||||
price: "",
|
||||
number: "",
|
||||
conditionType: "件数",
|
||||
});
|
||||
};
|
||||
return (
|
||||
<obj-table-plus
|
||||
class="mt-5"
|
||||
style="height:50vh;"
|
||||
enable-auto-query={false}
|
||||
v-model={this.modalData.shippingTemplatesConditionList}
|
||||
tableCols={tableCols}
|
||||
isPagination={false}
|
||||
>
|
||||
<template slot="empty">
|
||||
<el-button
|
||||
onClick={addAreaFare}
|
||||
type="text"
|
||||
icon="el-icon-plus"
|
||||
>
|
||||
添加其他地区/其他包邮条件
|
||||
</el-button>
|
||||
</template>
|
||||
</obj-table-plus>
|
||||
);
|
||||
},
|
||||
},
|
||||
];
|
||||
},
|
||||
modalHandles() {
|
||||
|
|
@ -602,16 +124,14 @@ export default {
|
|||
type: "primary",
|
||||
loading: this.isLoading,
|
||||
submit: true,
|
||||
handle: debounce(() => {}, 300),
|
||||
},
|
||||
handle: debounce(() => {
|
||||
|
||||
}, 300),
|
||||
}
|
||||
];
|
||||
},
|
||||
},
|
||||
asyncComputed: {
|
||||
async getCityOptions() {
|
||||
let res = await this.$api.mer_admin.getCity();
|
||||
return res.data.data;
|
||||
},
|
||||
async getProductCategory() {
|
||||
let res = await this.$api.mer_admin.getProductCategory();
|
||||
return res.data.data;
|
||||
|
|
|
|||
Loading…
Reference in New Issue