Merge branch 'master' of http://47.98.226.240:3000/twt/operatingCompany

operatingCompany/pages.json

@@ -11,10 +11,41 @@
 			"path": "pages/team/myTeam",
 			"style": {
 				"navigationBarTitleText": "我的团队",
-				 "navigationBarBackgroundColor":"#FFFFFF"
+				 "navigationBarBackgroundColor":"#FFFFFF",
+				  "enablePullDownRefresh": false
 			}
-		}
-	    
+		},
+	    {
+	        "path" : "pages/manageStore/manageStore",
+	        "style" :                                                                                    
+	        {
+	            "navigationBarTitleText": "管理门店",
+	    		"navigationBarBackgroundColor":"#FFFFFF",
+	            "enablePullDownRefresh": false
+	        }
+	        
+	    },
+        {
+            "path" : "pages/myStore/myStore",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "我的门店",
+				"navigationBarBackgroundColor":"#FFFFFF",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        
+        ,{
+            "path" : "pages/AccountSet/AccountSet",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "账户设置",
+				"navigationBarBackgroundColor":"#FFFFFF",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

operatingCompany/pages/AccountSet/AccountSet.vue

@@ -0,0 +1,120 @@
+<template>
+	<view class="content">
+		<!-- message -->
+		<view class="messageBg">
+			<!-- 头像 -->
+			<view class="message line">
+				<view class="leftTitle">头像</view>
+				<image class="headImg" src='headUrl' mode=""></image>
+			</view>
+
+			<!-- 姓名 -->
+			<view class="message line">
+				<view class="leftTitle">姓名</view>
+				<view class="rightContent">张老师</view>
+			</view>
+
+			<!-- 所属部门 -->
+			<view class="message">
+				<view class="leftTitle">所属部门</view>
+				<view class="rightContent">总部一店</view>
+			</view>
+		</view>
+
+		<!-- 修改密码 -->
+		<view class="messageBg">
+			<view class="message" @click="changePW">
+				<view class="leftTitle">修改密码</view>
+				<image class="rightArrow" src="../../static/img/icon_zhanghu_arrow.png" mode=""></image>
+			</view>
+		</view>
+
+		<!-- 退出登录 -->
+		<view class="logOut" @click="logOut">退出登录</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				headUrl:'',
+			}
+		},
+		methods: {
+			changePW(){
+				console.log('修改密码');
+			},
+			logOut(){
+				console.log('退出');
+			},
+		}
+	}
+</script>
+
+<style>
+	.content {
+		background-color: #F4F5F7;
+		min-height: 100vh;
+		padding: 20rpx 24rpx;
+	}
+
+	/* #ifdef H5 */
+	.content {
+		background-color: #F4F5F7;
+		min-height: calc(100vh - 44px);
+		padding: 20rpx 24rpx;
+	}
+
+	/* #endif */
+	.messageBg,
+	.logOut{
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+		margin: 20rpx 0rpx;
+
+	}
+
+	.message {
+		display: flex;
+		justify-content: space-between;
+		line-height: 98rpx;
+		align-items: center;
+	}
+
+	.line {
+		border-bottom: 1rpx solid #EEEEEE;
+	}
+
+	.headImg {
+		width: 72rpx;
+		height: 72rpx;
+		margin-right: 20rpx;
+		background-color: #007AFF;
+
+	}
+
+	.leftTitle {
+		font-size: 28rpx;
+		color: #3C3C3C;
+		margin-left: 20rpx;
+	}
+
+	.rightContent {
+		font-size: 28rpx;
+		color: #999999;
+		margin-right: 20rpx;
+	}
+
+	.rightArrow {
+		width: 14rpx;
+		height: 26rpx;
+		margin-right: 20rpx;
+	}
+	.logOut{
+		line-height: 98rpx;
+		text-align: center;
+		color: #FF3B30;
+	}
+</style>

operatingCompany/pages/index/index.vue

@@ -42,7 +42,7 @@
 		<view class="modular">
 			<view class="modularTitle">其他设置</view>
 			<view class="modularCont">
-				<view class="modularLine">
+				<view class="modularLine" @click="goRouter('../AccountSet/AccountSet')">
 					<image src="../../static/img/home_icon_6.png" mode="" class="modularImg"></image>
 					<view class="modularName">账号设置</view>
 				</view>

operatingCompany/pages/manageStore/manageStore.vue

