add

pages/Workorder/AccessControl/AccessControl.vue

@@ -8,18 +8,19 @@
 			<view class="mjlx">{{item.deviceSerial}}</view>
 			<view class="mjsh">{{item.parentCategory}}</view>
 
+		
 			<view class="mjkg">
 				<view class="anniu">
-					<u-button type="success" text="开启" @click="buttons(item,'open')"></u-button>
+					<u-button  type="primary" :plain="true" text="开启" @click="buttons(item,'open')"></u-button>
 				</view>
 				<view class="anniu">
-					<u-button type="warning" text="关闭" @click="buttons(item,'close')"></u-button>
+					<u-button  type="primary" :plain="true" text="关闭" @click="buttons(item,'close')"></u-button>
 				</view>	
 				<view class="anniu">
-					<u-button type="primary" text="常开" @click="buttons(item,'alwaysOpen')"></u-button>
+					<u-button  type="primary" :plain="true" text="常开" @click="buttons(item,'alwaysOpen')"></u-button>
 				</view>		
 				<view class="anniu">
-					<u-button type="error" text="常关" @click="buttons(item,'alwaysClose')"></u-button>
+					<u-button  type="primary" :plain="true" text="常关" @click="buttons(item,'alwaysClose')"></u-button>
 				</view>
 				<!-- <view class="sfkq">
 					<view class="sfkq1">是否开启</view>
@@ -181,13 +182,17 @@
 		align-items: center;
 		justify-content: center;
 	}
-
+.anniu{
+	width: 120rpx;
+	margin-left: 30rpx;
+}
 	.mjkg {
 		display: flex;
 		align-items: center;
-		justify-content: space-around;
-		margin-top: 40rpx;
-		margin-bottom: 10rpx;
+		justify-content:flex-end;
+		height: 120rpx;
+		border-top: 2px solid #F6F6F6;
+		margin-top: 20rpx;
 	}
 
 	.mjsh {
@@ -210,7 +215,7 @@
 
 	.mjym {
 		width: 690rpx;
-		height: 400rpx;
+		height: 380rpx;
 		background: #fff;
 		margin: 20rpx auto;
 		border-radius: 10px;

pages/index/index.vue

@@ -222,18 +222,20 @@
 
 			</u-tabbar-item>
 		</u-tabbar>
- <canvas v-if="showCanvas" class="watermarkCans" canvas-id="watermarkCanvas"></canvas>
+		
+	<!-- 水印 -->	
+<!-- <canvas v-if="showCanvas" class="watermarkCans" canvas-id="watermarkCanvas"></canvas> -->
 	</view>
 </template>
 
 <script>
-	  import watermark from '../../js_sdk/ly-watermark/commons/watermark.js'
+	  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],
+		//  mixins: [watermark],  // 水印
 		components: {
 			tTable,
 			tTh,
@@ -271,7 +273,7 @@
 			 
 		},
 		mounted() {
-				            this.initWatermark(); // 可以在水印内容准备好后执行初始化
+ //     this.initWatermark(); // 可以在水印内容准备好后执行初始化
 				        },
 		onPullDownRefresh() {
 			//	console.log('我下拉刷新页面了！！！！！！！！！！！！！！！', )

pages/my/my.vue

@@ -23,7 +23,7 @@
 				</view>
 			</view>
 
-			<view class="changemm">
+			<!-- <view class="changemm">
 				<view class="message">
 					<view class="wdmessage">已读信息:</view>
 					<view class="messagenumber">
@@ -36,11 +36,8 @@
 						<u-badge type="warning" max="99" :value="information2"></u-badge>
 					</view>
 				</view>
-				<!-- 	<view class="setdata"> -->
-				<!-- <u-icon name="setting" color="#0C1935" size="40" @click="tuichu"></u-icon> -->
-				<!-- 	<img src="../../static/my/tc.png" alt=""  @click="tuichu"> -->
-				<!-- </view> -->
-			</view>
+				
+			</view> -->
 		</view>
 		<!-- 头部结束 -->
 		<view class="minndle" v-if="$has('app:PersonalInformation')||$has('app:MyOrder')
@@ -169,7 +166,7 @@
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad() {
 			this.getuserInfo = uni.getStorageSync('getuserInfo');
-			console.log('111111111111111111', this.getuserInfo)
+			//console.log('111111111111111111', this.getuserInfo)
 		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
 		onReady() {},