Merge commit '498cb04eaeee99794f27eb41d08c096603709628' into dev-xiaomi

# Conflicts:
#	manifest.json
#	unpackage/cache/apk/__UNI__DBA6730_cm.apk
#	unpackage/cache/apk/apkurl
#	unpackage/cache/apk/cmManifestCache.json
#	unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-hdpi.png
#	unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xhdpi.png
#	unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxhdpi.png
#	unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxxhdpi.png
#	unpackage/cache/wgt/__UNI__DBA6730/app-service.js
#	unpackage/cache/wgt/__UNI__DBA6730/app-view.js
#	unpackage/cache/wgt/__UNI__DBA6730/manifest.json
#	unpackage/dist/build/app-plus/app-service.js
#	unpackage/dist/build/app-plus/app-view.js
#	unpackage/dist/build/app-plus/manifest.json
#	unpackage/res/icons/1024x1024.png
#	unpackage/res/icons/120x120.png
#	unpackage/res/icons/144x144.png
#	unpackage/res/icons/152x152.png
#	unpackage/res/icons/167x167.png
#	unpackage/res/icons/180x180.png
#	unpackage/res/icons/192x192.png
#	unpackage/res/icons/20x20.png
#	unpackage/res/icons/29x29.png
#	unpackage/res/icons/40x40.png
#	unpackage/res/icons/58x58.png
#	unpackage/res/icons/60x60.png
#	unpackage/res/icons/72x72.png
#	unpackage/res/icons/76x76.png
#	unpackage/res/icons/80x80.png
#	unpackage/res/icons/87x87.png
#	unpackage/res/icons/96x96.png
#	util/api.js

App.vue

@@ -11,6 +11,7 @@
 </script>
 <style lang="scss">
 	@import "./static/font/iconfont.css";
+	@import "./static/iconfont/iconfont.css";
 	html {
 		box-sizing: border-box;
 		font-size: 28rpx !important;

manifest.json

@@ -2,8 +2,8 @@
     "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.9.6",
-    "versionCode" : 196,
+    "versionName" : "1.9.8",
+    "versionCode" : 198,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -139,29 +139,29 @@
         },
         "usingComponents" : true,
         "uniStatistics" : {
-            "enable" : false
+            "enable" : true
         }
     },
     "mp-alipay" : {
         "usingComponents" : true,
         "uniStatistics" : {
-            "enable" : false
+            "enable" : true
         }
     },
     "mp-baidu" : {
         "usingComponents" : true,
         "uniStatistics" : {
-            "enable" : false
+            "enable" : true
         }
     },
     "mp-toutiao" : {
         "usingComponents" : true,
         "uniStatistics" : {
-            "enable" : false
+            "enable" : true
         }
     },
     "uniStatistics" : {
-        "enable" : false,
+        "enable" : true,
         "version" : "2"
     },
     "h5" : {
@@ -188,37 +188,37 @@
             }
         },
         "uniStatistics" : {
-            "enable" : false
+            "enable" : true
         }
     },
     "mp-jd" : {
         "uniStatistics" : {
-            "enable" : false
+            "enable" : true
         }
     },
     "mp-kuaishou" : {
         "uniStatistics" : {
-            "enable" : false
+            "enable" : true
         }
     },
     "mp-lark" : {
         "uniStatistics" : {
-            "enable" : false
+            "enable" : true
         }
     },
     "mp-qq" : {
         "uniStatistics" : {
-            "enable" : false
+            "enable" : true
         }
     },
     "quickapp-webview-huawei" : {
         "uniStatistics" : {
-            "enable" : false
+            "enable" : true
         }
     },
     "quickapp-webview-union" : {
         "uniStatistics" : {
-            "enable" : false
+            "enable" : true
         }
     }
 }

pages.json

@@ -244,8 +244,8 @@
 			"path": "pages/prevention/sim",
 			"style": {
 				"navigationBarTitleText": "sim卡详情",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
+				"enablePullDownRefresh": false
+				// "navigationStyle": "custom"
 			}
 
 		}, {
@@ -806,6 +806,13 @@
         		"navigationBarTitleText" : "水肥详情",
         		"enablePullDownRefresh" : false
         	}
