Compare commits
No commits in common. "4800553a0f8b2f9a9308321e673165620647071a" and "579e4d860ee21a374590f80c97b02847c8d41a2e" have entirely different histories.
4800553a0f
...
579e4d860e
|
@ -2,128 +2,108 @@ import $http from "@/utils/httpRequest.js";
|
|||
import city_data from "@/utils/country-level2-data.js";
|
||||
|
||||
export const mer_admin = {
|
||||
/**
|
||||
* 登录
|
||||
* @param {object} params LoginParam
|
||||
* @param {number} params.type
|
||||
* @param {string} params.role
|
||||
* @param {string} params.username
|
||||
* @param {string} params.password
|
||||
* @param {string} params.mobile
|
||||
* @param {string} params.code
|
||||
* @returns
|
||||
*/
|
||||
loginByAccount: (params) => {
|
||||
return $http.post(`/auth/login`, {
|
||||
...params,
|
||||
type: 1,
|
||||
});
|
||||
},
|
||||
loginByMobile: (params) => {
|
||||
return $http.post(`/merchant-api/auth/sms/login`, {
|
||||
...params,
|
||||
type: 2,
|
||||
});
|
||||
},
|
||||
getYZM(mobile) {
|
||||
return $http.get(`/merchant-api/auth/login/code?mobile=${mobile}`);
|
||||
},
|
||||
getInfo() {
|
||||
return $http.get(`/merchant-api/auth/info`);
|
||||
},
|
||||
//商品管理
|
||||
//保存商品信息
|
||||
saveProduct: (data) => {
|
||||
return $http.post(`/merchant-api/product/save`, data);
|
||||
},
|
||||
//保存商品基本信息
|
||||
saveProductBase: (data) => {
|
||||
return $http.post(`/merchant-api/product/save/basic`, data);
|
||||
},
|
||||
//返回商品分类以及列表(聚合)
|
||||
getPolyProduct: (data) => {
|
||||
return $http.post(`/merchant-api/product/polymerization/list`, data);
|
||||
},
|
||||
//商品分页
|
||||
getProductPage: (data) => {
|
||||
return $http.post(`/merchant-api/product/page`, data);
|
||||
},
|
||||
//商户商品分类
|
||||
getProductCategory: () => {
|
||||
return $http.get(
|
||||
`/merchant-api/product/category/list?shopId=${
|
||||
JSON.parse(sessionStorage.getItem("userInfo")).shopId
|
||||
}`
|
||||
);
|
||||
},
|
||||
//上架或下架
|
||||
putOnShelvesProducts: (data) => {
|
||||
return $http.post(`/merchant-api/product/batch/update/status`, data);
|
||||
},
|
||||
//批量删除商品
|
||||
BatchDeleteProducts: (data) => {
|
||||
return $http.post(`/merchant-api/product/batch/delete`, data);
|
||||
},
|
||||
//打折扣
|
||||
setDiscounts: (data) => {
|
||||
return $http.post(`merchant-api/activity/save`, data);
|
||||
},
|
||||
//获取销售单位
|
||||
getSaleUnit: (data) => {
|
||||
return $http.request({
|
||||
url: `/merchant-api/product/unit/list`,
|
||||
method: "get",
|
||||
params: data,
|
||||
});
|
||||
},
|
||||
//文件上传
|
||||
uploadFile: () => {
|
||||
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 },
|
||||
});
|
||||
},
|
||||
};
|
||||
/**
|
||||
* 登录
|
||||
* @param {object} params LoginParam
|
||||
* @param {number} params.type
|
||||
* @param {string} params.role
|
||||
* @param {string} params.username
|
||||
* @param {string} params.password
|
||||
* @param {string} params.mobile
|
||||
* @param {string} params.code
|
||||
* @returns
|
||||
*/
|
||||
loginByAccount: (params) => {
|
||||
return $http.post(`/auth/login`, {
|
||||
...params,
|
||||
type: 1
|
||||
})
|
||||
},
|
||||
loginByMobile: (params) => {
|
||||
return $http.post(`/merchant-api/auth/sms/login`, {
|
||||
...params,
|
||||
type: 2
|
||||
})
|
||||
},
|
||||
getYZM(mobile) {
|
||||
return $http.get(`/merchant-api/auth/login/code?mobile=${mobile}`);
|
||||
},
|
||||
getInfo() {
|
||||
return $http.get(`/merchant-api/auth/info`);
|
||||
},
|
||||
//商品管理
|
||||
//保存商品信息
|
||||
saveProduct: (data) => {
|
||||
return $http.post(`/merchant-api/product/save`, data);
|
||||
},
|
||||
//保存商品基本信息
|
||||
saveProductBase: (data) => {
|
||||
return $http.post(`/merchant-api/product/save/basic`, data);
|
||||
},
|
||||
//返回商品分类以及列表(聚合)
|
||||
getPolyProduct: (data) => {
|
||||
return $http.post(`/merchant-api/product/polymerization/list`, data);
|
||||
},
|
||||
//商品分页
|
||||
getProductPage: (data) => {
|
||||
return $http.post(`/merchant-api/product/page`, data);
|
||||
},
|
||||
//商户商品分类
|
||||
getProductCategory: () => {
|
||||
return $http.get(`/merchant-api/product/category/list?shopId=${JSON.parse(sessionStorage.getItem('userInfo')).shopId}`);
|
||||
},
|
||||
//获取销售单位
|
||||
getSaleUnit: (data) => {
|
||||
return $http.request({ url: `/merchant-api/product/unit/list`, method: 'get', params: data });
|
||||
},
|
||||
//文件上传
|
||||
uploadFile: () => {
|
||||
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 }
|
||||
})
|
||||
}
|
||||
}
|
|
@ -29,6 +29,7 @@
|
|||
placeholder="商品搜索"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="$refs.oTable.reload()"
|
||||
>查询</el-button
|
||||
|
@ -91,7 +92,6 @@ export default {
|
|||
border: true,
|
||||
height: "auto",
|
||||
"row-id": "id",
|
||||
"show-overflow": false,
|
||||
},
|
||||
productFilterType: "SALE",
|
||||
selectList: [],
|
||||
|
@ -112,7 +112,6 @@ export default {
|
|||
type: "warning",
|
||||
})
|
||||
.then(() => {
|
||||
console.log("111");
|
||||
this.$api.mer_admin.BatchDeleteProducts(integers).then((res) => {
|
||||
this.$refs.oTable.reload();
|
||||
});
|
||||
|
|
|
@ -187,7 +187,16 @@ export default {
|
|||
productIntroducePhoto: "",
|
||||
productPhotoList: [],
|
||||
productPlace: "",
|
||||
productSpecificationList: [],
|
||||
productSpecificationList: [
|
||||
{
|
||||
attributeValue: "默认",
|
||||
costPrice: 20,
|
||||
salePrice: 30,
|
||||
stockNum: 10,
|
||||
weight: 1,
|
||||
volume: 0.3,
|
||||
},
|
||||
],
|
||||
productUnit: "",
|
||||
productVideo: "",
|
||||
shelfLife: "",
|
||||
|
@ -648,10 +657,9 @@ export default {
|
|||
v-model={this.place}
|
||||
onChange={change}
|
||||
options={this.$api.mer_admin.getCityOptions()}
|
||||
props={{
|
||||
{...{
|
||||
props: {
|
||||
label: "name",
|
||||
value: "name",
|
||||
checkStrictly: true,
|
||||
},
|
||||
}}
|
||||
clearable
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
:modalHandles="modalHandles"
|
||||
>
|
||||
<obj-table-plus
|
||||
v-show="modalData.specType == 1"
|
||||
v-show="tableData.length > 1"
|
||||
style="height: calc(100vh - 120px - 240px)"
|
||||
slot="dialog__after"
|
||||
ref="oTable"
|
||||
|
@ -86,7 +86,7 @@ export default {
|
|||
},
|
||||
computed: {
|
||||
modalCols() {
|
||||
if (this.modalData.specType == 0) {
|
||||
if (this.tableData.length == 1) {
|
||||
return [
|
||||
{
|
||||
label: "价格",
|
||||
|
@ -154,7 +154,7 @@ export default {
|
|||
type: "primary",
|
||||
submit: true,
|
||||
handle: debounce(() => {
|
||||
if (this.modalData.specType == 0) {
|
||||
if (this.tableData.length == 1) {
|
||||
this.$api.mer_admin
|
||||
.saveProductBase(this.modalData)
|
||||
.then((res) => {
|
||||
|
|
|
@ -91,6 +91,7 @@ export default {
|
|||
//监控对象数据
|
||||
tableData: [],
|
||||
//表格属性
|
||||
//表格属性
|
||||
tableProp: {
|
||||
height: "auto",
|
||||
border: true,
|
||||
|
@ -398,8 +399,6 @@ export default {
|
|||
disabled: () => this.tableData.length <= 0,
|
||||
// submit: true,
|
||||
handle: () => {
|
||||
let volume = "" //重量
|
||||
let weight = "" //体积
|
||||
let salePrice = ""; //价格范围
|
||||
let stockNum = ""; //库存范围
|
||||
let minSalePrice = Math.min.apply(
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
:modalHandles="modalHandles"
|
||||
>
|
||||
<obj-table-plus
|
||||
v-show="modalData.specType == 1"
|
||||
v-show="tableData.length > 1"
|
||||
style="height: calc(100vh - 120px - 240px)"
|
||||
slot="dialog__after"
|
||||
ref="oTable"
|
||||
|
@ -86,7 +86,7 @@ export default {
|
|||
},
|
||||
computed: {
|
||||
modalCols() {
|
||||
if (this.modalData.specType == 0) {
|
||||
if (this.tableData.length == 1) {
|
||||
return [
|
||||
{
|
||||
label: "库存",
|
||||
|
@ -154,7 +154,7 @@ export default {
|
|||
type: "primary",
|
||||
submit: true,
|
||||
handle: debounce(() => {
|
||||
if (this.modalData.specType == 0) {
|
||||
if (this.tableData.length == 1) {
|
||||
this.$api.mer_admin
|
||||
.saveProductBase(this.modalData)
|
||||
.then((res) => {
|
||||
|
|
Loading…
Reference in New Issue