Compare commits
No commits in common. "4800553a0f8b2f9a9308321e673165620647071a" and "579e4d860ee21a374590f80c97b02847c8d41a2e" have entirely different histories.
4800553a0f
...
579e4d860e
|
@ -16,14 +16,14 @@ export const mer_admin = {
|
||||||
loginByAccount: (params) => {
|
loginByAccount: (params) => {
|
||||||
return $http.post(`/auth/login`, {
|
return $http.post(`/auth/login`, {
|
||||||
...params,
|
...params,
|
||||||
type: 1,
|
type: 1
|
||||||
});
|
})
|
||||||
},
|
},
|
||||||
loginByMobile: (params) => {
|
loginByMobile: (params) => {
|
||||||
return $http.post(`/merchant-api/auth/sms/login`, {
|
return $http.post(`/merchant-api/auth/sms/login`, {
|
||||||
...params,
|
...params,
|
||||||
type: 2,
|
type: 2
|
||||||
});
|
})
|
||||||
},
|
},
|
||||||
getYZM(mobile) {
|
getYZM(mobile) {
|
||||||
return $http.get(`/merchant-api/auth/login/code?mobile=${mobile}`);
|
return $http.get(`/merchant-api/auth/login/code?mobile=${mobile}`);
|
||||||
|
@ -50,35 +50,15 @@ export const mer_admin = {
|
||||||
},
|
},
|
||||||
//商户商品分类
|
//商户商品分类
|
||||||
getProductCategory: () => {
|
getProductCategory: () => {
|
||||||
return $http.get(
|
return $http.get(`/merchant-api/product/category/list?shopId=${JSON.parse(sessionStorage.getItem('userInfo')).shopId}`);
|
||||||
`/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) => {
|
getSaleUnit: (data) => {
|
||||||
return $http.request({
|
return $http.request({ url: `/merchant-api/product/unit/list`, method: 'get', params: data });
|
||||||
url: `/merchant-api/product/unit/list`,
|
|
||||||
method: "get",
|
|
||||||
params: data,
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
//文件上传
|
//文件上传
|
||||||
uploadFile: () => {
|
uploadFile: () => {
|
||||||
return `${window.SITE_CONFIG["baseUrl"]}/merchant-api/file/upload`;
|
return `${window.SITE_CONFIG['baseUrl']}/merchant-api/file/upload`
|
||||||
},
|
},
|
||||||
//直接获取城市数据
|
//直接获取城市数据
|
||||||
getCityOptions: () => {
|
getCityOptions: () => {
|
||||||
|
@ -95,8 +75,8 @@ export const mer_admin = {
|
||||||
//删除模板
|
//删除模板
|
||||||
removeShippingTemplate: (id) => {
|
removeShippingTemplate: (id) => {
|
||||||
return $http.post(`/merchant-api/shippingTemplates/delete`, {
|
return $http.post(`/merchant-api/shippingTemplates/delete`, {
|
||||||
id,
|
id
|
||||||
});
|
})
|
||||||
},
|
},
|
||||||
//更新模板
|
//更新模板
|
||||||
updateShippingTemplate: (data) => {
|
updateShippingTemplate: (data) => {
|
||||||
|
@ -105,25 +85,25 @@ export const mer_admin = {
|
||||||
//获取模板分页
|
//获取模板分页
|
||||||
getShippingTemplatePage: (data) => {
|
getShippingTemplatePage: (data) => {
|
||||||
return $http.request({
|
return $http.request({
|
||||||
method: "get",
|
method: 'get',
|
||||||
url: "/merchant-api/shippingTemplates/page",
|
url: '/merchant-api/shippingTemplates/page',
|
||||||
params: data,
|
params: data
|
||||||
});
|
})
|
||||||
},
|
},
|
||||||
//获取配送模板列表
|
//获取配送模板列表
|
||||||
getShippingTemplateList: (data) => {
|
getShippingTemplateList: (data) => {
|
||||||
return $http.request({
|
return $http.request({
|
||||||
method: "get",
|
method: 'get',
|
||||||
url: "/merchant-api/shippingTemplates/list",
|
url: '/merchant-api/shippingTemplates/list',
|
||||||
params: data,
|
params: data
|
||||||
});
|
})
|
||||||
},
|
},
|
||||||
//获取模板详情
|
//获取模板详情
|
||||||
getShippingTemplateInfo: (id) => {
|
getShippingTemplateInfo: (id) => {
|
||||||
return $http.request({
|
return $http.request({
|
||||||
method: "get",
|
method: 'get',
|
||||||
url: "/merchant-api/shippingTemplates/list",
|
url: '/merchant-api/shippingTemplates/list',
|
||||||
params: { id },
|
params: { id }
|
||||||
});
|
})
|
||||||
},
|
}
|
||||||
};
|
}
|
|
@ -29,6 +29,7 @@
|
||||||
placeholder="商品搜索"
|
placeholder="商品搜索"
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="$refs.oTable.reload()"
|
<el-button type="primary" @click="$refs.oTable.reload()"
|
||||||
>查询</el-button
|
>查询</el-button
|
||||||
|
@ -91,7 +92,6 @@ export default {
|
||||||
border: true,
|
border: true,
|
||||||
height: "auto",
|
height: "auto",
|
||||||
"row-id": "id",
|
"row-id": "id",
|
||||||
"show-overflow": false,
|
|
||||||
},
|
},
|
||||||
productFilterType: "SALE",
|
productFilterType: "SALE",
|
||||||
selectList: [],
|
selectList: [],
|
||||||
|
@ -112,7 +112,6 @@ export default {
|
||||||
type: "warning",
|
type: "warning",
|
||||||
})
|
})
|
||||||
.then(() => {
|
.then(() => {
|
||||||
console.log("111");
|
|
||||||
this.$api.mer_admin.BatchDeleteProducts(integers).then((res) => {
|
this.$api.mer_admin.BatchDeleteProducts(integers).then((res) => {
|
||||||
this.$refs.oTable.reload();
|
this.$refs.oTable.reload();
|
||||||
});
|
});
|
||||||
|
|
|
@ -187,7 +187,16 @@ export default {
|
||||||
productIntroducePhoto: "",
|
productIntroducePhoto: "",
|
||||||
productPhotoList: [],
|
productPhotoList: [],
|
||||||
productPlace: "",
|
productPlace: "",
|
||||||
productSpecificationList: [],
|
productSpecificationList: [
|
||||||
|
{
|
||||||
|
attributeValue: "默认",
|
||||||
|
costPrice: 20,
|
||||||
|
salePrice: 30,
|
||||||
|
stockNum: 10,
|
||||||
|
weight: 1,
|
||||||
|
volume: 0.3,
|
||||||
|
},
|
||||||
|
],
|
||||||
productUnit: "",
|
productUnit: "",
|
||||||
productVideo: "",
|
productVideo: "",
|
||||||
shelfLife: "",
|
shelfLife: "",
|
||||||
|
@ -648,10 +657,9 @@ export default {
|
||||||
v-model={this.place}
|
v-model={this.place}
|
||||||
onChange={change}
|
onChange={change}
|
||||||
options={this.$api.mer_admin.getCityOptions()}
|
options={this.$api.mer_admin.getCityOptions()}
|
||||||
props={{
|
{...{
|
||||||
props: {
|
props: {
|
||||||
label: "name",
|
checkStrictly: true,
|
||||||
value: "name",
|
|
||||||
},
|
},
|
||||||
}}
|
}}
|
||||||
clearable
|
clearable
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
:modalHandles="modalHandles"
|
:modalHandles="modalHandles"
|
||||||
>
|
>
|
||||||
<obj-table-plus
|
<obj-table-plus
|
||||||
v-show="modalData.specType == 1"
|
v-show="tableData.length > 1"
|
||||||
style="height: calc(100vh - 120px - 240px)"
|
style="height: calc(100vh - 120px - 240px)"
|
||||||
slot="dialog__after"
|
slot="dialog__after"
|
||||||
ref="oTable"
|
ref="oTable"
|
||||||
|
@ -86,7 +86,7 @@ export default {
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
modalCols() {
|
modalCols() {
|
||||||
if (this.modalData.specType == 0) {
|
if (this.tableData.length == 1) {
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
label: "价格",
|
label: "价格",
|
||||||
|
@ -154,7 +154,7 @@ export default {
|
||||||
type: "primary",
|
type: "primary",
|
||||||
submit: true,
|
submit: true,
|
||||||
handle: debounce(() => {
|
handle: debounce(() => {
|
||||||
if (this.modalData.specType == 0) {
|
if (this.tableData.length == 1) {
|
||||||
this.$api.mer_admin
|
this.$api.mer_admin
|
||||||
.saveProductBase(this.modalData)
|
.saveProductBase(this.modalData)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
|
|
@ -91,6 +91,7 @@ export default {
|
||||||
//监控对象数据
|
//监控对象数据
|
||||||
tableData: [],
|
tableData: [],
|
||||||
//表格属性
|
//表格属性
|
||||||
|
//表格属性
|
||||||
tableProp: {
|
tableProp: {
|
||||||
height: "auto",
|
height: "auto",
|
||||||
border: true,
|
border: true,
|
||||||
|
@ -398,8 +399,6 @@ export default {
|
||||||
disabled: () => this.tableData.length <= 0,
|
disabled: () => this.tableData.length <= 0,
|
||||||
// submit: true,
|
// submit: true,
|
||||||
handle: () => {
|
handle: () => {
|
||||||
let volume = "" //重量
|
|
||||||
let weight = "" //体积
|
|
||||||
let salePrice = ""; //价格范围
|
let salePrice = ""; //价格范围
|
||||||
let stockNum = ""; //库存范围
|
let stockNum = ""; //库存范围
|
||||||
let minSalePrice = Math.min.apply(
|
let minSalePrice = Math.min.apply(
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
:modalHandles="modalHandles"
|
:modalHandles="modalHandles"
|
||||||
>
|
>
|
||||||
<obj-table-plus
|
<obj-table-plus
|
||||||
v-show="modalData.specType == 1"
|
v-show="tableData.length > 1"
|
||||||
style="height: calc(100vh - 120px - 240px)"
|
style="height: calc(100vh - 120px - 240px)"
|
||||||
slot="dialog__after"
|
slot="dialog__after"
|
||||||
ref="oTable"
|
ref="oTable"
|
||||||
|
@ -86,7 +86,7 @@ export default {
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
modalCols() {
|
modalCols() {
|
||||||
if (this.modalData.specType == 0) {
|
if (this.tableData.length == 1) {
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
label: "库存",
|
label: "库存",
|
||||||
|
@ -154,7 +154,7 @@ export default {
|
||||||
type: "primary",
|
type: "primary",
|
||||||
submit: true,
|
submit: true,
|
||||||
handle: debounce(() => {
|
handle: debounce(() => {
|
||||||
if (this.modalData.specType == 0) {
|
if (this.tableData.length == 1) {
|
||||||
this.$api.mer_admin
|
this.$api.mer_admin
|
||||||
.saveProductBase(this.modalData)
|
.saveProductBase(this.modalData)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
|
Loading…
Reference in New Issue