审核

common/lang/en.js

@@ -57,6 +57,8 @@ export default {
 		data:'Temporarily no data',
 	},
 	equipmentStatusList:{
+		reset:'reboot',
+		reboot:'reboot equipment',
 		door:'open door',
 		open:'open',
 		opensuccess:'open success',
@@ -74,6 +76,7 @@ export default {
 		humidity:'equipmentHumidity',
 		alarm:'alarm content',
 		tip:'prompt',
+		rebootTip:'whether or not to reboot?',
 		sleepTip:'whether or not to sleep?',
 		onoffTip:'whether to turn it off?',
 		onoff:'boot/shut down....',

common/lang/zh.js

@@ -55,6 +55,8 @@ export default {
 		data:'暂无数据',
 	},
 	equipmentStatusList:{
+		reset:'重启',
+		reboot:'一键重启',
 		door:'远程开门',
 		open:'开门',
 		opensuccess:'开门成功',
@@ -72,6 +74,7 @@ export default {
 		humidity:'柜内湿度',
 		alarm:'报警内容',
 		tip:'提示',
+		rebootTip:'是否重启？',
 		sleepTip:'是否休眠？',
 		onoffTip:'是否关机？',
 		onoff:'开/关机中',

configs/env.js

@@ -9,8 +9,8 @@ let configs = {
 if (process.env.NODE_ENV === 'development') {
 	// 测试环境
 	configs = Object.assign(configs, {
-		baseUrl: 'https://app.sunzee.com.cn/ShenzeeServer',
-		// baseUrl: 'http://127.0.0.1:8090',
+		// baseUrl: 'https://app.sunzee.com.cn/ShenzeeServer',
+		baseUrl: 'http://127.0.0.1:8090',
 	});
 }
 

main.js

@@ -54,8 +54,8 @@ const i18n = new VueI18n({
 });
 
 App.mpType = 'app'
-// Vue.prototype.serverurl="http://127.0.0.1:8090";
-Vue.prototype.serverurl="https://app.sunzee.com.cn/ShenzeeServer";
+Vue.prototype.serverurl="http://127.0.0.1:8090";
+// Vue.prototype.serverurl="https://app.sunzee.com.cn/ShenzeeServer";
 Vue.prototype.$store = store;
 Vue.prototype._i18n = i18n;
 const app = new Vue({

packageA/pages/remote/alarmClockItem.vue

@@ -57,7 +57,8 @@
 			<button v-if="clock=='add'" type="primary" formType="submit" @click="add()" class="button">
 				<p class="p1">添加</p>
 			</button>
-			<button v-if="clock!='add'" v-show="ushow" type="primary" formType="submit" @click="update()" class="button">
+			<button v-if="clock!='add'" v-show="ushow" type="primary" formType="submit" @click="update()"
+				class="button">
 				<p class="p1">修改</p>
 			</button>
 			<button v-if="clock!='add'" v-show="ushow" type="warn" formType="submit" @click="delet()" class="button">
@@ -102,7 +103,7 @@
 				Thursday: true,
 				Friday: true,
 				Saturday: true,
-				week: '',
+				week: '1,2,3,4,5,6,7,',
 				searchClientId: null,
 				equipmentName: null,
 				equipmentNameList: [],
@@ -110,16 +111,24 @@
 				equipmentIds: [],
 				clock: null,
 				status: true,
-				ushow:false
+				ushow: false
 			}
 		},
 		onShow() {
 			this.globalUser = uni.getStorageSync("globalUser");
 			this.clock = uni.getStorageSync("clock");
 			var token = uni.getStorageSync("token");
+			if (this.clock == "add") {
+				this.Sunday = false;
+				this.Monday = false;
+				this.Tuesday = false;
+				this.Wednesday = false;
+				this.Thursday = false;
+				this.Friday = false;
+				this.Saturday = false;
+			}
 			if (token.length > 1) {
 				this.getEquipmentListData();
-
 			} else {
 				uni.reLaunch({
 					url: '../../../pages/Login/Login',
@@ -129,6 +138,15 @@
 		},
 		onLoad() {
 			let that = this
+			// if (that.clock == "add") {
+			// 	this.Sunday = false;
+			// 	this.Monday = false;
+			// 	this.Tuesday = false;
+			// 	this.Wednesday = false;
+			// 	this.Thursday = false;
+			// 	this.Friday = false;
+			// 	this.Saturday = false;
+			// }
 			// 回显
 			setTimeout(function() {
 				if (that.clock != "add") {
@@ -141,7 +159,7 @@
 					that.ushow = true;
 				}
 			}, 4000)
-			
+
 		},
 		methods: {
 			...mapActions('chart', ['getEquipmentListByUser', 'addAlarmClock', 'addAlarmClockItem', 'updateAlarmClock']),
@@ -486,12 +504,12 @@
 									// 	url: 'alarmClockList',
 									// });
 									uni.navigateBack({
-									    url:'alarmClockList'
+										url: 'alarmClockList'
 									});
 								}
 							}
 						})
-						
+
 						uni.stopPullDownRefresh();
 					}, _ => void uni.stopPullDownRefresh());
 			},
@@ -558,7 +576,7 @@
 												// 	url: 'alarmClockList',
 												// });
 												uni.navigateBack({
-												    url:'alarmClockList'
+													url: 'alarmClockList'
 												});
 											}
 										}

