zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into ma 

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

28
buyer/src/components/verify/index.vue
View File

@ -72,19 +72,25 @@ 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 () { // 刷新滑块

2
manager/package.json
View File

@ -47,7 +47,7 @@
"vue-router": "^3.1.3",
"vuedraggable": "^2.23.2",
"vuex": "^3.4.0",
"wangeditor": "^4.5.3",
"wangeditor": "^4.7.5",
"xlsx": "^0.16.2",
"xss": "^1.0.7"
},

4
manager/src/api/pages.js
View File

@ -80,11 +80,11 @@ export const updateArticleCategory = (params, id) => {
}
//文章添加
export const saveArticle = (params) => {
return postRequest('/article', params)
return postRequest('/article', params, {"Content-Type": "application/json"})
}
//文章修改
export const updateArticle = (params) => {
return putRequest(`/article/update/${params.id}`, params)
return putRequest(`/article/update/${params.id}`, params, {"Content-Type": "application/json"})
}
//文章是否展示修改
export const updateArticleStatus = (id,params) => {

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

@ -17,14 +17,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: {
common: "https://common-api.pickmall.cn",

43
manager/src/views/distribution/distributionCash.vue
View File

@ -37,8 +37,8 @@
</FormItem>
<FormItem label="是否通过" prop="result" v-if="handleStatus =='edit'">
<RadioGroup v-model="result" type="button" button-style="solid">
<Radio :key=0 :label=0>通过</Radio>
<Radio :key=-1 :label=-1>拒绝</Radio>
<Radio label="PASS">通过</Radio>
<Radio label="REFUSE">拒绝</Radio>
</RadioGroup>
</FormItem>
</Form>
@ -67,7 +67,7 @@ export default {
loading: true, // 表单加载状态
modalVisible: false, // 添加或编辑显示
modalTitle: "", // 添加或编辑标题
result: -1, // 是否通过
result: 'REFUSE', // 是否通过
searchForm: { // 搜索框初始化对象
pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小
@ -80,9 +80,6 @@ export default {
memberName: "",
price: "",
},
auditForm: { // 编辑表单
result: -1
},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
@ -101,11 +98,9 @@ export default {
title: "申请金额",
key: "price",
minWidth: 90,
render: (h, params) => {
if (params.row.price) {
return h("div", this.$options.filters.unitPrice(params.row.price,'￥'));
}
}
render: (h, params) => {
return h("div", this.$options.filters.unitPrice(params.row.price,'￥'));
}
},
{
title: "申请时间",
@ -193,23 +188,27 @@ export default {
};
},
methods: {
// 初始化数据
init() {
this.getDataList();
},
// 改变页码
changePage(v) {
this.searchForm.pageNumber = v;
this.getDataList();
this.clearSelectAll();
},
// 改变页数
changePageSize(v) {
this.searchForm.pageSize = v;
this.getDataList();
},
// 搜索表格
handleSearch() {
this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10;
this.getDataList();
},
// 排序
changeSort(e) {
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
@ -218,14 +217,7 @@ export default {
}
this.getDataList();
},
clearSelectAll() {
this.$refs.table.selectAll(false);
},
changeSelect(e) {
this.selectList = e;
this.selectCount = e.length;
},
// 获取列表数据
getDataList() {
this.loading = true;
// 带多条件搜索参数获取表单数据 请自行修改接口
@ -241,7 +233,7 @@ export default {
},
handleSubmit() {
let result = "拒绝"
if(this.result == 0){
if(this.result == 'PASS'){
result = "通过"
}
this.$refs.form.validate(valid => {
@ -251,13 +243,14 @@ export default {
content: "您确认要审核"+result+"么?",
loading: true,
onOk: () => {
this.auditForm.result = this.result;
auditDistributionCash(this.form.id,this.auditForm).then(res => {
auditDistributionCash(this.form.id,{result:this.result}).then(res => {
if (res.success) {
this.$Modal.remove();
this.$Message.success("审核成功");
this.getDataList();
this.modalVisible = false;
} else {
this.modalVisible = false;
}
});
}
@ -275,9 +268,7 @@ export default {
v[attr] = "";
}
}
let str = JSON.stringify(v);
let data = JSON.parse(str);
this.form = data;
this.form = JSON.parse(JSON.stringify(v));
this.modalVisible = true;
},
view(v){

1
manager/src/views/my-components/lili/editor.vue
View File

@ -122,6 +122,7 @@ export default {
// 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式，可使用该配置
customInsert: function (insertImg, result, editor) {
if (result.success == true) {
console.log(insertImg,result,editor);
let url = result.result;
insertImg(url);
that.$Message.success("上传图片成功");

29
manager/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 () { // 刷新滑块

10
manager/src/views/page/article-manage/ArticleCategory.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<div class="operation">
<div class="operation mb_10">
<Button @click="addParent" icon="md-add">添加一级分类</Button>
</div>
<tree-table
@ -16,10 +16,9 @@
primary-key="id">
<template slot="action" slot-scope="scope">
<Button
type="primary"
type="info"
@click="edit(scope.row)"
size="small"
icon="md-add"
style="margin-right:5px"
>编辑
</Button>
@ -28,17 +27,14 @@
type="error"
@click="remove(scope.row)"
size="small"
icon="md-add"
style="margin-right:5px"
>删除
</Button>
&nbsp;
<Button
v-show="scope.row.level != 2 "
type="primary"
type="success"
@click="addChildren(scope.row)"
size="small"
icon="md-add"
style="margin-right:5px"
>添加子分类
</Button>

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", [