@@ -0,0 +1,166 @@
+<template>
+	<view class="content">
+		<!-- 搜索 -->
+		<view class="searchBoxBg">
+			<view class="searchBox">
+				<image src="../../static/img/icon_search.png" mode="" class="searchImg"></image>
+				<input type="text" class="searchInput" placeholder="请输入门店名称、联系人、手机号" v-model="searchValue"
+					@confirm="searchDone" />
+			</view>
+		</view>
+
+		<!-- 门店列表 -->
+		<view class="shopContent">
+			<view v-for="(item,index) in data" :key="index">
+				<view class="shopBox">
+					<view class="shopTop">
+						<view class="shopName">门店名称门店名称门店名称称门店名称</view>
+
+						<!-- 地址和电话 -->
+						<image class="tubiao" src="../../static/img/icon_daohang_def.png" mode="" @click="goAddress(item.address)">
+						</image>
+						<image class=" tubiao" src="../../static/img/icon_phone_def.png" mode="" @click="call(item.phone)">
+						</image>
+					</view>
+
+					<!-- 门店类型-开业时间-联系人 -->
+					<view class="shopType"><text style='color: #B98B5D;'>门店类型</text> · 开业时间 · 联系人：{{lianxiren}}</view>
+
+					<!-- 详细地址 -->
+					<view class="addressView">
+						<view class="address">山东省济南市历下区齐鲁软件园创业广场广广场广广场广广场广广场广</view>
+						<view class="distance">29.6km</view>
+					</view>
+
+
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				searchValue: '',
+				data: [1, 2, 3, 4, 5, 6, 7],
+				lianxiren: '王老师',
+			}
+		},
+		methods: {
+			searchDone() {
+				this.searchValue = e.target.value;
+			},
+			goAddress(e) {
+				console.log('地图导航');
+			},
+			call(e) {
+				console.log('打电话');
+			},
+		}
+	}
+</script>
+
+<style>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+
+	}
+
+	.searchBoxBg {
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		z-index: 99;
+	}
+
+	/* #ifdef H5 */
+	.searchBoxBg {
+		top: 44px;
+	}
+
+	/* #endif */
+	.searchBox {
+		display: flex;
+		height: 72rpx;
+		margin: 24rpx;
+		background-color: #F4F5F7;
+		border-radius: 36rpx;
+	}
+
+	.searchImg {
+		margin-top: 20rpx;
+		margin-left: 20rpx;
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.searchInput {
+		height: 72rpx;
+		font-size: 28rpx;
+		padding-left: 16rpx;
+		width: 85%;
+	}
+
+	.shopContent {
+		position: relative;
+		top: 120rpx;
+		left: 0rpx;
+		padding: 0rpx 24rpx;
+		background-color: #F4F5F7;
+
+	}
+
+	.shopBox {
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+		margin: 20rpx 0rpx;
+	}
+
+	.shopTop {
+		display: flex;
+		padding: 30rpx 20rpx 10rpx 20rpx;
+		justify-content: space-between;
+
+	}
+
+	.shopName {
+		font-size: 30rpx;
+		color: #3C3C3C;
+		font-weight: bold;
+	}
+
+	.tubiao {
+		width: 48rpx;
+		height: 48rpx;
+		margin-left: 40rpx;
+	}
+
+	.shopType {
+		font-size: 26rpx;
+		padding: 10rpx 20rpx;
+		color: #3C3C3C;
+	}
+
+	.addressView {
+		font-size: 26rpx;
+		color: #999999;
+		padding-left: 20rpx;
+		padding-right: 20rpx;
+		padding-top: 10rpx;
+		padding-bottom: 30rpx;
+		display: flex;
+		justify-content: space-between;
+
+	}
+
+	.distance {
+		margin-left: 20rpx;
+		margin-right: 20rpx;
+	}
+</style>

operatingCompany/pages/myStore/myStore.vue

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

operatingCompany/pages/team/myTeam.vue

@@ -4,7 +4,8 @@
 		<view class="searchBoxBg">
 			<view class="searchBox">
 				<image src="../../static/img/icon_search.png" mode="" class="searchImg"></image>
-				<input type="text" class="searchInput" placeholder="请输入姓名、手机号" v-model="searchValue" />
+				<input type="text" class="searchInput" placeholder="请输入姓名、手机号" v-model="searchValue"
+					@confirm="searchDone" />
 			</view>
 		</view>
 
@@ -17,7 +18,7 @@
 		<!-- 内容 -->
 		<view class="teamContent">
 			<view v-for="(item,index) in data" :key="index">
-				<view class="team">
+				<view class="team" @click="goRouter('../manageStore/manageStore')">
 					<!-- 第一行 -->
 					<view class="customer">
 						<view class="name">姓名 手机号</view>
@@ -49,7 +50,15 @@
 
 		},
 		methods: {
-
+			searchDone(e) {
+				this.searchValue = e.target.value;
+				console.log(this.searchValue);
+			},
+			goRouter(url) {
+				uni.navigateTo({
+					url:url
+				})
+			}
 		}
 	}
 </script>