packageA/pages/remote/remoteList.vue

@@ -10,7 +10,7 @@
 						<uni-list-item title="参数调整" @click="parameters()" />
 					</view>
 					<view v-show="show">
-						<uni-list-item title="闹钟" @click="alarmClock()" />
+						<uni-list-item title="闹钟(定时开关炉头/机器休眠)" @click="alarmClock()" />
 					</view>
 					<view v-show="show">
 						<uni-list-item title="机器音量调节" @click="volume()" />

packageA/pages/user/examine.vue

@@ -14,16 +14,14 @@
 	export default {
 		methods: {
 	
-			retail() {
-				console.log("retail")
+			collection() {
 				uni.navigateTo({
-					url: 'modify/retailModify',
+					url: './modify/joinpayMchCheckList',
 				});
 			},
-			collection() {
-				console.log("collection")
+			retail() {
 				uni.navigateTo({
-					url: 'modify/collectionModify',
+					url: './modify/proportionCheckList',
 				});
 			},
 		}

packageA/pages/user/modify/collectionModify.vue

@@ -1,85 +0,0 @@
-<template>
-	<view class="content">
-		<form >
-			<view class="body user-insert">旧账号：</view>
-			<view class="body user-insert-line">旧银行卡号：</view>
-			<view class="body user-insert-line">旧银行账户：</view>
-			<view class="body user-insert-line">旧法人姓名：</view>
-			<view class="body user-insert-line">旧身份证：</view>
-			<view class="body user-insert-line">旧银联号：</view>
-			<view class="body user-insert-line">旧提交时间：</view>
-		</form>
-		<form >
-			<view class="body user-insert" style="padding-top: 40upx;">
-				新账号：
-			</view>
-			<view class="body user-insert-line">新银行卡号：</view>
-			<view class="body user-insert-line">新银行账户：</view>
-			<view class="body user-insert-line">新法人姓名：</view>
-			<view class="body user-insert-line">新身份证：</view>
-			<view class="body user-insert-line">新银联号：</view>
-			<view class="body user-insert-line">新提交时间：</view>
-			<view class="btn-area">
-				<button type="primary" formType="submit" style="margin-right: 20px;" >确认</button>
-				<button type="primary" formType="submit"  >撤销</button>
-			</view>
-		</form>
-	</view>
-</template>
-
-<script>
-</script>
-
-<style>
-	.content{
-			padding-top:20upx;
-			margin-left:20upx;
-	}
-	.body {
-		background-color: #FFFFFF;
-		padding: 10upx 20upx 10upx 20upx;
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-start;
-	}
-
-	.input {
-		/* padding: 10upx 20upx 10upx 0upx; */
-		padding-left: 20upx;
-		padding-top: 10upx;
-		background-color: #FFFFFF;
-		width: 500upx;
-		height: 50upx;
-		box-shadow: 0upx 0upx 20upx #D3D3D3;
-		border-radius: 5upx;
-	}
-
-	.button {
-		margin: 0 auto;
-		display: inline-block;
-	}
-
-	button[type=primary] {
-	    background-color: #007aff;
-	    color: #fff;
-		display: inline-block;
-	}	
-	.btn-area{
-		padding-top:60upx;
-		margin: 0 auto;
-		width: 50%;
-	}
-	.user-insert-line {
-	  width: 500upx;
-	  height: 23px;
-	  border-bottom:solid black 1px;
-	  margin: 0 auto;
-	}
-	.user-insert{
-		width: 400upx;
-		margin: 0 auto;
-	}
-	view{
-		font-size: 30rpx;
-	}
-</style>

packageA/pages/user/modify/joinpayMchCheck.vue

@@ -0,0 +1,169 @@
+<template>
+	<view class="content">
+		<view class="body user-insert">账号：{{joinpayMchCheck.userName}}</view>
+		<form >
+			<view class="body user-insert-line">旧银行卡号：{{oldJoinpayMchCheck.bankAccountNo}}</view>
+			<view class="body user-insert-line">旧银行账户名：{{oldJoinpayMchCheck.bankAccountName}}</view>
+			<view class="body user-insert-line">旧法人姓名：{{oldJoinpayMchCheck.legalPerson}}</view>
+			<view class="body user-insert-line">旧身份证：{{oldJoinpayMchCheck.idCardNo}}</view>
+			<view class="body user-insert-line">旧银联号：{{oldJoinpayMchCheck.bankChannelNo}}</view></br>
+			<!-- <view class="body user-insert-line">旧提交时间：{{oldJoinpayMchCheck.createDate}}</view> -->
+		</form>
+		<view class="body user-insert">-------------------------------</view>
+		<form >
+			<view class="body user-insert-line">新银行卡号：{{joinpayMchCheck.bankAccountNo}}</view>
+			<view class="body user-insert-line">新银行账户名：{{joinpayMchCheck.bankAccountName}}</view>
+			<view class="body user-insert-line">新法人姓名：{{joinpayMchCheck.legalPerson}}</view>
+			<view class="body user-insert-line">新身份证：{{joinpayMchCheck.idCardNo}}</view>
+			<view class="body user-insert-line">新银联号：{{joinpayMchCheck.bankChannelNo}}</view>
+			<view class="body user-insert-line">提交时间：{{joinpayMchCheck.createDate}}</view>
+			<view class="btn-area">
+				<button type="primary" @click="agree(joinpayMchCheck.id)" style="margin-right: 20px;" >通过</button>
+				<button type="primary"  @click="unagree(joinpayMchCheck.id)" >撤销</button>
+			</view>
+		</form>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				oldJoinpayMchCheck:{},
+				joinpayMchCheck:{}
+			}
+		},
+		onLoad: function(option) {
+			const joinpayMchCheck = JSON.parse(decodeURIComponent(option.joinpayMchCheck));
+			this.joinpayMchCheck = joinpayMchCheck;
+			this.getOldJoinpayMch(joinpayMchCheck.adminId);
+		},
+		onShow() {
+		},
+		methods: {
+            getOldJoinpayMch(adminId){
+				var token = uni.getStorageSync("token");
+				// var globalUser = uni.getStorageSync("globalUser");
+				uni.request({
+					url: this.serverurl + '/TJoinpayMch/getMch',
+					data: {
+						"adminId": adminId,
+					},
+					header: {
+						'token': token
+					},
+					method: "POST",
+					success: (res) => {
+						var date  = res.data.data;
+						this.oldJoinpayMchCheck = date;
+					},
+				});
+			},
+			agree(id){
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否通过？',
+					success: function(res) {
+						if (res.confirm) {
+							var token = uni.getStorageSync("token");
+							uni.request({
+								url: that.serverurl + '/TJoinpayMchCheck/agree?id=' + id,
+								header: {
+									'token': token
+								},
+								method: "GET",
+								success: (res) => {
+									uni.showToast({
+										title: res.data.message,
+										duration: 2000
+									});
+								},
+							});
+						} else if (res.cancel) {}
+					}
+				});
+			},
+			unagree(id){
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否不通过？',
+					success: function(res) {
+						if (res.confirm) {
+							var token = uni.getStorageSync("token");
+							uni.request({
+								url: that.serverurl + '/TJoinpayMchCheck/unagree?id=' + id,
+								header: {
+									'token': token
+								},
+								method: "GET",
+								success: (res) => {
+									uni.showToast({
+										title: res.data.message,
+										duration: 2000
+									});
+								},
+							});
+						} else if (res.cancel) {}
+					}
+				});
+			}
+		}
+	}
+	
+</script>
+
+<style>
+	.content{
+			padding-top:20upx;
+			margin-left:20upx;
+	}
+	.body {
+		background-color: #FFFFFF;
+		padding: 10upx 20upx 10upx 20upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+
+	.input {
+		/* padding: 10upx 20upx 10upx 0upx; */
+		padding-left: 20upx;
+		padding-top: 10upx;
+		background-color: #FFFFFF;
+		width: 500upx;
+		height: 50upx;
+		box-shadow: 0upx 0upx 20upx #D3D3D3;
+		border-radius: 5upx;
+	}
+
+	.button {
+		margin: 0 auto;
+		display: inline-block;
+	}
+
+	button[type=primary] {
+	    background-color: #007aff;
+	    color: #fff;
+		display: inline-block;
+	}	
+	.btn-area{
+		padding-top:60upx;
+		margin: 0 auto;
+		width: 50%;
+	}
+	.user-insert-line {
+	  width: 500upx;
+	  height: 23px;
+	  border-bottom:solid black 1px;
+	  margin: 0 auto;
+	}
+	.user-insert{
+		width: 400upx;
+		margin: 0 auto;
+	}
+	view{
+		font-size: 30rpx;
+	}
+</style>

packageA/pages/user/modify/joinpayMchCheckList.vue

@@ -0,0 +1,49 @@
+<template>
+	<view>
+		<view v-for="(joinpayMchCheck, index) in joinpayMchCheckList" :key="index">
+			<uni-list-item :title="name+joinpayMchCheck.userName"  @click="retail(joinpayMchCheck)"  />
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				name:'账号:',
+				joinpayMchCheckList:[],
+				weixinDown: true
+			};
+		},
+		onShow() {
+			this.init();
+		},
+		methods: {
+			init(){
+				var token = uni.getStorageSync("token");
+				uni.request({
+					url: this.serverurl + '/TJoinpayMchCheck/getList',
+					header: {
+						'token': token
+					},
+					method: "GET",
+					success: (res) => {
+						if(res.data.code){
+							this.joinpayMchCheckList = res.data.data;
+						}
+					},
+				});
+			},
+			retail(joinpayMchCheck) {
+				uni.navigateTo({
+					url: 'joinpayMchCheck?joinpayMchCheck='+ encodeURIComponent(JSON.stringify(joinpayMchCheck)),
+				});
+			}
+		}
+		
+	}
+	
+</script>
+
+<style>
+</style>

