Переглянути джерело

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

twt 3 роки тому
батько
коміт
155fde84a3

+ 1 - 2
operatingCompany/pages.json

@@ -68,8 +68,7 @@
 		{
 			"path": "pages/logIn/logIn",
 			"style": {
-				"navigationBarTitleText": "登录",
-				"navigationBarBackgroundColor": "#FFFFFF"
+				"navigationStyle": "custom"
 			}
 
 		}, {

+ 33 - 2
operatingCompany/pages/logIn/logIn.vue

@@ -1,5 +1,16 @@
 <template>
 	<view class="content">
+
+		<view class="zdyNav">
+		  <view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		  <view class="nav">
+
+			  <view >登录</view>
+			  
+		  </view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view>
 
 		<image class="topImg" src="../../static/img/dl_bg@2x.png" mode=""></image>
 
@@ -48,8 +59,11 @@
 				phoneValue: '',
 				codeValue: '',
 				code_time: 0 ,// 倒计时
-
+				iStatusBarHeight:'',
 			}
+		},
+		onLoad() {
+			 this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 		},
 		methods: {
 			roleTypeFirst() {
@@ -157,7 +171,24 @@
 
 	/* #endif */
 
-
+	.zdyNav{
+		position: fixed;
+		left: 0;
+		top: 0;
+		background: #FFFFFF;
+		z-index: 11;
+	}
+	.status_bar{
+		background: #FFFFFF;
+	}
+	.nav{
+		width: 100vw;
+		height: 44px;
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 34rpx;
+		line-height: 44px;
+	}
 	.topImg {
 		padding-left: 152rpx;
 		height: 256rpx;

+ 111 - 74
operatingCompany/pages/shop/shopIndex/index.vue

@@ -2,11 +2,22 @@
 	<view class="content">
 		<view class="navBg">
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			<view class="nav">运营陪伴</view>
-		</view>
-		<view style="background-color: #353847;">
-			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			<view style="height: 44px;"></view>
+			<view class="nav">
+				
+					<view class="backBox" @click="logOut">
+						<image src="../../../static/img/icon_tuichu@2x.png" mode="" class="baiheiback" @click="back">
+						</image>
+						<view class="logOut">退出登录</view>
+						
+					</view>
+				
+				<view>运营陪伴</view>
+				<view style="width:157rpx;"></view>
+			</view>
+		</view>
+		<view style="background-color: #353847;">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view style="height: 44px;"></view>
 		</view>
 
 		<!-- topView -->
@@ -103,11 +114,11 @@
 
 						<view class="shopName">{{item.ShopName}}</view>
 
-						<!-- 订单状态 1 待提交 2 待作业 3 待点评 4 待回复 5 已完成 -->
-						<view class="type" v-if="item.State == 1">待提交</view>
-						<view class="type" v-if="item.State == 2">待作业</view>
-						<view class="type" v-if="item.State == 3">待运营经理点评</view>
-						<view class="type" v-if="item.State == 4">待回复</view>
+						<!-- 订单状态 1 待提交 2 待作业 3 待点评 4 待回复 5 已完成 -->
+						<view class="type" v-if="item.State == 1">待提交</view>
+						<view class="type" v-if="item.State == 2">待作业</view>
+						<view class="type" v-if="item.State == 3">待运营经理点评</view>
+						<view class="type" v-if="item.State == 4">待回复</view>
 						<view class="type" v-if="item.State == 5">已完成</view>
 
 					</view>
@@ -115,16 +126,17 @@
 					<!-- 第2行 -->
 					<view class="bottomView">
 						<!-- 运营经理 -->
-						<view class="manager">{{item.ManagerName}} · {{item.CheckTime.slice(0,item.CheckTime.length-8)}}</view>
+						<view class="manager">{{item.ManagerName}} · {{item.CheckTime.slice(0,item.CheckTime.length-8)}}
+						</view>
 						<!-- 评分 -->
 						<view class="score" v-if="item.ShopScore">{{item.ShopScore}}分</view>
 					</view>
 
 
 				</view>
-			
-				
-			
+
+
+
 			</view>
 		</view>
 
@@ -149,7 +161,7 @@
 			return {
 				iStatusBarHeight: '',
 				tabIndex: 0,
-				status: '', 
+				status: '',
 				storeMess: {},
 				thirdIndex: null,
 				thirdArr: ['请选择'],
@@ -167,15 +179,15 @@
 		onLoad() {
 			//页面加载初始化生命周期函数
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-			
+
 			this.getVisitor()
-			
-		},
-		onShow() {
-			this.getMessage()
-			
-			this.page = 1
-			this.getShopData()
+
+		},
+		onShow() {
+			this.getMessage()
+
+			this.page = 1
+			this.getShopData()
 		},
 		methods: {
 			//自己定义的方法函数
@@ -186,17 +198,23 @@
 				uni.navigateTo({
 					url: url
 				})
+			},
+			logOut() {
+				uni.clearStorageSync();
+				uni.navigateTo({
+					url: '../../logIn/logIn'
+				})
 			},
-			goAppraise(item){
+			goAppraise(item) {
 				console.log(item);
 				uni.navigateTo({
-					url:'../../reportManage/reportDetail?id='+item.ID
+					url: '../../reportManage/reportDetail?id=' + item.ID
+				})
+			},
+			goReviews(storeMess) {
+				uni.navigateTo({
+					url: 'reviews'
 				})
-			},
-			goReviews(storeMess){
-				uni.navigateTo({
-					url:'reviews'
-				})
 			},
 			timeClick() {
 
@@ -244,24 +262,24 @@
 				this.thirdIndex = e.target.value
 				this.managerName = this.thirdArr[this.thirdIndex]
 				if (e.target.value == 0) {
-					this.thirdIndex = null
+					this.thirdIndex = null
 					this.managerName = ''
 				}
 				this.page = 1
 				this.getShopData()
 			},
-			
-			getVisitor() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				let url = 'accompany/SuperCheckSheet/myShopCheckManagerPage',
-					params = {
-						
-					}
-				this.$http(url, params, 'GET').then(res => {
-					this.thirdArr = this.thirdArr.concat(res.data)
-				})
+
+			getVisitor() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'accompany/SuperCheckSheet/myShopCheckManagerPage',
+					params = {
+
+					}
+				this.$http(url, params, 'GET').then(res => {
+					this.thirdArr = this.thirdArr.concat(res.data)
+				})
 			},
 			getShopData() {
 				uni.showLoading({
@@ -278,9 +296,9 @@
 
 					}
 				this.$http(url, params, 'GET').then(res => {
-					var list = res.data.Items
-					
-					
+					var list = res.data.Items
+
+
 					// 处理 undefined和null转为空白字符串
 					list.forEach((item, index) => {
 						for (const key in item) {
@@ -288,28 +306,27 @@
 						}
 					})
 
-					
+
 					if (this.page == 1) {
-						this.shopData = list
-						
+						this.shopData = list
+
 					} else {
 						this.shopData = this.shopData.concat(list)
 					}
-					
-					if(list.length < 10){
-						this.noMoreShow = false
-					}
-					else {
-						this.noMoreShow = true
-					}
-					
+
+					if (list.length < 10) {
+						this.noMoreShow = false
+					} else {
+						this.noMoreShow = true
+					}
+
 				})
 			},
 
 		},
 
 		// 下拉刷新 上拉加载更多
-		onPullDownRefresh() {
+		onPullDownRefresh() {
 			this.getMessage()
 			this.page = 1
 			this.getShopData()
@@ -339,32 +356,52 @@
 
 	}
 
-	/* #endif */
-	.navBg{
-		position: fixed;
-		top: 0rpx;
+	/* #endif */
+	.navBg {
+		position: fixed;
+		top: 0rpx;
 		left: 0rpx;
+		width: 100vw;
+		z-index: 11;
 	}
+
 	.status_bar {
 		background: #353847;
 	}
 
-	.nav {
-		width: 100vw;
-		height: 44px;
-		background: #353847;
-		text-align: center;
-		line-height: 44px;
-		font-size: 34rpx;
-		color: #FFFFFF;
+	
+	.nav{
+		display: flex;
+		justify-content: space-between;
+		line-height: 44px;
+		font-size: 36rpx;
+		color: #FFFFFF;
+		background-color: #353847;
+	}
+	
+	.backBox{
+		display: flex;
+		justify-content: flex-start;
+		padding-left: 24rpx;
+		align-items: center;
+	}
+	.baiheiback{
+		width: 32rpx;
+		height: 32rpx;
+		
+	}
+	.logOut{
+		color: #FFFFFF;
+		font-size: 24rpx;
+		margin-left: 5rpx;
 	}
 
 	.topView {
 		width: 100%;
 		height: 580rpx;
 		background-color: #353847;
-		padding-top: 20rpx;
-		/* position: fixed; */
+		padding-top: 20rpx;
+		/* position: fixed; */
 		z-index: 99;
 	}
 
@@ -425,7 +462,7 @@
 		text-align: center;
 		height: 80rpx;
 	}
-	
+
 	.title {
 		font-size: 24rpx;
 		color: #555555;
@@ -529,7 +566,7 @@
 	.shopList {
 		background-color: #F4F5F7;
 		padding: 0rpx 24rpx;
-		
+
 	}
 
 	.shopBox {

+ 1 - 0
operatingCompany/pages/shop/shopIndex/reviewsContent.vue

@@ -16,6 +16,7 @@
 			</view>
 			
 			
+			
 		</view>
 	</view>
 </template>

BIN
operatingCompany/static/img/icon_tuichu@2x.png