소스 검색

fix

master
[caserKing] 4 년 전
부모
커밋
15ef40a1a6
11개의 변경된 파일61개의 추가작업 그리고 188개의 파일을 삭제
  1. +10
    -8
      src/App.vue
  2. +6
    -0
      src/routers/index.js
  3. +11
    -2
      src/services/request.js
  4. +8
    -3
      src/stores/index.js
  5. +0
    -154
      src/views/demo/index.vue
  6. +1
    -1
      src/views/home/index.vue
  7. +5
    -3
      src/views/login/index.vue
  8. +12
    -9
      src/views/person/index.vue
  9. +4
    -4
      src/views/person/myTicket.vue
  10. +3
    -3
      src/views/person/pointRecord.vue
  11. +1
    -1
      src/views/person/userInfo.vue

+ 10
- 8
src/App.vue 파일 보기

@@ -5,10 +5,10 @@
<router-view class="page" /> <router-view class="page" />
</transition> </transition>
<!-- 底部导航 --> <!-- 底部导航 -->
<div class="foot-bar">
<router-link class="foot-item" @click="selRouter(index)" v-for="(item,index) in footBarList" :key="item.path" :to="{name:item.path}">
<img class="foot-icon" :src="item.checked ? item.iconY : item.iconN" />
<span class="foot-title">{{item.title}}</span>
<div class="foot-bar" v-if="$route.meta.isShowNav">
<router-link class="foot-item" v-for="(item,index) in footBarList" :key="item.path" :to="{name:item.path}">
<img class="foot-icon" @click="selRouter(index)" :src="item.checked ? item.iconY : item.iconN" />
<span class="foot-title" @click="selRouter(index)">{{item.title}}</span>
</router-link> </router-link>
</div> </div>
</div> </div>
@@ -26,7 +26,7 @@ export default {
iconN: require('./assets/images/home-n.png'), iconN: require('./assets/images/home-n.png'),
checked: true, checked: true,
title: '首页', title: '首页',
path: 'hello',
path: 'home',
}, },
/* { /* {
iconY: require('./assets/images/bill1.png'), iconY: require('./assets/images/bill1.png'),
@@ -52,7 +52,8 @@ export default {
const localRoute = (window.myVue && window.myVue.localRoute) || []; const localRoute = (window.myVue && window.myVue.localRoute) || [];
// console.log(localRoute, currentPath); // console.log(localRoute, currentPath);
const index = localRoute.indexOf(currentPath); const index = localRoute.indexOf(currentPath);
let tranName = 'fade';
let tranName = '';
// let tranName = 'fade';


/* if (localRoute.length === 0) { /* if (localRoute.length === 0) {
tranName = 'fade'; // 首页,渐显 tranName = 'fade'; // 首页,渐显
@@ -71,11 +72,12 @@ export default {
} }
}, },
created() { created() {
console.log('欢迎访问...');
let index = sessionStorage.getItem('navIndex') != 'undefined' ? sessionStorage.getItem('navIndex') : 0
this.selRouter(index)
}, },
methods: { methods: {
selRouter(index) { selRouter(index) {
console.log(index)
sessionStorage.setItem('navIndex',index)
this.footBarList.map(item => { this.footBarList.map(item => {
item.checked = false; item.checked = false;
}) })


+ 6
- 0
src/routers/index.js 파일 보기

@@ -21,6 +21,7 @@ const routes = [
name: 'login', name: 'login',
component: Login, component: Login,
meta: { meta: {
isShowNav: false,
title: '登陆' title: '登陆'
} }
}, },
@@ -29,6 +30,7 @@ const routes = [
name: 'home', name: 'home',
component: Home, component: Home,
meta: { meta: {
isShowNav: true,
title: '首页' title: '首页'
} }
}, },
@@ -47,6 +49,7 @@ const routes = [
name: 'person', name: 'person',
component: Person, component: Person,
meta: { meta: {
isShowNav: true,
title: '我的' title: '我的'
} }
}, },
@@ -55,6 +58,7 @@ const routes = [
name: 'myTicket', name: 'myTicket',
component: MyTicket, component: MyTicket,
meta: { meta: {
isShowNav: false,
title: '赠券库存' title: '赠券库存'
} }
}, },
@@ -63,6 +67,7 @@ const routes = [
name: 'pointRecord', name: 'pointRecord',
component: PointRecord, component: PointRecord,
meta: { meta: {
isShowNav: false,
title: '积分操作记录' title: '积分操作记录'
} }
}, },
@@ -71,6 +76,7 @@ const routes = [
name: 'userInfo', name: 'userInfo',
component: UserInfo, component: UserInfo,
meta: { meta: {
isShowNav: false,
title: '登陆信息' title: '登陆信息'
} }
}, },


+ 11
- 2
src/services/request.js 파일 보기

@@ -31,6 +31,7 @@ const instance = axios.create({
// 实例添加请求拦截器 // 实例添加请求拦截器
instance.interceptors.request.use( instance.interceptors.request.use(
function(config) { function(config) {
config.headers.bid = store.state.token;
config.headers.token = store.state.token; config.headers.token = store.state.token;
// 在发送请求之前做处理... // 在发送请求之前做处理...
config.headers = Object.assign( config.headers = Object.assign(
@@ -84,6 +85,14 @@ instance.interceptors.response.use(
// window.location.href = '/login'; // window.location.href = '/login';
// }, 3000) // }, 3000)
// } // }
console.log(response)
console.log(response.data.code === 1053)
if (response.data.code === 1052 || response.data.code === 1053) {
this.$router.push({
path: '/login'
})
return
}
return Promise.resolve(checkStatus(response)); return Promise.resolve(checkStatus(response));
}, },
function(error) { function(error) {
@@ -121,10 +130,10 @@ const request = async function(opt) {
} }
return res; return res;
} catch (err) { } catch (err) {
if (options.ifHandleError) {
/* if (options.ifHandleError) {
// 自定义参数,是否允许全局提示错误信息 // 自定义参数,是否允许全局提示错误信息
Toast(err.msg || "请求处理失败!"); Toast(err.msg || "请求处理失败!");
}
} */
return err; return err;
} }
}; };