packageA/pages/user/modify/proportionCheck.vue

@@ -0,0 +1,175 @@
+<template>
+	<view class="content">
+		<form>
+			<view class="body user-insert">账号：{{proportionCheck.userName}}</view>
+			<view class="body user-insert">旧分销：</view>
+			<view class="body user-insert-line">平台：{{oldProportionCheck.adminProportion}}%</view>
+			<view class="body user-insert-line">省级：{{oldProportionCheck.agencyProportion}}%</view>
+			<view class="body user-insert-line">市级：{{oldProportionCheck.merchantProportion}}%</view>
+			<view class="body user-insert-line">终端：{{oldProportionCheck.personageProportion}}%</view>
+		</form>
+		<form>
+			<view class="body user-insert" style="padding-top: 40upx;">
+				新分销：
+			</view>
+			<view class="body user-insert-line">平台：{{proportionCheck.adminProportion}}%</view>
+			<view class="body user-insert-line">省级：{{proportionCheck.agencyProportion}}%</view>
+			<view class="body user-insert-line">市级：{{proportionCheck.merchantProportion}}%</view>
+			<view class="body user-insert-line">终端：{{proportionCheck.personageProportion}}%</view>
+			<!-- <view class="body">
+				省级：<input class="input"  name="oldPassword" />
+			</view> -->
+			<view class="btn-area">
+				<button type="primary" @click="agree(proportionCheck.id)" style="margin-right: 20px;">通过</button>
+				<button type="primary" @click="unagree(proportionCheck.id)">撤销</button>
+			</view>
+		</form>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				oldProportionCheck: {},
+				proportionCheck: {}
+			}
+		},
+		onLoad: function(option) {
+			const proportionCheck = JSON.parse(decodeURIComponent(option.proportionCheck));
+			this.proportionCheck = proportionCheck;
+			this.getOldProportion(proportionCheck.adminId);
+		},
+		onShow() {},
+		methods: {
+			getOldProportion(adminId) {
+				var token = uni.getStorageSync("token");
+				// var globalUser = uni.getStorageSync("globalUser");
+				uni.request({
+					url: this.serverurl + '/TProportion/getList?adminId=' + adminId,
+					header: {
+						'token': token
+					},
+					method: "GET",
+					success: (res) => {
+						if (res.data.code) {
+							this.oldProportionCheck = res.data.data;
+						}
+					},
+				});
+			},
+			agree(id) {
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否通过？',
+					success: function(res) {
+						if (res.confirm) {
+							var token = uni.getStorageSync("token");
+							uni.request({
+								url: that.serverurl + '/TProportionCheck/agree?id=' + id,
+								header: {
+									'token': token
+								},
+								method: "GET",
+								success: (res) => {
+									uni.showToast({
+										title: res.data.message,
+										duration: 2000
+									});
+								},
+							});
+						} else if (res.cancel) {}
+					}
+				});
+
+			},
+			unagree(id) {
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否不通过？',
+					success: function(res) {
+						if (res.confirm) {
+							var token = uni.getStorageSync("token");
+							uni.request({
+								url: that.serverurl + '/TProportionCheck/unagree?id=' + id,
+								header: {
+									'token': token
+								},
+								method: "GET",
+								success: (res) => {
+									uni.showToast({
+										title: res.data.message,
+										duration: 2000
+									});
+								},
+							});
+						} else if (res.cancel) {}
+					}
+				});
+
+			}
+
+		}
+	}
+</script>
+
+<style>
+	.content {
+		padding-top: 20upx;
+		margin-left: 20upx;
+	}
+
+	.body {
+		background-color: #FFFFFF;
+		padding: 10upx 20upx 10upx 20upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+
+	.input {
+		/* padding: 10upx 20upx 10upx 0upx; */
+		padding-left: 20upx;
+		padding-top: 10upx;
+		background-color: #FFFFFF;
+		width: 500upx;
+		height: 50upx;
+		box-shadow: 0upx 0upx 20upx #D3D3D3;
+		border-radius: 5upx;
+	}
+
+	.button {
+		margin: 0 auto;
+		display: inline-block;
+	}
+
+	button[type=primary] {
+		background-color: #007aff;
+
+		display: inline-block;
+	}
+
+	.btn-area {
+		padding-top: 100upx;
+		margin: 0 auto;
+		width: 50%;
+	}
+
+	.user-insert-line {
+		width: 400upx;
+		height: 23px;
+		border-bottom: solid black 1px;
+		margin: 0 auto;
+	}
+
+	.user-insert {
+		width: 400upx;
+		margin: 0 auto;
+	}
+
+	view {
+		font-size: 30rpx;
+	}
+</style>

packageA/pages/user/modify/proportionCheckList.vue

@@ -0,0 +1,49 @@
+<template>
+	<view>
+		<view v-for="(proportionCheck, index) in proportionCheckList" :key="index">
+			<uni-list-item :title="name+proportionCheck.userName"  @click="retail(proportionCheck)"  />
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				name:'账号：',
+				proportionCheckList:[],
+				weixinDown: true
+			};
+		},
+		onShow() {
+			this.init();
+		},
+		methods: {
+			init(){
+				var token = uni.getStorageSync("token");
+				uni.request({
+					url: this.serverurl + '/TProportionCheck/getList',
+					header: {
+						'token': token
+					},
+					method: "GET",
+					success: (res) => {
+						if(res.data.code){
+							this.proportionCheckList = res.data.data;
+						}
+					},
+				});
+			},
+			retail(proportionCheck) {
+				uni.navigateTo({
+					url: 'proportionCheck?proportionCheck='+encodeURIComponent(JSON.stringify(proportionCheck)),
+				});
+			}
+		}
+		
+	}
+	
+</script>
+
+<style>
+</style>

