许成详 6 anos atrás
pai
commit
a070bbb8cd

+ 6
- 0
package-lock.json Ver arquivo

@@ -7375,6 +7375,12 @@
7375 7375
         "esprima": "4.0.1"
7376 7376
       }
7377 7377
     },
7378
+    "jsbarcode": {
7379
+      "version": "3.11.0",
7380
+      "resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.0.tgz",
7381
+      "integrity": "sha512-/ozCd7wsa+VIHo9sUc03HneVEQrH7cVWfJolUT/WOW1m8mJ2e3iYZje6C9X3LFHdczlesqFHRpxLtbVsNtjyow==",
7382
+      "dev": true
7383
+    },
7378 7384
     "jsbn": {
7379 7385
       "version": "0.1.1",
7380 7386
       "resolved": "http://registry.npm.taobao.org/jsbn/download/jsbn-0.1.1.tgz",

+ 1
- 2
package.json Ver arquivo

@@ -35,7 +35,6 @@
35 35
     "vue-croppa": "^1.3.8",
36 36
     "vue-router": "^3.0.1",
37 37
     "vue-template-compiler": "^2.5.17",
38
-    "vuex": "^3.0.1",
39
-    "weixin-js-sdk": "^1.3.3"
38
+    "vuex": "^3.0.1"
40 39
   }
41 40
 }

+ 1
- 1
src/pages/bodyCheck/app.js Ver arquivo

@@ -1,7 +1,7 @@
1 1
 import Vue from 'vue'
2 2
 import App from './App.vue'
3 3
 import Vant from 'vant'
4
-import 'vant/lib/index.css'
4
+import 'vant/lib/vant-css/index.css'
5 5
 import router from './router'
6 6
 import store from '../../store/index'
7 7
 import Vuex from 'vuex'

+ 1
- 1
src/pages/sales/app.js Ver arquivo

@@ -1,7 +1,7 @@
1 1
 import Vue from 'vue'
2 2
 import App from './App.vue'
3 3
 import Vant from 'vant'
4
-import 'vant/lib/index.css'
4
+import 'vant/lib/vant-css/index.css'
5 5
 import router from './router'
6 6
 import store from '../../store/index'
7 7
 import Vuex from 'vuex'

+ 9
- 9
src/pages/user/App.vue Ver arquivo

@@ -12,7 +12,7 @@ export default {
12 12
   name: 'app',
13 13
   data () {
14 14
     return {
15
-      showPage: true 
15
+      showPage: false 
16 16
     }
17 17
   },
18 18
   components: {},
@@ -23,14 +23,14 @@ export default {
23 23
     })
24 24
   },
25 25
   created () {
26
-    // if (location.search && this.toolClass.UrlSearch(location.search).code) {
27
-    //   this.code = this.toolClass.UrlSearch(location.search).code
28
-    // } else {
29
-    //   this.code = null
30
-    // }
31
-    // this.getUserInfo({ org: this.org, code: this.code }).then(() => {
32
-    //   this.showPage = true
33
-    // })
26
+    if (location.search && this.toolClass.UrlSearch(location.search).code) {
27
+      this.code = this.toolClass.UrlSearch(location.search).code
28
+    } else {
29
+      this.code = null
30
+    }
31
+    this.getUserInfo({ org: this.org, code: this.code }).then(() => {
32
+      this.showPage = true
33
+    })
34 34
   },
