add

.idea/workspace.xml

@@ -2,10 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b14f9fe1-d3c3-496a-8ebb-4789fe400212" name="默认更改列表" comment="">
-      <change beforePath="$PROJECT_DIR$/pages.json" beforeDir="false" afterPath="$PROJECT_DIR$/pages.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/Workordertodone/Workordertodone.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Workordertodone/Workordertodone.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/Workordertodone/hasrepaired/hasrepaired.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Workordertodone/hasrepaired/hasrepaired.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/App.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/http/baseApi.js" beforeDir="false" afterPath="$PROJECT_DIR$/http/baseApi.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/my/Myorder/Orderdetails/Orderdetails.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/Myorder/Orderdetails/Orderdetails.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/__UNI__FF40C0C_cm.apk" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/__UNI__FF40C0C_cm.apk" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/apkurl" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/apkurl" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/cmManifestCache.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/cmManifestCache.json" afterDir="false" />
@@ -52,7 +53,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="11010">
+            <state relative-caret-position="11310">
               <caret line="377" column="6" selection-start-line="377" selection-start-column="6" selection-end-line="377" selection-end-column="6" />
             </state>
           </provider>
@@ -187,6 +188,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -341,7 +343,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -394,15 +395,15 @@
       <workItem from="1682641765071" duration="593000" />
       <workItem from="1683160641474" duration="594000" />
       <workItem from="1683265707499" duration="595000" />
+      <workItem from="1683332933669" duration="593000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="102587000" />
+    <option name="totallyTimeSpent" value="103180000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-8" width="1936" height="1056" extended-state="1" />
-    <editor active="true" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -604,7 +605,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pages.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="11010">
+        <state relative-caret-position="11310">
           <caret line="377" column="6" selection-start-line="377" selection-start-column="6" selection-end-line="377" selection-end-column="6" />
         </state>
       </provider>

App.vue

@@ -1,4 +1,7 @@
+
 <script>
+	
+
 //	window.SITE_CONFIG = {};
 //	window.SITE_CONFIG["dictList"] = JSON.parse(localStorage.getItem('dictList'))||[];
 //	import Api from "./@/http/Api.js";
@@ -6,6 +9,7 @@
 		data() {
 			return {
 			//	globalData: {},
+		
 			}
 		},
 		methods:{
@@ -37,5 +41,6 @@
 			 width: 750rpx;
 			 background: #F6F6F6;
 	    }  
+		
 </style>
 

http/baseApi.js

@@ -1,6 +1,6 @@
 const BaseApi = 'http://gpu.ringzle.com:8082/witcarbon-app/app'
 //严工
-//const BaseApi = 'http://192.168.1.16:9013/witcarbon-app/app'
+//const BaseApi = 'http://192.168.1.28:9013/witcarbon-app/app'
 
 
 

js_sdk/ly-watermark/commons/watermark.js

