防盗链

APP.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

App.vue

@@ -3,9 +3,9 @@
 		onLaunch: function() {
 			console.log('App Launch');
 			//默认语言
-			var lan = 'en'
+			// var lan = 'en'
 			
-			// var lan = 'zh'
+			var lan = 'zh'
 			 try {
 				const res = uni.getSystemInfoSync();
 				lan = res.language

common/lang/en.js

@@ -17,6 +17,11 @@ export default {
 		title:'Statistical charts',
 		name:'name',
 		company:'sunzee',
+		dayImg:'../../static/img/ri1.png',
+		weekImg:'../../static/img/zhou1.png',
+		monthImg:'../../static/img/yue1.png',
+		yearImg:'../../static/img/nian1.png',
+		allImg:'../../static/img/zong1.png',
 		dayTotalMoney:'todayMoney',
 		dayTotalNum:'todayNumber',
 		weekTotalMoney:'weekMoney',
@@ -52,6 +57,9 @@ export default {
 		data:'Temporarily no data',
 	},
 	equipmentStatusList:{
+		door:'open door',
+		open:'open',
+		opensuccess:'open success',
 		title:'equipment status',
 		red:'Red means machine alarm',
 		green:'Green means the machine is normal',
@@ -67,7 +75,15 @@ export default {
 		alarm:'alarm content',
 		tip:'prompt',
 		sleepTip:'whether or not to sleep?',
-		onoffTip:'whether to turn it off?'
+		onoffTip:'whether to turn it off?',
+		onoff:'boot/shut down....',
+		kaiji:'In the boot',
+		guanji:'Shut down the',
+		tishi:'Do not repeat within 30 s',
+		remainingtime:'Do not operate. Remaining time:',
+		error:'Abnormal operation',
+		guanjierror:'Equipment has been shut down.',
+		kaijierror:'Equipment has been started.',
 	},
 	equipmentStatics:{
 		title:'Machine Sales Ranking',

common/lang/zh.js

@@ -17,6 +17,11 @@ export default {
 		title:'统计图表',
 		name:'用户',
 		company:'申泽智能物联',
+		dayImg:'../../static/img/ri.png',
+		weekImg:'../../static/img/zhou.png',
+		monthImg:'../../static/img/yue.png',
+		yearImg:'../../static/img/nian.png',
+		allImg:'../../static/img/zong.png',
 		dayTotalMoney:'今日收入总额',
 		dayTotalNum:'今日销售数量',
 		weekTotalMoney:'本周收入总额',
@@ -50,13 +55,16 @@ export default {
 		data:'暂无数据',
 	},
 	equipmentStatusList:{
+		door:'远程开门',
+		open:'开门',
+		opensuccess:'开门成功',
 		title:'机器状态',
 		red:'红色代表机器报警',
 		green:'绿色代表机器正常',
 		sleep:'睡眠状态：机器已睡眠',
 		unsleep:'睡眠状态：未睡眠',
-		on:'关机：未关机',
-		off:'关机：已关机',
+		on:'开/关机：已开机',
+		off:'开/关机：已关机',
 		equipmentNo:'机器唯一码',
 		area:'所在地',
 		temperature :'炉头温度',
@@ -65,7 +73,15 @@ export default {
 		alarm:'报警内容',
 		tip:'提示',
 		sleepTip:'是否休眠？',
-		onoffTip:'是否关机？'
+		onoffTip:'是否关机？',
+		onoff:'开/关机中',
+		kaiji:'开机中',
+		guanji:'关机中',
+		tishi:'三十秒内请勿重复操作',
+		remainingtime:'请勿操作,剩余时间：',
+		error:'操作异常',
+		guanjierror:'设备已关机',
+		kaijierror:'设备已开机',
 	},
 	equipmentStatics:{
 		title:'机器销售排行',

main.js

@@ -12,8 +12,8 @@ import mainStatistics from '@/pages/Charts/mainStatistics';
 Vue.use(VueI18n)
 Vue.config.productionTip = !!env.isProduction;
 const i18n = new VueI18n({  
-  locale: 'en-US',  // 默认选择的语言
-  // locale: 'zh-CN',
+  // locale: 'en-US',  // 默认选择的语言
+  locale: 'zh-CN',
    messages: {
          'zh-CN': zh,   // 中文语言包
          'en-US': en    // 英文语言包

manifest.json

@@ -110,7 +110,14 @@
         "usingComponents" : true
     },
     "h5" : {
-        "title" : "申泽智能物联",
-        "domain" : "localhost"
+        "title" : "sunzee",
+        "domain" : "",
+        "router" : {
+            "mode" : "hash",
+            "base" : "/sunzeeapp/"
+        },
+        "devServer" : {
+            "https" : true
+        }
     }
 }

pages/Charts/equipmentStatistics.vue

@@ -79,7 +79,7 @@
 			<view class="qiun-columns">
 				<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
 					<view class="qiun-title-dot-light">
-						<view class="dis">全国平均日销售排行</view>
+						<view class="dis">全国平均日销售排行(某省日销售总额/省机器数量)</view>
 					</view>
 					<view class="shijian" style="text-align: center;position: relative;">
 						<image @click="pre2('day')" class="preImg" src="/static/img/leftTriangle.png"></image>
@@ -148,7 +148,7 @@
 			<view class="qiun-columns">
 				<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
 					<view class="qiun-title-dot-light">
-						<view class="dis">全国日销售排行</view>
+						<view class="dis">全国日销售排行(全省当日销售总额)</view>
 					</view>
 					<view class="shijian" style="text-align: center;position: relative;">
 						<image @click="pre3('day')" class="preImg" src="/static/img/leftTriangle.png"></image>
@@ -299,7 +299,13 @@
 			if (globalUser.id == '1') {
 				this.show = true
 			}
-			this.init();
+			if (globalUser.id!=null) {
+				this.init();
+			}else{
+				uni.reLaunch({
+					url: '../Login/Login',
+				});
+			}
 		},
 
 		methods: {
@@ -570,6 +576,12 @@
 				} else if ('admin' !== this.loginUser['username']) { //否则为主页，拿登录用户
 					param['adminId'] = this.loginUser['id'];
 				}
+				var globalUser = uni.getStorageSync("globalUser");
+				if (globalUser.id != 1) {
+					if (param.adminId == null || param.adminId == undefined) {
+						param['adminId'] = globalUser.id;
+					}
+				}
 				if (this.equipmentId) {
 					param['equipmentId'] = this.equipmentId;
 				}

pages/Charts/mainStatistics.vue

@@ -14,7 +14,7 @@
 		<view class="ri">
 			<view class="riShell">
 				<view class="riImg">
-					<image style="width: 64upx;height: 64upx;padding-top: 20upx;" src="../../static/img/ri.png"></image>
+					<image style="width: 64upx;height: 64upx;padding-top: 20upx;" :src="$t('mainStatistics.dayImg')"></image>
 				</view>
 				<view class="riTitle">
 					<view style="text-align:left;font-size:28upx;font-family:PingFang-SC-Medium">
@@ -39,7 +39,7 @@
 		<view class="fourTitle">
 			<view class="four">
 				<view class="fourImg">
-					<image style="width: 54upx;height: 54upx;padding-top: 20upx;" src="../../static/img/zhou.png" mode=""></image>
+					<image style="width: 54upx;height: 54upx;padding-top: 20upx;" :src="$t('mainStatistics.weekImg')" mode=""></image>
 				</view>
 				<view class="fourShell">
 					<view class="one">
@@ -55,7 +55,7 @@
 
 			<view class="four">
 				<view class="fourImg">
-					<image style="width: 54upx;height: 54upx;padding-top: 20upx;" src="../../static/img/yue.png" mode=""></image>
+					<image style="width: 54upx;height: 54upx;padding-top: 20upx;" :src="$t('mainStatistics.monthImg')" mode=""></image>
 				</view>
 				<view class="fourShell">
 					<view class="one">
@@ -71,7 +71,7 @@
 
 			<view class="four">
 				<view class="fourImg">
-					<image style="width: 54upx;height: 54upx;padding-top: 20upx;" src="../../static/img/nian.png" mode=""></image>
+					<image style="width: 54upx;height: 54upx;padding-top: 20upx;" :src="$t('mainStatistics.yearImg')" mode=""></image>
 				</view>
 				<view class="fourShell">
 					<view class="one">
@@ -87,7 +87,7 @@
 
 			<view class="four">
 				<view class="fourImg">
-					<image style="width: 54upx;height: 54upx;padding-top: 20upx;" src="../../static/img/zong.png" mode=""></image>
+					<image style="width: 54upx;height: 54upx;padding-top: 20upx;" :src="$t('mainStatistics.allImg')" mode=""></image>
 				</view>
 				<view class="fourShell">
 					<view class="one">
@@ -103,7 +103,9 @@
 		</view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light"><view class="dis">{{$t('mainStatistics.day')}}</view></view>
+				<view class="qiun-title-dot-light">
+					<view class="dis">{{$t('mainStatistics.day')}}</view>
+				</view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('day')" class="preImg" src="/static/img/leftTriangle.png"></image>
 					<span>{{startDate1}}</span>
@@ -118,7 +120,9 @@
 		<view class="line"></view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light"><view class="dis">{{$t('mainStatistics.week')}}</view></view>
+				<view class="qiun-title-dot-light">
+					<view class="dis">{{$t('mainStatistics.week')}}</view>
+				</view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('week')" class="preImg" src="/static/img/leftTriangle.png"></image>
 					<span>{{startDate2}} -- {{endDate2}}</span>
@@ -133,7 +137,9 @@
 		<view class="line"></view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light"><view class="dis">{{$t('mainStatistics.month')}}</view></view>
+				<view class="qiun-title-dot-light">
+					<view class="dis">{{$t('mainStatistics.month')}}</view>
+				</view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('month')" class="preImg" src="/static/img/leftTriangle.png"></image>
 					<span>{{startDate3}} -- {{endDate3}}</span>
@@ -148,7 +154,9 @@
 		<view class="line"></view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light"><view class="dis">{{$t('mainStatistics.year')}}</view></view>
+				<view class="qiun-title-dot-light">
+					<view class="dis">{{$t('mainStatistics.year')}}</view>
+				</view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('year')" class="preImg" src="/static/img/leftTriangle.png"></image>
 					<span>{{startDate4}} -- {{endDate4}}</span>
@@ -208,37 +216,48 @@
 				endDate3: '',
 				startDate4: '',
 				endDate4: '',
-				today:'',
-				week:''
-				// pname:''
+				today: '',
+				week: ''
 			}
 		},
 		computed: {
 			...mapState(['loginUser']),
-			pnameData:{
-				get(){
+			pnameData: {
+				get() {
 					return this.pname;
 				}
 			},
 		},
-		// onLoad(option){
-		// 	console.log("onLoad")
-		// 	this.init();
-		// },
 		onShow() {
-			uni.setNavigationBarTitle({title: this.$t('mainStatistics.title')});
-			uni.setTabBarItem({ index: 0,text: this.$t('tabs.tab1')});
+			uni.setNavigationBarTitle({
+				title: this.$t('mainStatistics.title')
+			});
+			uni.setTabBarItem({
+				index: 0,
+				text: this.$t('tabs.tab1')
+			});
 			// console.log("onShow");
 			var test = uni.getStorageSync('test');
-			//判断是不是初次登陆
-			if (test == 2) {
-				this.init();
+			var globalUser = uni.getStorageSync("globalUser");
+			if (globalUser.toString().length > 1) {
+				//判断是不是初次登陆
+				if (test == 2) {
+					this.init();
+				}
 			}
+			var id = this.adminId;
+
 			this.day();
 		},
 		mounted() {
-			// console.log("mounted");
-			this.init();
+			var globalUser = uni.getStorageSync("globalUser");
+			if (globalUser.toString().length > 1) {
+				this.init();
+			}else{
+				uni.reLaunch({
+					url: '../Login/Login',
+				});
+			}
 			this.day();
 		},
 		methods: {
@@ -263,36 +282,14 @@
 				uni.setStorageSync('test', '2');
 
 			},
-			day(){
+			day() {
 				var date = new Date();
 				// var daystr = dateUtils.formateDate(date, 'yyyy年MM月dd日');
 				var daystr = dateUtils.formateDate(date, 'yyyy-MM-dd');
 				this.today = daystr;
 				// var str= '星期'+'日一二三四五六'.charAt(date.getDay());
-				this.week = this.$t('mainStatistics.week'+date.getDay());
-				// if(this.$t('mainStatistics.name')=='Name'){
-				// 	if(date.getDay()=='0'){
-				// 		this.week = "SUN";
-				// 	}
-				// 	if(date.getDay()=='1'){
-				// 		this.week = "MON";
-				// 	}
-				// 	if(date.getDay()=='2'){
-				// 		this.week = "TUE";
-				// 	}
-				// 	if(date.getDay()=='3'){
-				// 		this.week = "WED";
-				// 	}
-				// 	if(date.getDay()=='4'){
-				// 		this.week = "THU";
-				// 	}
-				// 	if(date.getDay()=='5'){
-				// 		this.week = "FRI";
-				// 	}
-				// 	if(date.getDay()=='6'){
-				// 		this.week = "SAT";
-				// 	}
-				// }
+				this.week = this.$t('mainStatistics.week' + date.getDay());
+				
 			},
 			initDateRang(day, chartType) {
 				const daystr = dateUtils.formateDate(day, 'yyyy/MM/dd');
@@ -382,10 +379,16 @@
 				} else if ('admin' !== this.loginUser['username']) { //否则为主页，拿登录用户
 					param['adminId'] = this.loginUser['id'];
 				}
+				var globalUser = uni.getStorageSync("globalUser");
+				if (globalUser.id != 1) {
+					if (param.adminId == null || param.adminId == undefined) {
+						param['adminId'] = globalUser.id;
+					}
+				}
+
 				if (this.equipmentId) {
 					param['equipmentId'] = this.equipmentId;
 				}
-
 				return this.getStatistics(param)
 					.then(data => {
 						uni.stopPullDownRefresh();
@@ -443,32 +446,32 @@
 					});
 			},
 			initChart(canvasId, chartData) {
-				if(this.$t('lang')!='zh'){
+				if (this.$t('lang') != 'zh') {
 					chartData.categories = chartData.categories.map(e => {
-						if(e.indexOf('点') >= 0){
-							return e.replace('点',this.$t('mainStatistics.oclock'));
+						if (e.indexOf('点') >= 0) {
+							return e.replace('点', this.$t('mainStatistics.oclock'));
 						}
-						if(e.indexOf('周') >= 0){
-							const weekNum = e.substring(e.length-1)=='日'?'0':e.substring(e.length-1);
-							return this.$t('mainStatistics.week'+weekNum);
+						if (e.indexOf('周') >= 0) {
+							const weekNum = e.substring(e.length - 1) == '日' ? '0' : e.substring(e.length - 1);
+							return this.$t('mainStatistics.week' + weekNum);
 						}
-						if(e.indexOf('月') >= 0){
+						if (e.indexOf('月') >= 0) {
 							var res = e.toString();
-							if(res.length>3){
-								return e.replace('月',this.$t('mainStatistics.mon'));
-							}else{
-								return e.replace('月',this.$t('mainStatistics.y'));
+							if (res.length > 3) {
+								return e.replace('月', this.$t('mainStatistics.mon'));
+							} else {
+								return e.replace('月', this.$t('mainStatistics.y'));
 							}
 						}
 						return e;
 					});
-					
+
 					chartData.series = chartData.series.map(e => {
-						if(e['name']=='销售个数'){
-							e['name']=this.$t('mainStatistics.saleNum');
+						if (e['name'] == '销售个数') {
+							e['name'] = this.$t('mainStatistics.saleNum');
 						}
-						if(e['name']=='销售额'){
-							e['name']=this.$t('mainStatistics.saleroom');
+						if (e['name'] == '销售额') {
+							e['name'] = this.$t('mainStatistics.saleroom');
 						}
 						return e;
 					});
@@ -493,11 +496,11 @@
 						scrollAlign: 'left', //滚动条初始位置
 						scrollBackgroundColor: '#F7F7FF', //默认为 #EFEBEF  滚动条颜色底色
 						scrollColor: '#DEE7F7', //默认为 #A6A6A6  滚动条颜色
-						disableGrid:true,
-						
+						disableGrid: true,
+
 					},
 					yAxis: {
-						
+
 						type: 'grid',
 						gridType: 'soild',
 						// disabled:true
@@ -521,6 +524,12 @@
 				} else if ('admin' !== this.loginUser['username']) { //否则为主页，拿登录用户
 					param['adminId'] = this.loginUser['id'];
 				}
+				var globalUser = uni.getStorageSync("globalUser");
+				if (globalUser.id != 1) {
+					if (param.adminId == null || param.adminId == undefined) {
+						param['adminId'] = globalUser.id;
+					}
+				}
 				if (this.equipmentId) {
 					param['equipmentId'] = this.equipmentId;
 				}
@@ -803,12 +812,14 @@
 		color: #363D44;
 		transform: translateY(20upx);
 	}
-	.dis{
+
+	.dis {
 		transform: translateY(-13upx);
 		font-size: 32upx;
 		font-family: "PingFang-SC-Bold";
 		color: #363D44;
 	}
+
 	.shijian {
 		transform: translateY(40upx);
 		padding-top: 30upx;
@@ -817,10 +828,12 @@
 		margin: auto;
 		box-shadow: 0upx 0upx 10upx #D3D3D3;
 	}
-	.line{
-		background:#ECECEC ;
+
+	.line {
+		background: #ECECEC;
 		height: 20upx;
 	}
+
 	.qiun-charts {
 		width: 690upx;
 		height: 370upx;

pages/Login/Login.vue

@@ -33,11 +33,6 @@
 
 			<view class="third-icos-wapper">
 				<!-- 5+app 用qq/微信/微博 登录 小程序用微信小程序登录 h5不支持 -->
-				<!-- #ifdef APP-PLUS -->
-				<!-- <image src="../../static/icos/weixin.png" data-logintype="weixin" @click="appOAuthLogin" class="third-ico"></image>
-				<image src="../../static/icos/QQ.png" data-logintype="qq" @click="appOAuthLogin" class="third-ico" style="margin-left: 80upx;"></image>
-				<image src="../../static/icos/weibo.png" data-logintype="sinaweibo" @click="appOAuthLogin" class="third-ico" style="margin-left: 80upx;"></image>
- -->				<!-- #endif -->
 				<!-- #ifdef MP-WEIXIN -->
 				<button open-type='getUserInfo' @getuserinfo="wxLogin" class="third-btn-ico">
 				</button>

pages/User/equipmentStatusList.vue

@@ -3,10 +3,12 @@
 	<view v-if="merchantList.length>1">
 		<uni-collapse :accordion="true">
 			<view class="titleFlag">
-				<image class="img" src="../../static/img/red.png" ></image>  <font class="wenziT">红色代表机器报警</font>
-				<image class="img" src="../../static/img/green.png"></image>  <font class="wenziT">绿色代表机器正常</font>
+				<image class="img" src="../../static/img/red.png"></image>
+				<font class="wenziT">红色代表机器报警</font>
+				<image class="img" src="../../static/img/green.png"></image>
+				<font class="wenziT">绿色代表机器正常</font>
 			</view>
-			<view class="titlelist" v-for="(merchant,index) in merchantList" :key="merchant.id" >
+			<view class="titlelist" v-for="(merchant,index) in merchantList" :key="merchant.id">
 				<uni-collapse-item :title="getMerchantTitle(merchant)" :open="index===0">
 					<view style="padding: 20upx;background-color: aliceblue;">
 						<view v-if="merchant.equipmentList.length==0" style="text-align: center;">暂无数据</view>
@@ -32,7 +34,7 @@
 											<view class="swithBox" v-if="equipment.eqeStatus==0">
 												<view class="swichFont">关机：已关机</view>
 												<view class="switch">
-													<switch style="transform:scale(0.65)" checked  @change="OnOff(equipment.id,1)" />
+													<switch style="transform:scale(0.65)" checked @change="OnOff(equipment.id,1)" />
 												</view>
 											</view>
 											<view class="swithBox" v-else>
@@ -47,19 +49,20 @@
 											<view><span>炉头温度：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
 											<view><span>柜内湿度：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
 											<view><span>柜内温度：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
-											<view  v-if="equipment.hasTodayAlarm">
+											<view v-if="equipment.hasTodayAlarm">
 												<view><span>报警内容：</span></view>
 												<view v-for="(alarm,index) in equipment.alarmList" :key="index">
-													<view><span class="baojing">{{alarm.occurrenceTime?alarm.occurrenceTime:''}}  {{alarm.alarmContent}}</span></view>
+													<view><span class="baojing">{{alarm.occurrenceTime?alarm.occurrenceTime:''}} {{alarm.alarmContent}}</span></view>
 												</view>
 											</view>
-											<view  v-else>
-												<view><span>报警内容：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}  {{equipment.alarmContent}}</span></view>
+											<view v-else>
+												<view><span>报警内容：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}
+														{{equipment.alarmContent}}</span></view>
 											</view>
 										</view>
 									</uni-collapse-item>
 								</view>
-							</uni-collapse>	
+							</uni-collapse>
 						</view>
 					</view>
 				</uni-collapse-item>
@@ -69,17 +72,20 @@
 	<view v-else>
 		<uni-collapse :show-animation="true">
 			<view class="titleFlag">
-				<image class="img" src="../../static/img/red.png" ></image>  <font class="wenziT">{{$t('equipmentStatusList.red')}}</font>
-				<image class="img" src="../../static/img/green.png"></image>  <font class="wenziT">{{$t('equipmentStatusList.green')}}</font>
+				<image class="img" src="../../static/img/red.png"></image>
+				<font class="wenziT">{{$t('equipmentStatusList.red')}}</font>
+				<image class="img" src="../../static/img/green.png"></image>
+				<font class="wenziT">{{$t('equipmentStatusList.green')}}</font>
 			</view>
 			<view class="titlelist" style="position: relative;" v-for="equipment in merchantList[0].equipmentList" :key="equipment.id">
 				<span class="status-css" :class="equipment.hasTodayAlarm===true?statusError : statusNormal"></span>
 				<uni-collapse-item :title="getEquipmentTitle(equipment)">
+					<!-- 睡眠 -->
 					<view style="padding: 20upx;background-color: antiquewhite;">
 						<view class="swithBox" v-if="equipment.isSleep">
 							<view class="swichFont">{{$t('equipmentStatusList.sleep')}}</view>
 							<view class="switch">
-								<switch style="transform:scale(0.65)" checked  @change="change(equipment.id,0)" />
+								<switch style="transform:scale(0.65)" checked @change="change(equipment.id,0)" />
 							</view>
 						</view>
 						<view class="swithBox" v-else>
@@ -89,19 +95,32 @@
 							</view>
 						</view>
 						<view class="line1"></view>
-						<view class="swithBox" v-if="equipment.eqeStatus==0">
-							<view class="swichFont">{{$t('equipmentStatusList.off')}}</view>
-							<view class="switch">
-								<switch style="transform:scale(0.65)" checked  @change="OnOff(equipment.id,1)" />
+						<!-- 关机 -->
+						<view class="" v-if="globalUser.open==0">
+							<view class="swithBox" v-if="equipment.eqeStatus==0">
+								<view class="swichFont">{{$t('equipmentStatusList.off')}}</view>
+								<view class="switch">
+									<switch style="transform:scale(0.65)" checked @change="OnOff(equipment.id,1)" />
+								</view>
 							</view>
-						</view>
-						<view class="swithBox" v-else>
-							<view class="swichFont">{{$t('equipmentStatusList.on')}}</view>
-							<view class="switch">
-								<switch style="transform:scale(0.65)" :checked="onffChecked" @change="OnOff(equipment.id,0)" />
+							<view class="swithBox" v-else>
+								<view class="swichFont">{{$t('equipmentStatusList.on')}}</view>
+								<view class="switch">
+									<switch style="transform:scale(0.65)" :checked="onffChecked" @change="OnOff(equipment.id,0)" />
+								</view>
 							</view>
 						</view>
+
 						<view class="line1"></view>
+						<!-- 远程开门 -->
+						<view class="opendoor"><span>{{$t('equipmentStatusList.door')}}：</span>
+							<view class="button">
+								<button type="primary" @click="openDoor(equipment.id)" class="button">
+									<p class="p">{{$t('equipmentStatusList.open')}}</p>
+								</button>
+							</view>
+						</view>
+
 						<view><span>{{$t('equipmentStatusList.equipmentNo')}}：</span><span>{{equipment.clientId}}</span></view>
 						<view><span>{{$t('equipmentStatusList.area')}}：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view>
 						<view><span>{{$t('equipmentStatusList.temperature')}}：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
@@ -110,28 +129,35 @@
 						<view class="" v-if="equipment.hasTodayAlarm">
 							<view><span>{{$t('equipmentStatusList.alarm')}}：</span></view>
 							<view v-for="(alarm,index) in equipment.alarmList" :key="index">
-								<view><span class="baojing">{{alarm.occurrenceTime?alarm.occurrenceTime:''}}  {{alarm.alarmContent}}</span></view>
+								<view><span class="baojing">{{alarm.occurrenceTime?alarm.occurrenceTime:''}} {{alarm.alarmContent}}</span></view>
 							</view>
 						</view>
 						<view class="" v-else>
-							<view><span>{{$t('equipmentStatusList.alarm')}}：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}  {{equipment.alarmContent}}</span></view>
+							<view><span>{{$t('equipmentStatusList.alarm')}}：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}
+									{{equipment.alarmContent}}</span></view>
 						</view>
 					</view>
 				</uni-collapse-item>
 			</view>
-		</uni-collapse>	
+		</uni-collapse>
 	</view>
-	
+
 </template>
 
 <script>
-    import {mapState,mapActions,mapMutations} from 'vuex'
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from 'vuex'
 	import uniCollapse from '@/components/uni-collapse/uni-collapse.vue'
 	import uniCollapseItem from '@/components/uni-collapse-item/uni-collapse-item.vue'
 	import uniList from '@/components/uni-list/uni-list.vue'
 	import uniListItem from '@/components/uni-list-item/uni-list-item.vue'
-	import {dateUtils} from '@/common/util.js';
-    export default {
+	import {
+		dateUtils
+	} from '@/common/util.js';
+	export default {
 		components: {
 			uniCollapse,
 			uniCollapseItem,
@@ -140,64 +166,113 @@
 		},
 		data() {
 			return {
-				globalUser:{},
-				merchantList:[{equipmentList:[]}],
+				globalUser: {},
+				merchantList: [{
+					equipmentList: []
+				}],
 				extraIcon: {
 					color: '#4cd964',
 					size: '22',
 					type: 'spinner'
 				},
-				statusNormal:'status-normal',
-				statusError:'status-error',
-				sleepChecked:null,
-				onffChecked:null,
+				statusNormal: 'status-normal',
+				statusError: 'status-error',
+				sleepChecked: null,
+				onffChecked: null,
+				time: null,
+				timeAll: {
+
+				},
+				input: 0,
 			}
 		},
 		computed: {
 			...mapState(['loginUser']),
 		},
-		onLoad(state){
-			// this.getEquipmentListData();
-		},
 		onPullDownRefresh() {
 			this.getEquipmentListData();
 		},
 		onShow() {
+			this.input = this.input + 1;
 			this.globalUser = uni.getStorageSync("globalUser");
-			uni.setNavigationBarTitle({title: this.$t('equipmentStatusList.title')});
-			uni.setTabBarItem({ index: 3,text: this.$t('tabs.tab4')});
-			this.getEquipmentListData();
+			uni.setNavigationBarTitle({
+				title: this.$t('equipmentStatusList.title')
+			});
+			uni.setTabBarItem({
+				index: 3,
+				text: this.$t('tabs.tab4')
+			});
+			if (this.globalUser.id!=null) {
+				this.getEquipmentListData();
+			}else{
+				uni.reLaunch({
+					url: '../Login/Login',
+				});
+			}
 		},
 		methods: {
 			...mapActions('chart', ['getEquipmentListByUser']),
-			getMerchantTitle(merchant){
-				return merchant.name?merchant.name:merchant.username;
+			getMerchantTitle(merchant) {
+				return merchant.name ? merchant.name : merchant.username;
 			},
-			getEquipmentTitle(equipment){
-				return equipment.name?equipment.name:'暂无名称';
+			getEquipmentTitle(equipment) {
+				return equipment.name ? equipment.name : '暂无名称';
 			},
-			getEquipmentListData(){
+			getEquipmentListData() {
 				this.getEquipmentListByUser(this.globalUser)
-				.then(data => {
-					this.merchantList = data;
-					var listName = data[0].equipmentList;
-					var listId = data[0].id;
-					if(listId!=null && listId!='1'){
-						uni.setStorageSync("listName",listName);
-					}
-					uni.stopPullDownRefresh();
-				}
-				, _ => void uni.stopPullDownRefresh());
+					.then(data => {
+						this.merchantList = data;
+						var listName = data[0].equipmentList;
+						var times = new Map;
+						if (this.input == 1) {
+							for (var i = 0; i < listName.length; i++) {
+								var k = listName[i].id;
+								times.set(k, null);
+							}
+							this.timeAll = times;
+						}
+						var listId = data[0].id;
+						if (listId != null && listId != '1') {
+							uni.setStorageSync("listName", listName);
+						}
+						uni.stopPullDownRefresh();
+					}, _ => void uni.stopPullDownRefresh());
 			},
-			OnOff(id,code){
+			OnOff(id, code) {
 				var that = this;
+				uni.request({
+					url: that.serverurl + '/TEquipment/onoffStatus',
+					data: {
+						"equipmentId": id
+					},
+					method: "POST",
+					success: (res) => {
+
+					},
+				});
+				var ddd = this.timeAll.get(id);
+				if (that.timeAll.get(id) != null) {
+					var stamp = Date.parse(new Date());
+					var t = (stamp - that.timeAll.get(id)) / 1000;
+					if (t < 30) {
+						var s = 30 - t;
+						uni.showModal({
+							title: that.$t('equipmentStatusList.onoff'),
+							content: that.$t('equipmentStatusList.remainingtime') + s + "s",
+							success: function(res) {
+								that.getEquipmentListData();
+							}
+						});
+						return;
+					}
+				}
 				var code1 = code;
-				if(code1==0){
+				if (code1 == 0) {
 					uni.showModal({
-					    title: that.$t('equipmentStatusList.tip'),
-					    content: that.$t('equipmentStatusList.onoffTip'),
-					    success: function (res)  {
-					        if (res.confirm) {
+						title: that.$t('equipmentStatusList.tip'),
+						content: that.$t('equipmentStatusList.onoffTip'),
+						success: function(res) {
+							if (res.confirm) {
 								var serverurl = that.serverurl;
 								var code2 = code1;
 								var equipmentId = id;
@@ -210,16 +285,40 @@
 									method: "POST",
 									success: (res) => {
 										var list = res.data.data;
+										that.input = 2;
+										var timestamp = Date.parse(new Date());
+										that.timeAll.set(id, timestamp);
+										var oo = that.timeAll;
+										// that.time = timestamp;
 										that.getEquipmentListData();
+										if (list == 'SUCCESS') {
+											uni.showModal({
+												title: that.$t('equipmentStatusList.guanji'),
+												content: that.$t('equipmentStatusList.tishi'),
+												success: function(res) {
+													that.getEquipmentListData();
+												}
+											})
+										} else {
+											uni.showModal({
+												title: that.$t('equipmentStatusList.error'),
+												content: that.$t('equipmentStatusList.guanjierror'),
+												success: function(res) {
+													that.onffChecked = true;
+													that.getEquipmentListData();
+												}
+											})
+										}
+
 									}
 								});
-					        } else if (res.cancel) {
+							} else if (res.cancel) {
 								that.onffChecked = false;
 								that.getEquipmentListData();
-					        }
-					    }
+							}
+						}
 					});
-				}else{
+				} else {
 					var serverurl = that.serverurl;
 					var code = code;
 					var equipmentId = id;
@@ -231,21 +330,63 @@
 						},
 						method: "POST",
 						success: (res) => {
+							that.input = 2;
 							var list = res.data.data;
 							that.getEquipmentListData();
+							var timestamp = Date.parse(new Date());
+							that.timeAll.set(id, timestamp);
+							var oo = that.timeAll;
+							// that.time = timestamp;
+							if (list == "SUCCESS") {
+								uni.showModal({
+									title: that.$t('equipmentStatusList.kaiji'),
+									content: that.$t('equipmentStatusList.tishi'),
+									success: function(res) {
+										that.getEquipmentListData();
+									}
+								})
+							} else {
+								uni.showModal({
+									title: that.$t('equipmentStatusList.error'),
+									content: that.$t('equipmentStatusList.kaijierror'),
+									success: function(res) {
+										that.onffChecked = false;
+										that.getEquipmentListData();
+									}
+								})
+							}
+
 						}
 					});
 				}
 			},
-			change(id,code){
+			openDoor(id) {
+				uni.request({
+					url: this.serverurl + '/TEquipment/openDoor',
+					data: {
+						"equipmentId": id
+					},
+					method: "POST",
+					success: (res) => {
+						uni.showModal({
+							title: this.$t('equipmentStatusList.open'),
+							content: this.$t('equipmentStatusList.opensuccess'),
+							success: function(res) {
+
+							}
+						})
+					}
+				});
+			},
+			change(id, code) {
 				var that = this;
 				var code1 = code;
-				if(code1==1){
+				if (code1 == 1) {
 					uni.showModal({
-					    title: that.$t('equipmentStatusList.tip'),
-					    content: that.$t('equipmentStatusList.sleepTip'),
-					    success: function (res)  {
-					        if (res.confirm) {
+						title: that.$t('equipmentStatusList.tip'),
+						content: that.$t('equipmentStatusList.sleepTip'),
+						success: function(res) {
+							if (res.confirm) {
 								var serverurl = that.serverurl;
 								var code2 = code1;
 								var equipmentId = id;
@@ -261,13 +402,13 @@
 										that.getEquipmentListData();
 									}
 								});
-					        } else if (res.cancel) {
+							} else if (res.cancel) {
 								that.sleepChecked = false;
 								that.getEquipmentListData();
-					        }
-					    }
+							}
+						}
 					});
-				}else{
+				} else {
 					var serverurl = that.serverurl;
 					var code = code;
 					var equipmentId = id;
@@ -284,25 +425,9 @@
 						}
 					});
 				}
-				
-				// var serverurl = this.serverurl;
-				// var code = code;
-				// var equipmentId = id;
-				// uni.request({
-				// 	url: serverurl + '/TEquipment/sleep',
-				// 	data: {
-				// 		"adminId": code,
-				// 		"equipmentId": equipmentId
-				// 	},
-				// 	method: "POST",
-				// 	success: (res) => {
-				// 		var list = res.data.data;
-				// 		this.getEquipmentListData();
-				// 	}
-				// });
 			},
 		}
-    }
+	}
 </script>
 
 <style>
@@ -316,16 +441,20 @@
 		color: "#596D83";
 		font-size: 12upx;
 	}
+
 	.status-error {
 		background-color: #dd524d
 	}
+
 	.status-normal {
 		background-color: #4cd964
 	}
-	.baojing{
+
+	.baojing {
 		padding-left: 120upx;
 	}
-	.titleFlag{
+
+	.titleFlag {
 		height: 56upx;
 		background-color: #F8F8F8;
 		color: #8C959F;
@@ -333,36 +462,60 @@
 		display: flex;
 		flex-direction: row;
 	}
-	.img{
+
+	.opendoor {
+		padding-top: 10upx;
+		padding-bottom: 10upx;
+		text-align: center;
+		display: flex;
+		flex-direction: row;
+	}
+
+	.button {
+		padding-left: 15upx;
+		padding-top: 2upx;
+	}
+
+	.p {
+		padding-left: 10upx;
+	}
+
+	.img {
 		padding-top: 20upx;
 		padding-left: 30upx;
 		width: 15upx;
 		height: 15upx;
 	}
-	.wenziT{
+
+	.wenziT {
 		padding-top: 10upx;
 		padding-left: 10upx;
 	}
-	.titlelist{
-		color:#363D44;
+
+	.titlelist {
+		color: #363D44;
 		font-size: 16upx;
 		font-family: "PingFang-SC-Medium";
 	}
-	.swithBox{
+
+	.swithBox {
 		display: flex;
 		flex-direction: row;
 		padding-bottom: 15upx;
 		padding-top: 5upx;
 	}
-	.switch{
+
+	.switch {
 		width: 44upx;
 		height: 22upx;
 	}
-	.swichFont{
+
+	.swichFont {
 		width: 85%;
 		padding-top: 12upx;
 	}
-	.line1{
+
+	.line1 {
 		width: 100%;
 		height: 3upx;
 		background: #000000;

pages/User/merchantList.vue

@@ -63,12 +63,14 @@
 			uni.setTabBarItem({ index: 1,text: this.$t('tabs.tab2')});
 			this.globalUser = uni.getStorageSync("globalUser");
 			this.id = this.globalUser.id;
-			this.getEquipmentListData();
-		},
-		onLoad(state) {
-			// this.globalUser = uni.getStorageSync("globalUser");
-			// this.id = this.globalUser.id;
-			// this.getEquipmentListData();
+			
+			if (this.id!=null) {
+				this.getEquipmentListData();
+			}else{
+				uni.reLaunch({
+					url: '../Login/Login',
+				});
+			}
 		},
 		onPullDownRefresh() {
 			this.getEquipmentListData();

pages/User/user.vue

@@ -79,24 +79,34 @@
 			}, 800);
 		},
 		onShow() {
-			uni.setNavigationBarTitle({title: this.$t('user.title')});
-			 uni.setTabBarItem({ index: 4,text: this.$t('tabs.tab5')});
+			uni.setNavigationBarTitle({
+				title: this.$t('user.title')
+			});
+			uni.setTabBarItem({
+				index: 4,
+				text: this.$t('tabs.tab5')
+			});
 			// uni.startPullDownRefresh();
 			var globalUser = uni.getStorageSync("globalUser");
 			var gid = globalUser.id;
-			if(gid!=1){
+			if (gid != 1) {
 				this.gid = true;
 			}
 			var ifForeign = globalUser.ifForeign;
-			if(ifForeign==0){
+			if (ifForeign == 0) {
 				this.ifForeign = true;
 			}
-			
-			// var me = this;
-			var name = uni.getStorageSync("name");
-			this.name = name;
-			var listName = uni.getStorageSync("listName");
-			this.listName = listName;
+			if (gid != null) {
+				var name = uni.getStorageSync("name");
+				this.name = name;
+				var listName = uni.getStorageSync("listName");
+				this.listName = listName;
+			} else {
+				uni.reLaunch({
+					url: '../Login/Login',
+				});
+			}
+
 			if (listName != '' && listName != null) {
 				var adminId = listName[0].adminId;
 				if (adminId != '1' && adminId != null) {

unpackage/dist/dev/.tmp/app-plus/app.json

@@ -1,32 +1,74 @@
 {
   "pages": [
     "pages/Login/Login",
-    "pages/PaperList/PaperList",
-    "pages/Paper/Paper"
+    "pages/Login/loginWeixin",
+    "pages/Charts/mainStatistics",
+    "pages/User/merchantList",
+    "pages/User/equipmentSratisticsList",
+    "pages/User/equipmentStatusList",
+    "pages/User/user",
+    "pages/User/promoCode",
+    "pages/User/buyPromo",
+    "pages/User/equipmentName",
+    "pages/Charts/elseStatistics",
+    "pages/Charts/equipmentStatistics",
+    "pages/WeixinSwicth/WeixinSwicth"
   ],
-  "subPackages": [],
   "window": {
-    "navigationBarTextStyle": "black",
+    "navigationBarTextStyle": "white",
     "navigationBarTitleText": "",
-    "navigationBarBackgroundColor": "#F8F8F8",
+    "navigationBarBackgroundColor": "#206DC3",
     "backgroundColor": "#F8F8F8",
     "animationType": "slide-in-right",
     "animationDuration": 200
   },
-  "nvueCompiler": "weex",
+  "tabBar": {
+    "color": "#7A7E83",
+    "selectedColor": "#007AFF",
+    "borderStyle": "black",
+    "backgroundColor": "#F8F8F8",
+    "list": [
+      {
+        "pagePath": "pages/Charts/mainStatistics",
+        "iconPath": "static/img/home.png",
+        "selectedIconPath": "static/img/homeHL.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/User/merchantList",
+        "iconPath": "static/img/merchantList.png",
+        "selectedIconPath": "static/img/merchantListHL.png",
+        "text": "机器销售"
+      },
+      {
+        "pagePath": "pages/Charts/equipmentStatistics",
+        "iconPath": "static/img/equipmentSratisticsList.png",
+        "selectedIconPath": "static/img/equipmentSratisticsListHL.png",
+        "text": "机器排行"
+      },
+      {
+        "pagePath": "pages/User/equipmentStatusList",
+        "iconPath": "static/img/equipment.png",
+        "selectedIconPath": "static/img/equipmentHL.png",
+        "text": "机器状态"
+      },
+      {
+        "pagePath": "pages/User/user",
+        "iconPath": "static/img/user.png",
+        "selectedIconPath": "static/img/userHL.png",
+        "text": "我的"
+      }
+    ]
+  },
+  "nvueCompiler": "uni-app",
+  "renderer": "auto",
   "splashscreen": {
     "alwaysShowBeforeRender": true,
     "autoclose": false
   },
-  "appname": "润银小测",
-  "compilerVersion": "2.1.1",
+  "appname": "申泽智能物联",
+  "compilerVersion": "2.4.2",
   "usingComponents": {
-    "paper-list-item": "/components/paper/PaperListItem",
-    "question-title": "/components/paper/QuestionTitle",
-    "single-answer-choise": "/components/paper/SingleAnswerChoise",
-    "multi-answers-choise": "/components/paper/MultiAnswersChoise",
-    "fill-blank": "/components/paper/FillBlank",
-    "true-false": "/components/paper/TrueFalse",
-    "qand-a": "/components/paper/QandA"
+    "main-statistics": "/pages/Charts/mainStatistics"
   }
 }

unpackage/dist/dev/.tmp/app-plus/components/paper/FillBlank.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "question-title": "/components/paper/QuestionTitle"
-  },
-  "component": true
-}

unpackage/dist/dev/.tmp/app-plus/components/paper/FillBlank.wxml

@@ -1 +0,0 @@
-<view><question-title vue-id="1" num="{{num}}" title="{{question.question.questionTitle}}" bind:__l="__l"></question-title><view class="fill-blank"><block wx:for="{{question.blankCount}}" wx:for-item="index" wx:for-index="__i0__" wx:key="*this"><input type="text" placeholder="请填写内容" data-event-opts="{{[['input',[['fillInAnswer',['$0','$event'],[[['question.blankCount','',__i0__]]]]]]]}}" bindinput="__e"/></block></view></view>

unpackage/dist/dev/.tmp/app-plus/components/paper/FillBlank.wxss

@@ -1,34 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.fill-blank {
-  padding: 5rpx 20rpx;
-}
-.fill-blank input {
-    border: 1px solid #c8c7cc;
-    margin: 10rpx 0;
-}
-

unpackage/dist/dev/.tmp/app-plus/components/paper/MultiAnswersChoise.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "question-title": "/components/paper/QuestionTitle"
-  },
-  "component": true
-}

unpackage/dist/dev/.tmp/app-plus/components/paper/MultiAnswersChoise.wxss

@@ -1,50 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.option-group {
-  padding: 5rpx 20rpx;
-}
-.option-group .option {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-    -webkit-flex-flow: row nowrap;
-        -ms-flex-flow: row nowrap;
-            flex-flow: row nowrap;
-    -webkit-box-pack: start;
-    -webkit-justify-content: flex-start;
-        -ms-flex-pack: start;
-            justify-content: flex-start;
-    -webkit-box-align: center;
-    -webkit-align-items: center;
-        -ms-flex-align: center;
-            align-items: center;
-    padding: 10rpx 0;
-}
-

unpackage/dist/dev/.tmp/app-plus/components/paper/PaperListItem.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

unpackage/dist/dev/.tmp/app-plus/components/paper/PaperListItem.wxml

@@ -1 +0,0 @@
-<view data-event-opts="{{[['tap',[['$emit',['click']]]]]}}" class="item-content" bindtap="__e"><view class="content-wrapper"><view class="paper-name">{{''+(paper.paperName||'')+''}}</view><view class="paper-desc">{{''+(paper.paperDescription||'')+''}}</view><view class="total-score">{{'总分: '+(paper.totalScore||'-')+''}}</view></view></view>

unpackage/dist/dev/.tmp/app-plus/components/paper/PaperListItem.wxss

@@ -1,76 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.item-content {
-  padding: 20rpx;
-}
-.item-content .content-wrapper {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-    -webkit-flex-flow: column nowrap;
-        -ms-flex-flow: column nowrap;
-            flex-flow: column nowrap;
-    -webkit-box-align: start;
-    -webkit-align-items: flex-start;
-        -ms-flex-align: start;
-            align-items: flex-start;
-    -webkit-box-pack: stretch;
-    -webkit-justify-content: stretch;
-        -ms-flex-pack: stretch;
-            justify-content: stretch;
-    border: 1px solid #c8c7cc;
-    border-radius: 10rpx;
-    background-color: #f8f8f8;
-}
-.item-content .content-wrapper:active {
-      background-color: #f1f1f1;
-}
-.item-content .content-wrapper .paper-name {
-      color: #333;
-      position: relative;
-      padding: 10rpx;
-}
-.item-content .content-wrapper .paper-name::after {
-        content: ' ';
-        border-bottom: 1px solid #c0c0c0;
-        position: absolute;
-        bottom: 0rpx;
-        left: 0rpx;
-        width: 100%;
-}
-.item-content .content-wrapper .paper-desc {
-      color: #999;
-      font-size: 24rpx;
-}
-.item-content .content-wrapper .total-score {
-      margin-top: 10rpx;
-      font-size: 32rpx;
-}
-

unpackage/dist/dev/.tmp/app-plus/components/paper/QandA.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "question-title": "/components/paper/QuestionTitle"
-  },
-  "component": true
-}

unpackage/dist/dev/.tmp/app-plus/components/paper/QandA.wxml

@@ -1 +0,0 @@
-<view><question-title vue-id="1" num="{{num}}" title="{{question.question.questionTitle}}" bind:__l="__l"></question-title><view class="answer-area"><textarea placeholder="请输入答案" data-event-opts="{{[['input',[['answerChanged',['$event']]]]]}}" bindinput="__e"></textarea></view></view>

unpackage/dist/dev/.tmp/app-plus/components/paper/QandA.wxss

@@ -1,33 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.answer-area {
-  padding: 5rpx 20rpx;
-}
-.answer-area textarea {
-    border: 1px solid #c8c7cc;
-}
-

unpackage/dist/dev/.tmp/app-plus/components/paper/QuestionTitle.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

unpackage/dist/dev/.tmp/app-plus/components/paper/QuestionTitle.wxml

@@ -1 +0,0 @@
-<view>{{num+". "+title}}</view>

unpackage/dist/dev/.tmp/app-plus/components/paper/SingleAnswerChoise.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "question-title": "/components/paper/QuestionTitle"
-  },
-  "component": true
-}

unpackage/dist/dev/.tmp/app-plus/components/paper/SingleAnswerChoise.wxss

@@ -1,50 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.option-group {
-  padding: 5rpx 20rpx;
-}
-.option-group .option {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-    -webkit-flex-flow: row nowrap;
-        -ms-flex-flow: row nowrap;
-            flex-flow: row nowrap;
-    -webkit-box-pack: start;
-    -webkit-justify-content: flex-start;
-        -ms-flex-pack: start;
-            justify-content: flex-start;
-    -webkit-box-align: center;
-    -webkit-align-items: center;
-        -ms-flex-align: center;
-            align-items: center;
-    padding: 10rpx 0;
-}
-

unpackage/dist/dev/.tmp/app-plus/components/paper/TrueFalse.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "question-title": "/components/paper/QuestionTitle"
-  },
-  "component": true
-}

unpackage/dist/dev/.tmp/app-plus/components/paper/TrueFalse.wxml

@@ -1 +0,0 @@
-<view><question-title vue-id="1" num="{{num}}" title="{{question.question.questionTitle}}" bind:__l="__l"></question-title><view class="option-group"><radio-group data-event-opts="{{[['change',[['trueFalseChanged',['$event']]]]]}}" bindchange="__e"><label class="option"><view><radio value="是" color="{{color}}"></radio></view><view>是</view></label><label class="option"><view><radio value="否" color="{{color}}"></radio></view><view>否</view></label></radio-group></view></view>

unpackage/dist/dev/.tmp/app-plus/components/paper/TrueFalse.wxss

@@ -1,50 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.option-group {
-  padding: 5rpx 20rpx;
-}
-.option-group .option {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-    -webkit-flex-flow: row nowrap;
-        -ms-flex-flow: row nowrap;
-            flex-flow: row nowrap;
-    -webkit-box-pack: start;
-    -webkit-justify-content: flex-start;
-        -ms-flex-pack: start;
-            justify-content: flex-start;
-    -webkit-box-align: center;
-    -webkit-align-items: center;
-        -ms-flex-align: center;
-            align-items: center;
-    padding: 10rpx 0;
-}
-

unpackage/dist/dev/.tmp/app-plus/manifest.json

@@ -5,7 +5,7 @@
     "iPad"
   ],
   "id": "__UNI__C9DE28D",
-  "name": "润银小测",
+  "name": "申泽智能物联",
   "version": {
     "name": "1.0.0",
     "code": "100"
@@ -24,7 +24,7 @@
   },
   "plus": {
     "useragent": {
-      "value": "uni-app appservice",
+      "value": "uni-app",
       "concatenate": true
     },
     "splashscreen": {
@@ -35,20 +35,52 @@
     },
     "popGesture": "close",
     "launchwebview": {
-      "render": "always",
       "id": "1",
-      "kernel": "WKWebview"
+      "kernel": "WKWebview",
+      "uni-app": "auto"
     },
     "statusbar": {
       "immersed": "supportedDevice",
-      "style": "dark",
-      "background": "#F8F8F8"
+      "style": "light",
+      "background": "#206DC3"
     },
     "softinput": {
       "navBar": "none"
     },
     "usingComponents": true,
     "distribute": {
+      "icons": {
+        "android": {
+          "hdpi": "unpackage/res/icons/72x72.png",
+          "xhdpi": "unpackage/res/icons/96x96.png",
+          "xxhdpi": "unpackage/res/icons/144x144.png",
+          "xxxhdpi": "unpackage/res/icons/192x192.png"
+        },
+        "ios": {
+          "appstore": "unpackage/res/icons/1024x1024.png",
+          "ipad": {
+            "app": "unpackage/res/icons/76x76.png",
+            "app@2x": "unpackage/res/icons/152x152.png",
+            "notification": "unpackage/res/icons/20x20.png",
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "proapp@2x": "unpackage/res/icons/167x167.png",
+            "settings": "unpackage/res/icons/29x29.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "spotlight": "unpackage/res/icons/40x40.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png"
+          },
+          "iphone": {
+            "app@2x": "unpackage/res/icons/120x120.png",
+            "app@3x": "unpackage/res/icons/180x180.png",
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "notification@3x": "unpackage/res/icons/60x60.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "settings@3x": "unpackage/res/icons/87x87.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png",
+            "spotlight@3x": "unpackage/res/icons/120x120.png"
+          }
+        }
+      },
       "google": {
         "permissions": [
           "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
@@ -85,10 +117,59 @@
       }
     },
     "allowsInlineMediaPlayback": true,
+    "safearea": {
+      "background": "#F8F8F8",
+      "bottom": {
+        "offset": "auto"
+      }
+    },
     "uni-app": {
-      "compilerVersion": "2.1.1",
+      "compilerVersion": "2.4.2",
       "control": "v8",
-      "nvueCompiler": "weex"
+      "nvueCompiler": "uni-app",
+      "renderer": "auto",
+      "nvue": {
+        "flex-direction": "column"
+      }
+    },
+    "tabBar": {
+      "color": "#7A7E83",
+      "selectedColor": "#007AFF",
+      "borderStyle": "rgba(0,0,0,0.4)",
+      "backgroundColor": "#F8F8F8",
+      "list": [
+        {
+          "pagePath": "pages/Charts/mainStatistics",
+          "iconPath": "static/img/home.png",
+          "selectedIconPath": "static/img/homeHL.png",
+          "text": "首页"
+        },
+        {
+          "pagePath": "pages/User/merchantList",
+          "iconPath": "static/img/merchantList.png",
+          "selectedIconPath": "static/img/merchantListHL.png",
+          "text": "机器销售"
+        },
+        {
+          "pagePath": "pages/Charts/equipmentStatistics",
+          "iconPath": "static/img/equipmentSratisticsList.png",
+          "selectedIconPath": "static/img/equipmentSratisticsListHL.png",
+          "text": "机器排行"
+        },
+        {
+          "pagePath": "pages/User/equipmentStatusList",
+          "iconPath": "static/img/equipment.png",
+          "selectedIconPath": "static/img/equipmentHL.png",
+          "text": "机器状态"
+        },
+        {
+          "pagePath": "pages/User/user",
+          "iconPath": "static/img/user.png",
+          "selectedIconPath": "static/img/userHL.png",
+          "text": "我的"
+        }
+      ],
+      "height": "50px"
     }
   }
 }

unpackage/dist/dev/.tmp/app-plus/pages/Paper/Paper.json

@@ -1,9 +0,0 @@
-{
-  "usingComponents": {
-    "single-answer-choise": "/components/paper/SingleAnswerChoise",
-    "multi-answers-choise": "/components/paper/MultiAnswersChoise",
-    "fill-blank": "/components/paper/FillBlank",
-    "true-false": "/components/paper/TrueFalse",
-    "qand-a": "/components/paper/QandA"
-  }
-}

unpackage/dist/dev/.tmp/app-plus/pages/Paper/Paper.wxss

@@ -1,39 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.odd {
-  background-color: #f8f8f8;
-}
-.event {
-  background-color: white;
-}
-.submit {
-  padding: 20rpx 30rpx;
-}
-button {
-  background-color: #f4ae1b !important;
-}
-

unpackage/dist/dev/.tmp/app-plus/pages/PaperList/PaperList.json

@@ -1,8 +0,0 @@
-{
-  "navigationBarTitleText": "待考试卷",
-  "disableScroll": true,
-  "enablePullDownRefresh": true,
-  "usingComponents": {
-    "paper-list-item": "/components/paper/PaperListItem"
-  }
-}

unpackage/dist/dev/.tmp/app-plus/pages/PaperList/PaperList.wxml

@@ -1 +0,0 @@
-<view><block wx:for="{{papers}}" wx:for-item="paper" wx:for-index="__i0__" wx:key="paperId"><paper-list-item vue-id="{{'1-'+__i0__}}" paper="{{paper}}" data-event-opts="{{[['^click',[['onPaperClicked',['$0'],[[['papers','paperId',paper.paperId]]]]]]]}}" bind:click="__e" bind:__l="__l"></paper-list-item></block></view>

unpackage/dist/dev/app-plus/__uniapptabbar.html

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-    <head>
-        <meta charset="UTF-8" />
-        <title>TabBar</title>
-
-        <script>
-            document.addEventListener('plusready', function() {
-                window.UniLaunchWebviewReady = function(isWebviewReady){
-                  plus.webview.postMessageToUniNView({type: 'UniWebviewReady-' + plus.webview.currentWebview().id}, '__uniapp__service');
-                }
-                UniLaunchWebviewReady(true);
-            })
-        </script>
-    </head>
-    <body>
-    </body>
-
-</html>

unpackage/dist/dev/app-plus/manifest.json

@@ -5,7 +5,7 @@
     "iPad"
   ],
   "id": "__UNI__C9DE28D",
-  "name": "润银小测",
+  "name": "申泽智能物联",
   "version": {
     "name": "1.0.0",
     "code": "100"
@@ -24,7 +24,7 @@
   },
   "plus": {
     "useragent": {
-      "value": "uni-app appservice",
+      "value": "uni-app",
       "concatenate": true
     },
     "splashscreen": {
@@ -35,20 +35,52 @@
     },
     "popGesture": "close",
     "launchwebview": {
-      "render": "always",
       "id": "1",
-      "kernel": "WKWebview"
+      "kernel": "WKWebview",
+      "uni-app": "auto"
     },
     "statusbar": {
       "immersed": "supportedDevice",
-      "style": "dark",
-      "background": "#F8F8F8"
+      "style": "light",
+      "background": "#206DC3"
     },
     "softinput": {
       "navBar": "none"
     },
     "usingComponents": true,
     "distribute": {
+      "icons": {
+        "android": {
+          "hdpi": "unpackage/res/icons/72x72.png",
+          "xhdpi": "unpackage/res/icons/96x96.png",
+          "xxhdpi": "unpackage/res/icons/144x144.png",
+          "xxxhdpi": "unpackage/res/icons/192x192.png"
+        },
+        "ios": {
+          "appstore": "unpackage/res/icons/1024x1024.png",
+          "ipad": {
+            "app": "unpackage/res/icons/76x76.png",
+            "app@2x": "unpackage/res/icons/152x152.png",
+            "notification": "unpackage/res/icons/20x20.png",
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "proapp@2x": "unpackage/res/icons/167x167.png",
+            "settings": "unpackage/res/icons/29x29.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "spotlight": "unpackage/res/icons/40x40.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png"
+          },
+          "iphone": {
+            "app@2x": "unpackage/res/icons/120x120.png",
+            "app@3x": "unpackage/res/icons/180x180.png",
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "notification@3x": "unpackage/res/icons/60x60.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "settings@3x": "unpackage/res/icons/87x87.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png",
+            "spotlight@3x": "unpackage/res/icons/120x120.png"
+          }
+        }
+      },
       "google": {
         "permissions": [
           "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
@@ -85,10 +117,59 @@
       }
     },
     "allowsInlineMediaPlayback": true,
+    "safearea": {
+      "background": "#F8F8F8",
+      "bottom": {
+        "offset": "auto"
+      }
+    },
     "uni-app": {
-      "compilerVersion": "2.1.1",
+      "compilerVersion": "2.4.2",
       "control": "v8",
-      "nvueCompiler": "weex"
+      "nvueCompiler": "uni-app",
+      "renderer": "auto",
+      "nvue": {
+        "flex-direction": "column"
+      }
+    },
+    "tabBar": {
+      "color": "#7A7E83",
+      "selectedColor": "#007AFF",
+      "borderStyle": "rgba(0,0,0,0.4)",
+      "backgroundColor": "#F8F8F8",
+      "list": [
+        {
+          "pagePath": "pages/Charts/mainStatistics",
+          "iconPath": "static/img/home.png",
+          "selectedIconPath": "static/img/homeHL.png",
+          "text": "首页"
+        },
+        {
+          "pagePath": "pages/User/merchantList",
+          "iconPath": "static/img/merchantList.png",
+          "selectedIconPath": "static/img/merchantListHL.png",
+          "text": "机器销售"
+        },
+        {
+          "pagePath": "pages/Charts/equipmentStatistics",
+          "iconPath": "static/img/equipmentSratisticsList.png",
+          "selectedIconPath": "static/img/equipmentSratisticsListHL.png",
+          "text": "机器排行"
+        },
+        {
+          "pagePath": "pages/User/equipmentStatusList",
+          "iconPath": "static/img/equipment.png",
+          "selectedIconPath": "static/img/equipmentHL.png",
+          "text": "机器状态"
+        },
+        {
+          "pagePath": "pages/User/user",
+          "iconPath": "static/img/user.png",
+          "selectedIconPath": "static/img/userHL.png",
+          "text": "我的"
+        }
+      ],
+      "height": "50px"
     }
   }
 }

unpackage/dist/dev/app-plus/pages/Paper/Paper.js

@@ -1,2 +0,0 @@
-setCssToHead(["@charset \x22UTF-8\x22;\n.",[1],"odd { background-color: #f8f8f8; }\n.",[1],"event { background-color: white; }\n.",[1],"submit { padding: ",[0,20]," ",[0,30],"; }\nwx-button { background-color: #f4ae1b !important; }\n",],undefined,{path:"./pages/Paper/Paper.wxss"})();
-document.dispatchEvent(new CustomEvent("generateFuncReady", { detail: { generateFunc: $gwx('./pages/Paper/Paper.wxml') } }));

unpackage/dist/dev/app-plus/pages/PaperList/PaperList.js

@@ -1 +0,0 @@
-document.dispatchEvent(new CustomEvent("generateFuncReady", { detail: { generateFunc: $gwx('./pages/PaperList/PaperList.wxml') } }));