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

会员中心添加首页按钮，pclogo改为阿里云地址，编辑折扣券没有传折扣值，

Browse Source
This commit is contained in:
mabo
2021-07-21 15:27:39 +08:00
parent f512caa81d
commit 75bff1edc4
30 changed files with 490 additions and 903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
buyer/src/App.vue
View File

@@ -7,7 +7,6 @@
<script>
import {v4 as uuidv4} from 'uuid';
import storage from '@/plugins/storage';
import {getLogo} from '@/api/common.js';
export default {
name: 'App',
mounted () {
@@ -16,16 +15,6 @@ export default {
uuid = uuidv4();
storage.setItem('uuid', uuid);
}
if (!this.Cookies.getItem('logo')) {
setTimeout(() => {
getLogo().then(res => {
if (res.success) {
let logoObj = JSON.parse(res.result.settingValue)
this.Cookies.setItem('logo', logoObj.buyerSideLogo)
}
})
}, 1000)
}
}
};
</script>

16
buyer/src/components/Search.vue
View File

@@ -2,7 +2,7 @@
<div>
<div class="container">
<img
:src="logoImg"
:src="$store.state.logoImg"
v-if="showLogo"
class="logo-img"
alt=""
@@ -37,7 +37,6 @@
</template>
<script>
import {getLogo} from '@/api/common.js'
import {hotWords} from '@/api/goods.js'
export default {
name: 'search',
@@ -62,7 +61,6 @@ export default {
data () {
return {
searchData: '', // 搜索内容
logoImg: '', // pc端展示logo
promotionTags: [] // 热门搜索列表
};
},
@@ -82,18 +80,6 @@ export default {
}
},
mounted () {
if (!this.Cookies.getItem('logo')) {
getLogo().then(res => {
if (res.success) {
let logoObj = JSON.parse(res.result.settingValue)
this.Cookies.setItem('logo', logoObj.buyerSideLogo)
this.logoImg = logoObj.buyerSideLogo
}
})
} else {
this.logoImg = this.Cookies.getItem('logo')
}
this.searchData = this.$route.query.keyword
if (!this.hover) { // 首页顶部固定搜索栏不调用热词接口

1
buyer/src/components/header/Header.vue
View File

@@ -2,6 +2,7 @@
<div class="box">
<div class="nav">
<ul class="location">
<li v-if="$route.path.includes('home')" style="margin-left:10px"><router-link to="/">首页</router-link></li>
</ul>
<ul class="detail">
<li class="first" v-show="!userInfo.username">

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

@@ -17,15 +17,15 @@ export default {
* @description api请求基础路径
*/
api_dev: {
common: 'http://192.168.0.101:8890',
buyer: 'http://192.168.0.101:8888',
seller: 'http://192.168.0.101:8889',
manager: 'http://192.168.0.101:8887'
// common: 'http://192.168.0.101:8890',
// buyer: 'http://192.168.0.101:8888',
// seller: 'http://192.168.0.101:8889',
// manager: 'http://192.168.0.101: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: 'https://common-api.pickmall.cn',
buyer: 'https://buyer-api.pickmall.cn',
seller: 'https://store-api.pickmall.cn',
manager: 'https://admin-api.pickmall.cn'
},
api_prod: {
common: 'https://common-api.pickmall.cn',

6
buyer/src/pages/Login.vue
View File

@@ -4,7 +4,7 @@
<div class="top-content" @click='$refs.verify.show = false'>
<div class="logo-box">
<img
:src="logoImg"
:src="$store.state.logoImg"
@click="$router.push('/')"
/>
<div>欢迎登录</div>
@@ -186,8 +186,7 @@ export default {
},
codeMsg: '发送验证码', // 验证码文字
interval: null, // 定时器
time: 60, // 倒计时
logoImg: '' // logo图片
time: 60 // 倒计时
};
},
methods: {
@@ -332,7 +331,6 @@ export default {
}
});
}
this.logoImg = this.Cookies.getItem('logo')
},
watch: {
type (v) {

7
buyer/src/pages/SignUp.vue
View File

@@ -4,7 +4,7 @@
<div class="logo-box">
<img
width="150"
:src="logoImg"
:src="$store.state.logoImg"
@click="$router.push('/')"
/>
<div>注册</div>
@@ -135,8 +135,7 @@ export default {
verifyType: 'REGISTER', // 验证状态
codeMsg: '发送验证码', // 提示文字
interval: '', // 定时器
time: 60, // 倒计时
logoImg: '' // logo图
time: 60 // 倒计时
};
},
methods: {
@@ -208,8 +207,6 @@ export default {
},
mounted () {
this.$refs.formRegist.resetFields();
this.logoImg = this.Cookies.getItem('logo')
console.log(window.innerHeight);
document.querySelector('.sign-up').style.height = window.innerHeight + 'px'
}
};

4
buyer/src/pages/forgetPassword.vue
View File

@@ -4,7 +4,7 @@
<!-- 顶部logo -->
<div class="logo-box">
<img
:src="logoImg" width='150'
:src="$store.state.logoImg" width='150'
@click="$router.push('/')"
/>
<div>修改密码</div>
@@ -118,7 +118,6 @@ export default {
components: { Verify },
data () {
return {
logoImg: '', // logo图
loading: false, // 加载状态
loading1: false, // 第二步加载状态
formFirst: { // 手机验证码表单
@@ -243,7 +242,6 @@ export default {
},
mounted () {
this.$refs.formFirst.resetFields();
this.logoImg = this.Cookies.getItem('logo')
},
watch: {
}

13
buyer/src/pages/payment/Pay.vue
View File

@@ -5,7 +5,7 @@
<div class="width_1200 logo">
<div>
<router-link to="/"
><img :src="logoImg" alt="lili shop" title="lilishop"
><img :src="$store.state.logoImg" alt="lili shop" title="lilishop"
/></router-link>
<div>结算页</div>
</div>
@@ -347,23 +347,12 @@ export default {
moreAddr: false, // 更多地址
canUseCouponNum: 0, // 可用优惠券数量
couponList: [], // 可用优惠券列表
logoImg: '', // 平台logo
usedCouponId: [], // 已使用优惠券id
selectedCoupon: {} // 已选优惠券对象
};
},
mounted () {
this.init();
if (!this.Cookies.getItem('logo')) {
getLogo().then((res) => {
if (res.success) {
let logoObj = JSON.parse(res.result.settingValue);
this.Cookies.setItem('logo', logoObj.buyerSideLogo);
}
});
} else {
this.logoImg = this.Cookies.getItem('logo');
}
},
methods: {
init () {

3
buyer/src/vuex/store.js
View File

@@ -11,7 +11,8 @@ export default new Vuex.Store({
state: {
category: [], // 全部分类
navList: [],
cartNum: storage.getItem('cartNum') || 0
cartNum: storage.getItem('cartNum') || 0,
logoImg: 'https://lili-system.oss-cn-beijing.aliyuncs.com/logo.png'
},
getters,
actions,