1

package-lock.json

@@ -2219,6 +2219,12 @@
         }
       }
     },
+    "base64-arraybuffer": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+      "dev": true
+    },
     "base64-js": {
       "version": "1.3.0",
       "resolved": "http://registry.npm.taobao.org/base64-js/download/base64-js-1.3.0.tgz",
@@ -2458,7 +2464,7 @@
       "integrity": "sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=",
       "dev": true,
       "requires": {
-        "pako": "1.0.6"
+        "pako": "1.0.7"
       }
     },
     "browserslist": {
@@ -2665,6 +2671,18 @@
       "integrity": "sha1-xkTDlYjdQtNJjpUiNMNy5aQKQSM=",
       "dev": true
     },
+    "canvas-exif-orientation": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/canvas-exif-orientation/-/canvas-exif-orientation-0.4.0.tgz",
+      "integrity": "sha1-tIfzcBmYqeh56xBAELKlgRU2i2s=",
+      "dev": true
+    },
+    "canvas2image": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/canvas2image/-/canvas2image-1.0.5.tgz",
+      "integrity": "sha1-Z2oJS0NjiIordmLli5zl07+8nRQ=",
+      "dev": true
+    },
     "case-sensitive-paths-webpack-plugin": {
       "version": "2.1.2",
       "resolved": "http://registry.npm.taobao.org/case-sensitive-paths-webpack-plugin/download/case-sensitive-paths-webpack-plugin-2.1.2.tgz",
@@ -3424,6 +3442,15 @@
         }
       }
     },
+    "css-line-break": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.0.1.tgz",
+      "integrity": "sha1-GfIGOjPpX7KDG4ZEbAuAwYivRQo=",
+      "dev": true,
+      "requires": {
+        "base64-arraybuffer": "0.1.5"
+      }
+    },
     "css-loader": {
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/css-loader/download/css-loader-1.0.0.tgz",
@@ -4513,6 +4540,12 @@
         "strip-eof": "1.0.0"
       }
     },
+    "exif-js": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/exif-js/-/exif-js-2.3.0.tgz",
+      "integrity": "sha1-nRCBm/Vx+HOBPnZAJBJVq5zhqBQ=",
+      "dev": true
+    },
     "expand-brackets": {
       "version": "0.1.5",
       "resolved": "http://registry.npm.taobao.org/expand-brackets/download/expand-brackets-0.1.5.tgz",
@@ -6310,6 +6343,15 @@
         }
       }
     },
+    "html2canvas": {
+      "version": "1.0.0-alpha.12",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-alpha.12.tgz",
+      "integrity": "sha1-OxmS48mz9WBjw1/WIElPN+uohRM=",
+      "dev": true,
+      "requires": {
+        "css-line-break": "1.0.1"
+      }
+    },
     "htmlparser2": {
       "version": "3.3.0",
       "resolved": "http://registry.npm.taobao.org/htmlparser2/download/htmlparser2-3.3.0.tgz",
@@ -7267,6 +7309,12 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
+    "jQuery": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/jQuery/-/jQuery-1.7.4.tgz",
+      "integrity": "sha1-8y3FyFpwRO6GS0RDue5F+UeLoTc=",
+      "dev": true
+    },
     "javascript-stringify": {
       "version": "1.6.0",
       "resolved": "http://registry.npm.taobao.org/javascript-stringify/download/javascript-stringify-1.6.0.tgz",
@@ -8880,9 +8928,9 @@
       "dev": true
     },
     "pako": {
-      "version": "1.0.6",
-      "resolved": "http://registry.npm.taobao.org/pako/download/pako-1.0.6.tgz",
-      "integrity": "sha1-AQEhG6pwxLykoPY/Igbpe3368lg=",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.7.tgz",
+      "integrity": "sha512-3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ==",
       "dev": true
     },
     "parallel-transform": {
@@ -12734,6 +12782,16 @@
         "swiper": "4.3.5"
       }
     },