+ 8
- 3
src/stores/index.js 파일 보기

@@ -1,3 +1,4 @@
import { resolve } from 'core-js/fn/promise'
/** /**
* @Author: nowThen * @Author: nowThen
* @Date: 2019-08-22 14:30:51 * @Date: 2019-08-22 14:30:51
@@ -10,14 +11,18 @@ Vue.use(Vuex)


export default new Vuex.Store({ export default new Vuex.Store({
state: { state: {
token: '0f2e7947-b7d8-444a-9d3a-7786e58e9177',
token: '',




}, },
mutations: { mutations: {

setToken (state, token) {
state.token = token
}
}, },
actions: { actions: {

doLogin ({commit}, res) {
commit('setToken', res.data.bUserId)
}
} }
}) })

+ 0
- 154
src/views/demo/index.vue 파일 보기

@@ -1,154 +0,0 @@
<template>
<section class="page-demo">
<Header showLeft showRight fixed @handle-left="goBack"></Header>
<div class="page-content header-fixed">
<h1 style="text-align:center;">demo页面</h1>
<p>1*1</p>
<p>1*2</p>
<p>1*3</p>
<p>1*4</p>
<p>1*5</p>
<p>1*6</p>
<p>1*7</p>
<p>1*8</p>
<p>1*9</p>
<p>1*10</p>
<p>1*11</p>
<p>1*12</p>
<p>1*13</p>
<p>1*14</p>
<p>1*15</p>
<p>1*16</p>
<p>1*17</p>
<p>1*18</p>
<p>1*19</p>
<p>1*20</p>
<p>1*21</p>
<p>1*22</p>
<p>1*23</p>
<p>1*24</p>
<p>1*25</p>
<p>1*26</p>
<p>1*27</p>
<p>1*28</p>
<p>1*29</p>
<p>1*30</p>
<p>1*31</p>
<p>1*32</p>
<p>1*33</p>
<p>1*34</p>
<p>1*35</p>
<p>1*36</p>
<p>1*37</p>
<p>1*38</p>
<p>1*39</p>
<p>1*40</p>
<p>1*41</p>
<p>1*42</p>
<p>1*43</p>
<p>1*44</p>
<p>1*45</p>
<p>1*46</p>
<p>1*47</p>
<p>1*48</p>
<p>1*49</p>
<p>1*50</p>
<p>1*51</p>
<p>1*52</p>
<p>1*53</p>
<p>1*54</p>
<p>1*55</p>
<p>1*56</p>
<p>1*57</p>
<p>1*58</p>
<p>1*59</p>
<p>1*60</p>
<p>1*61</p>
<p>1*62</p>
<p>1*63</p>
<p>1*64</p>
<p>1*65</p>
<p>1*66</p>
<p>1*67</p>
<p>1*68</p>
<p>1*69</p>
<p>1*70</p>
<p>1*71</p>
<p>1*72</p>
<p>1*73</p>
<p>1*74</p>
<p>1*75</p>
<p>1*76</p>
<p>1*77</p>
<p>1*78</p>
<p>1*79</p>
<p>1*80</p>
<p>1*81</p>
<p>1*82</p>
<p>1*83</p>
<p>1*84</p>
<p>1*85</p>
<p>1*86</p>
<p>1*87</p>
<p>1*88</p>
<p>1*89</p>
<p>1*90</p>
<p>1*91</p>
<p>1*92</p>
<p>1*93</p>
<p>1*94</p>
<p>1*95</p>
<p>1*96</p>
<p>1*97</p>
<p>1*98</p>
<p>1*99</p>
<p>1*100</p>
<MainButton />
</div>
</section>
</template>

<script>
import { formatDate } from '@/utils/cloud-utils';
import MainButton from '@/component_basics/MainButton';
import Header from '@/component_basics/Header';
import transferDom from '@/directives/transferDom';

export default {
name: 'page-demo',
components: { // 组件
MainButton,
Header,
},
directives: {
// 指令
transferDom
},
filters: {
// 过滤器
formatDate
},
data() {
return {
title: '测试'
};
},
methods: {
goBack() {
window.history.length > 1
? this.$router.go(-1)
: this.$router.push('/')
}
}
};
</script>

<style lang="less" rel="stylesheet/less" >
.page-demo {
text-align: left;
.common-btns {
position: fixed;
bottom: 0;
}
}
</style>

+ 1
- 1
src/views/home/index.vue 파일 보기

@@ -344,7 +344,7 @@ export default {
} }
</script> </script>


<style lang="less" rel="stylesheet/less" >
<style lang="less" rel="stylesheet/less" scoped>
@font-face { @font-face {
font-family: 'iconfont'; /* project id 1353693 */ font-family: 'iconfont'; /* project id 1353693 */
src: url('//at.alicdn.com/t/font_1353693_617eu8di04k.eot'); src: url('//at.alicdn.com/t/font_1353693_617eu8di04k.eot');