+        },
+        {
+        	"path" : "pages/cb/xylps/detail",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "详情"
+        	}
         }
     ],
 	"condition": { //模式配置，仅开发期间生效

pages/cb/bzy/equip-set/bzyhistoryile.vue

@@ -257,7 +257,8 @@
 				})
 			},
 			showColumn(id, xtitle, xinfo) {
-				var _self = this
+				var _self = this;
+				console.log(_self.cWidth, '_self.cWidth');
 				canvaColumnA = new uCharts({
 					canvasId: id,
 					type: 'line',
@@ -475,7 +476,7 @@
 
 				.th:first-child,
 				.td:first-child {
-					width: 300rpx;
+					width: 350rpx;
 				}
 			}
 

pages/cb/cbd/equip-set/historyfile.vue

@@ -30,7 +30,7 @@
 						<tr class="tr">
 							<th class="th" v-for="(item,index) in thdata" :key="'a'+index">{{item}}</th>
 						</tr>
-						<tr class="tr" v-for="(items,indexs) in historylistdata" :key="'b'+indexs" v-if="!forbidden">
+						<tr :class="`tr ${items.d_h_t.is_history && myuser_type == 1 ? 'redText': ''}`" v-for="(items,indexs) in historylistdata" :key="'b'+indexs" v-if="!forbidden">
 							<td class="td">{{items.d_h_t.addtime|timeFormat()}}</td>
 							<td class="td">{{items.d_h_t.at}}</td>
 							<td class="td">{{items.d_h_t.ah}}</td>
@@ -53,7 +53,7 @@
 						<tr class="tr">
 							<th class="th" v-for="(item,index) in thdata2" :key="'a'+index">{{item}}</th>
 						</tr>
-						<tr class="tr" v-for="(items,indexs) in historylistdata" :key="'b'+indexs" v-if="!forbidden">
+						<tr :class="`tr ${items.d_h_t.is_history && myuser_type == 1 ? 'redText': ''}`" v-for="(items,indexs) in historylistdata" :key="'b'+indexs" v-if="!forbidden">
 							<td class="td">{{items.d_h_t.addtime|timeFormat()}}</td>
 							<td class="td">{{items.d_h_t.at}}</td>
 							<td class="td">{{items.d_h_t.ah}}</td>
@@ -92,6 +92,7 @@
 	export default {
 		data() {
 			return {
+				myuser_type: null,
 				styles: {
 					// width: "650rpx",
 					height: "400rpx"
@@ -331,6 +332,7 @@
 			this.device_id = option.device_id
 			this.cWidth = uni.upx2px(650);
 			this.cHeight = uni.upx2px(500);
+			this.myuser_type = uni.getStorageSync('myuser_type')
 		},
 		onShow(){
 			this.end_time = +new  Date() + 1000
@@ -470,6 +472,11 @@
 				background-color: #57c878;
 				color: #fff;
 			}
+			.redText{
+				.td{
+					color: #dc143c;
+				}
+			}
 		}
 
 		.pagenumber {

pages/cb/equip-detail/equip-detail.vue

@@ -160,7 +160,7 @@
 					}, {
 						icon: '/image/cb/6.png',
 						tex: 'sim卡详情',
-						path: '/pages/cb/sim/sim',
+						path: '/pages/prevention/sim',
 						tf: QueryPermission(274)
 					}, {
 						icon: '/image/environment/7.png',
@@ -183,7 +183,7 @@
 					{
 						icon: '/image/cb/6.png',
 						tex: 'sim卡详情',
-						path: '/pages/cb/sim/sim',
+						path: '/pages/prevention/sim',
 						tf: QueryPermission(70)
 					}, {
 						icon: '/image/environment/7.png',
@@ -200,7 +200,7 @@
 				}, {
 					icon: '/image/cb/6.png',
 					tex: 'sim卡详情',
-					path: '/pages/cb/sim/sim',
+					path: '/pages/prevention/sim',
 					tf: QueryPermission(66),
 				}, {
 					icon: '/image/cb/2.png',

pages/cb/index/index.vue

@@ -31,7 +31,7 @@
 						<equipItem @click.native="itemClick(item)" v-bind:item="item" :key="index">
 							<view class="date">
 								<p>设备ID：{{item.imei || item.device_id}}</p>
-								<p>最新上报时间：{{item.addtime|timeFormat}}</p>
+								<p>最新上报时间：{{item.uptime|timeFormat}}</p>
 								<view class="" style="display: flex;justify-content: space-between;"
 									v-if="(device_type == 3 || device_type==7) && showLastTime">
 									<p>设备到期情况：<span
@@ -300,6 +300,9 @@
 						this.equipArr[act].list[i]['device_expiretext'] = "即将到期"
 					}
 				}
+				this.equipArr[act].list.forEach(item => {
+					item.uptime = item.addtime;
+				})
 				console.log(this.equipArr[act].list)
 			},
 			async getxyEquipList(act) {
@@ -317,6 +320,9 @@
 				this.loadingtf = false
 				console.log(res)
 				this.equipArr[act].list = [...this.equipArr[act].list, ...res.data]
+				// this.equipArr[act].list.forEach(item => {
+				// 	item.addtime = item.uptime;
+				// })
 				console.log(this.equipArr[act].list)
 			},
 			async getthxyEquipList(act) {
@@ -333,7 +339,10 @@
 				})
 				this.loadingtf = false
 				console.log(res)
-				this.equipArr[act].list = [...this.equipArr[act].list, ...res.data]
+				this.equipArr[act].list = [...this.equipArr[act].list, ...res.data];
+				// this.equipArr[act].list.forEach(item => {
+				// 	item.addtime = item.uptime;
+				// })
 				console.log(this.equipArr[act].list)
 			},
 			async getxctEquipList(act) {
@@ -351,9 +360,9 @@
 				this.loadingtf = false
 				console.log(res)
 				this.equipArr[act].list = [...this.equipArr[act].list, ...res.data];
-				this.equipArr[act].list.forEach(item => {
-					item.addtime = item.uptime;
-				})
+				// this.equipArr[act].list.forEach(item => {
+				// 	item.addtime = item.uptime;
+				// })
 			},
 			tabClick(index) {
 				this.width = 0

pages/cb/sy/detail.vue

@@ -32,6 +32,12 @@
 					历史数据
 				</view>
 			</view>
+			<view class="caobox_item" v-if="$QueryPermission(244)" @click="simRouter">
+				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/6.png" mode="widthFix"></image>
+				<view class="">
+					SIM卡信息
+				</view>
+			</view>
 		</view>
 		<view class="realtime">
 			<view class="realtime_title">
@@ -107,6 +113,11 @@
 					url: "./history?device_id=" + this.equipInfo.imei + "&d_id=" + this.equipInfo.d_id
 				})
 			},
+			simRouter() {
+				uni.navigateTo({
+					url: "/pages/prevention/sim?id=" + this.equipInfo.d_id
+				})
+			},
 			copy(item) {
 				console.log(item)
 				uni.setClipboardData({

pages/cb/sy/history.vue

@@ -325,6 +325,7 @@
 			}
 
 			.tr {
+				width: 1070rpx;
 				display: flex;
 				overflow: hidden;
 
@@ -340,7 +341,7 @@
 
 				.th:first-child,
 				.td:first-child {
-					width: 300rpx;
+					width: 350rpx;
 				}
 			}
 

pages/cb/thxydetail/thxydetail.vue

@@ -13,7 +13,7 @@
 				设备类型：性诱3.0
 			</view>
 			<view class="">
-				最新上报时间：{{equipInfo.addtime||equipInfo.uptime | timeFormat}}
+				最新上报时间：{{equipInfo.uptime||equipInfo.uptime | timeFormat}}
 			</view>
 			<view class="">
 				设备地址：{{equipInfo.address}}
@@ -152,7 +152,7 @@
 		methods: {
 			tosim() {
 				uni.navigateTo({
-					url: "../sim/sim?d_id=" + this.equipInfo.d_id + "&device_id=" + this.equipInfo.imei +
+					url: "/pages/prevention/sim?d_id=" + this.equipInfo.d_id + "&device_id=" + this.equipInfo.imei +
 						"&device_type=" + this.equipInfo.type + "&disable=" + this.equipInfo.disable
 				})
 			},

pages/cb/xctdetail/xctdetail.vue

@@ -13,7 +13,7 @@
 				设备类型：吸虫塔
 			</view>
 			<view class="">
-				最新上报时间：{{equipInfo.addtime||equipInfo.uptime | timeFormat}}
+				最新上报时间：{{equipInfo.uptime||equipInfo.uptime | timeFormat}}
 			</view>
 			<view class="">
 				设备地址：{{equipInfo.address||city}}
@@ -38,12 +38,12 @@
 					虫情分析
 				</view>
 			</view>
-			<!-- <view class="caobox_item" v-if="$QueryPermission(238)" @click="toanal">
+			<view class="caobox_item" @click="simRouter">
 				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/6.png" mode="widthFix"></image>
 				<view class="">
 					SIM卡
 				</view>
-			</view> -->
+			</view>
 		</view>
 		<view class="" v-if="$QueryPermission(183)">
 			<view class="">
@@ -213,6 +213,11 @@
 						"&device_type=12&disable=" + this.equipInfo.disable
 				})
 			},