packageA/pages/user/modify/retailModify.vue

@@ -1,84 +0,0 @@
-<template>
-	<view class="content">
-		<form >
-			<view class="body user-insert">账号：admin</view>
-			<view class="body user-insert">旧分销：</view>
-			<view class="body user-insert-line">平台：</view>
-			<view class="body user-insert-line">省级：</view>
-			<view class="body user-insert-line">市级：</view>
-			<view class="body user-insert-line">终端：</view>
-		</form>
-		<form >
-			<view class="body user-insert" style="padding-top: 40upx;">
-				新分销：
-			</view>
-			<view class="body user-insert-line">平台：</view>
-			<view class="body user-insert-line">省级：</view>
-			<view class="body user-insert-line">市级：</view>
-			<view class="body user-insert-line">终端：</view>
-			<!-- <view class="body">
-				省级：<input class="input"  name="oldPassword" />
-			</view> -->
-			<view class="btn-area">
-				<button type="primary" formType="submit" style="margin-right: 20px;" >确认</button>
-				<button type="primary" formType="submit" >撤销</button>
-			</view>
-		</form>
-	</view>
-</template>
-
-<script>
-</script>
-
-<style>
-	.content{
-			padding-top:20upx;
-			margin-left:20upx;
-	}
-	.body {
-		background-color: #FFFFFF;
-		padding: 10upx 20upx 10upx 20upx;
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-start;
-	}
-
-	.input {
-		/* padding: 10upx 20upx 10upx 0upx; */
-		padding-left: 20upx;
-		padding-top: 10upx;
-		background-color: #FFFFFF;
-		width: 500upx;
-		height: 50upx;
-		box-shadow: 0upx 0upx 20upx #D3D3D3;
-		border-radius: 5upx;
-	}
-
-	.button {
-		margin: 0 auto;
-		display: inline-block;
-	}
-	button[type=primary] {
-	    background-color: #007aff;
-	    
-		display: inline-block;
-	}	
-	.btn-area{
-		padding-top:100upx;
-		margin: 0 auto;
-		width: 50%;
-	}
-	.user-insert-line {
-	  width: 400upx;
-	  height: 23px;
-	  border-bottom:solid black 1px;
-	  margin: 0 auto;
-	}
-	.user-insert{
-		width: 400upx;
-		margin: 0 auto;
-	}
-	view{
-		font-size: 30rpx;
-	}
-</style>

