ming před 3 roky
rodič
revize
8dd2102166

+ 3 - 3
components/fs-button/fs-button.vue

@@ -18,10 +18,10 @@
     ]"
 		:open-type="openType"
 		:form-type="formType"
-		@getuserinfo="getUserInfo"
+		@getuserinfo="getuserinfo"
 		@contact="contact"
-		@getphonenumber="getPhoneNumber"
-		@opensetting="openSetting"
+		@getphonenumber="getphonenumber"
+		@opensetting="opensetting"
 		@error="error"
     @click="handleClick"
   >

+ 3 - 2
manifest.json

@@ -50,11 +50,12 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx0d3444a5c672db0c",
         "setting" : {
             "urlCheck" : false
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+				"optimization":{"subPackages":true}
     },
     "mp-alipay" : {
         "usingComponents" : true

+ 0 - 0
pages/my/addrbook/detail.vue → modules/common/addrbook/detail.vue


+ 0 - 0
pages/my/addrbook/list.vue → modules/common/addrbook/list.vue


+ 0 - 0
pages/my/address/add.vue → modules/common/address/add.vue


+ 0 - 0
pages/my/address/list.vue → modules/common/address/list.vue


+ 0 - 0
pages/my/feedback.vue → modules/common/feedback.vue


+ 0 - 0
pages/my/licensePlate/add.vue → modules/common/licensePlate/add.vue


+ 0 - 0
pages/my/licensePlate/list.vue → modules/common/licensePlate/list.vue


+ 1 - 1
pages/login/login.vue → modules/common/login/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="login-box">
 		<view class="text-center">
-			<image src="/static/images/login/logo.png" mode="widthFix" style="width: 500rpx"></image>
+			<image src="/modules/common/static/images/login/logo.png" mode="widthFix" style="width: 500rpx"></image>
 		</view>
 		<view class="login-top">
 			<view>欢迎回来!</view>

+ 0 - 0
pages/login/login1.vue → modules/common/login/login1.vue


+ 1 - 1
pages/login/login2.vue → modules/common/login/login2.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="layout-box">
 		<view class="login-bg pr">
-			<image src="/static/images/login/login-sw.jpg" mode="widthFix" style="width: 100%;"></image>
+			<image src="/modules/common/static/images/login/login-sw.jpg" mode="widthFix" style="width: 100%;"></image>
 			<view class="bg-text">
 				<view class="bg-text-hd">您好</view>
 				<view class="bg-text-bd">欢迎登录</view>

+ 1 - 1
pages/login/login3.vue → modules/common/login/login3.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image src="/static/images/login/login-car.png" mode="widthFix" style="width: 100vw;"></image>
+		<image src="/modules/common/static/images/login/login-car.png" mode="widthFix" style="width: 100vw;"></image>
 		
 		<view class="login-box">
 			<view class="login-box-top">手机号登录</view>

+ 0 - 0
pages/login/login4.vue → modules/common/login/login4.vue


+ 1 - 1
pages/login/login5.vue → modules/common/login/login5.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="login-box">
 		<view class="text-center">
-			<image src="/static/images/login/logo.png" mode="widthFix" style="width: 500rpx"></image>
+			<image src="/modules/common/static/images/login/logo.png" mode="widthFix" style="width: 500rpx"></image>
 		</view>
 		<view class="login-top">
 			<view>欢迎回来!</view>

+ 0 - 0
pages/login/login6.vue → modules/common/login/login6.vue


+ 1 - 1
pages/login/wxLogin.vue → modules/common/login/wxLogin.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<image src="/static/images/login/login-bg.png" mode="widthFix" style="width: 100vw;"></image>
+		<image src="/modules/common/static/images/login/login-bg.png" mode="widthFix" style="width: 100vw;"></image>
 		<view class="login-box">
 			<fs-button block type="success" radius @click="getUserProfile">微信登录</fs-button>
 		</view>

+ 0 - 0
pages/my/notice.vue → modules/common/notice.vue


+ 0 - 0
pages/my/org.vue → modules/common/org.vue


+ 0 - 0
static/images/login/login-bg.png → modules/common/static/images/login/login-bg.png


+ 0 - 0
static/images/login/login-car.png → modules/common/static/images/login/login-car.png


+ 0 - 0
static/images/login/login-sw.jpg → modules/common/static/images/login/login-sw.jpg


+ 0 - 0
static/images/login/logo.png → modules/common/static/images/login/logo.png


+ 0 - 0
pages/my/version.vue → modules/common/version.vue


+ 84 - 85
pages.json

@@ -5,20 +5,6 @@
 			"style": {
 				"navigationBarTitleText": "首页"
 			}
-		}, {
-			"path": "pages/my/version",
-			"style": {
-				"navigationBarTitleText": "版本记录",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/my/feedback",
-			"style": {
-				"navigationBarTitleText": "意见反馈",
-				"enablePullDownRefresh": false
-			}
-
 		}, {
 			"path": "pages/my/userInfo",
 			"style": {
@@ -26,78 +12,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		}
-
-		, {
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}
-
-		, {
-			"path": "pages/my/notice",
-			"style": {
-				"navigationBarTitleText": "我的消息",
-				"enablePullDownRefresh": false
-			}
-
 		}, {
-			"path": "pages/my/org",
-			"style": {
-				"navigationBarTitleText": "组织架构",
-				"enablePullDownRefresh": false
-			}
-
-		}
-
-		, {
-			"path": "pages/my/addrbook/list",
-			"style": {
-				"navigationBarTitleText": "通讯录",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/my/addrbook/detail",
-			"style": {
-				"navigationBarTitleText": "通讯录",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/my/address/list",
-			"style": {
-				"navigationBarTitleText": "地址管理",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/my/address/add",
-			"style": {
-				"navigationBarTitleText": "地址管理",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/my/licensePlate/list",
-			"style": {
-				"navigationBarTitleText": "车辆管理",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/my/licensePlate/add",
-			"style": {
-				"navigationBarTitleText": "车辆管理",
-				"enablePullDownRefresh": false
-			}
-
-		}
-
-		, {
 			"path": "pages/my/my",
 			"style": {
 				"navigationBarTitleText": "个人中心",
@@ -105,6 +20,90 @@
 			}
 
 		}
+	],
+	"subPackages": [
+		{
+			"root": "modules/common",
+			"pages": [
+				{
+					"path": "login/login",
+					"style": {
+						"navigationBarTitleText": "登录",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "version",
+					"style": {
+						"navigationBarTitleText": "版本记录",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "feedback",
+					"style": {
+						"navigationBarTitleText": "意见反馈",
+						"enablePullDownRefresh": false
+					}
+				}, 
+				{
+					"path": "licensePlate/list",
+					"style": {
+						"navigationBarTitleText": "车辆管理",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "licensePlate/add",
+					"style": {
+						"navigationBarTitleText": "车辆管理",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "addrbook/list",
+					"style": {
+						"navigationBarTitleText": "通讯录",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "addrbook/detail",
+					"style": {
+						"navigationBarTitleText": "通讯录",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "address/list",
+					"style": {
+						"navigationBarTitleText": "地址管理",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "address/add",
+					"style": {
+						"navigationBarTitleText": "地址管理",
+						"enablePullDownRefresh": false
+					}
+				}, 
+				{
+					"path": "notice",
+					"style": {
+						"navigationBarTitleText": "我的消息",
+						"enablePullDownRefresh": false
+					}
+				}, 
+				{
+					"path": "org",
+					"style": {
+						"navigationBarTitleText": "组织架构",
+						"enablePullDownRefresh": false
+					}
+				}
+			]
+		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

+ 8 - 8
pages/my/my.vue

@@ -21,7 +21,7 @@
 					</fs-icon>
 				</view>
 				<view v-else class="user-info">
-					<fs-avatar size="140rpx" link="../login/login4" border>去登录</fs-avatar>
+					<fs-avatar size="140rpx" link="/modules/common/login/login" border>去登录</fs-avatar>
 				</view>
 				
 				<view :style="{'margin-top': userInfo.name ? '80rpx' : '20rpx'}">
@@ -48,37 +48,37 @@
 		</fs-card>
 		
 		<fs-cell-group arrow border gutter>
-			<fs-cell link="./licensePlate/list" value="车辆管理">
+			<fs-cell link="/modules/common/licensePlate/list" value="车辆管理">
 				<template #title>
 					<fs-icon type="icon-car" colorType="primary"></fs-icon>
 				</template>
 			</fs-cell>
-			<fs-cell link="./address/list" value="地址管理">
+			<fs-cell link="/modules/common/address/list" value="地址管理">
 				<template #title>
 					<fs-icon type="icon-location" colorType="primary"></fs-icon>
 				</template>
 			</fs-cell>
-			<fs-cell link="./org" value="组织架构">
+			<fs-cell link="/modules/common/org" value="组织架构">
 				<template #title>
 					<fs-icon type="icon-org" colorType="primary"></fs-icon>
 				</template>
 			</fs-cell>
-			<fs-cell link="./addrbook/list" value="通讯录">
+			<fs-cell link="/modules/common/addrbook/list" value="通讯录">
 				<template #title>
 					<fs-icon type="icon-tongxunlu" colorType="primary"></fs-icon>
 				</template>
 			</fs-cell>
-			<fs-cell link="./notice" value="我的消息">
+			<fs-cell link="/modules/common/notice" value="我的消息">
 				<template #title>
 					<fs-icon type="icon-notice" colorType="primary"></fs-icon>
 				</template>
 			</fs-cell>
-			<fs-cell link="./feedback" value="意见反馈">
+			<fs-cell link="/modules/common/feedback" value="意见反馈">
 				<template #title>
 					<fs-icon type="icon-feedback" colorType="primary"></fs-icon>
 				</template>
 			</fs-cell>
-			<fs-cell link="./version" value="版本记录">
+			<fs-cell link="/modules/common/version" value="版本记录">
 				<template #title>
 					<fs-icon type="icon-version" colorType="primary"></fs-icon>
 				</template>