github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 06:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

Browse Source
This commit is contained in:
evoxwht 2023-06-27 15:31:47 +08:00
commit a1df236dea
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
template/admin/src/layout/component/columnsAside.vue
View File

@ -130,7 +130,6 @@ export default {
},
// 传送当前子级数据到菜单中
setSendChildren(path) {
const currentPathSplit = path.split('/');
let currentData = {};
this.columnsAsideList.map((v, k) => {
if (v.path === path) {
@ -188,7 +187,7 @@ export default {
let asideList = getMenuSider(this.columnsAsideList, HeadName)[0]?.children;
const resData = this.setSendChildren(HeadName);
if (resData.length <= 0) return false;
this.onColumnsAsideDown(resData.item[0].k);
if (resData.item) this.onColumnsAsideDown(resData.item[0].k);
this.bus.$emit('oneCatName', resData.item[0].title);
this.bus.$emit('setSendColumnsChildren', asideList || []);
this.$store.commit('menus/childMenuList', asideList || []);

8
template/admin/src/pages/product/productAdd/taoBao.vue
View File

@ -1,15 +1,13 @@
<template>
<div class="Box">
<Card>
<Card :dis-hover="true">
<div>
生成的商品默认是没有上架的，请手动上架商品！
<a href="http://help.crmeb.net/crmeb-v4/1863579" v-if="copyConfig.copy_type == 2" target="_blank"
>如何配置密钥</a
>
<span v-else
>您当前剩余{{ copyConfig.copy_num }}条采集次数，<span class="add" @click="mealPay()"
>增加采集次数</span
></span
>您当前剩余{{ copyConfig.copy_num }}条采集次数，<span class="add" @click="mealPay()">增加采集次数</span></span
>
</div>
<div>商品采集设置：设置 > 系统设置 > 第三方接口设置 > 采集商品配置</div>
@ -74,7 +72,7 @@ export default {
},
methods: {
mealPay() {
this.$router.push({ path: this.$routeProStr + '/setting/sms/sms_config/index'});
this.$router.push({ path: this.$routeProStr + '/setting/sms/sms_config/index' });
},
getCopyConfig() {
copyConfigApi().then((res) => {

4
template/admin/src/pages/product/productList/taoBao.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="Box">
<Card>
<Card :dis-hover="true">
<div>
生成的商品默认是没有上架的，请手动上架商品！
<a href="http://help.crmeb.net/crmeb-v4/1863579" v-if="copyConfig.copy_type == 2" target="_blank"
@ -69,7 +69,7 @@
v-model="formValidate.cate_id"
size="small"
:options="treeSelect"
:props="{ multiple: true, emitPath: false,checkStrictly: true, }"
:props="{ multiple: true, emitPath: false, checkStrictly: true }"
clearable
></el-cascader>
</FormItem>

5
template/admin/src/store/module/app.js
View File

@ -87,8 +87,9 @@ export default {
if (type === 'push')
if (i < 1) state.tagNavList.push(router);
else {
if (router.name === homeName) state.tagNavList.unshift(router);
else state.tagNavList.splice(1, 0, router);
return;
// if (router.name === homeName) state.tagNavList.unshift(router);
// else state.tagNavList.splice(1, 0, router);
}
setTagNavListInLocalstorage([...state.tagNavList]);
}