+			simRouter() {
+				uni.navigateTo({
+					url: "/pages/prevention/sim?id=" + this.equipInfo.d_id
+				})
+			},
 			timechange(e) {
 				this.start_time = +new Date(e.startDate)
 				this.end_time = +new Date(e.endDate)

pages/cb/xy2.0/particulars.vue

@@ -71,7 +71,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="sim" v-if="simTF && $QueryPermission(246)">
+			<!-- <view class="sim" v-if="simTF && $QueryPermission(246)">
 				<p class="sim_title">sim卡详情</p>
 				<view class="sim_text">
 					<p class="p">ICCID：{{simdata.iccid}}</p>
@@ -99,7 +99,7 @@
 					</view>
 					<p class="p">到期时间：{{simdata.expiry_date | timeFormat}}</p>
 				</view>
-			</view>
+			</view> -->
 			<u-popup v-model="yxShow" mode="center" width="600rpx">
 				<u-field label="害虫名称" label-width='240' required :error-message="xyErr" v-model="decoy" class="field" :field-style="fieldstyle" placeholder="请填写害虫名称">
 				</u-field >
@@ -288,7 +288,7 @@
 			console.log(this.equipInfo)
       this.getState(this.equipInfo.d_id)
       if (this.equipInfo.type != 21) {
-        this.getSim(this.equipInfo.d_id)
+        // this.getSim(this.equipInfo.d_id)
       }
 			var times = new Date()
 			this.date = times.getFullYear()+1 + "-" + Number(times.getMonth()+1) + "-" + times.getDate()

pages/cb/zjxydetail/thxydetail.vue

@@ -13,7 +13,7 @@
 				设备类型：性诱测报L
 			</view>
 			<view class="">
-				最新上报时间：{{equipInfo.addtime||equipInfo.uptime | timeFormat}}
+				最新上报时间：{{equipInfo.uptime||equipInfo.uptime | timeFormat}}
 			</view>
 			<view class="">
 				设备地址：{{equipInfo.address}}

pages/environment/equipment.vue

@@ -34,7 +34,7 @@
 					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/10.png'" mode=""></image>
 					<p>历史数据</p>
 				</view>
-				<view class="control_item" v-if="eqinfo.item.iccid && $QueryPermission(146)" @click="siminfo(eqinfo.item.iccid)">
+				<view class="control_item" v-if="$QueryPermission(146)" @click="siminfo(eqinfo.item.d_id)">
 					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/6.png'" mode=""></image>
 					<p>SIM卡信息</p>
 				</view>
@@ -332,8 +332,11 @@
 				});
 			},
 			siminfo(sim) {
+				// uni.navigateTo({
+				// 	url: "./sim?simid=" + sim
+				// })
 				uni.navigateTo({
-					url: "./sim?simid=" + sim
+					url: "/pages/prevention/sim?id=" + sim
 				})
 			},
 			async getbaseinfo(id) {

pages/environment/history.vue

@@ -50,7 +50,7 @@
 									{{key.replace("#","(")+")"}}
 								</th>
 							</tr>
-							<tr class="tr" v-for="(items,index) in historydatas.data" :key="index" v-if="!forbidden">
+							<tr :class="`tr ${items.is_history && myuser_type == 1 ? 'redText': ''}`" v-for="(items,index) in historydatas.data" :key="index" v-if="!forbidden">
 								<td class="td">{{items.time|timeFormat()}}</td>
 								<td class="td" v-for="item,indexss in datalength" :key="indexss">
 									{{parseFloat(items.dat["e"+(indexss+1)])==-99.99?"N/A":parseFloat(items.dat["e"+(indexss+1)])}}
@@ -84,6 +84,7 @@
 	export default {
 		data() {
 			return {
+				myuser_type: null,
 				cWidth: '400',
 				cHeight: '400',
 				pixelRatio: 1,
@@ -291,6 +292,7 @@
 			console.log(new Date(1616145097 * 1000), new Date(1616231497 * 1000))
 			this.historydata(option.device_id)
 			this.listhistorydata(option.device_id)
+			this.myuser_type = uni.getStorageSync('myuser_type')
 		}
 	}
 </script>
@@ -457,7 +459,11 @@
 					width: 300rpx;
 				}
 			}
-
+			.redText{
+				.td{
+					color: #dc143c;
+				}
+			}
 			.tr:nth-child(2n-1) {
 				background-color: #f5fff8;
 			}

pages/equipList/index.vue

@@ -45,12 +45,12 @@
               <p>
                 适配用户：{{ item.real_name == "" ? "无" : item.real_name }}
               </p>
-              <p>最新上报时间：{{ (item.addtime) | timeFormat() }}</p>
-              <p v-if="item.uptime === 0">添加设备时间：- -</p>
-              <p v-else>添加设备时间：{{ item.uptime | timeFormat() }}</p>
+              <p>最新上报时间：{{ (item.uptime) | timeFormat() }}</p>
+              <p v-if="item.addtime === 0">添加设备时间：- -</p>
+              <p v-else>添加设备时间：{{ item.addtime | timeFormat() }}</p>
               <p>设备已运行：{{ item.days }}天</p>
             </view>
-            <view class="list_item_btn" v-if="$QueryPermission(108) && ![13, 17, 18, 11, 19, 20, 14, 22].includes(type_id)"
+            <view class="list_item_btn" v-if="$QueryPermission(108) && ![13, 17, 18, 11, 19, 20, 14, 22, 25].includes(type_id)"
               @click.stop="modification(item)">
               信息修改
             </view>
@@ -119,16 +119,23 @@ export default {
       } else {
         var newtime = +new Date() / 1000;
       }
