1

api/mine/order.js

@@ -88,4 +88,19 @@ export function getNewsList(data) {
 	'data':data
   })
 }
+// 设备列表接口
+export function getCameraList(data) {
+  return request({
+    'url': '/camera/list',
+    'method': 'get',
+	'data':data
+  })
+}
+// 设备列表接口
+export function getCameraVideo(data) {
+  return request({
+    'url': '/camera/video/'+data,
+    'method': 'get',
+  })
+}
 // 新的end

api/system/user.js

@@ -9,7 +9,7 @@ export function updateUserPwd(oldPassword, newPassword) {
   }
   return request({
     url: '/system/user/profile/updatePwd',
-    method: 'put',
+    method: 'post',
     params: data
   })
 }

components/footer/footer.vue

@@ -19,15 +19,18 @@
 	// import plugins from '../../commen/js/plugin.js'
     export default {
 		props:[
-			'footlist',
-			'footerindex',
-			'color_checked',
-			'color_nochecked',
-			'isHomeIndex'
+			'footerindex'
 		],
         data () {
             return{
 				active :'',
+				footlist:[
+					{module:'home',title:'首页',img:"imga",icon_checked:require('@/static/images/tabbar/home_.png'),icon_nochecked:require('@/static/images/tabbar/home.png')},
+					{module:'video',title:'视频',img:"imgb",icon_checked:require('@/static/images/tabbar/video_.png'),icon_nochecked:require('@/static/images/tabbar/video.png')},
+					{module:'mine',title:'我的',img:"imga",icon_checked:require('@/static/images/tabbar/mine_.png'),icon_nochecked:require('@/static/images/tabbar/mine.png')},
+					],
+				color_checked :'161616',
+				color_nochecked :'666666',
             }
         },
 		mounted() {
@@ -41,6 +44,8 @@
 				let link = e.link, module = e.module, def = e.default, title = e.title;
 				if(module == 'home'){
 					this.$tab.reLaunch('/pages/index/index')
+				}else if(module == 'video'){
+					this.$tab.reLaunch('/pages/video/index')
 				}else if(module == 'mine'){
 					this.$tab.reLaunch('/pages/mine/index')
 				}
@@ -53,7 +58,7 @@
 
 
 <style type="text/css">
-    .com_footer{ display: flex;position: fixed;box-sizing: border-box;z-index: 99;width: 100%;height: 100rpx;bottom: 0;left: 0;background-color: #fff;overflow: hidden;box-shadow: 0px 0px 16rpx 0px rgba(87,87,87,0.41);}
+    .com_footer{ display: flex;position: fixed;box-sizing: border-box;z-index: 98;width: 100%;height: 100rpx;bottom: 0;left: 0;background-color: #fff;overflow: hidden;box-shadow: 0px 0px 16rpx 0px rgba(87,87,87,0.41);}
 	.com_footer .in_item{ display: block;flex: 1;padding: 12rpx 0 0 0;overflow: hidden; }
 	.com_footer .in_img{ display: block;width: 44rpx;height: 44rpx;margin: 0 auto; }
 	.com_footer .in_txt{ font-size: 26rpx;color: #999;text-align: center; font-weight: bold;}

components/order/list.vue

@@ -2,7 +2,43 @@
   <view>
 	<view v-if="datalist.length>0">
 		<!-- 预约 -->
-		<block v-if="type==1">
+		<block v-if="type=='order'">
+			<view class="ylist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.reservatId)">
+				<image :src="ysta" class="ystaimg" v-if="ite.visitType==3"></image>
+				<image :src="ystb" class="ystaimg" v-if="ite.visitType==2"></image>
+				<view class="ytop flexc">
+					<view class="tit">{{ite.visitName.charAt(0)}}</view>
+					<view class="cent">
+						<view class="ctit">{{ite.visitName}}提交的预约来访申请</view>
+						<view class="ctime">提交时间：{{ite.createTime}}</view>
+					</view>
+					<view class="right" v-if="ite.visitType==1">
+						<image :src="ybga"></image>
+						<view>待审核</view>
+					</view>
+					
+				</view>
+				<view class="ybox">
+					<view class="yblist w50"><text>预约日期</text>{{ite.visitDate}}</view>
+					<view class="yblist w50"><text>预约时间</text>{{ite.visitTime}}</view>
+					<view class="yblist w50"><text>手机号码</text>{{ite.visitPhone}}</view>
+					<view class="yblist w50"><text>人 数</text>{{ite.visitNum}}</view>
+					<view class="yblist w50"><text>来访地点</text>{{kaType(ite.appointmentSite,adrlist)}}</view>
+					<view class="yblist w50"><text>来访事由</text>{{ite.visitReason}}</view>
+				</view>
+				<view class="ybtn">
+					<view class="ybtns btn1" @click.stop="getDelFn(ite.reservatId)">删除</view>
+					<view class="flex1"></view>
+					<block v-if="ite.visitType==1">
+						<view class="ybtns btn2" @click.stop="gettypeFn(2,ite.reservatId)">拒绝</view>
+						<view class="ybtns btn3" @click.stop="gettypeFn(3,ite.reservatId)">同意</view>
+					</block>
+					
+				</view>
+			</view>
+		</block>
+		<!-- 视频 -->
+		<block v-if="type=='video'">
 			<view class="ylist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.reservatId)">
 				<image :src="ysta" class="ystaimg" v-if="ite.visitType==3"></image>
 				<image :src="ystb" class="ystaimg" v-if="ite.visitType==2"></image>

manifest.json

@@ -18,7 +18,8 @@
             "delay" : 0
         },
         "modules" : {
-            "Geolocation" : {}
+            "Geolocation" : {},
+            "VideoPlayer" : {}
         },
         "distribute" : {
             "android" : {

pages.json

@@ -114,16 +114,16 @@
 	},
 	
   {
-    "path": "pages/work/index",
+    "path": "pages/video/index",
     "style": {
-      "navigationBarTitleText": "工作台"
+      "navigationBarTitleText": "视频",
+	   "navigationStyle": "custom"
     }
 	}, {
     "path": "pages/mine/index",
     "style": {
       "navigationBarTitleText": "我的",
-	  "navigationStyle": "custom",
-	  "enablePullDownRefresh":true
+	  "navigationStyle": "custom"
     }
   }, {
     "path": "pages/mine/avatar/index",

pages/index/index.vue

@@ -1,7 +1,6 @@
 <template>
-	<view class="yybox">
+	<view>
 		<view class="navbox">
-			<image :src="navbg" class="navbg"></image>
 			<uni-nav-bar  color="#ffffff" leftWidth='340rpx'  :background-color="backgroundColor" :border="false" statusBar='true' fixed="true">
 				<block slot="left">
 					<view class="navleft">
@@ -18,7 +17,8 @@
 			</uni-nav-bar>
 		</view>
 		<!-- 主体 -->
-		<view class="yymain">
+		<image :src="navbg" class="navbg"></image>
+		<view class="yymain" :style="'margin-top:-'+marTop+'rpx;'">
 			<view class="yycard">
 				<view class="top flexccc">
 					<image :src="headimg"></image>
@@ -51,12 +51,12 @@
 				</view>
 				<!-- 列表 -->
 				<view>
-					<y-list type='1' :datalist="list" :wtdt="wtdt" @getDetail='getDetail' :adrlist="adrlist" @getDelFn="getDelFn" @gettypeFn="gettypeFn"></y-list>
+					<y-list type='order' :datalist="list" :wtdt="wtdt" @getDetail='getDetail' :adrlist="adrlist" @getDelFn="getDelFn" @gettypeFn="gettypeFn"></y-list>
 				</view>
 			</view>
 		</view>
 	
-	<footers v-if="isfootflag" :footlist="footlist" :footerindex="footerindex" :color_checked="color_checked" :color_nochecked="color_nochecked" :isHomeIndex="true"></footers>
+	<footers v-if="isfootflag"  :footerindex="footerindex"></footers>
   </view>
 </template>
 
@@ -72,14 +72,8 @@
 	components:{yList,footers},
 	data(){
 		return{
-			footlist:[
-				{module:'home',title:'首页',icon_checked:require('@/static/images/tabbar/home_.png'),icon_nochecked:require('@/static/images/tabbar/home.png')},
-				{module:'mine',title:'我的',icon_checked:require('@/static/images/tabbar/mine_.png'),icon_nochecked:require('@/static/images/tabbar/mine.png')},
-				],
 			footerindex:'home',
 			isfootflag:true,
-			color_checked :'161616',
-			color_nochecked :'666666',
 			navbg:require("@/static/images/navbg.png"),
 			headimg:require("@/static/images/order/staff/head.png"),
 			listline:require("@/static/images/order/staff/listline.png"),
@@ -92,6 +86,9 @@
 			pageSize: 10,
 			pageNum: 1,
 			reachflag: false,
+			nvaHeight:44,
+			marTop:0,//距离顶部的距离
+			stubarHeight:0,//
 			wtdt:'',
 			daytime:'',
 			lunar:'',
@@ -107,6 +104,9 @@
 			this.backgroundColor = 'transparent'
 		}
 	},
+	onUnload() {
+		uni.$off('refreshdatalist')
+	},
 	onLoad: function() {
 		uni.$on('refreshdatalist',(e) => {
 			this.reachflag=false;
@@ -119,12 +119,18 @@
 		this.init()
 		// this.getcount()
 		this.getDataFn()
+		uni.getSystemInfo({
+			success: (e) => {
+				this.stubarHeight=Number(e.statusBarHeight);
+				this.nvaHeight = Number(e.statusBarHeight)+44;
+				this.marTop=692-Number(this.nvaHeight*2)-16;
+			}
+		})
 		
 	},
-	onUnload() {
-		uni.$off('refreshdatalist')
+	mounted() {
+		this.getHeightFn()
 	},
-
 	onShow() {
 		var that=this;
 		this.time();
@@ -154,6 +160,26 @@
 	},
 	methods:{
 		checkPermi, checkRole,
+		getHeightFn(){
+			let query = uni.createSelectorQuery().in(this);
+			//需要给黄色区域设置一个id标识，在这里是demo
+			query.select('.navbox').boundingClientRect(data => {
+				var top=data.top<0 ? -data.top : data.top;
+				var stubarHeight=Number(this.stubarHeight);
+				if (top <=this.nvaHeight) {
+					const opacity = top / 100 // 计算透明度值
+					const color = `rgba(4, 145, 253, ${opacity})`
+					this.backgroundColor = color // 更新盒子背景颜色
+				} else {
+					this.backgroundColor = '#00A9F0'
+				}
+				if(top>2){
+					this.scroflag=true
+				}else{
+					this.scroflag=false
+				}
+			}).exec();
+		},
 		init(){
 			// 记录来源
 			getDictionaryFn('jluly').then(res=>{
@@ -279,16 +305,16 @@
 </script>
 
 <style lang="scss" scoped>
-.navbox{
-	.navbg{width: 100%;height: 692rpx;position: fixed;left: 0;right: 0;top: 0;z-index: 1;}	
-}
+// .navbox{
+// 	.navbg{width: 100%;height: 692rpx;position: fixed;left: 0;right: 0;top: 0;z-index: 1;}	
+// }
+.navbox{position: fixed;left: 0;right: 0;top: 0;z-index: 4;	}
+.navbg{width: 100%;height: 692rpx;}	
 .navleft{padding-left: 12rpx;
 		view{font-weight: bold;font-size: 26rpx;color: #FFFFFF;line-height: 36rpx;}
 	}
 	.navright{width: 40rpx;height: 40rpx;}
-.yymain{
-	flex: 1;z-index: 2;padding-top: 20rpx;
-}
+.yymain{flex: 1;z-index: 2;position: relative;}
 .yycard{width: 684rpx;height: 306rpx;background: #FFFFFF;border-radius: 14rpx;margin: 0 auto;
 	.top{
 		image{width: 132rpx;height: 132rpx;margin-bottom: 12rpx;margin-top: -56rpx;}

pages/mine/index.vue

@@ -51,7 +51,7 @@
 			</view>
 		</view>
 	</view>
-	<footers v-if="isfootflag" :footlist="footlist" :footerindex="footerindex" :color_checked="color_checked" :color_nochecked="color_nochecked" :isHomeIndex="true"></footers>
+	<footers v-if="isfootflag" :footerindex="footerindex"></footers>
  </view>
 </template>
 
@@ -68,14 +68,8 @@
 	components:{footers},
     data() {
       return {
-		  footlist:[
-		  	{module:'home',title:'首页',icon_checked:require('@/static/images/tabbar/home_.png'),icon_nochecked:require('@/static/images/tabbar/home.png')},
-		  	{module:'mine',title:'我的',icon_checked:require('@/static/images/tabbar/mine_.png'),icon_nochecked:require('@/static/images/tabbar/mine.png')},
-		  	],
 		  footerindex:'mine',
 		  isfootflag:true,
-		  color_checked :'161616',
-		  color_nochecked :'666666',
 		  abg:require('@/static/images/mine/habg.png'),
 		  noticimg:require('@/static/images/mine/mnotic.png'),
 		  rimg:require('@/static/images/mine/rimg.png'),

pages/mine/pwd/forgetpwd.vue

@@ -81,10 +81,10 @@
 			that.$toast("请输入验证码")
 			return
 		}
-		if(this.code!=this.newcode){
-			that.$toast("验证码错误，请重新输入")
-			return
-		}
+		// if(this.code!=this.newcode){
+		// 	that.$toast("验证码错误，请重新输入")
+		// 	return
+		// }
 		let regphone = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
 		if (this.phonenumber && !regphone.test(this.phonenumber)) {
 			that.$toast("请输入正确的手机号")

pages/order/info.vue

@@ -85,14 +85,14 @@
 				that.$toast("请输入手机号")
 				return
 			}
-			if (!this.code ) {
+			if (!this.code) {
 				that.$toast("请输入验证码")
 				return
 			}
-			if(this.code!=this.newcode){
-				that.$toast("验证码错误，请重新输入")
-				return
-			}
+			// if(this.code!=this.newcode){
+			// 	that.$toast("验证码错误，请重新输入")
+			// 	return
+			// }
 			let regphone = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
 			if (this.phonenumber && !regphone.test(this.phonenumber)) {
 				that.$toast("请输入正确的手机号")

pages/order/search.vue

@@ -172,10 +172,10 @@
 			that.$toast("请输入验证码")
 			return
 		}
-		if(this.code!=this.newcode){
-			that.$toast("验证码错误，请重新输入")
-			return
-		}
+		// if(this.code!=this.newcode){
+		// 	that.$toast("验证码错误，请重新输入")
+		// 	return
+		// }
 		let regphone = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
 		if (this.phonenumber && !regphone.test(this.phonenumber)) {
 			that.$toast("请输入正确的手机号")

pages/work/index.vue

@@ -1,37 +0,0 @@
-<template>
-	<view class="zan">
-		<!-- <view @click="geta">保安</view>
-		<view @click="getb">被访者</view> -->
-		<view @click="getc">来访者</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		data(){
-			return{
-				
-			}
-		},
-		methods:{
-			geta(){
-				this.$tab.navigateTo('/pages/order/staff')
-			},
-			getb(){
-				this.$tab.navigateTo('/pages/order/notice')
-			},
-			getc(){
-				this.$tab.navigateTo('/pages/order/come')
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-.zan{
-	display: flex;align-items: center;
-	view{
-		font-size: 32rpx;padding: 0 20rpx;flex: 1;
-	}
-}
-</style>

static/scss/colorui.css

@@ -11,7 +11,7 @@
         main 初始化
  ==================== */
 body {
-	background-color: #f1f1f1;
+	background-color: #f6f6f6;
 	font-size: 28upx;
 	color: #333333;
 	font-family: Helvetica Neue, Helvetica, sans-serif;