pages/User/equipmentStatusList.vue

@@ -102,6 +102,15 @@
 							</view>
 						</view>
 						<view class="line1"></view>
+						<!-- 一键重启 -->
+						<view class="opendoor"><span>{{$t('equipmentStatusList.reboot')}}：</span>
+							<view class="">
+								<button type="primary" @click="reboot(equipment.id)" class="button">
+									<p class="p">{{$t('equipmentStatusList.reset')}}</p>
+								</button>
+							</view>
+						</view>
+						<view class="line1"></view>
 						<!-- 关机 -->
 						<view class="" v-if="globalUser.open==0">
 							<!-- 已关机 -->
@@ -133,6 +142,15 @@
 						</view>
 
 						<view class="line1"></view>
+						<!-- 一键重启 -->
+						<!-- <view class="opendoor"><span>{{$t('equipmentStatusList.reboot')}}：</span>
+							<view class="">
+								<button type="primary" @click="reboot(equipment.id)" class="button">
+									<p class="p">{{$t('equipmentStatusList.reset')}}</p>
+								</button>
+							</view>
+						</view>
+						<view class="line1"></view> -->
 						<!-- 远程开门 -->
 						<view class="opendoor"><span>{{$t('equipmentStatusList.door')}}：</span>
 							<view class="">
