Ver código fonte

SIM卡信息改造

zhangsijie 1 ano atrás
pai
commit
363a3597b4
43 arquivos alterados com 247 adições e 131 exclusões
  1. 3 3
      manifest.json
  2. 2 2
      pages.json
  3. 3 3
      pages/cb/equip-detail/equip-detail.vue
  4. 11 0
      pages/cb/sy/detail.vue
  5. 1 1
      pages/cb/thxydetail/thxydetail.vue
  6. 7 2
      pages/cb/xctdetail/xctdetail.vue
  7. 3 3
      pages/cb/xy2.0/particulars.vue
  8. 5 2
      pages/environment/equipment.vue
  9. 188 91
      pages/prevention/sim.vue
  10. BIN
      unpackage/cache/apk/__UNI__DBA6730_cm.apk
  11. 1 1
      unpackage/cache/apk/apkurl
  12. 1 1
      unpackage/cache/apk/cmManifestCache.json
  13. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-hdpi.png
  14. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xhdpi.png
  15. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxhdpi.png
  16. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxxhdpi.png
  17. 2 2
      unpackage/cache/wgt/__UNI__DBA6730/app-config-service.js
  18. 5 5
      unpackage/cache/wgt/__UNI__DBA6730/app-service.js
  19. 1 1
      unpackage/cache/wgt/__UNI__DBA6730/app-view.js
  20. 1 1
      unpackage/cache/wgt/__UNI__DBA6730/manifest.json
  21. 2 2
      unpackage/dist/build/app-plus/app-config-service.js
  22. 5 5
      unpackage/dist/build/app-plus/app-service.js
  23. 1 1
      unpackage/dist/build/app-plus/app-view.js
  24. 1 1
      unpackage/dist/build/app-plus/manifest.json
  25. BIN
      unpackage/res/icons/1024x1024.png
  26. BIN
      unpackage/res/icons/120x120.png
  27. BIN
      unpackage/res/icons/144x144.png
  28. BIN
      unpackage/res/icons/152x152.png
  29. BIN
      unpackage/res/icons/167x167.png
  30. BIN
      unpackage/res/icons/180x180.png
  31. BIN
      unpackage/res/icons/192x192.png
  32. BIN
      unpackage/res/icons/20x20.png
  33. BIN
      unpackage/res/icons/29x29.png
  34. BIN
      unpackage/res/icons/40x40.png
  35. BIN
      unpackage/res/icons/58x58.png
  36. BIN
      unpackage/res/icons/60x60.png
  37. BIN
      unpackage/res/icons/72x72.png
  38. BIN
      unpackage/res/icons/76x76.png
  39. BIN
      unpackage/res/icons/80x80.png
  40. BIN
      unpackage/res/icons/87x87.png
  41. BIN
      unpackage/res/icons/96x96.png
  42. 2 2
      util/api.js
  43. 2 2
      util/neutral.js

+ 3 - 3
manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "云飞智控",
+    "name" : "智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.9.6",
-    "versionCode" : 196,
+    "versionName" : "1.9.7",
+    "versionCode" : 197,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 2
pages.json

@@ -244,8 +244,8 @@
 			"path": "pages/prevention/sim",
 			"style": {
 				"navigationBarTitleText": "sim卡详情",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
+				"enablePullDownRefresh": false
+				// "navigationStyle": "custom"
 			}
 
 		}, {

+ 3 - 3
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',

+ 11 - 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({

+ 1 - 1
pages/cb/thxydetail/thxydetail.vue

@@ -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
 				})
 			},

+ 7 - 2
pages/cb/xctdetail/xctdetail.vue

@@ -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)

+ 3 - 3
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()

+ 5 - 2
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) {

+ 188 - 91
pages/prevention/sim.vue

@@ -1,34 +1,75 @@
 <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 class="infoDeclear">
+							<span>已使用:{{siminfo['data'].used.toFixed(2)}}M/{{siminfo['data'].total}}M</span>
+							<span>剩余:<span>{{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 class="infoDeclear">
+								<span>已使用:{{siminfo['photo'].used.toFixed(2)}}M/{{siminfo['photo'].total}}M</span>
+								<span>剩余:<span>{{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>
@@ -38,129 +79,178 @@
 		data() {
 			return {
 				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
+					},
+					photo: {
+						expire: "",
+						iccid: "",
+						status: "",
+						total: 0,
+						used: 0
 					}
 				},
-				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)
 		}
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped="scoped">
+	.expireBox{
+		padding: 0 20rpx;
+	}
 	.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 +269,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>

BIN
unpackage/cache/apk/__UNI__DBA6730_cm.apk


+ 1 - 1
unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/2d19e080-716a-11ef-ae18-ef0d62a40ef9
+https://app.liuyingyong.cn/build/download/6a5741d0-976b-11ef-801c-690ba8eee648

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
unpackage/cache/apk/cmManifestCache.json


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-hdpi.png


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xhdpi.png


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxhdpi.png


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxxhdpi.png


Diferenças do arquivo suprimidas por serem muito extensas
+ 2 - 2
unpackage/cache/wgt/__UNI__DBA6730/app-config-service.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 5 - 5
unpackage/cache/wgt/__UNI__DBA6730/app-service.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
unpackage/cache/wgt/__UNI__DBA6730/app-view.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
unpackage/cache/wgt/__UNI__DBA6730/manifest.json


Diferenças do arquivo suprimidas por serem muito extensas
+ 2 - 2
unpackage/dist/build/app-plus/app-config-service.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 5 - 5
unpackage/dist/build/app-plus/app-service.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/build/app-plus/app-view.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/build/app-plus/manifest.json


BIN
unpackage/res/icons/1024x1024.png


BIN
unpackage/res/icons/120x120.png


BIN
unpackage/res/icons/144x144.png


BIN
unpackage/res/icons/152x152.png


BIN
unpackage/res/icons/167x167.png


BIN
unpackage/res/icons/180x180.png


BIN
unpackage/res/icons/192x192.png


BIN
unpackage/res/icons/20x20.png


BIN
unpackage/res/icons/29x29.png


BIN
unpackage/res/icons/40x40.png


BIN
unpackage/res/icons/58x58.png


BIN
unpackage/res/icons/60x60.png


BIN
unpackage/res/icons/72x72.png


BIN
unpackage/res/icons/76x76.png


BIN
unpackage/res/icons/80x80.png


BIN
unpackage/res/icons/87x87.png


BIN
unpackage/res/icons/96x96.png


+ 2 - 2
util/api.js

@@ -5,9 +5,9 @@ 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' ? "http://8.136.98.49:8002" : "http://8.136.98.49:8002"
+		BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.2.110:8003" : "http://8.136.98.49:8002"
 		// BASE_URL = 'http://192.168.1.77:8002'
 	}
 	// BASE_URL = 'http://192.168.1.52:8003'

+ 2 - 2
util/neutral.js

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