Merge branch 'dev'

Author: levy

template/framework-mobile/_package.json

@@ -31,6 +31,7 @@
   "dependencies": {
     "@femessage/data-list": "latest",
     "@femessage/upload-to-ali": "latest",
+    "@femessage/vant": "latest",
     "@nuxtjs/axios": "^5.0.1",
     "@nuxtjs/dotenv": "^1.3.0",
     "@nuxtjs/pwa": "^3.0.0-beta.16",
@@ -40,8 +41,7 @@
     "js-cookie": "^2.2.0",
     "less": "3.9.0",
     "less-loader": "4.1.0",
-    "nuxt": "^2.7.1",
-    "vant": "^2.1.0"
+    "nuxt": "^2.7.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^8.0.0",

template/framework-mobile/components/agreement.vue

@@ -148,7 +148,7 @@
   </div>
 </template>
 <script>
-import {NavBar} from 'vant'
+import {NavBar} from '@femessage/vant'
 export default {
   name: 'Agreement',
   components: {

template/framework-mobile/components/header-nav-bar.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import {NavBar} from 'vant'
+import {NavBar} from '@femessage/vant'
 
 export default {
   name: 'HeaderNavBar',

template/framework-mobile/layouts/layout-with-footer.vue

@@ -16,7 +16,7 @@
   </div>
 </template>
 <script>
-import {Tabbar, TabbarItem} from 'vant'
+import {Tabbar, TabbarItem} from '@femessage/vant'
 export default {
   components: {
     'van-tabbar': Tabbar,

template/framework-mobile/pages/cart.vue

@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import {Checkbox, CheckboxGroup, Card, SubmitBar} from 'vant'
+import {Checkbox, CheckboxGroup, Card, SubmitBar} from '@femessage/vant'
 
 export default {
   layout: 'layout-with-footer',

template/framework-mobile/pages/goods-detail.vue

@@ -56,7 +56,7 @@ import {
   GoodsAction,
   GoodsActionButton,
   GoodsActionIcon,
-} from 'vant'
+} from '@femessage/vant'
 
 export default {
   components: {

template/framework-mobile/pages/index.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import {Swipe, SwipeItem} from 'vant'
+import {Swipe, SwipeItem} from '@femessage/vant'
 
 export default {
   layout: 'layout-with-footer',

template/framework-mobile/pages/my.vue

@@ -58,7 +58,7 @@
 
 <script>
 import Agreement from '@/components/agreement'
-import {Checkbox} from 'vant'
+import {Checkbox} from '@femessage/vant'
 
 export default {
   layout: 'layout-with-footer',

template/framework-mobile/plugins/vant.js

@@ -15,7 +15,7 @@ import {
   RadioGroup,
   Radio,
   Toast,
-} from 'vant'
+} from '@femessage/vant'
 
 Vue.use(Button)
 Vue.use(Cell).use(CellGroup)

template/framework-mobile/postcss.config.js

@@ -8,7 +8,7 @@ module.exports = ({file}) => {
    * 使vant组件代码自适应viewport。引入其他第三方样式库时可参考此方式处理
    * @see https://github.com/youzan/vant/issues/1181
    */
-  if (file && file.dirname && /node_modules\/vant/.test(file.dirname)) {
+  if (file && file.dirname && file.dirname.indexOf('vant') > -1) {
     vwUnit = 375
   }
   return {