@@ -0,0 +1,184 @@
+const VIEW_ID = '1.23452384164.123412415';
+let watermarkView;
+export default {
+	data() {
+		return {
+			showCanvas: true,
+			canvasText: '',
+			canvasSize: uni.upx2px(250),
+			canvasFontSize: uni.upx2px(30),
+			canvasTextColor: 'rgba(200, 200, 200, 0.50)',
+			canvasRotate: -30 * Math.PI / 180,
+			canvasTextAlign: 'left',
+			canvasTextBaseline: 'middle',
+			canvasTextFillX: uni.upx2px(-50),
+			canvasTextFillY: uni.upx2px(170)
+		}
+	},
+	
+	watch: {
+		canvasText(newVal) {
+			this.updateWatermark()
+		}
+	},
+	
+	methods: {
+		show() {
+			// #ifdef APP-PLUS
+			plus.nativeObj.View.getViewById(VIEW_ID) !== null && plus.nativeObj.View.getViewById(VIEW_ID).show();
+			// #endif
+
+			// #ifdef H5
+			if (document.getElementById(VIEW_ID)) {
+				document.getElementById(VIEW_ID).style.visibility = "visible";
+			}
+			// #endif
+		},
+		
+		hide() {
+			// #ifdef APP-PLUS
+			plus.nativeObj.View.getViewById(VIEW_ID) !== null && plus.nativeObj.View.getViewById(VIEW_ID).hide();
+			// #endif
+
+			// #ifdef H5
+			if (document.getElementById(VIEW_ID)) {
+				document.getElementById(VIEW_ID).style.visibility = "hidden";
+			}
+			// #endif
+		},
+		
+		updateWatermark() {
+			if (!this.canvasText) throw new Error('canvasText is Requied!');
+			
+			// #ifdef APP-PLUS  
+			watermarkView && watermarkView.reset();
+			this.drawAppWaterMark(VIEW_ID);
+			// #endif  
+			
+			// #ifdef H5  
+			this.drawH5WaterMark(VIEW_ID);
+			// #endif  
+		},
+		
+		initWatermark() {
+			if (!this.canvasText) throw new Error('canvasText is Requied!');
+			
+			// #ifdef APP-PLUS  
+			this.drawAppWaterMark(VIEW_ID);
+			// #endif  
+			
+			// #ifdef H5  
+			this.drawH5WaterMark(VIEW_ID);
+			// #endif  
+			
+			uni.$off('ly-show-watermar');
+			uni.$off('ly-hide-watermark');
+			
+			// 全局监听事件，触发水印显示
+			uni.$on('ly-show-watermark', () => {
+				this.show();
+			});
+			
+			// 全局监听事件，触发水印隐藏
+			uni.$on('ly-hide-watermark', () => {
+				this.hide();
+			});
+		},
+		
+		// #ifdef APP-PLUS
+		drawAppWaterMark(id) {
+			plus.nativeObj.View.getViewById(id) && plus.nativeObj.View.getViewById(id).close();
+
+			let cans = uni.createCanvasContext('watermarkCanvas');
+			
+			cans.rotate(this.canvasRotate);
+			cans.setFontSize(this.canvasFontSize);
+			cans.setFillStyle(this.canvasTextColor);
+			cans.setTextAlign(this.canvasTextAlign);
+			cans.setTextBaseline(this.canvasTextBaseline);
+			cans.fillText(this.canvasText, this.canvasTextFillX, this.canvasTextFillY);
+			cans.draw(false);
+			this.canvasDrawCallFn(id);
+		},
+		
+		// 利用canvas生成水印图片
+		canvasDrawCallFn(id) {
+			// 适当的延时确保绘制完毕
+			setTimeout(() => {
+				uni.canvasToTempFilePath({
+					canvasId: "watermarkCanvas",
+					success: res => {
+						let viewList = this.getWaterMarkWebview(res);
+						watermarkView = new plus.nativeObj.View(id, {
+							top: '0',
+							left: '0',
+							right: '0',
+							bottom: '0'
+						}, viewList);
+				
+						// 拦截View控件的触屏事件,将事件穿透给下一层view  
+						watermarkView.interceptTouchEvent(false);
+						watermarkView.show();
+						// this.showCanvas = false;
+					}
+				});
+			}, 100);
+		},
+		
+		// 创建webview页面水印样式
+		getWaterMarkWebview(res) {
+			let sysInfo = uni.getSystemInfoSync(),
+				row = Math.ceil(sysInfo.windowHeight / this.canvasSize), // 水印排列行数
+				imgList = [];
+
+			for (let i = 0; i < row; i++) {
+				for (let j = 0; j < 3; j++) {
+					imgList.push({
+						tag: 'img',
+						src: res.tempFilePath,
+						position: {
+							top: (this.canvasSize * i) + 'px',
+							left: (this.canvasSize * j) + 'px',
+							width: this.canvasSize + 'px',
+							height: this.canvasSize + 'px'
+						}
+					});
+				}
+			}
+
+			return imgList;
+		},
+		// #endif
+		
+		// #ifdef H5
+		drawH5WaterMark(id) {
+			document.getElementById(id) && document.body.removeChild(document.getElementById(id));
+
+			let can = document.createElement('canvas');
+			let cans = can.getContext('2d');
+			let div = document.createElement('div');
+
+			can.width = this.canvasSize;
+			can.height = this.canvasSize;
+
+			cans.rotate(this.canvasRotate);
+			cans.font = this.canvasFontSize + 'px sans-serif';
+			cans.fillStyle = this.canvasTextColor;
+			cans.textAlign = this.canvasTextAlign;
+			cans.textBaseline = this.canvasTextBaseline;
+			cans.fillText(this.canvasText, this.canvasTextFillX, this.canvasTextFillY);
+
+			div.id = id;
+			div.style.pointerEvents = 'none';
+			div.style.top = '0';
+			div.style.left = '0';
+			div.style.bottom = '0';
+			div.style.right = '0';
+			div.style.position = 'fixed';
+			div.style.zIndex = '100000';
+			div.style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat';
+			document.body.appendChild(div);
+		}
+		// #endif
+	}
+}

pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue

@@ -32,9 +32,9 @@
 						<view class="settled" @click="kaimen(item)">
 							开门记录
 						</view>
-					<!-- 	<view class="outstanding" @click="mensuo(item)">
-							门锁信息
-						</view> -->
+						<view class="outstanding" @click="Remotedooropening(item)">
+							远程开门
+						</view>
 						<view class="outstanding1" @click="mima(item)">
 							临时密码
 						</view>
@@ -71,13 +71,13 @@
 				<h3>临时密码</h3>
 
 				<u-cell-group>
-					<u-cell icon="lock-opened-fill" title="临时密码"  :value='lsmima'></u-cell>
-				
+					<u-cell icon="lock-opened-fill" title="临时密码" :value='lsmima'></u-cell>
+
 				</u-cell-group>
 			</view>
 		</u-popup>
 
-<u-notify ref="uNotify" message="" ></u-notify>
+		<u-notify ref="uNotify" message=""></u-notify>
 	</view>
 </template>
 
@@ -100,7 +100,7 @@
 
 				totalnumber: 0,
 				setyesno: true,
-lsmima:'',
+				lsmima: '',
 				indexList: [],
 				dataList: [],
 				dataForm: {
@@ -153,6 +153,22 @@ lsmima:'',
 
 
 		methods: {
+			Remotedooropening(e) {
+				let postdata = {
+					cmdType: 'RemoteOpenDoor',
+					roomId: e.roomid
+				};
+				this.$api.post('/lock/issuedCmd', postdata)
+					.then(res => {
+						if (res.data.code == 0) {
+this.$refs.uNotify.success(res.data.data)
+
+						} else {
+							this.$refs.uNotify.error(res.data.msg)
+						}
+					})
+			},
+
 			seedetail(e) {
 				uni.navigateTo({
 					url: `/pages/Workorder/Intelligentdoorlock/Tenantdetails/Tenantdetails?companyOrgId=${e.roomid}`
@@ -163,27 +179,27 @@ lsmima:'',
 					url: `/pages/Workorder/Intelligentdoorlock/Dooropeningrecord/Dooropeningrecord?companyOrgId=${e.roomid}`
 				});
 			},
-			mima(e) {			
-			
-				
-				let postdata={
-  "currentPage": 0,
-  "deviceId": "",
-  "pageSize": 10,
-  "roomId": e.roomid,
-  "tempPwd": "",
-  "tenantsId": "",
-  "userName": ""
-};
-				this.$api.post('/lock/getTempPwd',postdata)
+			mima(e) {
+
+
+				let postdata = {
+					"currentPage": 0,
+					"deviceId": "",
+					"pageSize": 10,
+					"roomId": e.roomid,
+					"tempPwd": "",
+					"tenantsId": "",
+					"userName": ""
+				};
+				this.$api.post('/lock/getTempPwd', postdata)
 					.then(res => {
-					
+
 						if (res.data.code == 0) {
-								this.showms = true;
-this.lsmima=res.data.data;
- // console.log('111111111111111111',this.lsmima)
+							this.showms = true;
+							this.lsmima = res.data.data;
+							// console.log('111111111111111111',this.lsmima)
 						} else {
-this.$refs.uNotify.error(res.data.msg)	
+							this.$refs.uNotify.error(res.data.msg)
 						}
 					})
 
@@ -194,7 +210,7 @@ this.$refs.uNotify.error(res.data.msg)
 			},
 
 
-		
+
 
 			scrolltolower() {
 				if (this.pd) {
@@ -328,7 +344,7 @@ this.$refs.uNotify.error(res.data.msg)
 		color: #fff;
 		font-size: 14rpx;
 		position: absolute;
-		top:42%;
+		top: 56%;
 		right: 0px;
 		border-top-left-radius: 10rpx;
 		border-bottom-left-radius: 10rpx;

pages/index/BillPending/BillPending.vue

@@ -660,7 +660,7 @@
             getDate(type) {
                 const date = new Date();
                 let year = date.getFullYear();
-                let month = date.getMonth() + 1;
+                let month = date.getMonth() ;
                 if (type === 'start') {
                     year = year - 60;
                 } else if (type === 'end') {

pages/index/Immediateinspection/Immediateinspection.vue

@@ -79,7 +79,7 @@
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
 				dataForm: {
 					page: 1,
-					limit: 10,
+					limit: 99999,
 					circuitType: "",
 					startDate: "",
 					endDate: "",

pages/index/index.vue

@@ -222,16 +222,18 @@
 
 			</u-tabbar-item>
 		</u-tabbar>
-
+ <canvas v-if="showCanvas" class="watermarkCans" canvas-id="watermarkCanvas"></canvas>
 	</view>
 </template>
 
 <script>
+	  import watermark from '../../js_sdk/ly-watermark/commons/watermark.js'
 	import tTable from '@/components/t-table/t-table.vue';
 	import tTh from '@/components/t-table/t-th.vue';
 	import tTr from '@/components/t-table/t-tr.vue';
 	import tTd from '@/components/t-table/t-td.vue';
 	export default {
+		  mixins: [watermark],
 		components: {
 			tTable,
 			tTh,
@@ -240,6 +242,7 @@
 		},
 		data() {
 			return {
+				 canvasText: '',
 				value1: 0,
 
 				tabimg1: require('@/static/tab/h2.png'),
@@ -264,8 +267,12 @@
 		onLoad() {
 			this.getalldata();
 			this.getuserInfo = uni.getStorageSync('getuserInfo');
+			this.canvasText=this.getuserInfo.realName;
+			 
 		},
-		
+		mounted() {
+				            this.initWatermark(); // 可以在水印内容准备好后执行初始化
+				        },
 		onPullDownRefresh() {
 			//	console.log('我下拉刷新页面了！！！！！！！！！！！！！！！', )
 			this.getalldata();
@@ -374,7 +381,12 @@
 		list-style: none;
 		text-decoration: none;
 	}
-
+ .watermarkCans {
+	        width: 250rpx;
+	        height: 250rpx;
+	        position: absolute;
+	        z-index: -1;
+	    }
 	// .u-tabbar__content{
 	// 	.u-tabbar-item__icon{
 	// 		.u-tabbar-item__icon{

pages/login/login.vue

@@ -37,10 +37,12 @@
 		</view>
 
 		<u-toast ref="uToast" />
+		
 	</view>
 </template>
 
 <script>
+	
 	// function getUUID() {
 	//   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
 	//     return (c === 'x' ? (Math.random() * 16 | 0) : ('r&0x3' | '0x8')).toString(16)
@@ -49,6 +51,7 @@
 	//const BaseApi= require("@/http/baseApi.js");
 
 	export default {
+		
 		data() {
 			return {
 				isShowPassword: false,
@@ -65,7 +68,10 @@
 		onLoad() {
 			//	 this.getCaptcha();
 		},
-
+ onUnload() {
+            //触发水印显示
+            uni.$emit('ly-show-watermark');
+        },
 		methods: {
 			// 获取验证码
 			//  getCaptcha() {
@@ -223,6 +229,8 @@
 </script>
 
 <style lang="scss">
+	
+	
 	page {
 		background-color: #0b0c14;
 	}

pages/my/Myorder/Orderdetails/Orderdetails.vue

@@ -21,7 +21,7 @@
 				<u-list-item v-for="(item, index) in indexList" :key="index">
 
 					<view class="companylist">
-						<view class="outstanding" v-if='item.status==2'>
+					<!-- 	<view class="outstanding" v-if='item.status==2'>
 							未支付
 						</view>
 						<view class="settled" v-if='item.status==1'>
@@ -29,7 +29,7 @@
 						</view>
 						<view class="guanbi" v-if="item.status=='3'">
 							支付失败
-						</view>
+						</view> -->
 
 						<view class="Currentamount" style="margin-top: 20rpx;">
 							金额: <span>￥{{item.amount}}</span>
@@ -213,7 +213,7 @@
 					 	this.$api.post('/refundinfo', postdata)
 					 		.then(res => {
 					 			if (res.data.code == 0) {
-					 				this.$refs.uNotify.success('退费成功')
+					 				this.$refs.uNotify.success('退费申请成功')
 					 			} else {
 					 				this.$refs.uNotify.error(res.data.msg)
 					 			}

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/59370f40-c9e1-11ed-b2ad-c180f3f14b9c
+https://ide.dcloud.net.cn/build/download/7e94ce20-ea49-11ed-b84d-319223d5ae50