+	  res.data.forEach(item => {
+		  let { uptime, addtime } = item;
+		  item.uptime = addtime;
+		  item.addtime = uptime;
+		  var days = (newtime - item.addtime) / 60 / 60 / 24;
+		  item.days = Math.round(days);
+	  })
       if (tf) {
         this.eqlistdata = this.eqlistdata.concat(res.data);
       } else {
         this.eqlistdata = res.data;
       }
       console.log(this.eqlistdata);
-      for (var i = 0; i < this.eqlistdata.length; i++) {
-        var days = (newtime - this.eqlistdata[i].uptime) / 60 / 60 / 24;
-        this.eqlistdata[i].days = Math.round(days);
-      }
+      // for (var i = 0; i < this.eqlistdata.length; i++) {
+      //   var days = (newtime - this.eqlistdata[i].addtime) / 60 / 60 / 24;
+      //   this.eqlistdata[i].days = Math.round(days);
+      // }
     },
     async xyeqlist(tf) {
       //设备列表
@@ -150,7 +157,7 @@ export default {
         this.eqlistdata = res.data;
       }
       for (var i = 0; i < this.eqlistdata.length; i++) {
-        var days = (newtime - this.eqlistdata[i].uptime) / 60 / 60 / 24;
+        var days = (newtime - this.eqlistdata[i].addtime) / 60 / 60 / 24;
         this.eqlistdata[i].days = Math.round(days);
       }
       console.log(res);
@@ -230,8 +237,9 @@ export default {
         duration: 500,
       });
     },
