code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2025-12-18 17:05:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ma

Browse Source 
# Conflicts:
#	seller/src/views/goods/goods-seller/goodsOperation.vue
This commit is contained in:
mabo
2021-07-02 17:38:14 +08:00
parent da330b80c8 cc1afed902
commit 31349634f6
13 changed files with 113 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
seller/src/config/index.js
View File

@@ -18,14 +18,14 @@ export default {
* @description api请求基础路径
*/
api_dev: {
// common: 'https://common-api.pickmall.cn',
// buyer: 'https://buyer-api.pickmall.cn',
// seller: 'https://store-api.pickmall.cn',
// manager: 'https://admin-api.pickmall.cn',
common: 'http://192.168.0.109:8890',
buyer: 'http://192.168.0.109:8888',
seller: 'http://192.168.0.109:8889',
manager: 'http://192.168.0.109:8887'
common: 'https://common-api.pickmall.cn',
buyer: 'https://buyer-api.pickmall.cn',
seller: 'https://store-api.pickmall.cn',
manager: 'https://admin-api.pickmall.cn',
// common: 'http://192.168.0.109:8890',
// buyer: 'http://192.168.0.109:8888',
// seller: 'http://192.168.0.109:8889',
// manager: 'http://192.168.0.109:8887'
},
api_prod: {

60
seller/src/views/goods/goods-seller/goodsOperation.vue
View File

@@ -393,38 +393,7 @@ export default {
secondStep,
thirdStep
},
watch: {
// selectGoodsType: {
// handler(val) {
// if (val && this.baseInfoForm.goodsType) {
// this.goodsTypeWay.forEach((item) => {
// item.check = false;
// if (item.type == this.baseInfoForm.goodsType) {
// item.check = true;
// }
// if (!item.type) {
// this.defaultBaseInfo();
// }
// });
// }
// },
// },
// $route(to, from) {
// if (to.query.draftId) {
// this.draftId = to.query.draftId;
// this.activestep = 1;
// this.isOperationGoods = false;
// this.GET_GoodData();
// } else if (to.query.id) {
// this.activestep = 1;
// this.goodsId = this.$route.query.id;
// this.GET_GoodData();
// } else {
// this.selectGoodsType = true;
// this.defaultBaseInfo();
// }
// },
},
data() {
// 表单验证项，商品价格
const checkPrice = (rule, value, callback) => {
@@ -482,8 +451,6 @@ export default {
showSkuPicture: false,
//选择的sku
selectedSku: {},
//模版 id
draftId: undefined,
/** 当前激活步骤*/
activestep: 0,
//是否在编辑商品
@@ -634,7 +601,6 @@ export default {
}
// 编辑模板
else if (this.$route.query.draftId) {
this.draftId = this.$route.query.draftId;
this.activestep = 1;
this.isOperationGoods = false;
this.GET_GoodData();
@@ -671,8 +637,6 @@ export default {
this.isPublish = true;
this.$refs.first.GET_NextLevelCategory();
},
/**
* 选择参数
* @paramsGroup 参数分组
@@ -848,8 +812,8 @@ export default {
// 编辑时获取商品信息
async GET_GoodData() {
let response = {};
if (this.draftId) {
response = await API_GOODS.getDraftGoodsDetail(this.draftId);
if (this.$route.query.draftId) {
response = await API_GOODS.getDraftGoodsDetail(this.$route.query.draftId);
} else {
response = await API_GOODS.getGoods(this.$route.query.id);
this.goodsId = response.result.id;
@@ -1280,14 +1244,19 @@ export default {
/** 下一步*/
next() {
window.scrollTo(0, 0);
if (this.activestep === 0 && this.draftId) {
if (this.activestep === 0 && this.$route.query.draftId) {
this.activestep = 1;
this.GET_GoodData();
return;
}
/** 1级校验 */
if (this.activestep === 0 && !this.activeCategoryName1) {
this.loading = true;
if (this.activestep === 0 && !this.baseInfoForm.goodsType) {
this.$Message.error('请选择商品类型')
this.loading = false;
return
}
if (this.activestep === 0 && !this.activeCategoryName1) {
this.$Message.error("请选择商品分类");
return;
} else if (this.activestep === 0 && this.activeCategoryIndex3 === -1) {
@@ -1327,8 +1296,7 @@ export default {
});
return;
}
/** 下一步 */
if (this.activestep++ > 2) return;
},
// 店内分类选择
selectTree(v) {
@@ -1439,8 +1407,8 @@ export default {
this.baseInfoForm.categoryName = [];
this.baseInfoForm.saveType = 'TEMPLATE';
if (this.draftId) {
this.baseInfoForm.id = this.draftId;
if (this.$route.query.draftId) {
this.baseInfoForm.id = this.$route.query.draftId;
this.$Modal.confirm({
title: "当前模板已存在",
content: "当前模板已存在，保存为新模板或替换原模板",

6
seller/src/views/goods/goods-seller/goodsOperationFirst.vue
View File

@@ -54,7 +54,7 @@
<span v-show="activeCategoryName2">> {{ activeCategoryName2 }}</span>
<span v-show="activeCategoryName3">> {{ activeCategoryName3 }}</span>
</p>
<template v-if="!$route.query.id && draftId">
<template v-if="!$route.query.id">
<Divider>已选商品模版:{{checkedTemplate()}}</Divider>
</template>
</div>
@@ -120,7 +120,7 @@ export default {
// 获取已选模板
checkedTemplate () {
if(this.goodsTemplates.length) {
return this.goodsTemplates.find(item=>{return item.id == this.draftId}).goodsName
return this.goodsTemplates.find(item=>{return item.id == this.$parent.draftId}).goodsName
} else {
return ""
}
@@ -134,6 +134,7 @@ export default {
val.check = !val.check;
if (!val.type) {
this.showGoodsTemplates = true;
this.GET_GoodsTemplate()
} else {
// this.baseInfoForm.goodsType = val.type;
// this.draftId = "";
@@ -198,6 +199,7 @@ export default {
},
},
mounted () {
this.GET_NextLevelCategory()
}
}
</script>

29
seller/src/views/my-components/verify/index.vue
View File

@@ -72,19 +72,26 @@ export default {
xPos: this.distance
};
postVerifyImg(params).then(res => {
if (res.result) {
this.bgColor = 'green';
this.verifyText = '解锁成功';
this.$emit('change', { status: true, distance: this.distance });
if (res.success) {
if (res.result) {
this.bgColor = 'green';
this.verifyText = '解锁成功';
this.$emit('change', { status: true, distance: this.distance });
} else {
this.bgColor = 'red';
this.verifyText = '解锁失败';
let that = this;
setTimeout(() => {
that.refresh();
}, 1000);
this.$emit('change', { status: false, distance: this.distance });
}
} else {
this.bgColor = 'red';
this.verifyText = '解锁失败';
let that = this;
setTimeout(() => {
that.refresh();
}, 1000);
this.$emit('change', { status: false, distance: this.distance });
this.refresh()
}
}).catch(()=>{
this.refresh()
});
},
refresh () { // 刷新滑块

4
seller/src/views/order/receiptManager/receipt.vue
View File

@@ -121,7 +121,7 @@ export default {
{
title: "发票状态",
key: "receiptStatus",
width: 90,
width: 100,
tooltip: true,
render: (h, params) => {
if (params.row.receiptStatus == 0) {
@@ -138,7 +138,7 @@ export default {
{
title: "订单状态",
key: "orderStatus",
width: 90,
width: 100,
render: (h, params) => {
if (params.row.orderStatus == "UNPAID") {
return h("div", [