测试修改

user_ui/api/work/people.js

@@ -50,7 +50,7 @@ export function reservList(data) {
 // 预约记录-详情wuYe:reservRecord:query
 export function reservDet(data) {
   return request({
-    url: '/wuYe/reservRecord/'+data,
+    url: '/wuYe/reservRecord/detail/'+data,
     method: 'get',
   })
 }

user_ui/manifest.json

@@ -53,7 +53,12 @@
             },
             "sdkConfigs" : {
                 "ad" : {},
-                "share" : {},
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx47d585d225f26459",
+                        "UniversalLinks" : ""
+                    }
+                },
                 "maps" : {
                     "amap" : {
                         "appkey_ios" : "f55857365884963baed205a0974d6e96",

user_ui/mine/pages/info/authenadd.vue

@@ -44,8 +44,8 @@
 							      style="margin-left: 20rpx;" 
 							     v-model="datainfo.houseId"
 							      :list='fwlist'
-							      valueName='dictLabel' 
-							      keyName="dictValue"
+							      valueName='detailedAddress' 
+							      keyName="houseId"
 								  :valuea="datainfo.houseId"
 								  :chosevalue="datainfo.detailedAddress"
 								:isdisabled="(ptype=='edit'&&datainfo.examine=='2')?true:false"
@@ -69,7 +69,7 @@
 											<view class="flex1 txr f13 co27" v-if="datainfo.residentRelationship&&!hzgx">{{statusFormats(datainfo.residentRelationship,hzgxList,'hzgx')}}</view>
 											<view class="flex1 txr f13" v-else :class="hzgx?'co27':'coa'">{{hzgx||"请选择与户主关系"}}</view>
 											<view class="flex0" @click.stop="">
-												<uni-icons v-if="datainfo.residentRelationship" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('hzgx')"></uni-icons>
+												<uni-icons v-if="datainfo.residentRelationship&&!isdisabled" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('hzgx')"></uni-icons>
 											</view>
 											<view class="rimg">
 												<image :src="rimg"></image>
@@ -114,7 +114,7 @@
 														<view class="flex1 txr f13 co27" v-if="datainfo.residentAppearance&&!rymm">{{statusFormats(datainfo.residentAppearance,rymmList,'rymm')}}</view>
 														<view class="flex1 txr f13" v-else :class="rymm?'co27':'coa'">{{rymm||"请选择人员面貌"}}</view>
 														<view class="flex0" @click.stop="">
-															<uni-icons v-if="datainfo.residentAppearance" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('rymm')"></uni-icons>
+															<uni-icons v-if="datainfo.residentAppearance&&!isdisabled" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('rymm')"></uni-icons>
 														</view>
 														<view class="rimg" @click.stop="datainfo.residentAppearance=''"><image :src="rimg"></image></view>
 													</view>
@@ -126,7 +126,7 @@
 														<view class="flex1 txr f13 co27" v-if="datainfo.specialType&&!dslx">{{statusFormats(datainfo.specialType,dslxList,'dslx')}}</view>
 														<view class="flex1 txr f13" v-else :class="dslx?'co27':'coa'">{{dslx||"如有五保户等特殊类型，请选择"}}</view>
 														<view class="flex0" @click.stop="">
-															<uni-icons v-if="datainfo.specialType" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('dslx')"></uni-icons>
+															<uni-icons v-if="datainfo.specialType&&!isdisabled" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('dslx')"></uni-icons>
 														</view>
 														<view class="rimg"><image :src="rimg"></image></view>
 													</view>
@@ -148,7 +148,7 @@
 													<block v-if="phofile&&phofile.length">
 														<view class="assimg" v-for="(ite,idx) in phofile" :key="idx" @click="getPreviewa(idx,phofile)">
 															<image :src="baseUrl+ite" class="img"></image>
-															<image :src="rdelimg" class="delimg" @click.stop="getDelFn(idx,'fm')"></image>
+															<image :src="rdelimg" v-if="!isdisabled" class="delimg" @click.stop="getDelFn(idx,'fm')"></image>
 														</view>
 													</block>
 													<view class="addbox" @click="getaddImageava">
@@ -187,7 +187,7 @@
 													<view class="flex1 txr f13 co27" v-if="houserinfo.rightType&&!qllx">{{statusFormats(houserinfo.rightType,qllxList,'qllx')}}</view>
 													<view class="flex1 txr f13" v-else :class="qllx?'co27':'coa'">{{qllx||"请选择权利类型"}}</view>
 													<view class="flex0" @click.stop="">
-														<uni-icons v-if="houserinfo.rightType" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('qllx')"></uni-icons>
+														<uni-icons v-if="houserinfo.rightType&&!isdisabled" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('qllx')"></uni-icons>
 													</view>
 													<view class="rimg"><image :src="rimg"></image></view>
 												</view>
@@ -230,7 +230,7 @@
 												<view class="flex1 txr f13 co27" v-if="houserinfo.houseType&&!fwlx">{{statusFormats(houserinfo.houseType,fwlxList,'fwlx')}}</view>
 												<view class="flex1 txr f13" v-else :class="fwlx?'co27':'coa'">{{fwlx||"请选择房屋类型"}}</view>
 												<view class="flex0" @click.stop="">
-													<uni-icons v-if="houserinfo.houseType" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('fwlx')"></uni-icons>
+													<uni-icons v-if="houserinfo.houseType&&!isdisabled" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('fwlx')"></uni-icons>
 												</view>
 												<view class="rimg"><image :src="rimg"></image></view>
 											</view>
@@ -267,7 +267,7 @@
 													<view class="flex1 txr f13 co27" v-if="houserinfo.houseStatus&&!fwzt">{{statusFormats(houserinfo.houseStatus,fwztList,'fwzt')}}</view>
 													<view class="flex1 txr f13" v-else :class="fwzt?'co27':'coa'">{{fwzt||"请选择房屋状态"}}</view>
 													<view class="flex0" @click.stop="">
-														<uni-icons v-if="houserinfo.houseStatus" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('fwzt')"></uni-icons>
+														<uni-icons v-if="houserinfo.houseStatus&&!isdisabled" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('fwzt')"></uni-icons>
 													</view>
 													<view class="rimg"><image :src="rimg"></image></view>
 												</view>
@@ -279,7 +279,7 @@
 													<view class="flex1 txr f13 co27" v-if="houserinfo.usageType&&!fwyt">{{statusFormats(houserinfo.usageType,fwytList,'fwyt')}}</view>
 													<view class="flex1 txr f13" v-else :class="fwyt?'co27':'coa'">{{fwyt||"请选择房屋用途"}}</view>
 													<view class="flex0" @click.stop="">
-														<uni-icons v-if="houserinfo.usageType" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('fwyt')"></uni-icons>
+														<uni-icons v-if="houserinfo.usageType&&!isdisabled" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('fwyt')"></uni-icons>
 													</view>
 													<view class="rimg"><image :src="rimg"></image></view>
 												</view>
@@ -291,7 +291,7 @@
 													<view class="flex1 txr f13 co27" v-if="houserinfo.hasParkingSpace&&!ywcw">{{statusFormats(houserinfo.hasParkingSpace,ywcwList,'ywcw')}}</view>
 													<view class="flex1 txr f13" v-else :class="ywcw?'co27':'coa'">{{ywcw||"请选择有/无"}}</view>
 													<view class="flex0" @click.stop="">
-														<uni-icons v-if="houserinfo.hasParkingSpace" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('ywcw')"></uni-icons>
+														<uni-icons v-if="houserinfo.hasParkingSpace&&!isdisabled" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('ywcw')"></uni-icons>
 													</view>
 													<view class="rimg"><image :src="rimg"></image></view>
 												</view>
@@ -308,7 +308,7 @@
 						</block>
 				</block>
 				</uni-collapse>
-				<view class="mt12">
+				<view class="mt12" v-if="!isdisabled">
 					<!-- <view class="hbtns mb10 bgb" @click="getAddfb" v-if="datainfo.residentType==1&&datainfo.isHouseholder=='Y'">添加房屋信息</view> -->
 					<view class="hbtns bga" @click="getSubmit">提交</view>
 				</view>
@@ -495,6 +495,9 @@
 				this.isdisabled=false;
 			},
 			onClear(type){
+				if(this.isdisabled){
+					return
+				}
 				 if(type=='hzgx'){
 					this.datainfo.residentRelationship='';
 					this.hzgx='';
@@ -522,6 +525,9 @@
 				}
 			},
 			getSyFn(e){
+				if(this.isdisabled){
+					return
+				}
 				this.datainfo.isHouseholder=e
 				console.log(this.datainfo.isHouseholder)
 			},
@@ -590,11 +596,12 @@
 				this.listNoPageTenant(e.dictValue)
 			},
 			getchange(e){
-				this.datainfo.houseId=e.dictValue;
-				this.datainfo.detailedAddress=e.dictLabel;
-				this.houserinfo.detailedAddress=e.dictLabel;
-				this.houserinfo.houseId=e.dictValue;
-				this.houserinfo.location=e.location;
+				this.datainfo.houseId=e.houseId;
+				this.datainfo.detailedAddress=e.detailedAddress;
+				// this.houserinfo.detailedAddress=e.dictLabel;
+				// this.houserinfo.houseId=e.dictValue;
+				// this.houserinfo.location=e.location;
+				this.houserinfo=JSON.parse(JSON.stringify(e))
 			},
 			// 获取租户列表
 			gettenantList(){
@@ -620,13 +627,15 @@
 				}
 				listNoPageTenant(params).then(res=>{
 					if(res.code==200){
-						this.fwlist= res.data.map(v => {
-							return {
-								dictLabel: v.detailedAddress,
-								dictValue: v.houseId,
-								location: v.location
-							}
-						})
+						// this.fwlist= res.data.map(v => {
+						// 	return {
+						// 		dictLabel: v.detailedAddress,
+						// 		dictValue: v.houseId,
+						// 		location: v.location
+						// 	}
+						// })
+						this.fwlist=JSON.parse(JSON.stringify(res.data))
+						
 						// if(res.rows&&res.rows.length<2){
 						// 	var newObj=res.rows[0];
 						// 	this.datainfo.houseId=newObj.houseId;
@@ -814,6 +823,9 @@
 							var houseinfo=res.data.houseInfoRedidentList[0]
 							this.houserinfo=JSON.parse(JSON.stringify(houseinfo))
 						}
+						// if(res.data.examine==2){
+						// 	this.isdisabled=true
+						// }
 						
 					}
 				})

