Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop

pages.json

@@ -273,6 +273,38 @@
         "navigationStyle": "custom",
         "enablePullDownRefresh": false
       }
+    },
+    {
+      "path": "pages/user-info/index",
+      "style": {
+        "navigationBarTitleText": "用户名",
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/about/index",
+      "style": {
+        "navigationBarTitleText": "关于",
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/account-management/index",
+      "style": {
+        "navigationBarTitleText": "账号管理",
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/add-account/index",
+      "style": {
+        "navigationBarTitleText": "新增企业账号",
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": false
+      }
     }
   ],
   "globalStyle": {

pages/account-management/index.vue

@@ -0,0 +1,46 @@
+<template>
+	<view class="account-management">
+		<view>
+			<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="">
+				<view class="account-management-title">账号管理</view>
+				<view slot="left"></view>
+				<view slot="right" class="add-account" @click="addAccount">添加账号</view>
+			</uni-nav-bar>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { back, go2, uploadFile } from '@/utils/hook.js'
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			back,
+			addAccount(){}
+		}
+	}
+</script>
+
+<style lang="scss">
+.account-management{
+	.account-management-title {
+		width: 100%;
+		font-size: 36rpx;
+		color: #000000;
+		letter-spacing: 0;
+		text-align: center;
+		font-weight: 500;
+	}
+	.add-account{
+		font-size: 28rpx;
+		color: #007AFF;
+		text-align: right;
+		line-height: 40rpx;
+		font-weight: 500;
+	}
+}
+</style>

pages/add-account/index.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/setting/index.vue

@@ -7,13 +7,15 @@
 				<view slot="right"></view>
 			</uni-nav-bar>
 		</view>
-		<view class="list-main" v-for="(item,index) in name" :key="index">
-			<view class="list-flex" :class="(index+1) === name.length ? '':'list-border'" @click="checkList(index)">
-				<view class="list-text"><text>{{item}}</text></view>
+		<view class="list-main" v-for="(item, index) in name" :key="index">
+			<view class="list-flex" :class="index + 1 === name.length ? '' : 'list-border'" @click="checkList(index)">
+				<view class="list-text">
+					<text>{{ item }}</text>
+				</view>
 				<view class="">
 					<text><uni-icons type="right" color="#000000" size="18"></uni-icons></text>
 				</view>
-		 </view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -23,23 +25,26 @@ import { back, go2, uploadFile } from '@/utils/hook.js'
 export default {
 	data() {
 		return {
-			name:['用户名','账号管理','用户协议','系统权限','关于纸掌柜']
+			name: ['用户名', '账号管理', '用户协议', '系统权限', '关于纸掌柜']
 		}
 	},
 	methods: {
 		back,
-		checkList(item){
-			switch (item){
+		checkList(item) {
+			switch (item) {
 				case 0:
-				go2('user-info')
-					break;
-					case 4:
+					go2('user-info')
+					break
+				case 1:
+					go2('account-management')
+					break
+				case 4:
 					go2('about')
-						break;
+					break
 				default:
-					break;
+					break
 			}
-		},
+		}
 	}
 }
 </script>
@@ -54,16 +59,16 @@ export default {
 		text-align: center;
 		font-weight: 500;
 	}
-	.list-main{
-		background-color: #FFFFFF;
+	.list-main {
+		background-color: #ffffff;
 	}
-	.list-border{
-			border-bottom: 2rpx solid #d8d8d8;
+	.list-border {
+		border-bottom: 2rpx solid #d8d8d8;
 	}
 	.list-flex {
 		display: flex;
 		justify-content: space-between;
-	
+
 		margin: 0rpx 32rpx;
 		height: 100rpx;
 		align-items: center;