页面搭建

user_ui/components/box/list.vue

@@ -71,6 +71,20 @@
 				<image :src="noiconpimg" class="hrimg"></image>
 			</view>
 		</block>
+		<!-- 推荐商品 -->
+		<view v-if="type=='goods'" class="goods flexcw">
+			<view class="goodslist" v-for="(ite,idx) in datainfo" :key="idx">
+				<image :src="noiconpimg" class="headimg"></image>
+				<view class="glist">
+					<view class="tit overtwo mb10">年货通用大米礼品包装盒新款五谷杂粮礼盒东北…</view>
+					<view class="numbox flexc">
+						<view class="num flex1"><text>¥</text>278</view>
+						<view class="txt flex0">已售2000+</view>
+					</view>
+				</view>
+				
+			</view>
+		</view>
 		<view class="shax" v-if="wtdt">{{wtdt}}</view>
 	</block>
 	
@@ -233,6 +247,21 @@
 	}
 	.hrimg{width: 210rpx;height: 138rpx;flex: 0 0 auto;margin-left: 36rpx;}
 }
+// 商品
+.goods{padding: 0 8rpx;align-items: stretch;
+	.goodslist{width: 334rpx;min-height: 472rpx;background: #FFFFFF;box-shadow: 0px 0px 18rpx 0px #DADADA;border-radius: 20rpx;border: 2rpx solid #DADADA;margin: 0 16rpx 20rpx;padding-bottom: 8rpx;box-sizing: border-box;
+		.headimg{height: 298rpx;width: 100%;margin-bottom: 18rpx;}
+		.glist{padding: 0 12rpx;}
+		.tit{font-weight: bold;font-size: 28rpx;color: #272727;}
+		.numbox{
+			.num{font-size: 40rpx;color: #FE5A0E;font-weight: bold;word-break: break-all;
+				text{font-size: 20rpx;}
+			}
+		}
+		.txt{font-weight: bold;font-size: 24rpx;color: #AAAAAA;}
+	}
+}
+
 // 无数据
 .nodata{display: flex;flex-direction: column;align-items: center;
 	image{width: 440rpx;height: 440rpx;}

user_ui/components/footer/footer.vue

@@ -32,7 +32,7 @@
 					// limit:'system:camera:video',
 					{module:'home',title:'首页',img:"imga",icon_checked:require('@/static/images/tabbar/home_.png'),icon_nochecked:require('@/static/images/tabbar/home.png')},
 					{module:'health',title:'康养',img:"imgb",icon_checked:require('@/static/images/tabbar/health_.png'),icon_nochecked:require('@/static/images/tabbar/health.png')},
-					{module:'store',title:'商圈',img:"imgc",icon_checked:require('@/static/images/tabbar/store_.png'),icon_nochecked:require('@/static/images/tabbar/store.png')},
+					{module:'goods',title:'商圈',img:"imgc",icon_checked:require('@/static/images/tabbar/store_.png'),icon_nochecked:require('@/static/images/tabbar/store.png')},
 					{module:'mine',title:'我的',img:"imgd",icon_checked:require('@/static/images/tabbar/mine_.png'),icon_nochecked:require('@/static/images/tabbar/mine.png')},
 					],
 				color_checked :'272727',
@@ -53,8 +53,8 @@
 					this.$tab.reLaunch('/pages/index/index')
 				}else if(module == 'health'){
 					this.$tab.reLaunch('/pages/health/index')
-				}else if(module == 'store'){
-					this.$tab.reLaunch('/pages/video/index')
+				}else if(module == 'goods'){
+					this.$tab.reLaunch('/pages/goods/index')
 				}else if(module == 'mine'){
 					this.$tab.reLaunch('/pages/mine/index')
 				}

user_ui/goods/components/box/list.vue

@@ -0,0 +1,181 @@
+<template>
+<view>
+	<!-- 第一种样式  人员管理-->
+	<block v-if="datainfo.length>0">
+		<!-- 人员管理 -->
+		<block v-if="type=='people'">
+			
+		</block>
+		<view class="shax">{{wtdt}}</view>
+	</block>
+	
+	<!-- 无数据 -->
+	<view class="nodata" v-else>
+		<image :src="noiconpimg"></image>
+		<view>
+			暂无数据
+		</view>
+	</view>
+</view>
+</template>
+
+<script>
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	import config from '@/config'
+	export default{
+		props:{
+			datainfo: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			wtdt:{
+				type:String,
+				default () {
+					return ''
+				}
+			},
+			type:{
+				type:String,
+				default () {
+					return 0
+				}
+			},
+			topval:{
+				type:String,
+				default () {
+					return ''
+				}
+			}
+		},
+		data(){
+			return{
+				noiconpimg:require("@/static/images/nodata.png"),
+				
+				
+				baseUrl:config.baseUrl,
+				delBtnWidth:66,//左滑默认宽度
+			}
+		},
+		mounted() {
+			
+		},
+		methods:{
+			checkPermi, checkRole,
+			getDetail(e){
+				this.$emit('getDetail',e)
+			},
+			getAddFn(e){
+				this.$emit('getAddFn',e)
+			},
+			getReadlist(e){
+				this.$emit('getReadlist',e)
+			},
+			getZhan(idx){
+				// var obj=JSON.parse(JSON.stringify(this.datainfo))[idx]
+				// obj.zhanflag=!obj.zhanflag;
+				// this.datainfo.splice(idx,1,obj);
+				this.datainfo[idx].zhanflag=!this.datainfo[idx].zhanflag
+			},
+			getPreview(idx,arr) {
+				var newArr=[];
+				arr.forEach(ite=>{
+					var ds=this.baseUrl+ite
+					newArr.push(ds)
+				})
+				uni.previewImage({
+					urls: newArr,
+					current:idx,
+					success: function(data) {},
+					fail: function(err) {}
+				});
+			},
+			//开始触摸滑动
+			drawStart(e) {
+				// console.log("开始触发");
+				var touch = e.touches[0];
+				this.startX = touch.clientX;
+			},
+			//触摸滑动
+			drawMove(e) {
+				// console.log("滑动");
+				for (var index in this.datainfo) {
+					// this.csListArrl[index].right=0
+					this.$set(this.datainfo[index],'right',0);
+				}
+				var idx=e.currentTarget.dataset.idx
+				var touch = e.touches[0];
+				var item = this.datainfo[idx];
+				var disX = this.startX - touch.clientX;
+				if (disX >= 20) {
+				        if (disX > this.delBtnWidth) {
+					    disX = this.delBtnWidth;
+				        }
+						// this.csListArrl[idx].right=disX
+				        this.$set(this.datainfo[idx],'right',disX);
+				} else {
+					// this.csListArrl[idx].right=0
+					this.$set(this.datainfo[idx],'right',0);
+				}
+			},
+			//触摸滑动结束
+			drawEnd(e) {
+				// console.log("滑动结束");
+				var idx=e.currentTarget.dataset.idx
+				var item = this.datainfo[idx];
+				if (item.right >= this.delBtnWidth / 2) {
+					// this.datainfo[idx].right=this.delBtnWidth
+					this.$set(this.datainfo[idx],'right',this.delBtnWidth);
+				} else {
+					this.datainfo[idx].right=0
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.flex{display: flex;}
+.flexc{display: flex;align-items: center;}
+.mb10{margin-bottom: 20rpx;}
+.carlist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;
+	.ctop{border-bottom: 2rpx solid #E5E5E5;padding: 24rpx 24rpx 22rpx;
+		.imgs{width: 40rpx;height: 42rpx;margin-right: 32rpx;}
+		.tit{font-size: 30rpx;color: #272727;font-weight: bold;margin-right: 20rpx;}
+		.txt{font-weight: 500;font-size: 26rpx;
+			&.ca{color: #3565ED;}
+			&.cb{color: #FE5A0E;}	
+			&.cc{color: #28C529;}	
+		}
+		.txta{font-weight: 500;font-size: 24rpx;color: #AAAAAA;}
+		.num{font-size: 24rpx;color: #AAAAAA;}
+	}
+	.plists{padding: 30rpx 24rpx 6rpx;
+		.plist{background: linear-gradient(-90deg, #F2F5FF 0%, #FBFDFF 100%);border-radius: 20rpx;border: 2rpx solid #E6E6E6;margin-bottom: 24rpx;padding: 18rpx 26rpx 4rpx;display: flex;
+		.head{width: 96rpx;height: 98rpx;margin-right: 32rpx;flex: 0 0 auto;margin-top: 36rpx;}
+		.ptit{font-weight: bold;font-size: 30rpx;color: #272727;display: flex;align-items: center;margin-bottom: 14rpx;}	
+		.ptxt{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 14rpx;min-width: 176rpx;}
+		}
+	}
+	.upimg{width: 26rpx;height: 22rpx;display: block;transform: rotate(180deg);transition: all 0.3s;margin: 0 auto 18rpx;
+		&.act{transform: rotate(0deg);}
+	}
+	.btn{height: 34rpx;border-radius: 18rpx;display: flex;align-items: center;justify-content: center;padding: 0 10rpx;font-size: 22rpx;margin-right: 24rpx;
+		&.btna{border: 2rpx solid #06C770;color: #06C770;}
+		&.btnb{border: 2rpx solid #3565ED;color: #3565ED;}
+		&.btnc{border: 2rpx solid #FE5A0E;color: #FE5A0E;}
+		&.btnbga{border: 1px solid #0156FE;color: #3565ED;background: #DFEAFF;height: 36rpx;}
+		&.btnbgb{border: 1px solid #C1C1C1;color: #666666;background: #F1F1F1;height: 36rpx;}
+		&.btnbgc{border: 1px solid #FE5A0E;color:#FE5A0E;background:#FFEEE6;height: 36rpx;}
+	}
+}
+
+
+
+// 无数据
+.nodata{display: flex;flex-direction: column;align-items: center;
+	image{width: 440rpx;height: 440rpx;}
+	view{font-size: 30rpx;color: #666666;font-weight: bold;}
+}
+</style>

user_ui/goods/components/popup/popup.vue

@@ -0,0 +1,85 @@
+<template>
+	<view>
+		<!-- 弹窗 -->
+		<view class="bgbox" @click="getClose" v-if="type"></view>
+		
+	</view>
+</template>
+
+<script>
+	import config from '@/config'
+	const baseUrl = config.baseUrl
+	import { getToken } from '@/utils/auth'
+	import {uploadmore} from '@/utils/common.js'
+	export default{
+		components:{},
+		props:{
+			type: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			finshtype:{
+				type: [String,Number],
+				default () {
+					return ''
+				}
+			}
+		},
+		data(){
+			return{
+				baseUrl:config.baseUrl,
+				closeimg:require("@/static/images/close.png"),
+				downimg:require("@/health/static/health/down.png"),
+				hicoa:require("@/health/static/health/hicoa.png"),
+			}
+		},
+		mounted() {
+			this.baseUrl=baseUrl
+		},
+		watch:{
+			type(val){
+				// this.filelist=[];
+				// this.shtext='';
+				// this.isty='2';
+				// this.phofile=[];
+			}
+		},
+		methods:{
+			bindDateChange(){
+				var val=e.detail.value;
+			},
+			getClose(){
+				this.$emit('getClose')
+			},
+			getSure(){
+				this.$emit('getSure')
+			},
+			getChose(val){
+				this.peoval=val
+			},
+			getPreviewImage(arr,idx){
+				var newArr=[];
+				arr.forEach(ite=>{
+					var ds=this.baseUrl+ite
+					newArr.push(ds)
+				})
+				uni.previewImage({
+					urls: newArr,
+					current:idx,
+					success: function(data) {
+						
+					},
+					fail: function(err) {
+						
+					}
+				});
+			},	
+		}
+	}
+</script>
+
+<style lang="scss" scoped>	
+.closeimg{width: 32rpx;height: 32rpx;position: absolute;bottom: -72rpx;left: 50%;margin-left: -16rpx;}
+</style>

user_ui/goods/pages/points/index.vue

@@ -0,0 +1,124 @@
+<template>
+  <view class="hdetail" :style="'padding-top:'+nvaHeight+'px;'">
+		<view class="navbox">
+			<uni-nav-bar  color="#ffffff" left-icon="left" title="积分商城"  :background-color="backgroundColor" :border="false" statusBar='true' fixed="true" @clickLeft="getBackFn">
+			</uni-nav-bar>
+			<!-- 家人 -->
+			<view class="headbox flexc" :style="'backgroundColor:'+backgroundColor">
+				<view class="htop" :class="tabval==idx?'act':''" v-for="(ite,idx) in list" :key="idx" @click="getTabFn(idx)">
+					<view class="img"><image :src="heada" class="imaga"></image></view>
+					<view class="tit">{{ite.tit}}</view>
+				</view>
+				<view class="htop"  @click="getAddFn">
+					<view class="img add"><image :src="addimg"></image></view>
+					
+				</view>
+				
+			</view>
+		</view>
+		<!-- 主体 -->
+		<view class="wymain" >
+			
+		</view>
+	<loading></loading>
+  </view>
+</template>
+
+<script>
+  export default {
+	components:{},
+	data(){
+		return{
+			nvaHeight:44,
+			// activeColor:'#A7CDF9',
+			// nactiveColor:'#DADADA',
+			backgroundColor: "transparent",
+			
+		}
+	},
+	watch:{
+		lookfalg(val){
+			if(val){
+				
+			}
+		}
+	},
+	onPageScroll(e) {
+		var scrollTop = Number(e.scrollTop);
+		if (scrollTop > 0) {
+			this.backgroundColor = '#48CC9A'
+		} else {
+			this.backgroundColor = 'transparent'
+		}
+	},
+    onLoad: function() {
+		uni.getSystemInfo({
+			success: (e) => {
+				this.nvaHeight = Number(e.statusBarHeight)+44;
+			}
+		})
+    },
+	methods:{	
+		getClose(){
+			this.type="";
+		},
+		getCodeFn(){
+			this.type='code'
+		},
+		getAddFn(){
+			this.$tab.navigateTo(`/health/pages/health/add`)
+		},
+		getZhanFn(idx){
+			this.zhanList[idx].zhanflag=!this.zhanList[idx].zhanflag
+		},
+		getBackFn(){
+			uni.navigateBack({
+				delta:1
+			})
+		},
+		getCode(code){
+			var idCard='123456789'
+			const firstPart = idCard.slice(0, 1);  
+			  // 生成中间8位的星号  
+			  const middlePart = '*'.repeat(idCard.length-2);  
+			  // 获取后4位  
+			  const lastPart = idCard.slice(idCard.length-1); 
+			  var s= firstPart + middlePart + lastPart;
+			  console.log(s)
+			  // return firstPart + middlePart + lastPart;
+		},
+		getTabFn(val){
+			this.tabval=val;
+		},
+		getDataFn(){
+			var params={
+				pageSize:this.pageSize,
+				pageNum: this.pageNum,
+			}
+			params.noticeType=this.tabidx
+			getNoticeList(params).then(res=>{
+				if(res.code==200){
+					
+				}else{
+					this.$toast(res.msg)
+				}
+			})
+			
+		},
+		
+	}
+  }
+</script>
+<style>
+	page{background:#F4F6F8;}
+</style>
+<style lang="scss" scoped>
+.w100{width: 100%;}
+.hdetail{
+	background: linear-gradient(180deg, #FFB132 0%, #FE5A0E 49%, #FFFFFF 100%) no-repeat;background-size: 100% 722rpx;min-height: 100vh;box-sizing: border-box;
+}
+
+.navbox{position: fixed;left: 0;right: 0;top: 0;z-index: 4;	}
+.wymain{z-index: 2;position: relative;padding: 0 24rpx 24rpx;}
+
+</style>

user_ui/health/components/popup/popup.vue

@@ -4,13 +4,13 @@
 		<view class="bgbox" @click="getClose" v-if="type"></view>
 		<!-- 健康码 -->
 		<view v-if="type=='code'" class="codebox">
-			<view>健康码</view>
-			<image :src="closeimg"></image>
-			<view>
+			<view class="tit mb18">健康码</view>
+			<image :src="hicoa" class="code"></image>
+			<view class="codebtns flexcc">
 				<image :src="downimg"></image>
 				保存健康码至手机
 			</view>
-			<image :src="closeimg"></image>
+			<image :src="closeimg" class="closeimg" @click="getClose"></image>
 		</view>
 	</view>
 </template>
@@ -40,20 +40,8 @@
 			return{
 				baseUrl:config.baseUrl,
 				closeimg:require("@/static/images/close.png"),
-				downimg:require("@/health/static/images/close.png"),
-				syqxidx:'',
-				datainfo:{
-					iszc:""
-				},
-				sexs: [{
-					text: '男',
-					value: 0
-				}, {
-					text: '女',
-					value: 1
-				}],
-				peoval:0,
-				peolist:[{name:'王安安',val:"0",type:0},{name:'刘柠溪',val:"1",type:1},{name:'王合一',val:"2",type:0},]
+				downimg:require("@/health/static/health/down.png"),
+				hicoa:require("@/health/static/health/hicoa.png"),
 			}
 		},
 		mounted() {
@@ -103,9 +91,14 @@
 
 <style lang="scss" scoped>	
 // 指派
-.codebox{width: 470rpx;height: 620rpx;background: #FFFFFF;border-radius: 20rpx;
-	padding: 44rpx 36rpx;position: fixed;left:140rpx;top: 40%;transform: translateY(-235rpx);
-
+.codebox{width: 470rpx;height: 620rpx;background: #FFFFFF;border-radius: 20rpx;padding: 30rpx 36rpx 44rpx;position: fixed;left:140rpx;top: 40%;transform: translateY(-235rpx);z-index: 10;box-sizing: border-box;
+	.tit{font-weight: bold;font-size: 30rpx;color: #272727;text-align: center;}
+	.code{width: 334rpx;height:334rpx;margin: 0 auto 56rpx;}
+	.codebtns{height: 78rpx;background: #318E6B;border-radius: 20rpx;font-weight: 500;
+font-size: 26rpx;
+color: #FFFFFF;
+		image{width: 22rpx;height: 22rpx;margin-right: 14rpx;}
+	}
 }
-.closeimg{width: 32rpx;height: 32rpx;position: absolute;bottom: -62rpx;left: 50%;margin-left: -16rpx;}
+.closeimg{width: 32rpx;height: 32rpx;position: absolute;bottom: -72rpx;left: 50%;margin-left: -16rpx;}
 </style>

user_ui/health/pages/health/add.vue

@@ -0,0 +1,295 @@
+<template>
+	<view class="check" :style="'padding-top:'+nvaHeight+'px;'">
+		<view class="navbox">
+			<uni-nav-bar  color="#ffffff" left-icon="left" title="健康档案"  :background-color="backgroundColor" :border="false" statusBar='true' fixed="true" @clickLeft="getBackFn">
+			</uni-nav-bar>
+		</view>
+		<uni-forms ref="form" :model="datainfo">
+			<view class="cbox">
+				<view class="chmain">
+					<view class="plr6">
+						<view class="rztit">请上传身份证照片</view>
+						<view class="flexcj mb10">
+							<view class="carbox" @click="getaddImage('front')">
+								<image :src="baseUrl+datainfo.front" class="img" v-if="datainfo.front"></image>
+								<image :src="cardz" class="img" v-else></image>
+								<view class="tit">拍摄人像面</view>
+								<!-- <view class="tit">身份证正面</view> -->
+							</view>
+							<view class="carbox" @click="getaddImage('back')">
+								<image :src="baseUrl+datainfo.back" class="img" v-if="datainfo.back"></image>
+								<image :src="cardf" class="img" v-else></image>
+								<view class="tit">拍摄国徽面</view>
+								<!-- <view class="tit">身份证反面</view> -->
+							</view>
+						</view>
+						<view class="mb4">
+							<view class="cardtip">身份信息会根据上传的证件照片自动识别，支持手动输入。</view>
+							<view class="cardtip">如果识别错误，可尝试再次拍照。</view>
+						</view>
+					</view>
+					<uni-forms-item label="身份证号" required name="phonenumber">
+						<view class="flexc">
+							<uni-easyinput disabled v-model="datainfo.phonenumber"  :inputBorder='false' placeholder="自动识别" />
+						</view>
+					</uni-forms-item>
+					<uni-forms-item label="姓名" required name="phonenumber">
+						<view class="flexc">
+							<uni-easyinput disabled v-model="datainfo.phonenumber"  :inputBorder='false' placeholder="自动识别" />
+						</view>
+					</uni-forms-item>
+					<uni-forms-item label="性别" required name="phonenumber">
+						<view class="flexc">
+							<uni-easyinput disabled v-model="datainfo.phonenumber"  :inputBorder='false' placeholder="自动识别" />
+						</view>
+					</uni-forms-item>
+					<uni-forms-item label="家庭地址" required name="phonenumber">
+						<view class="flexc">
+							<uni-easyinput disabled  v-model="datainfo.phonenumber"  :inputBorder='false' placeholder="自动识别" />
+						</view>
+					</uni-forms-item>
+					<picker range-key='text' :value="syqxidx" :range="sexs"   @change='bindDateChange'>
+						<uni-forms-item label="与户主关系" required name="phonenumber">
+							<view class="flexc ml10">
+								<view class="flex1 txr f13" :class="datainfo.iszc?'co27':'coa'">{{datainfo.iszc?'是':'选择与户主关系'}}</view>
+							</view>
+						</uni-forms-item>
+					</picker>
+					<picker range-key='text' :value="syqxidx" :range="sexs"   @change='bindDateChange'>
+						<uni-forms-item label="是否党员" required name="phonenumber">
+							<view class="flexc ml10">
+								<view class="flex1 txr f13" :class="datainfo.iszc?'co27':'coa'">{{datainfo.iszc?'是':'请选择是/否'}}</view>
+							</view>
+						</uni-forms-item>
+					</picker>
+					<picker range-key='text' :value="syqxidx" :range="sexs"   @change='bindDateChange'>
+						<uni-forms-item label="特殊类型" name="phonenumber">
+							<view class="flexc ml10">
+								<view class="flex1 txr f13" :class="datainfo.iszc?'co27':'coa'">{{datainfo.iszc?'是':'如有五保户等特殊类型，请选择'}}</view>
+							</view>
+						</uni-forms-item>
+					</picker>
+					<uni-forms-item label="兴趣爱好" name="phonenumber">
+						<view class="flexc ml10">
+							<uni-easyinput type="textarea" autoHeight v-model="text" :inputBorder='false' placeholder="请输入兴趣爱好" />
+						</view>
+					</uni-forms-item>
+					
+					<uni-forms-item label="上传头像" name="phonenumber">			
+						<view class="flexe mt10">
+							<view class="addimgs">
+								<view class="assimg">
+									<image :src="aphoto" class="img"></image>
+									<image :src="rdelimg" class="delimg" @click="getDelFn"></image>
+								</view>
+							</view>
+							<view class="addbox">
+								<image :src="aphoto"></image>
+								<view>添加头图</view>
+							</view>
+						</view>	
+					</uni-forms-item>
+				</view>
+				<view class="rhbtn mt30 bga" @click="getNext">提交</view>
+			</view>
+		</uni-forms>
+		
+
+		<loading></loading>
+	</view>
+</template>
+
+<script>
+	import config from '@/config'
+	import {
+		checkPermi,
+		checkRole
+	} from "@/utils/permission"; // 权限判断函数
+	import {
+		uploadIdentify
+	} from '@/utils/common.js'
+	export default {
+		components: {},
+		data() {
+			return {
+				cardz:require('@/health/static/health/cardz.png'),
+				cardf:require('@/health/static/health/cardf.png'),
+				aphoto: require('@/work/static/service/photo.png'),
+				rdelimg: require('@/work/static/service/rdel.png'),
+				baseUrl: config.baseUrl,
+				checkflag:true,
+				nvaHeight:44,
+				backgroundColor: "transparent",
+				datainfo: {
+					sex:0,
+					realName: '',
+					idCard: '',
+					address: '',
+					expirationDate: '',
+					phonenumber: '',
+					front: '',
+					back: '',
+				},
+				syqxidx:'',
+				sexs: [{
+					text: '男',
+					value: 0
+				}, {
+					text: '女',
+					value: 1
+				}],
+			}
+		},
+		onLoad: function() {
+			uni.getSystemInfo({
+				success: (e) => {
+					this.nvaHeight = Number(e.statusBarHeight)+44;
+				}
+			})
+		},
+		onPageScroll(e) {
+			var scrollTop = Number(e.scrollTop);
+			if (scrollTop > 0) {
+				this.backgroundColor = '#48CC9A'
+			} else {
+				this.backgroundColor = 'transparent'
+			}
+		},
+		methods: {
+			checkPermi,
+			checkRole,
+			getBackFn(){
+				uni.navigateBack({
+					delta:1
+				})
+			},
+			bindDateChange(e){
+				var val=e.detail.value;
+				// this.datainfo.applicationBank=this.sdyhlist[val].value;
+				// this.applicationBank=this.sdyhlist[val].label;
+			},
+			getaddImage(e) {
+				let that = this;
+				// var rs=['D:\\idcard.png']
+				// if(rs&&rs.length>0){
+				// 	var obj={
+				// 		type:e,
+				// 		// url:baseUrl+rs.join(',')
+				// 		url:rs.join(',')
+				// 	}
+				// 	that.getOcrIdCard(obj)
+				// }
+				// return
+				let file = [],
+					count = 9
+				uni.chooseImage({
+					count: 1,
+					success: function(res) {
+						let img = res.tempFilePaths;
+						if (img.length + file.length > count) {
+							uni.showToast({
+								title: '最多上传' + count + '张图片',
+								icon: 'none',
+								duration: 2000
+							})
+						} else {
+							let imglen = res.tempFilePaths.length;
+							var fuwufile = [];
+							uploadIdentify('/common/upload', img, 0, 0, 0, imglen, fuwufile, function(rs) {
+								var resurl = rs[0];
+								if (e == 'front') {
+									that.datainfo.front = resurl.fileName;
+								} else {
+									that.datainfo.back = resurl.fileName;
+								}
+								if (rs && rs.length > 0) {
+									var obj = {
+										type: e,
+										url: resurl.urlOnline
+									}
+									that.getOcrIdCard(obj)
+								}
+							})
+						}
+					}
+				});
+			},
+			getOcrIdCard(obj) {
+				var params = {
+					image: obj.url,
+					idCardSide: obj.type
+				}
+				getOcrIdCard(params).then(res => {
+					if (res.code == 200) {
+						var datainfo = res.data;
+						if (obj.type == 'front') {
+							this.datainfo.realName = datainfo.realName;
+							this.datainfo.idCard = datainfo.idCard;
+							this.datainfo.address = datainfo.address;
+						} else {
+							this.datainfo.expirationDate = datainfo.expirationDate
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+<style>
+	page{background: #F3F3F0;}
+</style>
+<style lang="scss" scoped>
+	.bga{background-color: #46CB99;}
+.check /deep/ .uni-forms-item{min-height: 106rpx;box-sizing: border-box;display: flex;align-items: center;margin-bottom: 0;border-bottom: 2rpx solid #E6E6E6;padding:10rpx 0;}
+.check .cbox /deep/ .uni-forms-item:last-child{border: none;}
+.check /deep/ .uni-forms-item__label{font-weight: bold;font-size: 26rpx;color: #222327;flex: 0 0 auto;width: auto !important;}
+.check /deep/ .uni-easyinput{flex: 1;text-align: right;font-size: 26rpx;color: #222327;}
+.check /deep/ .uni-easyinput__content-textarea{min-height: 40rpx;font-size: 26rpx;}
+.check /deep/ .uni-easyinput__placeholder-class{font-size: 26rpx;color: #AAAAAA;}
+.check /deep/ .uni-input-input{font-size: 26rpx;}
+.check /deep/ .uni-textarea-textarea{font-size: 26rpx;}
+.check /deep/ .is-disabled{color: #222327;background-color: #ffffff !important;}
+.check /deep/ .uni-data-checklist .checklist-group .checklist-box{margin:10rpx 8rpx 10rpx 16rpx;}
+.check /deep/ .uni-data-checklist{flex: 0 0 auto;}
+.check /deep/ .is-required{font-size: 26rpx;color: #F40027;margin-right: 4rpx;}
+.check{background: linear-gradient(180deg, #45CB99 0%, rgba(238,227,197,0) 100%) no-repeat;background-size: 100% 782rpx;min-height: 100vh;box-sizing: border-box;padding: 0 18rpx 22rpx;}
+.cbox{background: #FFFFFF;border-radius: 20rpx;flex: 1;padding: 30rpx 24rpx 46rpx;
+	.chmain{
+		padding: 0 8rpx;
+		.upbox{height: 224rpx;background: #EFF4FF;border-radius: 20rpx;display: flex;align-items: center;justify-content: center;flex-direction: column;margin-bottom: 8rpx;overflow: auto;
+			.img{width: 100%;height: 100%;}
+			.addimg{width: 70rpx;height: 70rpx;margin-bottom: 16rpx;}
+			view{font-weight: bold;font-size: 26rpx;color: #4C6686;}
+		}
+		.rimg{width: 16rpx;height: 28rpx;flex: 0 0 auto;margin-left: 20rpx;
+			image{width: 100%;height: 100%;}
+		}
+		.checkimg{width: 80rpx;height: 40rpx;margin-right: 8rpx;}
+		.aphoto{padding: 0 24rpx;border-left: 2rpx solid #e6e6e6;margin-left: 26rpx;
+			image{width: 40rpx;height: 38rpx;}
+		}
+	}
+	
+}
+.navbox{position: fixed;left: 0;right: 0;top: 0;z-index: 4;	}
+.rztit{font-weight: bold;font-size: 30rpx;color: #222327;margin-bottom: 30rpx;}
+	.carbox{width: 300rpx;border-radius: 14rpx;overflow: hidden;
+		.img{width: 300rpx;height: 208rpx;}
+		.tit{width: 100%;height: 56rpx;background: #7CC2A8;text-align: center;font-weight: 500;
+font-size: 26rpx;line-height: 56rpx;
+color: #FFFFFF;}
+	}
+	.cardtip{font-weight: 500;font-size: 24rpx;color: #999999;line-height: 40rpx;}
+.addimgs{display: flex;align-items: center;flex-wrap: wrap;justify-content: flex-end;
+	
+	.assimg{width: 128rpx;height: 128rpx;position: relative;overflow: hidden;margin: 0 0 20rpx 24rpx;
+		.img{width: 100%;height: 100%;}
+		.delimg{width: 24rpx;height: 24rpx;position: absolute;right: 0;top: 0;}
+	}
+}
+.addbox{width: 160rpx;height: 128rpx;background: #F0F0F0;border-radius: 20rpx;display: flex;flex-direction: column;align-items: center;justify-content: center;margin-left: 24rpx;margin-bottom: 20rpx;flex: 0 0 auto;
+		image{width: 48rpx;height: 42rpx;margin-bottom: 12rpx;}
+		view{font-weight: 500;font-size: 24rpx;color: #666666;}
+	}
+.tips{font-weight: bold;color: #272727;font-size: 26rpx;margin-left: 8rpx;}
+</style>

user_ui/health/pages/health/detail.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="hdetail" :style="'padding-top:'+nvaHeight+'px;'">
 		<view class="navbox">
-			<uni-nav-bar  color="#ffffff" title="健康档案"  :background-color="backgroundColor" :border="false" statusBar='true' fixed="true" @clickLeft="getBackFn">
+			<uni-nav-bar  color="#ffffff" left-icon="left" title="健康档案"  :background-color="backgroundColor" :border="false" statusBar='true' fixed="true" @clickLeft="getBackFn">
 			</uni-nav-bar>
 			<!-- 家人 -->
 			<view class="headbox flexc" :style="'backgroundColor:'+backgroundColor">
@@ -187,6 +187,7 @@
 			tabval:0,
 			cartit:'378554199010206016',
 			carpass:'3********6',
+			type:'',
 			list:[{tit:'户主'},{tit:'丈夫'},{tit:'儿子'},{tit:'女儿'},{tit:'婆婆'},{tit:'公公'},],
 			datainfo:{
 				
@@ -223,6 +224,9 @@
 		getCodeFn(){
 			this.type='code'
 		},
+		getAddFn(){
+			this.$tab.navigateTo(`/health/pages/health/add`)
+		},
 		getZhanFn(idx){
 			this.zhanList[idx].zhanflag=!this.zhanList[idx].zhanflag
 		},

user_ui/pages.json

@@ -15,6 +15,13 @@
 	    }
 	  },
 	  {
+	    "path": "pages/goods/index",
+	    "style": {
+	      "navigationBarTitleText": "商圈",
+	      "navigationStyle": "custom"
+	    }
+	  },
+	  {
     "path": "pages/login",
     "style": {
       "navigationBarTitleText": "登录",
@@ -45,7 +52,8 @@
  {
     "path": "pages/mine/index",
     "style": {
-      "navigationBarTitleText": "我的"
+      "navigationBarTitleText": "我的",
+	  "navigationStyle": "custom"
     }
   }, {
     "path": "pages/mine/avatar/index",
@@ -103,6 +111,14 @@
 			"navigationStyle": "custom",
 			"h5":{"titleNView":false}
 		  }
+		},
+		{
+		  "path": "pages/health/add",
+		  "style": {
+		    "navigationBarTitleText": "添加档案",
+			"navigationStyle": "custom",
+			"h5":{"titleNView":false}
+		  }
 		}
 	  ]
 	  },
@@ -123,7 +139,16 @@
 				"navigationStyle": "custom",
 				"h5":{"titleNView":false}
 			  }
-			},{
+			},
+			{
+			  "path": "pages/clean/list",
+			  "style": {
+			    "navigationBarTitleText": "家政订单",
+				"navigationStyle": "custom",
+				"h5":{"titleNView":false}
+			  }
+			},
+			{
 			  "path": "pages/service/warranty",
 			  "style": {
 			    "navigationBarTitleText": "物业报修",
@@ -307,6 +332,18 @@
 			}
 			
 		]
+	},
+	{
+		"root": "goods",
+		"pages": [
+			{
+			   "path": "pages/points/index",
+			   "style": {
+			     "navigationBarTitleText": "积分商城",
+				  "navigationStyle": "custom"
+			   }
+			 }
+		]
 	}
   ],
   "preloadRule":{

user_ui/pages/goods/index.vue

@@ -0,0 +1,195 @@
+<template>
+  <view class="home" :style="'padding-top:'+nvaHeight+'px;'">
+		<view class="navbox" :style="'backgroundColor:'+backgroundColor">
+			<uni-nav-bar  color="#272727" title="商圈"  :background-color="backgroundColor" :border="false" statusBar='true' fixed="true">
+			</uni-nav-bar>
+			<view class="flexc plr12 mt10 mb10">
+				<view class="topl flexc">
+					<image :src="adrimg" ></image>
+					<view class="over">{{city}}</view>
+				</view>
+				<view class="search flexc">
+					<image :src="search"></image>
+					<!-- confirm-type="search" @confirm="getConfirm" -->
+					<input placeholder="请输入商品名称进行搜索"  v-model="text"/>
+					<view class="btn" @click="getConfirm">搜索</view>
+				</view>
+			</view>
+		</view>
+		<!-- 主体 -->
+		<view class="wymain mt10">
+			
+			<!-- 轮播图 circular-->
+			<swiper  class="swiper mb12" circular :indicator-color="incolorh" :indicator-active-color="activecolorh" :indicator-dots="indicatorDotsh" :autoplay="autoplayh">
+				<!-- v-if="checkPermi(['system:application:list'])" -->
+				<swiper-item>
+					<image :src="banner" class="bannerimg"></image>
+				</swiper-item>
+			</swiper>
+			<view class="grid mb18">
+				<view class="grid-item-box" @click="getHouseFn" >
+					<view class="img"><image :src="gtaba" class="imga"></image></view>
+					<view>积分商城</view>
+				</view>
+				<view class="grid-item-box" @click="getCarFn" >
+					<view class="img"><image :src="gtabb" class="imga"></image></view>
+					<view>每日签到</view>
+				</view>
+				<view class="grid-item-box" @click="getBusListFn(1)" >
+					<view class="img"><image :src="gtabc" class="imga"></image></view>
+					<view>领券中心</view>
+				</view>
+				<view class="grid-item-box" @click="getBusListFn(1)" >
+					<view class="img"><image :src="gtabd" class="imga"></image></view>
+					<view>精选商品</view>
+				</view>
+			</view>
+		</view>
+		<!-- 今日优惠 -->
+		<view class="hlist">
+			<view class="hlista flexc mb12 ">
+				<view class="line" ></view>
+				<view class="tit flex1">今日优惠</view>
+				<view class="more flex0 flexc">更多<image :src="more"></image></view>
+			</view>
+		</view>
+		<view class="mb20">
+			<box-list type='coupon' :datainfo="list"></box-list>	
+		</view>
+		<!-- 推荐商品 -->
+		<view class="hlist">
+			<view class="hlista flexc mb15 ">
+				<view class="line" ></view>
+				<view class="tit flex1">推荐商品</view>
+				<view class="more flex0 flexc" @click="getMoreFn">更多<image :src="more"></image></view>
+			</view>
+		</view>
+		<view class="mb4">
+			<box-list type='goods' :datainfo="list"></box-list>	
+		</view>
+
+	<loading></loading>
+	<pop-up :type="type" @getClose="getClose"></pop-up>
+	 <footers v-if="isfootflag"  :footerindex="footerindex"></footers>
+  </view>
+</template>
+
+<script>
+import footers from '@/components/footer/footer.vue'
+import notice from '@/components/swiper/notice.vue'
+import boxList from "@/components/box/list.vue"
+import popUp from "@/components/box/popup.vue"
+  export default {
+	components:{footers,notice,boxList,popUp},
+	data(){
+		return{
+			footerindex:'goods',
+			isfootflag:true,
+			nvaHeight:96,
+			activeColor:'#A7A7A7',
+			nactiveColor:'#E6E6E6',
+			text:'',
+			backgroundColor: "transparent",
+			adrimg:require("@/static/images/goods/adr.png"),
+			search:require('@/static/images/goods/search.png'),
+			banner:require('@/static/images/goods/banner.png'),
+			gtaba:require("@/static/images/goods/gtaba.png"),
+			gtabb:require("@/static/images/goods/gtabb.png"),
+			gtabc:require("@/static/images/goods/gtabc.png"),
+			gtabd:require("@/static/images/goods/gtabd.png"),
+			more:require("@/static/images/home/more.png"),
+			type:'',//wygj
+			wtdt:"加载更多",
+			autoplay:false,
+			autoplayh:false,
+			incolorh:'#E6E6E6',
+			activecolorh:'#A7A7A7',
+			indicatorDotsh: false,
+			city:'幸福大街',
+			list:[{tit:'123'},{tit:'123'},{tit:'123'}],
+			tabval:0,
+			tablist:[{tit:'本地资讯',val:"0"},{tit:'供求资讯',val:"1"},{tit:'热门资讯',val:"2"}],
+			noticelist:[{noticeTitle:"您有1条报修信息，请及时查看处理！",num:'11-14'},{noticeTitle:"您有1条报修信息，请及时查看处理！",num:'11-14'}]
+		}
+	},
+	onPageScroll(e) {
+		var scrollTop = Number(e.scrollTop);
+		if (scrollTop > 0) {
+			this.backgroundColor = '#FFF7E1'
+		} else {
+			this.backgroundColor = 'transparent'
+		}
+	},
+    onLoad: function() {
+		uni.getSystemInfo({
+			success: (e) => {
+				this.nvaHeight = Number(e.statusBarHeight)+96;
+			}
+		})
+    },
+	methods:{
+		getClose(){
+			this.type=''
+		},
+		getNoticeDet(){
+			
+		},
+		getZhanFn(){
+			this.zhanflag=!this.zhanflag
+		},
+		getMoreFn(){//积分商城
+			this.$tab.navigateTo(`/goods/pages/points/index`) 
+		},
+	}
+  }
+</script>
+<style lang="scss" scoped>
+.home{min-height: 100vh;background: linear-gradient(180deg, #FFF6E1 0%, rgba(214,164,164,0) 100%) no-repeat;background-size: 100% 614rpx;}
+.navbox{position: fixed;left: 0;right: 0;top: 0;z-index: 4;	}
+.navbg{width: 100%;height: 782rpx;}
+.wymain{z-index: 2;position: relative;padding: 0 24rpx;}
+
+.topl{overflow: hidden;padding-left: 2rpx;max-width: 240rpx;
+	image{width: 18rpx;height: 22rpx;margin-right: 14rpx;flex: 0 0 auto;}
+	view{font-weight: bold;font-size: 26rpx;color: #272727;}
+}
+.search{flex: 1;margin-left: 16rpx;height: 64rpx;background: #FFFFFF;border-radius: 32rpx;border: 2rpx solid #FE5A0E;padding-left: 24rpx;box-sizing: border-box;
+	image{width: 32rpx;height: 34rpx;margin-right: 22rpx;flex: 0 0 auto;}
+	input{flex: 1;font-size: 26rpx;color: #272727;}
+	.btn{width: 100rpx;height: 64rpx;background: #FE5A0E;border-radius: 32rpx;flex: 0 0 auto;font-weight: bold;text-align: center;line-height: 64rpx;font-size: 26rpx;color: #FFFFFF;}
+}
+.swiper{
+	width: 100%;height: 314rpx;
+	image{width: 100%;height: 314rpx;}
+}
+.line{width: 14rpx;height: 48rpx;background: #FE5A0E;border-radius:0 12rpx 12rpx 0;margin-right: 18rpx;}
+// tab栏
+.grid{
+	display: flex;align-items: center;flex-wrap: wrap;
+	.grid-item-box {display: flex;flex-direction: column;align-items: center;width: 25%;box-sizing: border-box;
+		.img{width: 108rpx;height: 108rpx;display: flex;align-items: center;justify-content: center;
+			.imga{width: 108rpx;height: 108rpx;}
+		}
+		view{font-weight: bold;font-size: 26rpx;color: #272727;position: relative;}
+	}
+}
+
+.hlist{
+	.hlista{padding: 8rpx 0;
+		.limg{width: 32rpx;height: 32rpx;margin-right: 18rpx;}
+		.tit{font-weight: bold;font-size: 30rpx;color: #272727;}
+		.more{font-weight: 500;font-size: 24rpx;color: #AAAAAA;
+			image{width: 18rpx;height: 16rpx;margin-left: 16rpx;}
+		}
+		.htabs{flex: 1;overflow: auto;padding: 10rpx 0;
+			view{font-weight: 500;font-size: 28rpx;color: #666666;position: relative;height: 56rpx;line-height: 56rpx;margin-right: 48rpx;flex: 0 0 auto;
+			&.act{font-size: 15px;font-weight: bold;color: #272727;
+				&:after{width: 36rpx;height: 10rpx;background: linear-gradient(150deg, rgba(177,240,216,0.97), rgba(3,218,138,0.97));border-radius: 6rpx;content: '';position: absolute;bottom: -10rpx;left: 50%;margin-left: -18rpx;}
+			}
+			}
+		}
+	}
+	
+}
+
+</style>

user_ui/pages/mine/index.vue

@@ -1,308 +1,436 @@
 <template>
-  <view class="mine-container" :style="{height: `${windowHeight}px`}">
-    <!--顶部个人信息栏-->
-    <view class="header-section">
-      <view class="flex padding justify-between">
-        <view class="flex align-center">
-          <view v-if="!avatar" class="cu-avatar xl round bg-white">
-            <view class="iconfont icon-people text-gray icon"></view>
-          </view>
-          <image v-if="avatar" @click="handleToAvatar" :src="avatar" class="cu-avatar xl round" mode="widthFix">
-          </image>
-          <view v-if="!name" @click="handleToLogin" class="login-tip">
-            点击登录
-          </view>
-          <view v-if="name" @click="handleToInfo" class="user-info">
-            <view class="u_title">
-              用户名：{{ name }}
-            </view>
-          </view>
-        </view>
-        <view @click="handleToInfo" class="flex align-center">
-          <text>个人信息</text>
-          <view class="iconfont icon-right"></view>
-        </view>
-      </view>
-    </view>
-
-    <view class="content-section">
-      <view class="mine-actions grid col-4 text-center">
-        <view class="action-item" @click="handleJiaoLiuQun">
-          <view class="iconfont icon-friendfill text-pink icon"></view>
-          <text class="text">交流群</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-service text-blue icon"></view>
-          <text class="text">在线客服</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-community text-mauve icon"></view>
-          <text class="text">反馈社区</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-dianzan text-green icon"></view>
-          <text class="text">点赞我们</text>
-        </view>
-      </view>
-
-      <view class="menu-list">
-        <view class="list-cell list-cell-arrow" @click="handleToEditInfo">
-          <view class="menu-item-box">
-            <view class="iconfont icon-user menu-icon"></view>
-            <view>编辑资料</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow" @click="handleHelp">
-          <view class="menu-item-box">
-            <view class="iconfont icon-help menu-icon"></view>
-            <view>常见问题</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow" @click="handleAbout">
-          <view class="menu-item-box">
-            <view class="iconfont icon-aixin menu-icon"></view>
-            <view>关于我们</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow" @click="handleToSetting">
-          <view class="menu-item-box">
-            <view class="iconfont icon-setting menu-icon"></view>
-            <view>应用设置</view>
-          </view>
-        </view>
-		<!-- #ifdef APP-PLUS -->
-		
-		<!-- #endif -->
-		<view class="list-cell list-cell-arrow" @click="onlineWgt">
-		  <view class="menu-item-box">
-		    <view class="iconfont icon-setting menu-icon"></view>
-		    <view>版本号{{wgtcode}}</view>
-		  </view>
+	<view class="zxbox">
+		<view class="navbox">
+			<uni-nav-bar color="#ffffff"  :background-color="backgroundColor" :border="false"
+				statusBar='true' fixed="true">
+			</uni-nav-bar>
 		</view>
-      </view>
+		<image :src="bgimg" class="navbg"></image>
+		<view class="mbox">
+			<view class="infobox flexc" @click="handleToInfo">
+				<image  @click.stop="handleToAvatar" :src="avatarimg" class="limg" mode="aspectFill"></image>
+				<view class="cbox">
+					<view class="tit flexc">{{name?name:'登录账号'}}
+					
+						<view class="deptbox">
+							<image :src="wyimg"></image>
+							<view>业主</view>
+						</view>
+					</view>
+					<!-- <view class="txt">点击详情 享受更多精彩信息</view> -->
+					<view class="txt">幸福小区12#1101</view>
+					<!-- <view class="flexc pr" v-if="deptName">
+						<image :src="headl"></image>
+							<view class="txt">{{deptName}}点击登录 享受更多精彩信息</view>
+						<image :src="headr"></image>
+					</view> -->
+				</view>
+				<image :src="wrimg" class="wrimg"></image>
+				<!-- 登录 -->
+			<!-- 	<image v-if="avatar" @click.stop="handleToAvatar" :src="avatar" class="limg" mode="aspectFill"></image>
+				<image v-else @click.stop="handleToAvatar" :src="avatarimg" class="limg" mode="aspectFill"></image> -->
+				<!-- 未登录 -->
+				
+			</view>
+			<view class="conts flexc">
+				<view class="contn" v-if="checkPermi([''])" @click="handleToYy">
+					<view class="img">
+						<image :src="listimga" class="imga"></image>
+					</view>
+					<view class="ctit">我的报修</view>
+				</view>
+				<view class="contn" v-if="checkPermi([''])" @click="handleToYy">
+					<view class="img">
+						<image :src="listimgb" class="imgb"></image>
+					</view>
+					<view class="ctit">供求订单</view>
+				</view>
+				<view class="contn">
+					<view class="img">
+						<image :src="listimgc" class="imgc"></image>
+					</view>
+					<view class="ctit">商圈订单</view>	
+				</view>
+				<view class="contn">
+					<view class="img">
+						<image :src="listimgd" class="imgd"></image>
+					</view>
+					<view class="ctit">家政订单</view>	
+				</view>
+			</view>
+			<view class="mbgbox">
+				<view class="flexc mine_list" @click="getClockcontFn" v-if="checkPermi([''])">
+					<view class="limg">
+						<image :src="listimge" class="imga"></image>
+					</view>
+					<view class="tit flex1">物业费账单</view>
+					<image :src="rimg" class="rimg"></image>
+				</view>
+				<view class="flexc mine_list" @click="getYqMeetFn">
+					<view class="limg">
+						<image :src="listimgf" class="imgb"></image>
+					</view>
+					<view class="tit flex1">优惠券</view>
+					<image :src="rimg" class="rimg"></image>
+				</view>
+				<view class="flexc mine_list" @click="getClockcontFn" v-if="checkPermi([''])">
+					<view class="limg">
+						<image :src="listimgg" class="imgc"></image>
+					</view>
+					<view class="tit flex1">积分收支</view>
+					<image :src="rimg" class="rimg"></image>
+				</view>
+				<view class="flexc mine_list" @click="getYqMeetFn">
+					<view class="limg">
+						<image :src="listimgh" class="imgd"></image>
+					</view>
+					<view class="tit flex1">我的违停</view>
+					<image :src="rimg" class="rimg"></image>
+				</view>
+				<view class="flexc mine_list" @click="getClockcontFn" v-if="checkPermi([''])">
+					<view class="limg">
+						<image :src="listimgi" class="imge"></image>
+					</view>
+					<view class="tit flex1">我的互动</view>
+					<image :src="rimg" class="rimg"></image>
+				</view>
+				<view class="flexc mine_list" @click="getYqMeetFn">
+					<view class="limg">
+						<image :src="listimgj" class="imgd"></image>
+					</view>
+					<view class="tit flex1">我的收藏</view>
+					<image :src="rimg" class="rimg"></image>
+				</view>
+				<view class="flexc mine_list" @click="getClockcontFn" v-if="checkPermi([''])">
+					<view class="limg">
+						<image :src="listimgk" class="imgd"></image>
+					</view>
+					<view class="tit flex1">收款方式</view>
+					<image :src="rimg" class="rimg"></image>
+				</view>
+				<view class="flexc mine_list" @click="handleUpassword">
+					<view class="limg">
+						<image :src="listimgl" class="imgc"></image>
+					</view>
+					<view class="tit flex1">修改密码</view>
+					<image :src="rimg" class="rimg"></image>
+				</view>
+				<!-- <view class="flexc mine_list" @click="handleToSetting">
+					<view class="limg">
+						<image :src="listimgg" class="imga"></image>
+					</view>
+					<view class="tit flex1">设置</view>
+					<image :src="rimg" class="rimg"></image>
+				</view> -->
+				<!-- #ifdef APP-PLUS -->
+				<view class="flexc mine_list"@click="onlineWgt">
+					<view class="limg">
+						<image :src="listimgm" class="imgd"></image>
+					</view>
+					<view class="tit flex1">版本号</view>
+					 <view  class="txt">{{wgtcode}}</view>
+					 <image :src="rimg" class="rimg"></image>
+				</view>
+				<!-- #endif -->
+				<view class="flexc mine_list" @click="handleLogout">
+					<view class="limg">
+						<image :src="listimgn" class="imgf"></image>
+					</view>
+					<view class="tit flex1">退出登录</view>
+					<image :src="rimg" class="rimg"></image>
+				</view>
+				<!-- <view class="flexc mine_list" @click="handleUpassword">
+					<view class="limg">
+						<image :src="listimgh" class="imga"></image>
+					</view>
+					<view class="tit flex1">修改密码</view>
+					<image :src="rimg" class="rimg"></image>
+				</view> -->
+			</view>
+		</view>
+		<view class="ztit">安徽中新云计算有限公司提供支持</view>
+		<footers v-if="isfootflag" :footerindex="footerindex" :isHomeIndex="false"></footers>
 
-    </view>
-	<footers v-if="isfootflag" :footerindex="footerindex" :isHomeIndex="false"></footers>
-  </view>
+	</view>
 </template>
 
 <script>
-  import storage from '@/utils/storage'
-  import footers from '@/components/footer/footer.vue'
-  import {findVersion} from "@/api/system/user.js"
-  import {checkPermi,checkRole} from "@/utils/permission"; // 权限判断函数
-  import config from '@/config'
-  const baseUrl = config.baseUrl
-  export default {
-    data() {
-      return {
-        name: this.$store.state.user.name,
-        version: getApp().globalData.config.appInfo.version,
-		footerindex: 'mine',
-		isfootflag: true,
-		wgtcode: this.$store.state.user.wgtcode,
-		platform: 'Android',
-      }
-    },
-	components: {
-		footers
-	},
-    computed: {
-      avatar() {
-        return this.$store.state.user.avatar
-      },
-      windowHeight() {
-        return uni.getSystemInfoSync().windowHeight - 50
-      }
-    },
-	onLoad() {
-		var that=this;
-		this.nvaHeight=uni.getSystemInfoSync().statusBarHeight+44;
-		// #ifdef APP-PLUS
-		plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
-			that.$store.dispatch('SetwgtFn', widgetInfo.version).then(() => {
-				that.wgtcode=widgetInfo.version
-			})
-		});
-		// #endif
-	},
-    methods: {
-		checkPermi,checkRole,
-      handleToInfo() {
-        this.$tab.navigateTo('/pages/mine/info/index')
-      },
-      handleToEditInfo() {
-        this.$tab.navigateTo('/pages/mine/info/edit')
-      },
-      handleToSetting() {
-        this.$tab.navigateTo('/pages/mine/setting/index')
-      },
-      handleToLogin() {
-        this.$tab.reLaunch('/pages/login')
-      },
-      handleToAvatar() {
-        this.$tab.navigateTo('/pages/mine/avatar/index')
-      },
-      handleLogout() {
-        this.$modal.confirm('确定注销并退出系统吗？').then(() => {
-          this.$store.dispatch('LogOut').then(() => {
-            this.$tab.reLaunch('/pages/index/index')
-          })
-        })
-      },
-      handleHelp() {
-        this.$tab.navigateTo('/pages/mine/help/index')
-      },
-      handleAbout() {
-        this.$tab.navigateTo('/pages/mine/about/index')
-      },
-      handleJiaoLiuQun() {
-        this.$modal.showToast('QQ群：①133713780(满)、②146013835(满)、③189091635')
-      },
-      handleBuilding() {
-        this.$modal.showToast('模块建设中~')
-      },
-	  onlineWgt() {
-	  	let that = this;
-	  	plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
-	  		that.$store.dispatch('SetwgtFn', widgetInfo.version).then(() => {
-	  			that.wgtcode=widgetInfo.version
-	  		})
-	  		that.comparisonVersionNo(widgetInfo.versionCode);
-	  	});
-	  	// that.comparisonVersionNo()
-	  },
-	  comparisonVersionNo(versionCode) {
-	  	let that = this;
-	  	// console.log("aaaaaaa===versionCode", versionCode);
-	  	const parmas = {
-	  		model: that.platform
-	  	}
-	  	findVersion(parmas).then(res => {
-	  		if (res.code == "200") {
-	  			let versionNos = res.data.code;
-	  			console.log(versionNos, 'versionNos')
-	  			// console.log(res.data.path);
-	  			let filePath = res.data.path;
-	  			if (Number(versionNos) > Number(versionCode)) { //服务器返回1更新，0则不更新
-	  				uni.showModal({
-	  					title: '提示',
-	  					content: '发现新版本，是否升级',
-	  					success: function(res) {
-	  						// console.log(widgetInfo.version);
-	  						if (res.confirm) {
-	  							console.log('用户点击确定');
-	  							that.getProperty(filePath);
-	  						} else if (res.cancel) {
-	  							console.log('用户点击取消');
-	  						}
-	  					}
-	  				});
-	  			} else {
-	  				this.$toast('该版本已是最新版')
-	  			}
-	  		}
-	  	}).catch(error => {
-	  		uni.hideLoading()
-	  		console.log(error)
-	  	})
-	  },
-	  getProperty(getProperty) {
-	  	// console.log("bbbbbbbbb----------->", getProperty)
-	  	let that = this;
-	  	// 在线升级app/热更新
-	  	that.showwri = true;
-	  	const downloadTask = uni.downloadFile({ //下载文件
-	  		url: baseUrl + getProperty,
-	  		success: (downloadResult) => {
-	  			// console.log(downloadResult);
-	  			if (downloadResult.statusCode == 200) {
-	  				// 更新升级
-	  				plus.runtime.install(downloadResult.tempFilePath, {
-	  					force: true
-	  				}, function() {
-	  					// console.log('install success...');
-	  					that.showwri = false;
-	  					plus.nativeUI.alert("应用资源更新完成！", function() {
-	  						plus.runtime.restart();
-	  					});
-	  				}, function(e) {
-	  					that.showwri = false;
-	  					plus.nativeUI.alert("更新失败，请稍后再试");
-	  				});
-	  			}
-	  		}
-	  	});
-	  	downloadTask.onProgressUpdate((res) => { //下载文件的进度
-	  		that.totalBytesWritten = res.totalBytesWritten; //当前下载大小
-	  		that.progress = res.progress; //当前下载比例
-	  		that.totalBytesExpectedToWrite = res.totalBytesExpectedToWrite; //
-	  	});
-	  },
-    }
-  }
-</script>
-
-<style lang="scss">
-  page {
-    background-color: #f5f6f7;
-  }
-
-  .mine-container {
-    width: 100%;
-    height: 100%;
-
+	import storage from '@/utils/storage'
+	import footers from '@/components/footer/footer.vue'
+	import {findVersion} from "@/api/system/user.js"
+	import {checkPermi,checkRole} from "@/utils/permission"; // 权限判断函数
+	import config from '@/config'
+	const baseUrl = config.baseUrl
+	const webUrl=config.webUrl
+	export default {
+		data() {
+			return {
+				bgimg: require("@/static/images/mine/mbg.png"),
+				avatarimg:require("@/static/images/mine/head.png"),
+				listimga: require('@/static/images/mine/mtaba.png'),
+				listimgb: require('@/static/images/mine/mtabb.png'),
+				listimgc: require('@/static/images/mine/mtabc.png'),
+				listimgd: require('@/static/images/mine/mtabd.png'),
+				listimge: require('@/static/images/mine/mtabe.png'),
+				listimgf: require('@/static/images/mine/mtabf.png'),
+				listimgg: require('@/static/images/mine/mtabg.png'),
+				listimgh: require('@/static/images/mine/mtabh.png'),
+				listimgi: require('@/static/images/mine/mtabi.png'),
+				listimgj: require('@/static/images/mine/mtabj.png'),
+				listimgk: require('@/static/images/mine/mtabk.png'),
+				listimgl: require('@/static/images/mine/mtabl.png'),
+				listimgm: require('@/static/images/mine/mtabm.png'),
+				listimgn: require('@/static/images/mine/mtabn.png'),
 
-    .header-section {
-      padding: 15px 15px 45px 15px;
-      background-color: #3c96f3;
-      color: white;
+				head:require('@/static/images/mine/head.png'),
+				wrimg:require("@/static/images/mine/wrimg.png"),
+				rimg:require("@/static/images/rimg.png"),
+				wyimg:require("@/static/images/mine/wy.png"),
+				border: false,
+				backgroundColor: 'transparent',
 
-      .login-tip {
-        font-size: 18px;
-        margin-left: 10px;
-      }
-
-      .cu-avatar {
-        border: 2px solid #eaeaea;
-
-        .icon {
-          font-size: 40px;
-        }
-      }
-
-      .user-info {
-        margin-left: 15px;
-
-        .u_title {
-          font-size: 18px;
-          line-height: 30px;
-        }
-      }
-    }
-
-    .content-section {
-      position: relative;
-      top: -50px;
+				name: this.$store.state.user.nickName,
+				deptName:this.$store.state.user.deptName,
+				// version: getApp().globalData.config.appInfo.version,
+				footerindex: 'mine',
+				isfootflag: true,
+				noticenum: 0,
+				deptId: this.$store.state.user.deptId,
+				wgtcode: this.$store.state.user.wgtcode,
+				platform: 'Android',
+				nvaHeight:44,
+			}
+		},
+		components: {
+			footers
+		},
+		computed: {
+			avatar() {
+				return this.$store.state.user.avatar
+			},
+			windowHeight() {
+				return uni.getSystemInfoSync().windowHeight - 50
+			}
+		},
+		onPageScroll(e) {
+			// var scrollTop = Number(e.scrollTop);
+			// var listTop=Number(this.listTop)-Number(this.nvaHeight)
+			// if (scrollTop <=this.nvaHeight) {
+			// 	const opacity = scrollTop / 100 // 计算透明度值
+			// 	const color = `rgba(29, 100, 226, ${opacity})`
+			// 	this.backgroundColor = color // 更新盒子背景颜色
+			// } else {
+			// 	// this.backgroundColor = '#00A9F0'
+			// }
+		}, 
+		onLoad() {
+			var that=this;
+			this.nvaHeight=uni.getSystemInfoSync().statusBarHeight+44;
+			// #ifdef APP-PLUS
+			plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
+				that.$store.dispatch('SetwgtFn', widgetInfo.version).then(() => {
+					that.wgtcode=widgetInfo.version
+				})
+			});
+			// #endif
+		},
+		mounted() {
+		}, 
+		
+		methods: {
+			checkPermi,checkRole,
+			// 待我审批
+			handleToYy(){
+				this.$tab.navigateTo("/pages/order/list")
+			},
+			//访客预约
+			handleToAddYy(){
+				this.$tab.navigateTo("/pages/order/come")
+			},
+			//在线会议
+			getYqMeetFn(){
+				// var url='https://www.baidu.com'
+				this.$tab.navigateTo("/pages/common/webview/index?url="+webUrl)
+			},
+			//我的会议
+			handleToMyhy(){
+				this.$tab.navigateTo("/work/pages/yyorder/meetlist")
+			},
+			//我的就餐
+			handleToMyjc(){
+				this.$tab.navigateTo("/work/pages/yyorder/eatlist")
+			},
+			//我的申报
+			handleToMysb(){
+				// this.$tab.navigateTo("/work/pages/business/list?from=my&type=0")
+			},
+			// 考勤设置
+			handleToKq(){
+				this.$tab.navigateTo('/work/pages/clock/kaorules')
+			},
+			// 考勤记录
+			getClockjlFn(){
+				this.$tab.navigateTo("/work/pages/record/clockin")
+			},
+			// 考勤统计
+			getClockcontFn(){
+				this.$tab.navigateTo("/work/pages/clock/personnel")
+			},
+			// 设置
+			handleToSetting() {
+			  this.$tab.navigateTo('/pages/mine/setting/index')
+			},
+			// 修改密码
+			handleUpassword(){
+				this.$tab.navigateTo(`/pages/mine/pwd/index`)  
+			},
+			// 账号信息
+			handleToInfo() {
+				this.$tab.navigateTo('/pages/mine/info/index')
+			},
+			handleToLogin() {
+				this.$tab.reLaunch('/pages/login')
+			},
+			handleToAvatar() {
+				this.$tab.navigateTo('/pages/mine/avatar/index')
+			},
+			handleLogout() {
+				this.$modal.confirm('确定注销并退出系统吗？').then(() => {
+					this.$store.dispatch('LogOut').then(() => {
+						this.$tab.reLaunch('/pages/index')
+					})
+				})
+			},
+			onlineWgt() {
+				let that = this;
+				plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
+					that.$store.dispatch('SetwgtFn', widgetInfo.version).then(() => {
+						that.wgtcode=widgetInfo.version
+					})
+					that.comparisonVersionNo(widgetInfo.versionCode);
+				});
+				// that.comparisonVersionNo()
+			},
+			comparisonVersionNo(versionCode) {
+				let that = this;
+				// console.log("aaaaaaa===versionCode", versionCode);
+				const parmas = {
+					model: that.platform
+				}
+				findVersion(parmas).then(res => {
+					if (res.code == "200") {
+						let versionNos = res.data.code;
+						console.log(versionNos, 'versionNos')
+						// console.log(res.data.path);
+						let filePath = res.data.path;
+						if (Number(versionNos) > Number(versionCode)) { //服务器返回1更新，0则不更新
+							uni.showModal({
+								title: '提示',
+								content: '发现新版本，是否升级',
+								success: function(res) {
+									// console.log(widgetInfo.version);
+									if (res.confirm) {
+										console.log('用户点击确定');
+										that.getProperty(filePath);
+									} else if (res.cancel) {
+										console.log('用户点击取消');
+									}
+								}
+							});
+						} else {
+							this.$toast('该版本已是最新版')
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					console.log(error)
+				})
+			},
+			getProperty(getProperty) {
+				// console.log("bbbbbbbbb----------->", getProperty)
+				let that = this;
+				// 在线升级app/热更新
+				that.showwri = true;
+				const downloadTask = uni.downloadFile({ //下载文件
+					url: baseUrl + getProperty,
+					success: (downloadResult) => {
+						// console.log(downloadResult);
+						if (downloadResult.statusCode == 200) {
+							// 更新升级
+							plus.runtime.install(downloadResult.tempFilePath, {
+								force: true
+							}, function() {
+								// console.log('install success...');
+								that.showwri = false;
+								plus.nativeUI.alert("应用资源更新完成！", function() {
+									plus.runtime.restart();
+								});
+							}, function(e) {
+								that.showwri = false;
+								plus.nativeUI.alert("更新失败，请稍后再试");
+							});
+						}
+					}
+				});
+				downloadTask.onProgressUpdate((res) => { //下载文件的进度
+					that.totalBytesWritten = res.totalBytesWritten; //当前下载大小
+					that.progress = res.progress; //当前下载比例
+					that.totalBytesExpectedToWrite = res.totalBytesExpectedToWrite; //
+				});
+			},
+		}
+	}
+</script>
 
-      .mine-actions {
-        margin: 15px 15px;
-        padding: 20px 0px;
-        border-radius: 8px;
-        background-color: white;
+<style lang="scss">
+page{background-color: #ffffff;}
+.navbox{position: fixed;left: 0;right: 0;top: 0;z-index: 4;	}
+.deptbox{height: 34rpx;position: relative;margin-left: 16rpx;padding-left: 40rpx;box-sizing: border-box;padding-top: 4rpx;
+	image{width: 102rpx;height: 34rpx;position: absolute;left: 0;top: 0;}
+	view{font-weight: bold;font-size: 22rpx;color: #FFFFFF;position: relative;z-index: 2;height: 30rpx;min-width: 60rpx;background: linear-gradient(90deg, #FFB54D, #FE5B0E);border-radius: 0 15rpx 15rpx 0;}
+}
+.zxbox{ 
+	.navbg{width: 100%;height: 782rpx;}
+	.mbox{padding: 148rpx 24rpx 0;z-index: 1;position: relative;
+		.infobox{margin-bottom: 48rpx;padding: 0 20rpx;
+			.limg{width: 98rpx;height: 98rpx;flex: 0 0 auto;margin-right: 24rpx;border-radius: 50%;box-sizing: border-box;border: 6rpx solid #FFFFFF;}
+			.cbox{flex: 1;z-index: 1;
+				.tit{font-weight: bold;font-size: 36rpx;color: #161616;margin-bottom: 10rpx;}
+				.txt{font-weight: 500;font-size: 26rpx;color: #76829B;}
+			}
+			.wrimg{width: 14rpx;height: 26rpx;flex: 0 0 auo;}
+		}
+		.conts{box-sizing: border-box;background: #FFFFFF;box-shadow: 0px 0px 10rpx 0px #EFD3B6;border-radius: 20rpx;
+			.contn{padding: 32rpx 0 28rpx;
+				display: flex;align-items: center;flex: 0 0 auto;width: 25%;flex-direction: column;
+				.img{width: 50rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;margin-bottom: 16rpx;flex: 0 0 auto;
+					.imga{width: 48rpx;height: 46rpx;}
+					.imgb{width: 48rpx;height: 48rpx;}
+					.imgc{width: 46rpx;height: 48rpx;}
+					.imgd{width: 40rpx;height: 50rpx;}
+				}
+				.ctit{font-weight: bold;font-size: 26rpx;color: #272727;}
+			}
+		}
+		.mbgbox{width: 100%;margin-bottom: 24rpx;padding-top: 32rpx;
+			.mine_list{
+				padding: 28rpx 36rpx;
+				.limg{flex: 0 0 auto;width: 32rpx;height: 32rpx;margin-right: 26rpx;display: flex;align-items: center;justify-content: center;
+					.imga{width: 30rpx;height: 30rpx;}//15 15
+					.imgb{width: 30rpx;height: 26rpx;}//15 13
+					.imgc{width: 30rpx;height: 32rpx;}//15 16
+					.imgd{width: 32rpx;height: 32rpx;}//16 16
+					.imge{width: 26rpx;height: 30rpx;}//13 15
+					.imgf{width: 26rpx;height: 32rpx;}//13 16
+				}
+				.tit{font-weight: bold;font-size: 26rpx;color: #272727;}
+				.txt{font-weight: 500;font-size: 26rpx;color: #666666;margin-left: 20rpx;flex: 0 0 auto;}
+				.rimg{width: 14rpx;height: 26rpx;margin-left: 20rpx;flex: 0 0 auto;}
+			}
+		}
+	}
+}
 
-        .action-item {
-          .icon {
-            font-size: 28px;
-          }
+.ztit{font-size: 24rpx;color:#c6c6c9;text-align: center;flex:0 0 auto;margin-bottom: 28rpx;margin-top: 40rpx;}
 
-          .text {
-            display: block;
-            font-size: 13px;
-            margin: 8px 0px;
-          }
-        }
-      }
-    }
-  }
 </style>

user_ui/static/style.css

@@ -10,6 +10,7 @@
 .flexjd{display: flex;justify-content: flex-end;}
 .flexdc{display: flex;flex-direction: column;}
 .flexat{display: flex;align-items: flex-start;}
+.flexe{display: flex;justify-content: flex-end;}
 image{display: block !important;}
 .bgbox{background-color: rgba(0, 0, 0, 0.5);position: fixed;left: 0;right: 0;top: 0;bottom: 0;z-index: 5;}
 .clearf::after {
@@ -83,6 +84,7 @@ font-weight: bold;font-size: 26rpx;color: #FFFFFF;background: #0256FD;border-rad
 .mb30{margin-bottom: 60rpx;}
 .mb38{margin-bottom: 76rpx;}
 .mt5{margin-top: 10rpx;}
+.mt10{margin-top: 20rpx;}
 .mt12{margin-top: 24rpx;}
 .mt16{margin-top: 32rpx;}
 .mt30{margin-top: 60rpx;}

user_ui/work/pages/clean/list.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

user_ui/work/pages/visitor/index.vue

@@ -36,7 +36,7 @@
 		data(){
 			return{
 				visbg:require('@/work/static/visitor/visbg.png'),
-				more:require("@/static/images/home/more.png"),
+				more:require("@/work/static/visitor/more.png"),
 				// adrs:require('@/mine/static/house/adrs.png'),
 				backgroundColor: "transparent",
 				nvaHeight:44,

user_ui/work/pages/visitor/vdetail.vue

@@ -88,7 +88,7 @@
 					longitude: '117.211954',
 					width:18,   //宽
 					height:19,   //高
-					iconPath: require("@/static/images/home/adr.png"),
+					iconPath: require("@/work/static/visitor/adr.png"),
 					anchor:{x: 0.5, y: 0.5}
 				}],
 			}