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

选择品牌，品牌绑定时候可以搜索

master
mabo 2021-08-12 16:41:43 +08:00
parent 71ab63e047
commit 9b0a089e29
5 changed files with 29 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buyer/src/config/index.js
View File

@ -17,10 +17,10 @@ export default {
* @description api请求基础路径 * @description api请求基础路径
*/ */
api_dev: { api_dev: {
// common: 'http://192.168.0.100:8890', // common: 'http://192.168.0.101:8890',
// buyer: 'http://192.168.0.100:8888', // buyer: 'http://192.168.0.101:8888',
// seller: 'http://192.168.0.100:8889', // seller: 'http://192.168.0.101:8889',
// manager: 'http://192.168.0.100:8887' // manager: 'http://192.168.0.101:8887'
common: 'https://common-api.pickmall.cn', common: 'https://common-api.pickmall.cn',
buyer: 'https://buyer-api.pickmall.cn', buyer: 'https://buyer-api.pickmall.cn',

9
buyer/src/pages/Merchant.vue
View File

@ -6,7 +6,7 @@
<!-- 店铺logo --> <!-- 店铺logo -->
<div class="shop-logo"> <div class="shop-logo">
<div> <div>
<img :src="storeMsg.storeLogo" height="50" alt=""> <img :src="storeMsg.storeLogo" height="80" alt="">
<div> <div>
<p>{{storeMsg.storeName || 'xx店铺'}}</p> <p>{{storeMsg.storeName || 'xx店铺'}}</p>
<p class="ellipsis" :alt="storeMsg.storeDesc" v-html="storeMsg.storeDesc"></p> <p class="ellipsis" :alt="storeMsg.storeDesc" v-html="storeMsg.storeDesc"></p>
@ -199,10 +199,6 @@ export default {
margin: 0 auto; margin: 0 auto;
align-items: center; align-items: center;
img {
width: 80px;
}
>div:nth-child(2){ >div:nth-child(2){
margin-left: 10px; margin-left: 10px;
flex: 1; flex: 1;
@ -212,9 +208,6 @@ export default {
width: 200px; width: 200px;
} }
} }
img {
height: 80px;
}
p:nth-child(1) { p:nth-child(1) {
font-size: 20px; font-size: 20px;
} }

1
buyer/src/pages/home/memberCenter/Distribution.vue
View File

@ -240,6 +240,7 @@ export default {
if (res.success) { if (res.success) {
this.$Message.success('申请已提交，请等待审核') this.$Message.success('申请已提交，请等待审核')
this.distribution() this.distribution()
this.getLog()
} else { } else {
this.$Message.error(res.message) this.$Message.error(res.message)
} }

2
manager/src/views/goods/goods-manage/category.vue
View File

@ -83,7 +83,7 @@
<Modal :title="modalBrandTitle" v-model="modalBrandVisible" :mask-closable="false" :width="500"> <Modal :title="modalBrandTitle" v-model="modalBrandVisible" :mask-closable="false" :width="500">
<Form ref="brandForm" :model="brandForm" :label-width="100"> <Form ref="brandForm" :model="brandForm" :label-width="100">
<Select v-model="brandForm.categoryBrands" multiple> <Select v-model="brandForm.categoryBrands" filterable multiple>
<Option v-for="item in brandWay" :value="item.id" :key="item.id">{{ item.name }}</Option> <Option v-for="item in brandWay" :value="item.id" :key="item.id">{{ item.name }}</Option>
</Select> </Select>

8
seller/src/libs/util.js
View File

@ -325,15 +325,8 @@ util.initRouter = function (vm) { // 初始化路由
} }
if (!vm.$store.state.app.added) { if (!vm.$store.state.app.added) {
// 第一次加载 读取数据
let accessToken = window.localStorage.getItem('accessToken');
// 加载菜单 // 加载菜单
// axios.get(getMenuList, { headers: { 'accessToken': accessToken } }).then(res => {
// let menuData = res.result;
let menuData = result; let menuData = result;
if (!menuData) {
return;
}
// 格式化数据，设置 空children 为 null // 格式化数据，设置 空children 为 null
for(let i =0;i<menuData.length;i++){ for(let i =0;i<menuData.length;i++){
let t = menuData[i].children let t = menuData[i].children
@ -357,7 +350,6 @@ util.initRouter = function (vm) { // 初始化路由
// 缓存数据 修改加载标识 // 缓存数据 修改加载标识
window.localStorage.setItem('menuData', JSON.stringify(menuData)); window.localStorage.setItem('menuData', JSON.stringify(menuData));
vm.$store.commit('setAdded', true); vm.$store.commit('setAdded', true);
// });
} else { } else {
// 读取缓存数据 // 读取缓存数据
let data = window.localStorage.getItem('menuData'); let data = window.localStorage.getItem('menuData');