+    "vue-croppa": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/vue-croppa/-/vue-croppa-1.3.8.tgz",
+      "integrity": "sha512-WwYgEKscTCD7BzhnbfRJfzWIU6RcMq2JRimB3aI5gGzpADmpKuqmDh9+oVfiZaEnpmRthgXZxcAvbxU6CeIU9w==",
+      "dev": true,
+      "requires": {
+        "canvas-exif-orientation": "0.4.0",
+        "object-assign": "4.1.1"
+      }
+    },
     "vue-eslint-parser": {
       "version": "2.0.3",
       "resolved": "http://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-2.0.3.tgz",

src/pages/bodyCheck/app.js

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

src/pages/sales/app.js

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

src/pages/user/app.js

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

src/pages/user/mainPage/index.vue

@@ -10,7 +10,8 @@
         <div>
           <img v-if="index==0" class="centerLabel" src="../../../common/icon/tabBar-icon-1.png" alt="">
           <img v-if="index==1" class="centerLabel" src="../../../common/icon/tabBar-icon-2.png" alt="">
-          <img v-if="index==2" class="centerLabel" src="../../../common/icon/tabBar-icon-3.png" alt="">
+          <img v-if="index==2" class="centerLabel" src="../../../common/icon/tabBar-icon-4.png" alt="">
+          <img v-if="index==3" class="centerLabel" src="../../../common/icon/tabBar-icon-3.png" alt="">
         </div>
         <span>{{item.name}}</span>
       </router-link>
@@ -31,6 +32,9 @@ export default {
       }, {
         pathName: 'coffeeIndex',
         name: '城咖啡'
+      }, {
+        pathName: 'libraryIndex',
+        name: '图书馆'
       }, {
         pathName: 'userCenter',
         name: '会员'

src/pages/user/mainPage/libraryIndex/index.vue

@@ -0,0 +1,41 @@
+<template>
+  <div class="mainPage">
+    <div>
+      <div class="header flex-h">
+        <div class="flex-item">
+          <div>
+            <i class="iconfont icon-sousuo"></i>
+            <input type="text">
+          </div>
+        </div>
+        <a>
+          <i class="iconfont icon-dingwei"></i>
+          <span>云台天境</span>
+        </a>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data () {
+    return {
+    }
+  },
+  computed: {
+  },
+  components: {
+  },
+  created () {
+  },
+  methods: {
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import 'page.scss';
+</style>

src/pages/user/mainPage/libraryIndex/page.scss

@@ -0,0 +1,49 @@
+.mainPage{
+  >div{
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    overflow-y: scroll;
+    -webkit-overflow-scrolling: touch;
+    transform: translateZ(0);
+    -webkit-transform: translateZ(0);
+    .header{
+      border-bottom: 1px solid #f5f5f5;
+      align-items: center;
+      padding: .1rem 0;
+      >div{
+        margin: 0 .1rem 0 .2rem;
+        >div{
+          width: 100%;
+          position: relative;
+          overflow: hidden;
+          font-size: 0;
+          white-space: nowrap;
+          background: #f2f2f2;
+          padding: .05rem 0;
+          >*{
+            display: inline-block;
+            vertical-align: middle;
+            line-height: .2rem;
+          }
+          i{
+            font-size: .15rem;
+            color: #ccc;
+            margin-left: .08rem;
+          }
+          input{
+            font-size: .13rem;
+            color: #ccc;
+            margin-left: .05rem;
+            background: none;
+          }
+        }
+      }
+      >a{
+        margin-right: .2rem;
+      }
+    }
+  }
+}

src/pages/user/router.js

@@ -12,6 +12,7 @@ import coffeeIndex from './mainPage/coffeeIndex/index' // 城咖啡
 import placeOrder from './placeOrder/index' // 城咖啡-点单
 import placeOrderDetail from './placeOrderDetail/index' // 城咖啡-点单详情
 import orderList from './orderList/index' // 城咖啡-点单列表
+import libraryIndex from './mainPage/libraryIndex/index' // 图书馆首页
 import userCenter from './mainPage/userCenter/index' // 个人中心
 import bindMobile from './bindMobile/bindMobile' // 绑定手机号
 import lessonOrder from './lessonOrder/index' // 我的订单
@@ -53,6 +54,11 @@ const router = new Router({
       name: 'coffeeIndex',
       component: coffeeIndex,
       children: []
+    }, { // 图书馆首页
+      path: 'libraryIndex',
+      name: 'libraryIndex',
+      component: libraryIndex,
+      children: []
     }, { // 个人中心
       path: 'userCenter',
       name: 'userCenter',