Skip to content

P
pica.cloud.web-education-admin
提交 b3436032 编写于 作者: 张磊's avatar 张磊
浏览文件
操作

save

上级 2cf557d3
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1367 行增加 和 646 行删除
package-lock.json
浏览文件 @ b3436032
...@@ -2103,6 +2103,11 @@ ...@@ -2103,6 +2103,11 @@
"assert-plus": "^1.0.0" "assert-plus": "^1.0.0"
} }
}, },
"dayjs": {
"version": "1.10.7",
"resolved": "http://192.168.110.93:4873/dayjs/-/dayjs-1.10.7.tgz",
"integrity": "sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg="
},
"de-indent": { "de-indent": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "http://192.168.110.93:4873/de-indent/-/de-indent-1.0.2.tgz", "resolved": "http://192.168.110.93:4873/de-indent/-/de-indent-1.0.2.tgz",
......
src/utils/shop/index.js
浏览文件 @ b3436032
...@@ -155,3 +155,41 @@ export const getStoreAdressRepot = (storeId) => { ...@@ -155,3 +155,41 @@ export const getStoreAdressRepot = (storeId) => {
description: "获取店铺退货地址信息", description: "获取店铺退货地址信息",
}); });
}; };
export const OCRStore = (params) => {
return fetch({
headers,
url: getBaseUrl(`store/ocr/license`),
method: 'post',
data: params,
description: 'ocr店铺',
})
};
export const idCardOcr = (params) => {
return fetch({
headers,
url: getBaseUrl(`store/ocr/idCard`),
method: 'post',
data: params,
description: '身份证ocr',
})
};
export const orgOptionList = () => {
return fetch({
headers,
url: getBaseUrl(`store/cert/constant/org/type`),
method: 'get',
description: '企业类型列表',
})
};
export const orgScopeOptionList = () => {
return fetch({
headers,
url: getBaseUrl(`store/cert/constant/biz/scope`),
method: 'get',
description: '经营范围',
})
};
src/views/shop/create-shop.vue
浏览文件 @ b3436032
此差异已折叠。
src/views/shop/shop-list.vue
浏览文件 @ b3436032
...@@ -93,6 +93,22 @@ ...@@ -93,6 +93,22 @@
<span>{{ scope.row.tradeStore.storeType | storeTypeFormat}}</span> <span>{{ scope.row.tradeStore.storeType | storeTypeFormat}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="storeType" label="审核状态" min-width="100" align="center">
<template slot-scope="scope">
<span :class="scope.row.tradeStore.storeType == 3 ? 'red' : 'green'">
{{ scope.row.tradeStore.storeType | storeStatusFormat}}
</span>
<el-popover
placement="top-start"
title="标题"
width="200"
trigger="hover"
content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。">
<i v-if="scope.row.tradeStore.storeType == 3" slot="reference" class="el-icon-warning-outline red"></i>
</el-popover>
</template>
</el-table-column>
<el-table-column prop="storeStatus" label="店铺状态" min-width="100" align="center"> <el-table-column prop="storeStatus" label="店铺状态" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.tradeStore.storeStatus | statusFormat }}</span> <span>{{ scope.row.tradeStore.storeStatus | statusFormat }}</span>
...@@ -242,16 +258,6 @@ ...@@ -242,16 +258,6 @@
canAdd: false, canAdd: false,
totalRows: 0, totalRows: 0,
tableData: [ tableData: [
// {
// tradeStore: {
// id: 12,
// storeName: '康爱多',
// storeType: 1,
// storeStatus: 0,
// count: 2,
// createdTime: ''
// }
// }
], ],
typeList: [ typeList: [
{ {
...@@ -311,9 +317,6 @@ ...@@ -311,9 +317,6 @@
}, },
}, },
setPriceRules: { setPriceRules: {
// commissionType: [
// {required: true, message: "请选择分佣方式", trigger: 'blur'}
// ]
}, },
} }
}, },
...@@ -391,14 +394,6 @@ ...@@ -391,14 +394,6 @@
} }
}); });
window.open(routeData.href, '_blank'); window.open(routeData.href, '_blank');
// this.$router.push({
// path: '/goods-manage',
// query: {
// storeId: row.tradeStore.id,
// commissionFlag:row.tradeStore.commissionFlag
// }
// })
}, },
orderManage(row) { orderManage(row) {
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
...@@ -408,12 +403,6 @@ ...@@ -408,12 +403,6 @@
} }
}); });
window.open(routeData.href, '_blank'); window.open(routeData.href, '_blank');
// this.$router.push({
// path: '/order-manage',
// query: {
// storeId: row.tradeStore.id,
// }
// })
}, },
//编辑 //编辑
editShop(row) { editShop(row) {
...@@ -421,7 +410,6 @@ ...@@ -421,7 +410,6 @@
path: `/create-shop`, path: `/create-shop`,
query:{ query:{
storeId: row.tradeStore.id, storeId: row.tradeStore.id,
storeData: JSON.stringify(row),
} }
}) })
}, },
...@@ -495,52 +483,6 @@ ...@@ -495,52 +483,6 @@
}); });
return; return;
} }
// for(let i = 0; i < this.setPriceForm.adminCommissionGoodsRespList.length; i++){
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// && (this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == null || this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == "")){
//
// this.$message({
// message: '请选择分佣方式',
// type: "warning"
// });
// return;
// }
//
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 == undefined ){
// this.$message({
// message: '请输入按比例分佣',
// type: "warning"
// });
// return;
// }
// else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 > 100){
// this.$message({
// message: '请输入按比例分佣0-100',
// type: "warning"
// });
// return;
// }
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 2 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 == undefined ){
// this.$message({
// message: '请输入固定分佣金额',
// type: "warning"
// });
// return;
// }
//
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1){
// this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 * 100;
// }
// else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 2){
// this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 * 100;
// }
//
// }
let timeoutId = null let timeoutId = null
timeoutId && clearTimeout(timeoutId) timeoutId && clearTimeout(timeoutId)
timeoutId = setTimeout(() => { timeoutId = setTimeout(() => {
...@@ -567,13 +509,6 @@ ...@@ -567,13 +509,6 @@
} }
vm.setPriceForm.adminCommissionGoodsRespList[0] = vm.setPriceForm.commission; vm.setPriceForm.adminCommissionGoodsRespList[0] = vm.setPriceForm.commission;
vm.setPriceForm.adminCommissionGoodsRespList[1] = vm.setPriceForm.proxyCommission; vm.setPriceForm.adminCommissionGoodsRespList[1] = vm.setPriceForm.proxyCommission;
// if(vm.setPriceForm.commissionType == 1){
// vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice1;
// }
// else if(vm.setPriceForm.commissionType == 2){
// vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice2;
// }
// vm.setPriceForm.commissionPrice = vm.setPriceForm.commissionPriceStr * 100;
vm.POST('/store/commission/admin/store/save', vm.setPriceForm.adminCommissionGoodsRespList).then(res => { vm.POST('/store/commission/admin/store/save', vm.setPriceForm.adminCommissionGoodsRespList).then(res => {
vm.loading = false vm.loading = false
// closeLoading(this); // closeLoading(this);
...@@ -689,26 +624,7 @@ ...@@ -689,26 +624,7 @@
storeId: row.tradeStore.id, storeId: row.tradeStore.id,
}; };
} }
// this.batchUpdatePriceFlag = batchUpdatePriceFlag;
// this.setPriceForm.storeId = row.tradeStore.id;
// this.setPriceForm.goodsId = row.tradeStore.goodsId;
// this.setPriceForm.commissionType = "";
// this.setPriceForm.commissionPrice1 = undefined;
// this.setPriceForm.commissionPrice2 = undefined;
// this.setPriceForm.commissionType = row.tradeStore.commissionType;
// if(this.setPriceForm.commissionType == 1){
// this.setPriceForm.commissionPrice1 = row.tradeStore.commissionPrice/100;
// }
// else if(this.setPriceForm.commissionType == 2){
// this.setPriceForm.commissionPrice2 = row.tradeStore.commissionPrice/100;
// }
this.setPriceVisible = true; this.setPriceVisible = true;
// if(this.$refs.setPriceForm) {
// this.$refs.setPriceForm.resetFields()
// }
// this.getProfit(row);
}, },
// 运费配置 // 运费配置
setFreight(row) { setFreight(row) {
...@@ -769,6 +685,27 @@ ...@@ -769,6 +685,27 @@
return value; return value;
} }
}, },
storeStatusFormat(v) {
let s = '';
switch (v) {
case 2:
s = '审核通过'
break;
case 3:
s = '审核不通过'
break;
case 4:
s = '信息待完善'
break;
case 5:
s = '待审核'
break;
default:
s ='审核通过'
break;
}
return s;
}
}, },
} }
</script> </script>
...@@ -805,5 +742,11 @@ ...@@ -805,5 +742,11 @@
} }
} }
} }
.red{
color: #FF4B33;
}
.green{
color: #449284;
}
} }
</style> </style>
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或