@@ -292,6 +310,49 @@
 				    // url: '/pages/user/map?item='+ encodeURIComponent(JSON.stringify(item))
 				});
 			},
+			//一键重启
+			reboot(id){
+				var that = this;
+				uni.showModal({
+					title: that.$t('equipmentStatusList.tip'),
+					content: that.$t('equipmentStatusList.rebootTip'),
+					success: function(res) {
+						var serverurl = that.serverurl;
+						var code = "1";
+						var equipmentId = id;
+						var token = uni.getStorageSync("token");
+						uni.request({
+							url: serverurl + '/TEquipment/onOff',
+							data: {
+								"adminId": code,
+								"equipmentId": equipmentId
+							},
+							method: "POST",
+							header: {
+								'token': token
+							},
+							success: (res) => {
+								var list = res.data.data;
+								if (list == "SUCCESS") {
+									uni.showModal({
+										title: that.$t('equipmentStatusList.kaiji'),
+										content: '发送成功',
+										success: function(res) {
+										}
+									})
+								} else {
+									uni.showModal({
+										title: that.$t('equipmentStatusList.error'),
+										content: that.$t('equipmentStatusList.kaijierror'),
+										success: function(res) {
+										}
+									})
+								}
+							}
+						});
+					}
+				})
+			},
 			OnOff(id, code) {
 				var that = this;
 				// var token = uni.getStorageSync("token");

pages/User/user.vue

@@ -33,7 +33,7 @@
 				</view>
 				<view v-if="show">
 					<!-- <view v-if=""> -->
-					<uni-list-item title="定时开关炉头" @click="time()" />
+					<!-- <uni-list-item title="定时开关炉头" @click="time()" /> -->
 					<!-- </view> -->
 				</view>
 				<view v-if="show">
@@ -45,7 +45,7 @@
 				<view v-if="noticeShow">
 					<uni-list-item title="编辑公告" @click="notice()" />
 				</view>
-				<view>
+				<view v-if="shenheShow">
 					<uni-list-item title="审核" @click="examine()" />
 				</view>
 			</uni-list>
@@ -78,6 +78,7 @@
 				name: '',
 				show: false,
 				noticeShow:false,
+				shenheShow:false,
 				showRemote: true,
 				ifForeign: false,
 				listName: [],
@@ -116,6 +117,9 @@
 			if (gid != 1) {
 				this.gid = true;
 				this.show = true;
+				if(gid==886){
+					this.shenheShow = true;
+				}
 			}else{
 				this.noticeShow = true;
 			}