35 35
   methods: {
36 36
     ...actions(['getUserInfo'])

+ 1
- 1
src/pages/user/app.js Ver arquivo

@@ -1,7 +1,7 @@
1 1
 import Vue from 'vue'
2 2
 import App from './App.vue'
3 3
 import Vant from 'vant'
4
-import 'vant/lib/index.css'
4
+import 'vant/lib/vant-css/index.css'
5 5
 import router from './router'
6 6
 import store from '../../store/index'
7 7
 import Vuex from 'vuex'

+ 78
- 0
src/pages/user/library/booksList/index.vue Ver arquivo

@@ -0,0 +1,78 @@
1
+<template>
2
+  <div class="mainPage">
3
+    <div>
4
+      1
5
+    </div>
6
+  </div>
7
+</template>
8
+
9
+<script>
10
+import { mapState, createNamespacedHelpers } from 'vuex'
11
+const { mapActions: mapAppActions } = createNamespacedHelpers('app')
12
+const { mapState: mapLibraryState, mapActions: mapLibraryAction } = createNamespacedHelpers('library')
13
+export default {
14
+  data () {
15
+    return {
16
+    }
17
+  },
18
+  created () {
19
+  },
20
+  computed: {
21
+    ...mapState({
22
+      CaseList: x => x.app.CaseList,
23
+    }),
24
+    ...mapLibraryState({
25
+      navList: x => x.navList
26
+    })
27
+  },
28
+  components: {
29
+  },
30
+  methods: {
31
+    ...mapAppActions([
32
+      'getCaseList',
33
+    ]),
34
+    ...mapLibraryAction(['getNavList']),
35
+    navClick (item) {
36
+    }
37
+  }
38
+}
39
+</script>
40
+
41
+<style lang="scss" scoped>
42
+.mainPage {
43
+  > div {
44
+    width: 100%;
45
+    position: absolute;
46
+    left: 0;
47
+    top: 0;
48
+    bottom: 0;
49
+    overflow-y: scroll;
50
+    -webkit-overflow-scrolling: touch;
51
+    transform: translateZ(0);
52
+    -webkit-transform: translateZ(0);
53
+    .nav {
54
+      width: 100%;
55
+      position: relative;
56
+      overflow: hidden;
57
+      font-size: 0;
58
+      > a {
59
+        display: inline-block;
60
+        width: 25%;
61
+        text-align: center;
62
+        margin-top: 0.15rem;
63
+        img {
64
+          height: 0.48rem;
65
+        }
66
+        span {
67
+          width: 100%;
68
+          display: inline-block;
69
+          text-align: center;
70
+          font-size: 0.12rem;
71
+          line-height: 0.22rem;
72
+          margin: 0.08rem auto 0;
73
+        }
74
+      }
75
+    }
76
+  }
77
+}
78
+</style>

+ 1
- 1
src/pages/user/mainPage/libraryIndex/index.vue Ver arquivo

@@ -137,7 +137,7 @@ export default {
137 137
       if (item.id === 'more') {
138 138
         this.$router.push({ name: 'libraryNavList' })
139 139
       } else {
140
-        this.$router.push({ name: 'libraryNavList', query: { id: item.id } })
140
+        this.$router.push({ name: 'booksList', query: { id: item.id } })
141 141
       }
142 142
     }
143 143
   }

+ 1
- 1
src/pages/user/mainPage/userCenter/index.vue Ver arquivo

@@ -89,7 +89,7 @@
89 89
 </template>
90 90
 
91 91
 <script>
92
-import JsBarcode from 'JsBarcode'
92
+import JsBarcode from 'jsbarcode'
93 93
 import { mapState, createNamespacedHelpers } from 'vuex'
94 94
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
95 95
 export default {

+ 6
- 0
src/pages/user/router.js Ver arquivo

@@ -15,6 +15,7 @@ import orderList from './orderList/index' // 城咖啡-点单列表
15 15
 import libraryIndex from './mainPage/libraryIndex/index' // 图书馆首页
16 16
 import userCenter from './mainPage/userCenter/index' // 个人中心
17 17
 import libraryNavList from './library/navList/index' // 图书馆nav
18
+import booksList from './library/booksList/index' // 图书列表
18 19
 import bindMobile from './bindMobile/bindMobile' // 绑定手机号
19 20
 import lessonOrder from './lessonOrder/index' // 我的订单
20 21
 import vip from './vip/index' // vip卡说明
@@ -71,6 +72,11 @@ const router = new Router({
71 72
     name: 'libraryNavList',
72 73
     component: libraryNavList,
73 74
     children: []
75
+  }, { // 图书列表
76
+    path: '/booksList',
77
+    name: 'booksList',
78
+    component: booksList,
79
+    children: []
74 80
   }, { // 城咖啡-点单
75 81
     path: '/placeOrder',
76 82
     name: 'placeOrder',