-    historys(item) {
-      console.log("item", item);
+    historys(itemOld) {
+    	let item = JSON.parse(JSON.stringify(itemOld))
+    	console.log("item", item);
       switch (this.type_id) {
 		// 水肥新设备
 		case 22:
@@ -242,18 +250,20 @@ export default {
 		obj.lat = item.lat;
 		obj.lng = item.lng;
 		obj.equip_name = item.device_name;
-		obj.uptime = item.addtime;
+		obj.uptime = item.uptime;
 		uni.navigateTo({
 		  url: "../waterandfernew/details?shebei=" + JSON.stringify(obj),
 		});
 		break
         // 病虫害可视监测
         case 14:
+		item.addtime = item.uptime;
           uni.navigateTo({
             url: "../cb/sy/detail?detail=" + JSON.stringify(item),
           });
           break
         case 2:
+		item.addtime = item.uptime;
           uni.navigateTo({
             url:
               "../prevention/equipmentdetails?shebei=" + JSON.stringify(item),
@@ -268,7 +278,7 @@ export default {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           uni.navigateTo({
             url: "../environment/equipment?shebei=" + JSON.stringify(obj),
           });
@@ -283,18 +293,21 @@ export default {
           });
           break;
         case 3:
+		item.addtime = item.uptime;
           item.type = this.type_id;
           uni.navigateTo({
             url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item),
           });
           break;
         case 4:
+		item.addtime = item.uptime;
           item.type = this.type_id;
           uni.navigateTo({
             url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item),
           });
           break;
         case 7:
+		item.addtime = item.uptime;
           item.type = this.type_id;
           uni.navigateTo({
             url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item),
@@ -314,6 +327,7 @@ export default {
 		    break;
         case 12:
           console.log(item);
+		  item.addtime = item.uptime;
           uni.navigateTo({
             url: "../cb/xctdetail/xctdetail?info=" + JSON.stringify(item),
           });
@@ -327,7 +341,7 @@ export default {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           uni.navigateTo({
             url: "../waterandfer/datails?shebei=" + JSON.stringify(obj),
           });
@@ -341,7 +355,7 @@ export default {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           uni.navigateTo({
             url: "../environment/gsequipment?shebei=" + JSON.stringify(obj),
           });
@@ -364,7 +378,7 @@ export default {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           obj.location = item.address;
           obj.type = 11;
           uni.navigateTo({
@@ -379,7 +393,7 @@ export default {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           obj.location = item.address;
           obj.type = 19;
           uni.navigateTo({
@@ -394,7 +408,7 @@ export default {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           obj.location = item.address;
           obj.type = 20;
           uni.navigateTo({
@@ -409,14 +423,21 @@ export default {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           obj.location = item.address;
           obj.type = 20;
           uni.navigateTo({
             url: "../disease/cmb?shebei=" + JSON.stringify(obj),
           });
           break;
+		  case 25:
+			item.addtime = item.uptime;
+		    uni.navigateTo({
+		      url:  "../cb/xylps/detail?detail=" + JSON.stringify(item),
+		    });
+		    break;
         default:
+			item.addtime = item.uptime;
           item.type = this.type_id;
           uni.navigateTo({
             url: "../cb/xy2.0/particulars?info=" + JSON.stringify(item),
@@ -511,13 +532,14 @@ page {
 
 .textbox {
   width: 100%;
-  height: 100vh;
+  height: calc(100vh - 30rpx);
   padding: 20rpx 30rpx;
   box-sizing: border-box;
   border-top-left-radius: 80rpx;
   border-top-right-radius: 80rpx;
   margin-top: 30rpx;
   background-color: #f9f9f9;
+  box-sizing: border-box;
 }
 
 .inputs {
@@ -559,13 +581,13 @@ page {
 .listbox {
   display: flex;
   justify-content: space-around;
-  height: calc(100vh - 84px);
+  height: calc(100vh - 150rpx);
   margin-top: 20rpx;
 
   .listbox_left {
     background-color: #fff;
     padding: 20rpx;
-    width: 140rpx;
+    width: 180rpx;
     overflow: auto;
 
     .listbox_left_item {
@@ -588,7 +610,7 @@ page {
 }
 
 .list {
-  width: 70%;
+  width: calc(100vw - 300rpx);
   background-color: #fdfdfd;
   // margin-bottom: 100rpx;
   overflow-y: auto;
@@ -607,7 +629,7 @@ page {
       justify-content: space-between;
 
       .p1 {
-        width: 87%;
+        width: 86%;
         display: flex;
         justify-content: space-between;
         align-items: center;

pages/equipList/search.vue

@@ -20,8 +20,8 @@
 				<view class="list_item_text">
 					<p>设备ID：{{item.imei}}</p>
 					<p>适配用户：{{item.device_user==''?"无":item.device_user}}</p>
-					<p>添加设备时间：{{item.addtime|timeFormat()}}</p>
 					<p>添加设备时间：{{item.uptime|timeFormat()}}</p>
+					<p>添加设备时间：{{item.addtime|timeFormat()}}</p>
 					<p>设备已运行：{{item.days}}天</p>
 				</view>
 				<view class="list_item_btn" v-if="infoalter" @click.stop="modification(item)">
@@ -96,12 +96,22 @@
 						page_size: this.size,
 					}
 				})
-				this.eqlistdata = this.eqlistdata.concat(res.data)
 				var newtime = +new Date()/1000
-				for(var i=0;i<this.eqlistdata.length;i++){
-					var days = (newtime-this.eqlistdata[i].uptime)/60/60/24
-					this.eqlistdata[i].days = Math.round(days)
-				} 
+				res.data.forEach(item => {
+				  let { uptime, addtime } = item;
+				  item.uptime = addtime;
+				  item.addtime = uptime;
+				  var days = (newtime - item.addtime) / 60 / 60 / 24;
+				  item.days = Math.round(days);
+				})
+				this.eqlistdata = this.eqlistdata.concat(res.data)
+				// for(var i=0;i<this.eqlistdata.length;i++){
+				// 	var days = (newtime-this.eqlistdata[i].uptime)/60/60/24
+				// 	this.eqlistdata[i].days = Math.round(days)
+				// 	let { uptime, addtime } = this.eqlistdata[i];
+				// 	this.eqlistdata[i].uptime = addtime;
+				// 	this.eqlistdata[i].addtime = uptime;
+				// } 
 				console.log(this.eqlistdata)
 				if (this.eqlistdata.length == 0) {
 					this.eqlistdatatf = true
@@ -131,102 +141,206 @@
 					url: "./modification?data=" + JSON.stringify(item) + "&id=" + (this.indexs)
 				})
 			},
-			historys(item) {
-				switch (this.type_id) {
-					case 2:
-						uni.navigateTo({
-							url: "../prevention/equipmentdetails?shebei=" + JSON.stringify(item)
-						})
-						break;
-					case 5:
-						console.log(item)
-						var obj = {}
-						obj.d_id = item.d_id
-						obj.equip_id = item.imei
-						obj.is_online = item.is_online
-						obj.lat = item.lat
-						obj.lng = item.lng
-						obj.equip_name = item.device_name
-						obj.uptime = item.addtime
-						uni.navigateTo({
-							url: "../environment/equipment?shebei=" + JSON.stringify(obj)
-						})
-						break;
-					case 6:
-						uni.navigateTo({
-							url: "/pages/webview?device_id=" + item.imei + "&accessToken=" + this.accessToken
-						})
-						break;
-					case 3:
-						item.type = this.type_id
-						uni.navigateTo({
-							url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item)
-						})
-						break;
-					case 4:
-						item.type = this.type_id
-						uni.navigateTo({
-							url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item)
-						})
-						break;
-					case 7:
-						item.type = this.type_id
-						uni.navigateTo({
-							url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item)
-						})
-						break;
-					case 8:
-					  // item.type = this.type_id;
-					  uni.navigateTo({
-					    url: "../cb/thxydetail/thxydetail?imei=" + item.imei
-					  });
-					  break;
-					case 12:
-					  console.log(item);
-					  uni.navigateTo({
-					    url: "../cb/xctdetail/xctdetail?info=" + JSON.stringify(item),
-					  });
-					  break;
-					case 13:
-						console.log(item)
-						var obj = {}
-						obj.d_id = item.d_id
-						obj.device_id = item.imei
-						obj.is_online = item.is_online
-						obj.lat = item.lat
-						obj.lng = item.lng
-						obj.equip_name = item.device_name
-						obj.uptime = item.addtime
-						uni.navigateTo({
-							url: "../waterandfer/datails?shebei=" + JSON.stringify(obj)
-						})
-						break;
-					case 15:
-						console.log(item)
-						var obj = {}
-						obj.d_id = item.d_id
-						obj.device_id = item.imei
-						obj.is_online = item.is_online
-						obj.lat = item.lat
-						obj.lng = item.lng
-						obj.equip_name = item.device_name
-						obj.uptime = item.addtime
-						uni.navigateTo({
-							url: "../environment/gsequipment?shebei=" + JSON.stringify(obj)
-						})
-						break;
-					case 17:
-						break;
-					case 18:
-						break;
-					default:
-						item.type = this.type_id
-						uni.navigateTo({
-							url: "../cb/xy2.0/particulars?info=" + JSON.stringify(item)
-						})
-						break;
-				}
-			}
+			historys(itemOld) {
+			  let item = JSON.parse(JSON.stringify(itemOld))
+			  console.log("item", item);
+			  switch (this.type_id) {
+				// 水肥新设备
+				case 22:
+				var obj = {};
+				obj.d_id = item.d_id;
+				obj.device_id = item.imei;
+				obj.is_online = item.is_online;
+				obj.lat = item.lat;
+				obj.lng = item.lng;
+				obj.equip_name = item.device_name;
+				obj.uptime = item.uptime;
+				uni.navigateTo({
+				  url: "../waterandfernew/details?shebei=" + JSON.stringify(obj),
+				});
+				break
+			    // 病虫害可视监测
+			    case 14:
+			      uni.navigateTo({
+			        url: "../cb/sy/detail?detail=" + JSON.stringify(item),
+			      });
+			      break
+			    case 2:
+			      uni.navigateTo({
+			        url:
+			          "../prevention/equipmentdetails?shebei=" + JSON.stringify(item),
+			      });
+			      break;
+			    case 5:
+			      console.log(item);
+			      var obj = {};
+			      obj.d_id = item.d_id;
+			      obj.equip_id = item.imei;
+			      obj.is_online = item.is_online;
+			      obj.lat = item.lat;
+			      obj.lng = item.lng;
+			      obj.equip_name = item.device_name;
+			      obj.uptime = item.uptime;
+			      uni.navigateTo({
+			        url: "../environment/equipment?shebei=" + JSON.stringify(obj),
+			      });
+			      break;
+			    case 6:
+			      uni.navigateTo({
+			        url:
+			          "/pages/webview?device_id=" +
+			          item.imei +
+			          "&accessToken=" +
+			          this.accessToken,
+			      });
+			      break;
+			    case 3:
+			      item.type = this.type_id;
+			      uni.navigateTo({
+			        url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item),
+			      });
+			      break;
+			    case 4:
+			      item.type = this.type_id;
+			      uni.navigateTo({
+			        url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item),
+			      });
+			      break;
+			    case 7:
+			      item.type = this.type_id;
+			      uni.navigateTo({
+			        url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item),
+			      });
+			      break;
+			    case 8:
+			      // item.type = this.type_id;
+			      uni.navigateTo({
+			        url: "../cb/thxydetail/thxydetail?imei=" + item.imei
+			      });
+			      break;
+				  case 24:
+				    // item.type = this.type_id;
+				    uni.navigateTo({
+				      url: "../cb/zjxydetail/thxydetail?imei=" + item.imei
+				    });
+				    break;
+			    case 12:
+			      console.log(item);
+			      uni.navigateTo({
+			        url: "../cb/xctdetail/xctdetail?info=" + JSON.stringify(item),
+			      });
+			      break;
+			    case 13:
+			      console.log(item);
+			      var obj = {};
+			      obj.d_id = item.d_id;
+			      obj.device_id = item.imei;
+			      obj.is_online = item.is_online;
+			      obj.lat = item.lat;
+			      obj.lng = item.lng;
+			      obj.equip_name = item.device_name;
+			      obj.uptime = item.uptime;
+			      uni.navigateTo({
+			        url: "../waterandfer/datails?shebei=" + JSON.stringify(obj),
+			      });
+			      break;
+			    case 15:
+			      console.log(item);
+			      var obj = {};
+			      obj.d_id = item.d_id;
+			      obj.device_id = item.imei;
+			      obj.is_online = item.is_online;
+			      obj.lat = item.lat;
+			      obj.lng = item.lng;
+			      obj.equip_name = item.device_name;
+			      obj.uptime = item.uptime;
+			      uni.navigateTo({
+			        url: "../environment/gsequipment?shebei=" + JSON.stringify(obj),
+			      });
+			      break;
+			    case 17:
+			      break;
+			    case 18:
+			      var obj = {};
+			      obj.device_id = item.imei;
+			      obj.is_online = item.is_online;
+			      uni.navigateTo({
+			        url: "../cb/shuifeiL/shuifeiL?detail=" + JSON.stringify(obj),
+			      });
+			      break;
+			    case 11:
+			      var obj = {};
+			      obj.d_id = item.d_id;
+			      obj.device_id = item.imei;
+			      obj.is_online = item.is_online;
+			      obj.lat = item.lat;
+			      obj.lng = item.lng;
+			      obj.equip_name = item.device_name;
+			      obj.uptime = item.uptime;
+			      obj.location = item.address;
+			      obj.type = 11;
+			      uni.navigateTo({
+			        url: "../disease/cmb?shebei=" + JSON.stringify(obj),
+			      });
+			      break;
+			    case 19:
+			      var obj = {};
+			      obj.d_id = item.d_id;
+			      obj.device_id = item.imei;
+			      obj.is_online = item.is_online;
+			      obj.lat = item.lat;
+			      obj.lng = item.lng;
+			      obj.equip_name = item.device_name;
+			      obj.uptime = item.uptime;
+			      obj.location = item.address;
+			      obj.type = 19;
+			      uni.navigateTo({
+			        url: "../disease/cmb?shebei=" + JSON.stringify(obj),
+			      });
+			      break;
+			    case 20:
+			      var obj = {};
+			      obj.d_id = item.d_id;
+			      obj.device_id = item.imei;
+			      obj.is_online = item.is_online;
+			      obj.lat = item.lat;
+			      obj.lng = item.lng;
+			      obj.equip_name = item.device_name;
+			      obj.uptime = item.uptime;
+			      obj.location = item.address;
+			      obj.type = 20;
+			      uni.navigateTo({
+			        url: "../disease/cmb?shebei=" + JSON.stringify(obj),
+			      });
+			      break;
+			    case 21:
+			      var obj = {};
+			      obj.d_id = item.d_id;
+			      obj.device_id = item.imei;
+			      obj.is_online = item.is_online;
+			      obj.lat = item.lat;
+			      obj.lng = item.lng;
+			      obj.equip_name = item.device_name;
+			      obj.uptime = item.uptime;
+			      obj.location = item.address;
+			      obj.type = 20;
+			      uni.navigateTo({
+			        url: "../disease/cmb?shebei=" + JSON.stringify(obj),
+			      });
+			      break;
+				  case 25:
+				    uni.navigateTo({
+				      url:  "../cb/xylps/detail?detail=" + JSON.stringify(item),
+				    });
+				    break;
+			    default:
+			      item.type = this.type_id;
+			      uni.navigateTo({
+			        url: "../cb/xy2.0/particulars?info=" + JSON.stringify(item),
+			      });
+			      break;
+			  }
+			},
 		},
 		onLoad(option) {
 			this.indexs = option.id

pages/prevention/sim.vue

@@ -1,34 +1,77 @@
 <template>
 	<view>
-		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 44px;">
-			<view style="position: fixed;z-index: 100;width: 100%;">
-				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="sim卡详情"></uni-nav-bar>
-			</view>
-			<view class="sim_info">
+		<view>
+			<view class="sim_info" v-if="iccidObj.data_iccid">
 				<view class="sim_info_loding" v-if="loding">
 					<image src="../../static/images/cb/6286299.gif" mode="" class="img"></image>
 				</view>
 				<view class="sim_info_title">
 					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/sim1.png'" mode=""></image>
-					<p>sim卡查询{{"("+simnew+")"}}</p>
+					<p>sim卡查询</p>
 				</view>
 				<view class="sim_info_text">
-					<p>运营商：{{siminfo.data.carrier}}</p>
-					<view class="sim_info_iccid" @click="copy(iccid)">
-						<p>ICCID：{{iccid}}</p>
-						<image src="../../static/images/ba167c2774bc7a63381dc3aaf1ef95c.png" mode="" class="tishi"></image>
+					<view class="sim_info_iccid" @click="copy(siminfo['data'].iccid)">
+						<p>ICCID：{{siminfo['data'].iccid}}</p>
+						<image src="../../static/images/ba167c2774bc7a63381dc3aaf1ef95c.png" mode="" class="tishi">
+						</image>
+					</view>
+					<view class="" v-if="!isDataFault">
+						<p>总流量：{{siminfo['data'].total}}M</p>
+						<p>状态：{{siminfo['data'].status}}</p>
+						<p>到期时间：{{siminfo['data'].expire}}</p>
+						<p  v-if="myuser_type == 1">厂商名称：{{siminfo['data'].company}}</p>
+						<p class="infoDeclear">
+							<span>已使用：<span :class="[siminfo['data'].used/siminfo['data'].total < 1 ?'green':'red']">{{siminfo['data'].used.toFixed(2)}}M</span>/{{siminfo['data'].total}}M</span>
+							<span>剩余：<span :class="[siminfo['data'].used/siminfo['data'].total < 1 ?'green':'red']">{{(siminfo['data'].total - siminfo['data'].used).toFixed(2)}}M</span></span>
+						</p>
+						<u-line-progress :percent="(siminfo['data'].used/siminfo['data'].total) * 100" height="12" :show-percent="false" :active-color="(siminfo['data'].used/siminfo['data'].total) < 1 ? '#14A478' : '#f56c6c'"></u-line-progress>
 					</view>
-					<p>状态：{{state}}</p>
-					<p>套餐：{{siminfo.data.data_plan || siminfo.data.totalDataVolume}}MB</p>
-					<p v-if="simnew=='旧'">已用流量：{{siminfo.data.data_usage.toFixed(2)}}MB</p>
-					<p v-if="simnew=='新'">已用流量：{{siminfo.data.usedDataVolume.toFixed(2)}}MB</p>
-					<p v-if="simnew=='旧'">剩余流量：{{siminfo.data.data_balance.toFixed(2)}}MB</p>
-					<p v-if="simnew=='新'">剩余流量：{{(siminfo.data.totalDataVolume-siminfo.data.usedDataVolume).toFixed(2)}}MB</p>
-					<p v-if="simnew=='旧'">到期时间：{{siminfo.data.expiry_date|timeFormat()}}</p>
-					<p v-if="simnew=='新'">到期时间：{{siminfo.data.expireDate}}</p>
 				</view>
 			</view>
+			<template v-if="iccidObj.photo_iccid">
+				<view class="sim_info">
+					<view class="sim_info_loding" v-if="loding2">
+						<image src="../../static/images/cb/6286299.gif" mode="" class="img"></image>
+					</view>
+					<view class="sim_info_title">
+						<image mode="widthFix" src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/sim2.png"></image>
+						图片sim卡流量
+					</view>
+					<view class="sim_info_text">
+						<view class="sim_info_iccid">
+							<p>ICCID：{{siminfo['photo'].iccid}}</p>
+							<image @click="copy(siminfo['photo'].iccid)" src="../../static/images/ba167c2774bc7a63381dc3aaf1ef95c.png" mode="" class="tishi">
+							</image>
+							<text v-if="iccidObj.data_iccid" class="yficonfont icon-xiugai" @click="editFun(siminfo['photo'].iccid)"></text>
+							<!-- <image  src="../../static/images/ba167c2774bc7a63381dc3aaf1ef95c.png" mode="" class="tishi">
+							</image> -->
+						</view>
+						<view class="contenB" v-if="!isPhotoFault">
+							<p>总流量：{{siminfo['photo'].total}}M</p>
+							<p>状态：{{siminfo['photo'].status}}</p>
+							<p>到期时间：{{siminfo['photo'].expire}}</p>
+							<p v-if="myuser_type == 1">厂商名称：{{siminfo['photo'].company}}</p>
+							<p class="infoDeclear">
+								<span>已使用：<span :class="[siminfo['photo'].used/siminfo['photo'].total < 1 ?'green':'red']">{{siminfo['photo'].used.toFixed(2)}}M</span>/{{siminfo['photo'].total}}M</span>
+								<span>剩余：<span :class="[siminfo['photo'].used/siminfo['photo'].total < 1 ?'green':'red']">{{(siminfo['photo'].total - siminfo['photo'].used).toFixed(2)}}M</span></span>
+							</p>
+							<u-line-progress :percent="(siminfo['photo'].used/siminfo['photo'].total) * 100" height="12" :show-percent="false" :active-color="(siminfo['photo'].used/siminfo['photo'].total) < 1 ? '#14A478' : '#f56c6c'"></u-line-progress>
+						</view>
+					</view>
+				</view>
+			</template>
+			<u-modal v-model="editFlag" width="90%" :async-close="true" :show-cancel-button="true"
+				@confirm="editFunConfim">
+				<view class="slot-content">
+					<view class="expireBox">
+						<u-form>
+							<u-form-item label="新iccid号" :label-width="140">
+								<u-input v-model="editSim" type="text" :border="true" />
+							</u-form-item>
+						</u-form>
+					</view>
+				</view>
+			</u-modal>
 		</view>
 	</view>
 </template>
@@ -37,130 +80,194 @@
 	export default {
 		data() {
 			return {
+				myuser_type:'',
 				iccid: '',
+				iccidObj: {
+					data_iccid: '',
+					photo_iccid: ''
+				},
 				siminfo: {
 					data: {
-						carrier: "--",
-						account_status: "--",
-						data_plan: "--",
-						data_usage: "--",
-						data_balance: "--",
-						outbound_date: ""
+						expire: "",
+						iccid: "",
+						status: "",
+						total: 0,
+						used: 0,
+						company:''
+					},
+					photo: {
+						expire: "",
+						iccid: "",
+						status: "",
+						total: 0,
+						used: 0,
+						company:''
 					}
 				},
-				state:"",
-				id: '',
-				simnew:"",
-				loding:false
+				editSim:'',
+				editFlag: false,
+				isPhotoFault: false,
+				isDataFault: false,
+				loding: true,
+				loding2: true,
 			}
 		},
 		methods: {
+			async editFun(iccid) {
+				// this.editSim = iccid;
+				this.editSim = '';
+				this.editFlag = true;
+			},
+			async editFunConfim() {
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.send_control.device_sim_update',
+					data: {
+						d_id: this.id,
+						simid:this.editSim
+					}
+				})
+				if(res.code) {
+					this.editFlag = false;
+					this.loding2 = true;
+					uni.showToast({
+					    title: '修改成功',
+					    duration: 2000,
+						icon:"none"
+					});
+					this.simdata(this.editSim, 'photo');
+				} else {
+					uni.showToast({
+					    title: res.msg,
+					    duration: 2000,
+						icon:"none"
+					});
+				}
+				console.log(res);
+			},
 			async simid(data) { //获取sim卡号
 				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=forecast.send_control.device_sim',
+					url: '/api/api_gateway?method=forecast.send_control.device_sim_new',
 					data: {
-						d_id: data,
-						type: 'sim'
+						d_id: data
 					}
 				})
-				if(res.length!=0){
-					this.iccid = res[0].iccid
-					this.simdata(this.iccid)
+				if(res.data_iccid == '' && res.photo_iccid == '') {
+					uni.showToast({
+					    title: '此设备暂无SIM卡信息!',
+					    duration: 2000,
+						icon:"none"
+					});
+					return
+				}
+				this.iccidObj = res;
+				if (res.data_iccid) {
+					this.simdata(res.data_iccid, 'data')
 				}
-				
+				if (res.photo_iccid) {
+					this.simdata(res.photo_iccid, 'photo')
+				}
+				console.log(res);
+
 			},
-			async simdata(data) { //获取sim信息
+			async simdata(data, type) { //获取sim信息
 				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=forecast.send_control.sim_query',
+					url: '/api/api_gateway?method=forecast.send_control.sim_query_new',
 					data: {
 						iccid: data
 					}
 				})
-				if(res.code==1){//企鹏
-					this.simnew = "新"
-					switch (res.data.data.deviceStatus){
-						case "TEST_READY_NAME":
-							this.state = "可测试"
-							break;
-						case "INVENTORY_NAME":
-							this.state = "库存"
-							break;
-						case "ACTIVATION_READY_NAME":
-							this.state = "可激活"
-							break;
-						case "ACTIVATED_NAME":
-							this.state = "已激活"
-							break;
-						case "DEACTIVATED_NAME":
-							this.state = "已停卡"
-							break;
-						case "RETIRED_NAME":
-							this.state = "已销卡"
-							break;
-						case "PURGED_NAME":
-							this.state = "已清除"
-							break;
+				if(type == 'data') {
+					this.loding = false;
+				} else {
+					this.loding2 = false;
+				}
+				if(res.code) {
+					uni.showToast({
+					    title: res.msg,
+					    duration: 5000,
+						icon:"none"
+					});
+					this.siminfo[type] = {
+						iccid: res.iccid
+					}
+					if(type == 'data') {
+						this.isDataFault = true;
+					} else {
+						this.isPhotoFault = true;
 					}
-				}else if(res.code==2){//合宙
-					var arr = ['未知', '测试期', '沉默期', '使用中', '停机', '停机保号', '预销号', '销号']
-					this.state = arr[res.data.data.account_status]
-					this.simnew = "旧"
+					return
 				}
-				this.siminfo = res.data
-				this.loding = false
-				console.log(this.siminfo.data)
+				this.isFault = false;
+				this.siminfo[type] = res;
+				console.log(this.siminfo[type])
 			},
 			clickLeft() {
 				uni.navigateBack({
 					delta: 1
 				})
 			},
-			copy(item){
+			copy(item) {
 				uni.setClipboardData({
-				    data: item , 
-				    success: function () {
-				        console.log('success');
-				    }
+					data: item,
+					success: function() {
+						console.log('success');
+					}
 				});
 			},
 		},
 		onLoad(option) {
 			console.log(option)
-			this.id = option.id
+			this.id = option.id ? option.id : option.d_id
 			this.loding = true
-			this.simid(this.id)
+			this.simid(this.id);
+			uni.getStorage({
+				key:"myuser_type",
+				success:(res)=>{
+					this.myuser_type = res.data
+				}
+			})
 		}
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped="scoped">
+	.expireBox{
+		padding: 0 20rpx;
+	}
+	.green{
+		color: #14A478;
+	}
+	.red{
+		color: #f56c6c;
+	}
 	.sim_info {
+		position: relative;
 		width: 90%;
-		position: absolute;
-		top: 54px;
-		left: 5%;
+		margin: 30rpx auto;
 		box-shadow: 0 0 10rpx #bcb9ca;
 		padding: 30rpx 20rpx 50rpx;
 		border-radius: 20rpx;
 		box-sizing: border-box;
-		
-		.sim_info_loding{
+
+		.sim_info_loding {
 			position: absolute;
 			top: 0;
 			left: 0;
 			width: 100%;
-			background-color: rgba(0,0,0,0.3);
+			background-color: rgba(0, 0, 0, 0.3);
 			border-radius: 20rpx;
 			height: 100%;
 			display: flex;
 			justify-content: space-around;
 			align-items: center;
-			.img{
+
+			.img {
 				width: 200rpx;
 				height: 175rpx;
-				
+
 			}
 		}
+
 		.sim_info_title {
 			width: 100%;
 			display: flex;
@@ -179,21 +286,28 @@
 		.sim_info_text {
 			width: 100%;
 			padding-left: 44rpx;
-
+			box-sizing: border-box;
 			p {
-				height: 30rpx;
-				margin-top: 20rpx;
+				height: 50rpx;
 				font-size: 26rpx;
+				line-height: 50rpx;
+			}
+			
+			.infoDeclear{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
 			}
-			.sim_info_iccid{
+			.sim_info_iccid {
 				display: flex;
-				.tishi{
+				align-items: center;
+				.tishi {
 					width: 30rpx;
 					height: 30rpx;
-					margin: 26rpx 0 0 20rpx;
 					color: #000;
+					margin:0 20rpx;
 				}
 			}
 		}
 	}
-</style>
+</style>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/f9af49c0-7261-11ef-9797-5b5230b9e1d7
+https://app.liuyingyong.cn/build/download/42163c40-a2f2-11ef-aa40-03840e3e04fa

util/api.js

@@ -5,7 +5,7 @@ export const myRequest = (options) => {
 	console.log(BASE_URL,'my request',process.env.NODE_ENV)
 	if (BASE_URL == '') {
 		// BASE_URL = 'http://114.55.0.7:8002'//测试
-		// BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.0.117:8003" : "http://8.136.98.49:8002"
+		// BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.2.157:8003" : "http://8.136.98.49:8002"
 		// BASE_URL = process.env.NODE_ENV === 'development' ? "http://114.55.0.7:8002" : "http://8.136.98.49:8002"
 		BASE_URL = process.env.NODE_ENV === 'development' ? "https://web.hnyfwlw.com:58002" : "https://web.hnyfwlw.com:58002"
 		// BASE_URL = 'http://192.168.1.77:8002'

util/neutral.js

@@ -1,4 +1,4 @@
 export default{
-	isneutral:true//云飞智控
-	// isneutral:false//智控
+	// isneutral:true//云飞智控
+	isneutral:false//智控
 }