1/6 代码更新

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "智控",
+    "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.2.2",
-    "versionCode" : 122,
+    "versionName" : "1.2.3",
+    "versionCode" : 123,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/login/login.vue

@@ -205,8 +205,8 @@
 			upgrade() {
 				console.log(this.appName)
 				// var url = this.value + "/app_file/" + this.appName
-				var appName = "big_data2"//中性
-				// var appName = "big_data"//云飞
+				// var appName = "big_data2"//中性
+				var appName = "big_data"//云飞
 				var url = "http://hnyfwlw.com/app/"+appName+".apk"
 				const downloadTask = uni.downloadFile({
 					url: url, //仅为示例，并非真实的资源

pages/my/about/about.vue

@@ -2,20 +2,20 @@
 	<view>
 		<view class="line"></view>
 		<view class="logo-box">
-			<!-- <image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/c9b4eb88c03b2f7460e8479e80f40fc.png'" mode="widthFix"></image> -->
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/c9b4eb88c03b2f7460e8479e80f40fc.png'" mode="widthFix"></image>
 			<view class="version">
-				<!-- <view>
-					云飞物联网
-				</view> -->
 				<view>
-					当前版本号
+					云飞物联网
 				</view>
+				<!-- <view>
+					当前版本号
+				</view> -->
 				<view>
 					V{{id}}
 				</view>
 			</view>
 		</view>
-		<!-- <view class="line"></view>
+		<view class="line"></view>
 		<view class="part">
 			<view class="info-item">
 				<text class="tit">技术支持</text>
@@ -43,7 +43,7 @@
 				<text class="tit">公司邮箱</text>
 				<text class="val">hnyf826@163.com</text>
 			</view>
-		</view> -->
+		</view>
 		<view class="line"></view>
 		<view class="part">
 			<view class="info-item" @click="renewal">
@@ -59,9 +59,9 @@
 				<u-icon name="arrow-right"></u-icon>
 			</view>
 		</view>
-		<!-- <view class="bottom">
+		<view class="bottom">
 			©河南云飞科技发展有限公司
-		</view> -->
+		</view>
 		<u-modal title="升级中请勿随意操作" :show-confirm-button="false" v-model="showA" :content="contentA">
 			<view class="upgradeBox">
 				<u-line-progress v-show="isShow" active-color="#19be6b" :striped="true" :percent="percentNum" :striped-active="true"></u-line-progress>
@@ -146,9 +146,9 @@
 				// console.log(this.appName)
 				// ---------------------------------------------------------------------------------------------------------------------------
 				//中性版
-				this.appName = "big_data2"
+				// this.appName = "big_data2"
 				//标准版
-				// this.appName = "big_data"
+				this.appName = "big_data"
 				var url = "http://hnyfwlw.com/app/" + this.appName + ".apk"
 				console.log(url)
 				const downloadTask = uni.downloadFile({

pages/my/index/index.vue

@@ -19,8 +19,8 @@
 			<view style="background-color: #FFFFFF;margin: 20rpx auto 0;">
 				<view class="AboutUs" @click="about">
 					<u-icon name="pingtai" custom-prefix="custom-icon" class="icon_left"></u-icon>
-					<!-- 关于我们 -->
-					关于更新
+					关于我们
+					<!-- 关于更新 -->
 					<p class="update" v-if="updateTF">NEW</p>
 					<uni-icons type="arrowright" class="icon_right"></uni-icons>
 				</view>

pages/prevention/equipmentdetails.vue

@@ -104,11 +104,11 @@
 					}, {
 						icon: '/image/cb/icon08.png',
 						txt: '环境温度(℃)',
-						value: this.olddata.new_tem == "" ? "--" : this.olddata.new_tem
+						value: this.olddata.at == "" ? "--" : this.olddata.at
 					}, {
 						icon: '/image/cb/icon07.png',
 						txt: '环境湿度(%)',
-						value: this.olddata.new_hum == "" ? "--" : this.olddata.new_hum
+						value: this.olddata.ah == "" ? "--" : this.olddata.ah
 					}, {
 						icon: '/image/prevention/icon16.png',
 						txt: '信号强度',

pages/prevention/ucharts.vue

@@ -65,8 +65,8 @@
 							<td class="td">{{items.d_h_t.dps==0?"正常":"保护"}}</td>
 							<td class="td">{{items.d_h_t.tt}}</td>
 							<td class="td">{{items.d_h_t.ct}}</td>
-							<td class="td">{{items.d_h_t.new_tem==""?"--":items.d_h_t.new_tem}}</td>
-							<td class="td">{{items.d_h_t.new_hum==""?"--":items.d_h_t.new_hum}}</td>
+							<td class="td">{{items.d_h_t.at==""?"--":items.d_h_t.at}}</td>
+							<td class="td">{{items.d_h_t.ah==""?"--":items.d_h_t.ah}}</td>
 							<td class="td">{{items.d_h_t.cv}}</td>
 							<td class="td">{{items.d_h_t.bv}}</td>
 						</tr>