+ 5
- 3
src/views/login/index.vue 파일 보기

@@ -31,6 +31,7 @@
</template> </template>


<script type="text/babel"> <script type="text/babel">
import {mapState,mapGetters,mapMutations,mapActions} from 'vuex'
// 组件 // 组件
export default { export default {
name: 'page-index', name: 'page-index',
@@ -49,9 +50,8 @@ export default {
}, },
methods: { methods: {
...mapActions(['doLogin']),
onSubmit(val) { onSubmit(val) {
console.log(val);
console.log(333)
this.$http.login({ this.$http.login({
method: 'post', method: 'post',
data: { data: {
@@ -64,6 +64,7 @@ export default {
}).then(res => { }).then(res => {
console.log(res) console.log(res)
if (res.code === 200) { if (res.code === 200) {
// this.doLogin(res)
this.$router.push({ this.$router.push({
path: '/home' path: '/home'
}) })
@@ -76,7 +77,7 @@ export default {
}; };
</script> </script>


<style lang="less" rel="stylesheet/less" >
<style lang="less" scoped>
@font-face { @font-face {
font-family: 'iconfont'; /* project id 1353693 */ font-family: 'iconfont'; /* project id 1353693 */
src: url('//at.alicdn.com/t/font_1353693_617eu8di04k.eot'); src: url('//at.alicdn.com/t/font_1353693_617eu8di04k.eot');
@@ -106,4 +107,5 @@ export default {
} }





</style> </style>

+ 12
- 9
src/views/person/index.vue 파일 보기

@@ -30,10 +30,10 @@
<img class="item-detail" src="../../assets/images/jian.png"> <img class="item-detail" src="../../assets/images/jian.png">
</div> </div>


<div class="ul-handle" @click="goToPage(3)">
<!-- <div class="ul-handle" @click="goToPage(3)">
<span class="item-left">会员列表</span> <span class="item-left">会员列表</span>
<img class="item-detail" src="../../assets/images/jian.png"> <img class="item-detail" src="../../assets/images/jian.png">
</div>
</div> -->
<div class="ul-handle" @click="goToPage(4)"> <div class="ul-handle" @click="goToPage(4)">
<span class="item-left">积分操作记录</span> <span class="item-left">积分操作记录</span>
<img class="item-detail" src="../../assets/images/jian.png"> <img class="item-detail" src="../../assets/images/jian.png">
@@ -101,12 +101,15 @@ export default {
method: 'get', method: 'get',
}).then(res => { }).then(res => {
this.userInfo.mall_name = res.data.mall_name
this.userInfo.merchant_name = res.data.merchant_name
this.userInfo.phone = res.data.phone
this.userInfo.service_phone = res.data.service_phone
this.userInfo.name = res.data.name
this.userInfo.name = res.data.merchant_id
if (res.code && res.code == 200) {
this.userInfo.mall_name = res.data.mall_name
this.userInfo.merchant_name = res.data.merchant_name
this.userInfo.phone = res.data.phone
this.userInfo.service_phone = res.data.service_phone
this.userInfo.name = res.data.name
this.userInfo.name = res.data.merchant_id
}
}) })
}, },
goToUserInfo () { goToUserInfo () {
@@ -121,7 +124,7 @@ export default {
} }
</script> </script>


<style lang="less" rel="stylesheet/less" >
<style lang="less" rel="stylesheet/less" scoped>
.floatR { .floatR {
float: right; float: right;
} }


+ 4
- 4
src/views/person/myTicket.vue 파일 보기

@@ -2,7 +2,7 @@
<div class='page-home'> <div class='page-home'>
<div class="back-box"> <div class="back-box">
<van-icon class="back-icon" @click="goBack" size=".6rem" name="arrow-left" color="#fff" /> <van-icon class="back-icon" @click="goBack" size=".6rem" name="arrow-left" color="#fff" />
<span>积分操作记录</span>
<span>我的赠券</span>
</div> </div>


<div class="btn-box"> <div class="btn-box">
@@ -30,7 +30,7 @@


<van-list <van-list
v-if="cardType==='type01'" v-if="cardType==='type01'"
style="margin-bottom:2rem;height:calc(100vh - 7rem);overflow-y:auto;"
style="margin-bottom:2rem;height:calc(100vh - 4.7rem);overflow-y:auto;"
v-model="loading" v-model="loading"
:finished="finished" :finished="finished"
finished-text="没有更多了" finished-text="没有更多了"
@@ -54,7 +54,7 @@


<van-list <van-list
v-if="cardType==='type02'" v-if="cardType==='type02'"
style="margin-bottom:2rem;height:calc(100vh - 8.69rem);overflow-y:auto;"
style="height:calc(100vh - 6.69rem);overflow-y:auto;"
v-model="loading" v-model="loading"
:finished="finished" :finished="finished"
finished-text="没有更多了" finished-text="没有更多了"
@@ -204,7 +204,7 @@ export default {
} }
</script> </script>


<style lang="less" rel="stylesheet/less" >
<style lang="less" rel="stylesheet/less" scoped>
.floatR { .floatR {
float: right; float: right;
} }


+ 3
- 3
src/views/person/pointRecord.vue 파일 보기

@@ -2,7 +2,7 @@
<div class='page-home'> <div class='page-home'>
<div class="back-box"> <div class="back-box">
<van-icon class="back-icon" @click="goBack" size=".6rem" name="arrow-left" color="#fff" /> <van-icon class="back-icon" @click="goBack" size=".6rem" name="arrow-left" color="#fff" />
<span>登陆信息</span>
<span>积分操作记录</span>
</div> </div>


<div class="header-wrap"> <div class="header-wrap">
@@ -25,7 +25,7 @@


<van-list <van-list
style="margin-bottom:2rem;height:calc(100vh - 7rem);overflow-y:auto;"
style="height:calc(100vh - 5rem);overflow-y:auto;"
v-model="loading" v-model="loading"
:finished="finished" :finished="finished"
finished-text="没有更多了" finished-text="没有更多了"
@@ -145,7 +145,7 @@ export default {
} }
</script> </script>


<style lang="less" rel="stylesheet/less" >
<style lang="less" rel="stylesheet/less" scoped>
.floatR { .floatR {
float: right; float: right;
} }


+ 1
- 1
src/views/person/userInfo.vue 파일 보기

@@ -60,7 +60,7 @@ export default {
} }
</script> </script>


<style lang="less" rel="stylesheet/less" >
<style lang="less" rel="stylesheet/less" scoped>
.floatR { .floatR {
float: right; float: right;
} }


불러오는 중...
취소
저장