user_ui/news/pages/news/detail.vue

@@ -81,6 +81,7 @@
 				upimg:require('@/mine/static/house/up.png'),
 				nonews:require('@/news/static/news/nonews.png'),
 				baseUrl:config.baseUrl,
+				shareurl:config.shareurl,
 				autoHeight:true,
 				confirmBar:false,
 				adrfixed:true,
@@ -144,16 +145,45 @@
 			 },
 			 // 分享
 			 getshareFn(){
-				 var params={
-					 communityId:this.id,
-					 tenantId:this.tenantId
-				 }
-				 setShare(params).then(res=>{
-					 if(res.code==200){
-						 this.$toast("分享成功")
-						 this.datainfo.userShare++
-					 }
-				 })
+				 var that=this;
+				 uni.share({
+				 	provider: "weixin",
+				 	scene: "WXSceneSession",
+				 	type: 0,
+				 	href: this.shareurl+'/news/pages/news/detail?id='+this.id,
+				 	title: this.datainfo.communityTitle,
+				 	summary: "邀请信息",
+				 	imageUrl: "https://zxyzhsq.qs163.cn/prod-api/profile/upload/2025/06/11/applogo_20250611034002A021.png",
+				 	success: function (res) {
+						var params={
+							communityId:that.id,
+							tenantId:that.tenantId
+						}
+						setShare(params).then(res=>{
+							if(res.code==200){
+								// that.$toast("分享成功")
+								that.datainfo.userShare++
+							}
+						})
+				 	},
+				 	fail: function (err) {
+				 		console.log("fail:" + JSON.stringify(err));
+				 	}
+				 });
+				 
+				 
+				 // // #ifdef APP-PLUS
+				 // 	uni.shareWithSystem({
+				 // 	  summary: '',
+				 // 	  href: 'http://47.99.82.249:5011/work/pages/visitor/vshare/id='+this.id+'&cflag'+this.checkflag,
+				 // 	  success(){
+				 // 	    // 分享完成，请注意此时不一定是成功分享
+				 // 	  },
+				 // 	  fail(){
+				 // 	    // 分享失败
+				 // 	  }
+				 // 	})
+				 // // #endif
 			 },
 			 btns(){
 				 

user_ui/pages/mine/index.vue

@@ -263,6 +263,9 @@
 			checkPermi,checkRole,
 			getClockcontFn(){
 				
+			},
+			handleToYy(){
+				
 			},
 			// 设置
 			handleToSetting() {

user_ui/permission.js

@@ -4,7 +4,7 @@ import { getToken } from '@/utils/auth'
 const loginPage = "/pages/login"
   
 // 页面白名单
-const whiteList = ['/pages/index/index','/pages/agreement',
+const whiteList = ['/pages/index/index','/pages/agreement','/work/pages/visitor/vshare','/news/pages/news/detail',
   '/pages/login','/mine/pages/tlogin', '/mine/pages/register', '/pages/common/webview/index','/mine/pages/pwd/resetpwd','/mine/pages/pwd/forgetpwd',
 ]
 

user_ui/work/pages/visitor/vdetail.vue

@@ -67,7 +67,7 @@
 				</view>
 			</view>
 			<!-- #ifdef APP-PLUS -->
-			<!-- <view class="rhbtn mt30" @click="getShareFn">分享</view> -->
+			<view class="rhbtn mt30" @click="getShareFn">分享</view>
 			<!-- #endif -->
 			<!-- #ifdef MP-WEIXIN -->
 			<!-- <button open-type="share" class="rhbtn mt30">分享</button> -->
@@ -109,7 +109,7 @@
 				checkflag:false,
 				backgroundColor: "transparent",
 				baseUrl:config.baseUrl,
-				baseUrlimg:config.baseUrlimg,
+				shareurl:config.shareurl,
 				mapContext:'',
 				center:{
 					lng:'',
@@ -154,23 +154,23 @@
 			}
 		},
 		onShareAppMessage(res) {
-			this.comflag=false;
-			if (res.from === 'button') {// 来自页面内分享按钮
-			    var data=res.target.dataset;
-				var newobj={
-					title: "邀请你来我家",
-					path: 'http://192.168.101.147:9091'
-				}
-				// if(data.img){
-				// 	newobj.imageUrl=this.baseUrl+data.img
-				// }
-				return newobj
-			}else{
-				return {
-				  title: '智能校管家',
-				  path: '/pages/trends/index'
-				}
-			}
+			// this.comflag=false;
+			// if (res.from === 'button') {// 来自页面内分享按钮
+			//     var data=res.target.dataset;
+			// 	var newobj={
+			// 		title: "邀请你来我家",
+			// 		path: 'http://192.168.101.147:9091'
+			// 	}
+			// 	// if(data.img){
+			// 	// 	newobj.imageUrl=this.baseUrl+data.img
+			// 	// }
+			// 	return newobj
+			// }else{
+			// 	return {
+			// 	  title: '智能校管家',
+			// 	  path: '/pages/trends/index'
+			// 	}
+			// }
 		},
 		methods:{
 			checkPermi, checkRole,
@@ -198,19 +198,27 @@
 				
 			},
 			getShareFn(){
-				 // this.$tab.navigateTo(`/work/pages/visitor/vshare?id=${this.id}&cflag=${this.checkflag}`)
-				// #ifdef APP-PLUS
-					uni.shareWithSystem({
-					  summary: '',
-					  href: 'http://47.99.82.249:5011/work/pages/visitor/vshare/id='+this.id+'&cflag'+this.checkflag,
-					  success(){
-					    // 分享完成，请注意此时不一定是成功分享
-					  },
-					  fail(){
-					    // 分享失败
-					  }
-					})
-				// #endif
+				// /profile/upload/2025/06/11/applogo_20250611033931A020.png
+				//用户端/profile/upload/2025/06/11/applogo_20250611034002A021.png
+				var cflag=0;
+				if(this.checkflag){
+					cflag=1
+				}
+				uni.share({
+					provider: "weixin",
+					scene: "WXSceneSession",
+					type: 0,
+					href: this.shareurl+'/work/pages/visitor/vshare?id='+this.id+'&cflag='+cflag,
+					title: "邀请你来我家",
+					summary: "邀请信息",
+					imageUrl: "https://zxyzhsq.qs163.cn/prod-api/profile/upload/2025/06/11/applogo_20250611034002A021.png",
+					success: function (res) {
+						console.log("success:" + JSON.stringify(res));
+					},
+					fail: function (err) {
+						console.log("fail:" + JSON.stringify(err));
+					}
+				});
 			},
 			getPutFn(){
 				this.$tab.navigateTo("/work/pages/visitor/vadd?id="+this.id)

user_ui/work/pages/visitor/vshare.vue

@@ -42,7 +42,7 @@
 					<view class="tit mb10">分享人</view>
 					<view class="txt">{{datainfo.houseAddress||"分享人"}}</view>
 				</view> -->
-				<view class="adrbox mb16">
+				<view class="adrbox mb16" v-if="checkflag">
 					<view class="tit mb10">房屋地址</view>
 					<view class="txt">{{datainfo.detailAddress}}{{datainfo.houseAddress}}</view>
 				</view>
@@ -108,11 +108,14 @@
 				this.id=e.id;
 				this.getDetail()
 			}
-			this.checkflag=e.cflag;
+			if(e.cflag=='1'){
+				this.checkflag=true;
+			}else{
+				this.checkflag=false;
+			}
 			if(this.checkflag){
 				this.getcreateMap()
 			}
-			console.log(this.checkflag)
 		},
 		onReady() {
 			
@@ -179,10 +182,8 @@
 					if(res.code==200){
 						this.datainfo=res.data;
 						this.chooseValue=res.data.houseId;
-						console.log(res.data.detailAddress&&this.checkflag)
 						if(res.data.detailAddress&&this.checkflag){
-							console.log(11)
-							// this.getLocation(res.data.detailAddress)
+							this.getLocation(res.data.detailAddress)
 						}
 					}
 				})