Browse Source

修改项目选择问题

杨孝海 10 months ago
parent
commit
f66da85429
100 changed files with 1474 additions and 826 deletions
  1. 2 0
      main.js
  2. 101 62
      pages/bluetooth/bluetooth.vue
  3. 7 4
      pages/cat-eye-test/cat-eye-test.vue
  4. 5 3
      pages/door-lock-module/door-lock-module.vue
  5. 17 13
      pages/lock-test/lock-test.vue
  6. 15 9
      pages/mine/mine.vue
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/add-project/add-project.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/bluetooth/bluetooth.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cat-eye-test/cat-eye-test.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/door-lock-module/door-lock-module.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/lock-test/lock-test.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/project-list/project-list.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/upload-face/upload-face.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  21. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-back-top/u-back-top.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-cell-group/u-cell-group.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-cell/u-cell.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-form-item/u-form-item.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-gap/u-gap.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-line/u-line.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-link/u-link.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-modal/u-modal.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-navbar/u-navbar.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-radio-group/u-radio-group.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-radio/u-radio.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
  41. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-skeleton/u-skeleton.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-steps-item/u-steps-item.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-steps/u-steps.js.map
  45. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item.js.map
  46. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
  47. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-tabbar/u-tabbar.js.map
  48. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-tabs/u-tabs.js.map
  49. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-text/u-text.js.map
  50. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-textarea/u-textarea.js.map
  51. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toast/u-toast.js.map
  52. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toolbar/u-toolbar.js.map
  53. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map
  54. 2 0
      unpackage/dist/dev/mp-weixin/common/main.js
  55. 2 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  56. 326 242
      unpackage/dist/dev/mp-weixin/common/vendor.js
  57. 4 4
      unpackage/dist/dev/mp-weixin/pages/add-project/add-project.js
  58. 81 27
      unpackage/dist/dev/mp-weixin/pages/bluetooth/bluetooth.js
  59. 1 0
      unpackage/dist/dev/mp-weixin/pages/bluetooth/bluetooth.json
  60. 1 1
      unpackage/dist/dev/mp-weixin/pages/bluetooth/bluetooth.wxml
  61. 14 11
      unpackage/dist/dev/mp-weixin/pages/cat-eye-test/cat-eye-test.js
  62. 12 9
      unpackage/dist/dev/mp-weixin/pages/door-lock-module/door-lock-module.js
  63. 24 20
      unpackage/dist/dev/mp-weixin/pages/lock-test/lock-test.js
  64. 20 15
      unpackage/dist/dev/mp-weixin/pages/mine/mine.js
  65. 2 2
      unpackage/dist/dev/mp-weixin/pages/project-list/project-list.js
  66. 2 2
      unpackage/dist/dev/mp-weixin/pages/tabbar/Bluetooth/Bluetooth.js
  67. 2 2
      unpackage/dist/dev/mp-weixin/pages/tabbar/gateway/gateway.js
  68. 2 2
      unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.js
  69. 2 2
      unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.js
  70. 2 2
      unpackage/dist/dev/mp-weixin/pages/tabbar/room/room.js
  71. 12 12
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--form/u--form.js
  72. 12 12
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--input/u--input.js
  73. 12 12
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--text/u--text.js
  74. 12 12
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--textarea/u--textarea.js
  75. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js
  76. 1 1
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js
  77. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-cell-group/u-cell-group.js
  78. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-cell/u-cell.js
  79. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form-item/u-form-item.js
  80. 12 12
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form/u-form.js
  81. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-gap/u-gap.js
  82. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js
  83. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-line/u-line.js
  84. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-link/u-link.js
  85. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js
  86. 3 3
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-modal/u-modal.js
  87. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-navbar/u-navbar.js
  88. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js
  89. 18 18
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js
  90. 19 19
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js
  91. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-radio-group/u-radio-group.js
  92. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-radio/u-radio.js
  93. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js
  94. 346 0
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-skeleton/u-skeleton.js
  95. 4 0
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-skeleton/u-skeleton.json
  96. 1 0
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-skeleton/u-skeleton.wxml
  97. 83 0
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-skeleton/u-skeleton.wxss
  98. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js
  99. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-steps-item/u-steps-item.js
  100. 0 0
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-steps/u-steps.js

+ 2 - 0
main.js

@@ -44,11 +44,13 @@ $http.afterRequest = function(err) {
 	// }
 	// uni.hideLoading()
 	if (err.data.code === 2000) {
+		uni.removeStorageSync('Token')
 		uni.showToast({
 			title: '令牌过期,请重新登录',
 			icon: 'none',
 			duration: 2000
 		})
+		uni.removeStorageSync('Token')
 		// uni.hideLoading()
 		uni.redirectTo({
 			url: "/pages/login/login"

+ 101 - 62
pages/bluetooth/bluetooth.vue

@@ -1,6 +1,5 @@
  <template>
  	<view class="content">
-
  		<view class="tabs">
  			<u-tabs :list="tabList" @click="change" lineWidth="30" lineColor="#02A7F0" :activeStyle="{
 					color: '#02A7F0', 
@@ -11,45 +10,47 @@
 					transform:'scale(1)'}" itemStyle="height: 50px; width: 33.3%;padding:0;border-bottom:1px solid #a0a0a0"></u-tabs>
 
  		</view>
- 		<scroll-view scroll-y="true" :style="'height:'+wh+'px;'" @scrolltolower="scrolltolower">
- 			<u-swipe-action btn-width="500">
- 				<u-swipe-action-item v-if="show1" :options="options1" @click="click(item.id)"
- 					v-for="(item,index) in productList" :key="index">
- 					<view v-if="productList.length!==0" class="list-items">
- 						<view class="list-item" @click="toText(item)">
- 							<view class="left">
- 								<!-- 左 -->
- 								<view class="icon">
- 									<u-icon v-if="item.type!==0" name="lock-opened-fill" color="#3c9cff"
- 										size="25"></u-icon>
- 									<u-icon v-else name="eye-fill" color="#3c9cff" size="25"></u-icon>
- 								</view>
- 								<!-- 中 -->
- 								<view class="msg">
- 									<view class="id">
- 										{{item.deviceId}}
+ 		<u-skeleton :animate="true" rows="17" title :loading='loading_skeleton'> <scroll-view scroll-y="true"
+ 				:style="'height:'+wh+'px;'" @scrolltolower="scrolltolower">
+ 				<u-swipe-action btn-width="500">
+ 					<u-swipe-action-item v-if="show1" :options="options1" @click="click(item.id)"
+ 						v-for="(item,index) in productList" :key="index">
+ 						<view v-if="productList.length!==0" class="list-items">
+ 							<view class="list-item" @click="toText(item)">
+ 								<view class="left">
+ 									<!-- 左 -->
+ 									<view class="icon">
+ 										<u-icon v-if="item.type!==0" name="lock-opened-fill" color="#3c9cff"
+ 											size="25"></u-icon>
+ 										<u-icon v-else name="eye-fill" color="#3c9cff" size="25"></u-icon>
  									</view>
- 									<view class="type">
- 										<text style="margin-right: 5px;">{{item.testTime|date}}</text>
- 										<text>信号值:{{item.signalNum}}</text>
+ 									<!-- 中 -->
+ 									<view class="msg">
+ 										<view class="id">
+ 											{{item.deviceId}}
+ 										</view>
+ 										<view class="type">
+ 											<text style="margin-right: 5px;">{{item.testTime|date}}</text>
+ 											<text>信号值:{{item.signalNum}}</text>
+ 										</view>
  									</view>
- 								</view>
 
+ 								</view>
+ 								<!-- 后 -->
+ 								<view class="button" @click.stop="textBtn(item)">
+ 									<u-button v-if="item.type==0" type="primary" size="small">风鸣</u-button>
+ 									<u-button v-else type="primary" size="small">开门</u-button>
+ 								</view>
  							</view>
- 							<!-- 后 -->
- 							<view class="button" @click.stop="textBtn(item)">
- 								<u-button v-if="item.type==0" type="primary" size="small">风鸣</u-button>
- 								<u-button v-else type="primary" size="small">开门</u-button>
- 							</view>
+
  						</view>
+ 						<view v-else class="noData" style="text-align: center;">
+ 							无数据
+ 						</view>
+ 					</u-swipe-action-item>
+ 				</u-swipe-action>
+ 			</scroll-view></u-skeleton>
 
- 					</view>
- 					<view v-else class="noData" style="text-align: center;">
- 						无数据
- 					</view>
- 				</u-swipe-action-item>
- 			</u-swipe-action>
- 		</scroll-view>
 
  		<view class="btn">
  			<u-button size="large" type="primary" @click="search"> 点击进行蓝牙设备搜索</u-button>
@@ -57,6 +58,7 @@
  		<view class="scan" @click="scan">
  			<img src="@/static/scan.png" alt="" style="width: 100rpx;height: 80rpx;">
  		</view>
+
  	</view>
  </template>
  <script>
@@ -64,6 +66,7 @@
 
  		data() {
  			return {
+ 				loading_skeleton: false,
  				gatewayFlag: 0,
  				show1: true,
  				options1: [{
@@ -232,11 +235,12 @@
  					data: res
  				} = await uni.$http.post('/api/v1/test/testResult/queryByCondition', {
  					testProjectId: uni.getStorageSync("testProjectId"),
- 					pageSize: 10,
+ 					pageSize: 100,
  					pageNo: 1,
  					status: 2
  				}, )
  				uni.hideLoading()
+ 				let that = this
  				if (res.code == 200) {
  					arr = res.data.records
  					console.log(arr);
@@ -245,50 +249,68 @@
  						success: function(res) {
  							console.log('条码类型:' + res.scanType);
  							console.log('条码内容:' + res.result);
- 							let arr1 = arr.filter((item) => {
- 								return item == res.result
+ 							console.log(arr, 'arr的数据');
+ 							let arr1 = arr.find((item) => {
+ 								return item.deviceId == res.result.toLowerCase()
  							})
- 							// console.log(arr1);
- 							let scanDeviced = JSON.stringify(arr1[0])
- 							if (arr1 == 0) {
- 								// this.$u.toast(`未找到该设备`)
- 								uni.showToast({
- 									icon: "error",
- 									title: "未找到该设备"
- 								})
- 								// console.log('未找到该设备');
+ 							console.log(arr1, 'arr1的msg');
+ 							let scanDeviced = JSON.stringify(arr1)
+ 							if (!arr1) {
+ 								return that.$u.toast(`未获取到设备信息`)
  							} else {
- 								// console.log('找到该设备');
- 								if (arr1[0].type == 0) {
+ 								if (arr1.type == 0) {
+ 									console.log('我是猫眼');
  									uni.navigateTo({
  										url: "/pages/cat-eye-test/cat-eye-test?item=" +
  											scanDeviced
-
  									})
- 								} else if (arr1[0].type == 1 && arr1[0].subType == 0 || arr1[0].subType ==
+ 								} else if (arr1.type == 1 && arr1.subType == 0 || arr1.subType ==
  									null) {
+ 									console.log('我是门锁');
  									uni.navigateTo({
  										url: "/pages/lock-test/lock-test?item=" + scanDeviced
-
  									})
  								} else {
+ 									console.log('我是模块');
  									uni.navigateTo({
-
-
  										url: "/pages/door-lock-module/door-lock-module?item=" +
  											scanDeviced
  									})
  								}
  							}
+ 							// 		if (arr1) {
+
+ 							// 			uni.showToast({
+ 							// 				icon: "error",
+ 							// 				title: "未找到该设备"
+ 							// 			})
+
+ 							// 		} else {
+
+ 							// 			if (arr1.type == 0) {
+ 							// 				console.log(2);
+ 							// 				uni.navigateTo({
+ 							// 					url: "/pages/cat-eye-test/cat-eye-test?item=" +
+ 							// 						scanDeviced
+ 							// 				})
+ 							// 			} else if (arr1.type == 1 && arr1.subType == 0 || arr1.subType ==
+ 							// 				null) {
+
+ 							// 				uni.navigateTo({
+ 							// 					url: "/pages/lock-test/lock-test?item=" + scanDeviced
+ 							// 				})
+ 							// 			} else {
+ 							// 				uni.navigateTo({
+ 							// 					url: "/pages/door-lock-module/door-lock-module?item=" +
+ 							// 						scanDeviced
+ 							// 				})
+ 							// 			}
+ 							// 		}
  						}
  					});
  				} else {
  					this.$u.toast(`请重新获取蓝牙设备`)
  				}
-
-
-
-
  			},
  			search() {
  				this.searchBluetooth().then(() => {
@@ -304,7 +326,6 @@
  			},
  			// 右滑删除
  			click(index) {
-
  				console.log('click', index);
  				uni.showModal({
  					title: '温馨提示',
@@ -336,6 +357,11 @@
  				})
  			},
  			async getBluetoothList() {
+				
+ 				if (!uni.getStorageSync('testProjectId')) {
+ 					return this.$u.toast(`未查询到测试项目,请前往后台添加测试项目`)
+ 				}
+				this.loading_skeleton=true
  				console.log(11);
  				this.gatewayFlag = 0
  				// uni.showLoading({
@@ -348,7 +374,6 @@
  				uni.hideLoading()
  				console.log(res);
  				if (res.code === 200) {
- 					uni.$showMsg('数据加载成功')
  					// let badge1 = res.data.records.filter((item) => {
  					// 	return item.status = 2
  					// })
@@ -361,6 +386,10 @@
  					} else if (this.parameter.status == 1) {
  						this.tabList[2].badge.value = res.data.total
  					}
+						
+ 					uni.$showMsg('数据加载成功')
+					this.loading_skeleton=false
+					this.productList=[]
  					this.productList = [
  						...this.productList,
  						...res.data.records
@@ -368,12 +397,14 @@
  				} else {
  					// uni.$showMsg('数据加载失败')
  					console.log('数据加载失败');
+					this.loading_skeleton=false
  				}
 
  				// console.log(this.productList);
 
  			},
  			async searchBluetooth() {
+
  				this.productList = []
  				uni.showLoading({
  					mask: true,
@@ -396,6 +427,9 @@
  				console.log(res);
  			},
  			async getNum() {
+ 				if (!uni.getStorageSync('testProjectId')) {
+ 					return this.$u.toast(`未查询到测试项目,请前往后台添加测试项目`)
+ 				}
  				const {
  					data: res
  				} = await uni.$http.post('/api/v1/test/testResult/queryByCondition', {
@@ -425,11 +459,10 @@
 
  		},
  		onShow() {
- 			this.searchBluetooth().then(() => {
+ 			this.getNum().then(() => {
  				if (this.gatewayFlag = 1) {
  					this.getBluetoothList()
  				}
-
  			})
  		},
  		onLoad() {
@@ -445,9 +478,15 @@
  			this.parameter.testProjectId = uni.getStorageSync('testProjectId')
  			console.log(this.parameter.testProjectId);
  			this.getNum()
+ 			this.searchBluetooth().then(() => {
+ 				if (this.gatewayFlag = 1) {
+ 					this.getBluetoothList()
+ 				}
+ 			})
 
 
- 		}
+ 		},
+
  	}
  </script>
  <style lang="scss">

+ 7 - 4
pages/cat-eye-test/cat-eye-test.vue

@@ -175,6 +175,9 @@
 				uni.hideLoading()
 				if (res.code == 200) {
 					this.$u.toast(`重置成功`)
+					uni.switchTab({
+						url:"/pages/bluetooth/bluetooth"
+					})
 				} else {
 					this.$u.toast(`重置失败`)
 				}
@@ -185,7 +188,7 @@
 						this.$set(this.uploadMsg, 'signalNum', this.signalNum)
 					this.$set(this.uploadMsg, 'status', 0)
 					// this.$set(this.uploadMsg, 'faceOpenRes', true)
-					this.$set(this.uploadMsg, 'signlRes', false)
+					this.$set(this.uploadMsg, 'signalRes', false)
 					this.$set(this.uploadMsg, 'faceOpenRes', false)
 					this.$set(this.uploadMsg, 'powerRes', false)
 
@@ -194,7 +197,7 @@
 				if (this.flag == 3 || this.flag == 4) {
 						this.$set(this.uploadMsg, 'signalNum', this.signalNum)
 					this.$set(this.uploadMsg, 'status', 0)
-					this.$set(this.uploadMsg, 'signlRes', true)
+					this.$set(this.uploadMsg, 'signalRes', true)
 					this.$set(this.uploadMsg, 'faceOpenRes', false)
 					this.$set(this.uploadMsg, 'powerRes', false)
 					this.uploadTest()
@@ -202,7 +205,7 @@
 				if (this.flag == 5) {
 						this.$set(this.uploadMsg, 'signalNum', this.signalNum)
 					this.$set(this.uploadMsg, 'status', 0)
-					this.$set(this.uploadMsg, 'signlRes', true)
+					this.$set(this.uploadMsg, 'signalRes', true)
 					this.$set(this.uploadMsg, 'faceOpenRes', true)
 						this.$set(this.uploadMsg, 'powerRes', false)
 					this.$set(this.uploadMsg, 'powerNum', this.powerNum)
@@ -212,7 +215,7 @@
 				if (this.flag == 6) {
 						this.$set(this.uploadMsg, 'signalNum', this.signalNum)
 					this.$set(this.uploadMsg, 'status', 1)
-					this.$set(this.uploadMsg, 'signlRes', true)
+					this.$set(this.uploadMsg, 'signalRes', true)
 					this.$set(this.uploadMsg, 'faceOpenRes', true)
 					this.$set(this.uploadMsg, 'powerRes', true)
 					this.$set(this.uploadMsg, 'powerNum', this.powerNum)

+ 5 - 3
pages/door-lock-module/door-lock-module.vue

@@ -273,7 +273,6 @@
 					this.$set(this.uploadMsg, 'signalRes', true)
 					this.$set(this.uploadMsg, 'doorOpenRes', false)
 					this.$set(this.uploadMsg, 'powerRes', false)
-
 					this.uploadTest()
 				}
 				if (this.flag == 3) {
@@ -282,7 +281,7 @@
 					}
 					this.$set(this.uploadMsg, 'signalNum', this.signalNum)
 					this.$set(this.uploadMsg, 'status', 0)
-					this.$set(this.uploadMsg, 'signlRes', true)
+					this.$set(this.uploadMsg, 'signalRes', true)
 					this.$set(this.uploadMsg, 'doorOpenRes', true)
 					this.$set(this.uploadMsg, 'powerRes', false)
 					this.uploadTest()
@@ -293,7 +292,7 @@
 					}
 					this.$set(this.uploadMsg, 'signalNum', this.signalNum)
 					this.$set(this.uploadMsg, 'status', 1)
-					this.$set(this.uploadMsg, 'signlRes', true)
+					this.$set(this.uploadMsg, 'signalRes', true)
 					this.$set(this.uploadMsg, 'doorOpenRes', true)
 					this.$set(this.uploadMsg, 'powerRes', true)
 							this.$set(this.uploadMsg, 'powerNum', this.powerNum)
@@ -324,6 +323,9 @@
 				uni.hideLoading()
 				if (res.code == 200) {
 					this.$u.toast(`重置成功`)
+					uni.switchTab({
+						url:"/pages/bluetooth/bluetooth"
+					})
 				} else {
 					this.$u.toast(`重置失败`)
 					

+ 17 - 13
pages/lock-test/lock-test.vue

@@ -324,19 +324,23 @@
 				uni.hideLoading()
 				if (res.code == 200) {
 					this.$u.toast(`重置成功`)
+					uni.switchTab({
+						url:"/pages/bluetooth/bluetooth"
+					})
 				} else {
-					this.$u.toast(`重置失败`)
-					uni.showModal({
-						title: '提示',
-						content: '设备重置失败,点击确定继续重置',
-						success: function(res) {
-							if (res.confirm) {
-								this.resetDevice()
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
+					// this.$u.toast(`重置失败`)
+					this.resetDevice()
+					// uni.showModal({
+					// 	title: '提示',
+					// 	content: '设备重置失败,点击确定继续重置',
+					// 	success: function(res) {
+					// 		if (res.confirm) {
+					// 			this.resetDevice()
+					// 		} else if (res.cancel) {
+					// 			console.log('用户点击取消');
+					// 		}
+					// 	}
+					// });
 				}
 			},
 			uploadTestMsg() {
@@ -400,7 +404,7 @@
 						this.$set(this.uploadMsg, 'subType', 0)
 					}
 					this.$set(this.uploadMsg, 'status', 1)
-					this.$set(this.uploadMsg, 'signlRes', true)
+					this.$set(this.uploadMsg, 'signalRes', true)
 					this.$set(this.uploadMsg, 'doorOpenRes', true)
 					this.$set(this.uploadMsg, 'powerRes', true)
 					this.$set(this.uploadMsg, 'cardOpenRes', true)

+ 15 - 9
pages/mine/mine.vue

@@ -62,17 +62,23 @@
 				console.log('弹出');
 			},
 			confirm(e) {
+				console.log(1);
 				console.log('confirm', e)
 				console.log(this.arr,'全部项目');
+				if(this.arr.length==0){
+						this.show = false
+					return this.$u.toast(`未检测到测试项目`)
+				
+				}
 				let getWay = this.arr.filter((item) => {
-					return item.description == e.value[0]
+					return item.name == e.value[0]
 				})
 				console.log(getWay, '过滤');
 				// console.log(getWay);
 				uni.setStorageSync('testProjectId', getWay[0].id)
 				uni.setStorageSync('gatewayDeviceId', getWay[0].gatewayDeviceId)
 				// uni.setStorageSync('testProjectId', e.value[0].id)
-				this.value = getWay[0].description
+				this.value = getWay[0].name
 				this.show = false
 			},
 
@@ -134,17 +140,17 @@
 					} else {
 						let filter = []
 						res.data.records.forEach((item) => {
-							filter.push(item.description)
+							filter.push(item.name)
 						})
 						this.columns[0] = filter
 						this.arr = res.data.records
 					}
-					let filter = []
-					res.data.records.forEach((item) => {
-						filter.push(item.description)
-					})
-					this.columns[0] = filter
-					this.arr = res.data.records
+					// let filter = []
+					// res.data.records.forEach((item) => {
+					// 	filter.push(item.description)
+					// })
+					// this.columns[0] = filter
+					// this.arr = res.data.records
 
 				} else {
 					this.$u.toast(`请求失败`)

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/add-project/add-project.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/bluetooth/bluetooth.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cat-eye-test/cat-eye-test.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/door-lock-module/door-lock-module.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/lock-test/lock-test.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/project-list/project-list.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/upload-face/upload-face.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-back-top/u-back-top.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-cell-group/u-cell-group.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-cell/u-cell.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-form-item/u-form-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-gap/u-gap.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-line/u-line.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-link/u-link.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-modal/u-modal.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-navbar/u-navbar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-radio-group/u-radio-group.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-radio/u-radio.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-skeleton/u-skeleton.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-steps-item/u-steps-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-steps/u-steps.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-tabbar/u-tabbar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-tabs/u-tabs.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-text/u-text.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-textarea/u-textarea.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toast/u-toast.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toolbar/u-toolbar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map


+ 2 - 0
unpackage/dist/dev/mp-weixin/common/main.js

@@ -59,11 +59,13 @@ _requestMiniprogram.$http.afterRequest = function (err) {
   // }
   // uni.hideLoading()
   if (err.data.code === 2000) {
+    uni.removeStorageSync('Token');
     uni.showToast({
       title: '令牌过期,请重新登录',
       icon: 'none',
       duration: 2000
     });
+    uni.removeStorageSync('Token');
     // uni.hideLoading()
     uni.redirectTo({
       url: "/pages/login/login"

File diff suppressed because it is too large
+ 2 - 2
unpackage/dist/dev/mp-weixin/common/runtime.js


+ 326 - 242
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1557,7 +1557,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"text-installation","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"text-installation","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8934,7 +8934,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"text-installation","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"text-installation","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8955,14 +8955,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"text-installation","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"text-installation","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"text-installation","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"text-installation","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9058,7 +9058,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"text-installation","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"text-installation","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -9918,10 +9918,10 @@ function _ref() {
                   }
                   // 不是白名单并且没有token
                   if (!pass && !uni.getStorageSync('Token')) {
+                    uni.removeStorageSync('Token');
                     uni.showToast({
                       title: "token过期,请重新登录"
                     });
-                    uni.removeStorageSync('Token');
                     uni.redirectTo({
                       url: "/pages/login/login"
                     });
@@ -22839,6 +22839,90 @@ exports.default = _default;
 /* 336 */,
 /* 337 */,
 /* 338 */
+/*!*******************************************************************************!*\
+  !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-skeleton/props.js ***!
+  \*******************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  props: {
+    // 是否展示骨架组件
+    loading: {
+      type: Boolean,
+      default: uni.$u.props.skeleton.loading
+    },
+    // 是否开启动画效果
+    animate: {
+      type: Boolean,
+      default: uni.$u.props.skeleton.animate
+    },
+    // 段落占位图行数
+    rows: {
+      type: [String, Number],
+      default: uni.$u.props.skeleton.rows
+    },
+    // 段落占位图的宽度
+    rowsWidth: {
+      type: [String, Number, Array],
+      default: uni.$u.props.skeleton.rowsWidth
+    },
+    // 段落占位图的高度
+    rowsHeight: {
+      type: [String, Number, Array],
+      default: uni.$u.props.skeleton.rowsHeight
+    },
+    // 是否展示标题占位图
+    title: {
+      type: Boolean,
+      default: uni.$u.props.skeleton.title
+    },
+    // 段落标题的宽度
+    titleWidth: {
+      type: [String, Number],
+      default: uni.$u.props.skeleton.titleWidth
+    },
+    // 段落标题的高度
+    titleHeight: {
+      type: [String, Number],
+      default: uni.$u.props.skeleton.titleHeight
+    },
+    // 是否展示头像占位图
+    avatar: {
+      type: Boolean,
+      default: uni.$u.props.skeleton.avatar
+    },
+    // 头像占位图大小
+    avatarSize: {
+      type: [String, Number],
+      default: uni.$u.props.skeleton.avatarSize
+    },
+    // 头像占位图的形状,circle-圆形,square-方形
+    avatarShape: {
+      type: String,
+      default: uni.$u.props.skeleton.avatarShape
+    }
+  }
+};
+exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+
+/***/ }),
+/* 339 */,
+/* 340 */,
+/* 341 */,
+/* 342 */,
+/* 343 */,
+/* 344 */,
+/* 345 */,
+/* 346 */
 /*!***********************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-swipe-action/props.js ***!
   \***********************************************************************************/
@@ -22865,12 +22949,12 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 339 */,
-/* 340 */,
-/* 341 */,
-/* 342 */,
-/* 343 */,
-/* 344 */
+/* 347 */,
+/* 348 */,
+/* 349 */,
+/* 350 */,
+/* 351 */,
+/* 352 */
 /*!********************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/libs/mixin/touch.js ***!
   \********************************************************************/
@@ -22946,7 +23030,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 345 */
+/* 353 */
 /*!****************************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-swipe-action-item/props.js ***!
   \****************************************************************************************/
@@ -23005,7 +23089,7 @@ exports.default = _default2;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 346 */
+/* 354 */
 /*!**************************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-swipe-action-item/wxs.js ***!
   \**************************************************************************************/
@@ -23037,16 +23121,16 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 347 */,
-/* 348 */,
-/* 349 */,
-/* 350 */,
-/* 351 */,
-/* 352 */,
-/* 353 */,
-/* 354 */,
 /* 355 */,
-/* 356 */
+/* 356 */,
+/* 357 */,
+/* 358 */,
+/* 359 */,
+/* 360 */,
+/* 361 */,
+/* 362 */,
+/* 363 */,
+/* 364 */
 /*!*********************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-cell-group/props.js ***!
   \*********************************************************************************/
@@ -23078,14 +23162,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 357 */,
-/* 358 */,
-/* 359 */,
-/* 360 */,
-/* 361 */,
-/* 362 */,
-/* 363 */,
-/* 364 */
+/* 365 */,
+/* 366 */,
+/* 367 */,
+/* 368 */,
+/* 369 */,
+/* 370 */,
+/* 371 */,
+/* 372 */
 /*!***************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-cell/props.js ***!
   \***************************************************************************/
@@ -23213,14 +23297,14 @@ exports.default = _default2;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 365 */,
-/* 366 */,
-/* 367 */,
-/* 368 */,
-/* 369 */,
-/* 370 */,
-/* 371 */,
-/* 372 */
+/* 373 */,
+/* 374 */,
+/* 375 */,
+/* 376 */,
+/* 377 */,
+/* 378 */,
+/* 379 */,
+/* 380 */
 /*!*****************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-picker/props.js ***!
   \*****************************************************************************/
@@ -23317,14 +23401,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 373 */,
-/* 374 */,
-/* 375 */,
-/* 376 */,
-/* 377 */,
-/* 378 */,
-/* 379 */,
-/* 380 */
+/* 381 */,
+/* 382 */,
+/* 383 */,
+/* 384 */,
+/* 385 */,
+/* 386 */,
+/* 387 */,
+/* 388 */
 /*!*****************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-navbar/props.js ***!
   \*****************************************************************************/
@@ -23426,14 +23510,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 381 */,
-/* 382 */,
-/* 383 */,
-/* 384 */,
-/* 385 */,
-/* 386 */,
-/* 387 */,
-/* 388 */
+/* 389 */,
+/* 390 */,
+/* 391 */,
+/* 392 */,
+/* 393 */,
+/* 394 */,
+/* 395 */,
+/* 396 */
 /*!****************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-steps/props.js ***!
   \****************************************************************************/
@@ -23490,14 +23574,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 389 */,
-/* 390 */,
-/* 391 */,
-/* 392 */,
-/* 393 */,
-/* 394 */,
-/* 395 */,
-/* 396 */
+/* 397 */,
+/* 398 */,
+/* 399 */,
+/* 400 */,
+/* 401 */,
+/* 402 */,
+/* 403 */,
+/* 404 */
 /*!*********************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-steps-item/props.js ***!
   \*********************************************************************************/
@@ -23539,14 +23623,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 397 */,
-/* 398 */,
-/* 399 */,
-/* 400 */,
-/* 401 */,
-/* 402 */,
-/* 403 */,
-/* 404 */
+/* 405 */,
+/* 406 */,
+/* 407 */,
+/* 408 */,
+/* 409 */,
+/* 410 */,
+/* 411 */,
+/* 412 */
 /*!****************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-popup/props.js ***!
   \****************************************************************************/
@@ -23643,14 +23727,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 405 */,
-/* 406 */,
-/* 407 */,
-/* 408 */,
-/* 409 */,
-/* 410 */,
-/* 411 */,
-/* 412 */
+/* 413 */,
+/* 414 */,
+/* 415 */,
+/* 416 */,
+/* 417 */,
+/* 418 */,
+/* 419 */,
+/* 420 */
 /*!****************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-input/props.js ***!
   \****************************************************************************/
@@ -23855,12 +23939,12 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 413 */,
-/* 414 */,
-/* 415 */,
-/* 416 */,
-/* 417 */,
-/* 418 */
+/* 421 */,
+/* 422 */,
+/* 423 */,
+/* 424 */,
+/* 425 */,
+/* 426 */
 /*!**********************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-radio-group/props.js ***!
   \**********************************************************************************/
@@ -23962,14 +24046,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 419 */,
-/* 420 */,
-/* 421 */,
-/* 422 */,
-/* 423 */,
-/* 424 */,
-/* 425 */,
-/* 426 */
+/* 427 */,
+/* 428 */,
+/* 429 */,
+/* 430 */,
+/* 431 */,
+/* 432 */,
+/* 433 */,
+/* 434 */
 /*!****************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-radio/props.js ***!
   \****************************************************************************/
@@ -24051,14 +24135,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 427 */,
-/* 428 */,
-/* 429 */,
-/* 430 */,
-/* 431 */,
-/* 432 */,
-/* 433 */,
-/* 434 */
+/* 435 */,
+/* 436 */,
+/* 437 */,
+/* 438 */,
+/* 439 */,
+/* 440 */,
+/* 441 */,
+/* 442 */
 /*!*****************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-tabbar/props.js ***!
   \*****************************************************************************/
@@ -24120,14 +24204,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 435 */,
-/* 436 */,
-/* 437 */,
-/* 438 */,
-/* 439 */,
-/* 440 */,
-/* 441 */,
-/* 442 */
+/* 443 */,
+/* 444 */,
+/* 445 */,
+/* 446 */,
+/* 447 */,
+/* 448 */,
+/* 449 */,
+/* 450 */
 /*!**********************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-tabbar-item/props.js ***!
   \**********************************************************************************/
@@ -24179,14 +24263,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 443 */,
-/* 444 */,
-/* 445 */,
-/* 446 */,
-/* 447 */,
-/* 448 */,
-/* 449 */,
-/* 450 */
+/* 451 */,
+/* 452 */,
+/* 453 */,
+/* 454 */,
+/* 455 */,
+/* 456 */,
+/* 457 */,
+/* 458 */
 /*!***************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-form/props.js ***!
   \***************************************************************************/
@@ -24249,12 +24333,12 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 451 */,
-/* 452 */,
-/* 453 */,
-/* 454 */,
-/* 455 */,
-/* 456 */
+/* 459 */,
+/* 460 */,
+/* 461 */,
+/* 462 */,
+/* 463 */,
+/* 464 */
 /*!********************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-form-item/props.js ***!
   \********************************************************************************/
@@ -24320,14 +24404,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 457 */,
-/* 458 */,
-/* 459 */,
-/* 460 */,
-/* 461 */,
-/* 462 */,
-/* 463 */,
-/* 464 */
+/* 465 */,
+/* 466 */,
+/* 467 */,
+/* 468 */,
+/* 469 */,
+/* 470 */,
+/* 471 */,
+/* 472 */
 /*!*******************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-textarea/props.js ***!
   \*******************************************************************************/
@@ -24464,12 +24548,12 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 465 */,
-/* 466 */,
-/* 467 */,
-/* 468 */,
-/* 469 */,
-/* 470 */
+/* 473 */,
+/* 474 */,
+/* 475 */,
+/* 476 */,
+/* 477 */,
+/* 478 */
 /*!***********************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-loading-icon/props.js ***!
   \***********************************************************************************/
@@ -24546,14 +24630,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 471 */,
-/* 472 */,
-/* 473 */,
-/* 474 */,
-/* 475 */,
-/* 476 */,
-/* 477 */,
-/* 478 */
+/* 479 */,
+/* 480 */,
+/* 481 */,
+/* 482 */,
+/* 483 */,
+/* 484 */,
+/* 485 */,
+/* 486 */
 /*!***************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-line/props.js ***!
   \***************************************************************************/
@@ -24604,14 +24688,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 479 */,
-/* 480 */,
-/* 481 */,
-/* 482 */,
-/* 483 */,
-/* 484 */,
-/* 485 */,
-/* 486 */
+/* 487 */,
+/* 488 */,
+/* 489 */,
+/* 490 */,
+/* 491 */,
+/* 492 */,
+/* 493 */,
+/* 494 */
 /*!******************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-overlay/props.js ***!
   \******************************************************************************/
@@ -24653,14 +24737,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 487 */,
-/* 488 */,
-/* 489 */,
-/* 490 */,
-/* 491 */,
-/* 492 */,
-/* 493 */,
-/* 494 */
+/* 495 */,
+/* 496 */,
+/* 497 */,
+/* 498 */,
+/* 499 */,
+/* 500 */,
+/* 501 */,
+/* 502 */
 /*!**************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-gap/props.js ***!
   \**************************************************************************/
@@ -24702,14 +24786,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 495 */,
-/* 496 */,
-/* 497 */,
-/* 498 */,
-/* 499 */,
-/* 500 */,
-/* 501 */,
-/* 502 */
+/* 503 */,
+/* 504 */,
+/* 505 */,
+/* 506 */,
+/* 507 */,
+/* 508 */,
+/* 509 */,
+/* 510 */
 /*!****************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-badge/props.js ***!
   \****************************************************************************/
@@ -24799,14 +24883,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 503 */,
-/* 504 */,
-/* 505 */,
-/* 506 */,
-/* 507 */,
-/* 508 */,
-/* 509 */,
-/* 510 */
+/* 511 */,
+/* 512 */,
+/* 513 */,
+/* 514 */,
+/* 515 */,
+/* 516 */,
+/* 517 */,
+/* 518 */
 /*!******************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-toolbar/props.js ***!
   \******************************************************************************/
@@ -24858,14 +24942,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 511 */,
-/* 512 */,
-/* 513 */,
-/* 514 */,
-/* 515 */,
-/* 516 */,
-/* 517 */,
-/* 518 */
+/* 519 */,
+/* 520 */,
+/* 521 */,
+/* 522 */,
+/* 523 */,
+/* 524 */,
+/* 525 */,
+/* 526 */
 /*!*********************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-status-bar/props.js ***!
   \*********************************************************************************/
@@ -24891,14 +24975,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 519 */,
-/* 520 */,
-/* 521 */,
-/* 522 */,
-/* 523 */,
-/* 524 */,
-/* 525 */,
-/* 526 */
+/* 527 */,
+/* 528 */,
+/* 529 */,
+/* 530 */,
+/* 531 */,
+/* 532 */,
+/* 533 */,
+/* 534 */
 /*!***************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-text/props.js ***!
   \***************************************************************************/
@@ -25026,12 +25110,12 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 527 */,
-/* 528 */,
-/* 529 */,
-/* 530 */,
-/* 531 */,
-/* 532 */
+/* 535 */,
+/* 536 */,
+/* 537 */,
+/* 538 */,
+/* 539 */,
+/* 540 */
 /*!*********************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-transition/props.js ***!
   \*********************************************************************************/
@@ -25073,7 +25157,7 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 533 */
+/* 541 */
 /*!**************************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-transition/transition.js ***!
   \**************************************************************************************/
@@ -25090,7 +25174,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 30));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
-var _nvueAniMap = _interopRequireDefault(__webpack_require__(/*! ./nvue.ani-map.js */ 534));
+var _nvueAniMap = _interopRequireDefault(__webpack_require__(/*! ./nvue.ani-map.js */ 542));
 // 定义一个一定时间后自动成功的promise,让调用nextTick方法处,进入下一个then方法
 var nextTick = function nextTick() {
   return new Promise(function (resolve) {
@@ -25182,7 +25266,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 534 */
+/* 542 */
 /*!****************************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-transition/nvue.ani-map.js ***!
   \****************************************************************************************/
@@ -25375,14 +25459,14 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 535 */,
-/* 536 */,
-/* 537 */,
-/* 538 */,
-/* 539 */,
-/* 540 */,
-/* 541 */,
-/* 542 */
+/* 543 */,
+/* 544 */,
+/* 545 */,
+/* 546 */,
+/* 547 */,
+/* 548 */,
+/* 549 */,
+/* 550 */
 /*!**********************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-safe-bottom/props.js ***!
   \**********************************************************************************/
@@ -25402,21 +25486,21 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 543 */,
-/* 544 */,
-/* 545 */,
-/* 546 */,
-/* 547 */,
-/* 548 */,
-/* 549 */,
-/* 550 */,
 /* 551 */,
 /* 552 */,
 /* 553 */,
 /* 554 */,
 /* 555 */,
 /* 556 */,
-/* 557 */
+/* 557 */,
+/* 558 */,
+/* 559 */,
+/* 560 */,
+/* 561 */,
+/* 562 */,
+/* 563 */,
+/* 564 */,
+/* 565 */
 /*!*****************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/libs/util/async-validator.js ***!
   \*****************************************************************************/
@@ -25454,7 +25538,7 @@ function _extends() {
 var formatRegExp = /%[sdj%]/g;
 var warning = function warning() {}; // don't print warning message when in production env or node runtime
 
-if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"text-installation","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
+if (typeof process !== 'undefined' && Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"text-installation","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
   warning = function warning(type, errors) {
     if (typeof console !== 'undefined' && console.warn) {
       if (errors.every(function (e) {
@@ -26597,10 +26681,10 @@ Schema.warning = warning;
 Schema.messages = messages;
 var _default = Schema; // # sourceMappingURL=index.js.map
 exports.default = _default;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/node-libs-browser/mock/process.js */ 558)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/node-libs-browser/mock/process.js */ 566)))
 
 /***/ }),
-/* 558 */
+/* 566 */
 /*!********************************************************!*\
   !*** ./node_modules/node-libs-browser/mock/process.js ***!
   \********************************************************/
@@ -26631,7 +26715,7 @@ exports.binding = function (name) {
     var path;
     exports.cwd = function () { return cwd };
     exports.chdir = function (dir) {
-        if (!path) path = __webpack_require__(/*! path */ 559);
+        if (!path) path = __webpack_require__(/*! path */ 567);
         cwd = path.resolve(dir, cwd);
     };
 })();
@@ -26644,7 +26728,7 @@ exports.features = {};
 
 
 /***/ }),
-/* 559 */
+/* 567 */
 /*!***********************************************!*\
   !*** ./node_modules/path-browserify/index.js ***!
   \***********************************************/
@@ -26954,22 +27038,22 @@ var substr = 'ab'.substr(-1) === 'b'
     }
 ;
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../node-libs-browser/mock/process.js */ 558)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../node-libs-browser/mock/process.js */ 566)))
 
 /***/ }),
-/* 560 */,
-/* 561 */,
-/* 562 */,
-/* 563 */,
-/* 564 */,
-/* 565 */,
-/* 566 */,
-/* 567 */,
 /* 568 */,
 /* 569 */,
 /* 570 */,
 /* 571 */,
-/* 572 */
+/* 572 */,
+/* 573 */,
+/* 574 */,
+/* 575 */,
+/* 576 */,
+/* 577 */,
+/* 578 */,
+/* 579 */,
+/* 580 */
 /*!***************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-text/value.js ***!
   \***************************************************************************/
@@ -27077,14 +27161,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 573 */,
-/* 574 */,
-/* 575 */,
-/* 576 */,
-/* 577 */,
-/* 578 */,
-/* 579 */,
-/* 580 */
+/* 581 */,
+/* 582 */,
+/* 583 */,
+/* 584 */,
+/* 585 */,
+/* 586 */,
+/* 587 */,
+/* 588 */
 /*!***************************************************************************!*\
   !*** E:/ios/iot-test-app/uni_modules/uview-ui/components/u-link/props.js ***!
   \***************************************************************************/

+ 4 - 4
unpackage/dist/dev/mp-weixin/pages/add-project/add-project.js

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     "u-Form": function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--form/u--form */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--form/u--form")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--form/u--form.vue */ 445))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--form/u--form */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--form/u--form")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--form/u--form.vue */ 453))
     },
     uFormItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-form-item/u-form-item.vue */ 451))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-form-item/u-form-item.vue */ 459))
     },
     "u-Input": function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--input/u--input.vue */ 407))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--input/u--input.vue */ 415))
     },
     "u-Textarea": function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--textarea/u--textarea */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--textarea/u--textarea")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--textarea/u--textarea.vue */ 459))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--textarea/u--textarea */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--textarea/u--textarea")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--textarea/u--textarea.vue */ 467))
     },
     uButton: function () {
       return Promise.all(/*! import() | uni_modules/uview-ui/components/u-button/u-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-button/u-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-button/u-button.vue */ 292))

+ 81 - 27
unpackage/dist/dev/mp-weixin/pages/bluetooth/bluetooth.js

@@ -103,11 +103,14 @@ try {
     uTabs: function () {
       return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabs/u-tabs.vue */ 325))
     },
+    uSkeleton: function () {
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-skeleton/u-skeleton */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-skeleton/u-skeleton")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-skeleton/u-skeleton.vue */ 333))
+    },
     uSwipeAction: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 333))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 341))
     },
     uSwipeActionItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 339))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 347))
     },
     uIcon: function () {
       return Promise.all(/*! import() | uni_modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-icon/u-icon.vue */ 283))
@@ -261,9 +264,12 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
+//
+//
 var _default = {
   data: function data() {
     return {
+      loading_skeleton: false,
       gatewayFlag: 0,
       show1: true,
       options1: [{
@@ -428,7 +434,7 @@ var _default = {
     scan: function scan() {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var arr, _yield$uni$$http$post3, res;
+        var arr, _yield$uni$$http$post3, res, that;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -442,7 +448,7 @@ var _default = {
                 _context2.next = 5;
                 return uni.$http.post('/api/v1/test/testResult/queryByCondition', {
                   testProjectId: uni.getStorageSync("testProjectId"),
-                  pageSize: 10,
+                  pageSize: 100,
                   pageNo: 1,
                   status: 2
                 });
@@ -450,6 +456,7 @@ var _default = {
                 _yield$uni$$http$post3 = _context2.sent;
                 res = _yield$uni$$http$post3.data;
                 uni.hideLoading();
+                that = _this2;
                 if (res.code == 200) {
                   arr = res.data.records;
                   console.log(arr);
@@ -458,40 +465,66 @@ var _default = {
                     success: function success(res) {
                       console.log('条码类型:' + res.scanType);
                       console.log('条码内容:' + res.result);
-                      var arr1 = arr.filter(function (item) {
-                        return item == res.result;
+                      console.log(arr, 'arr的数据');
+                      var arr1 = arr.find(function (item) {
+                        return item.deviceId == res.result.toLowerCase();
                       });
-                      // console.log(arr1);
-                      var scanDeviced = JSON.stringify(arr1[0]);
-                      if (arr1 == 0) {
-                        // this.$u.toast(`未找到该设备`)
-                        uni.showToast({
-                          icon: "error",
-                          title: "未找到该设备"
-                        });
-                        // console.log('未找到该设备');
+                      console.log(arr1, 'arr1的msg');
+                      var scanDeviced = JSON.stringify(arr1);
+                      if (!arr1) {
+                        return that.$u.toast("\u672A\u83B7\u53D6\u5230\u8BBE\u5907\u4FE1\u606F");
                       } else {
-                        // console.log('找到该设备');
-                        if (arr1[0].type == 0) {
+                        if (arr1.type == 0) {
+                          console.log('我是猫眼');
                           uni.navigateTo({
                             url: "/pages/cat-eye-test/cat-eye-test?item=" + scanDeviced
                           });
-                        } else if (arr1[0].type == 1 && arr1[0].subType == 0 || arr1[0].subType == null) {
+                        } else if (arr1.type == 1 && arr1.subType == 0 || arr1.subType == null) {
+                          console.log('我是门锁');
                           uni.navigateTo({
                             url: "/pages/lock-test/lock-test?item=" + scanDeviced
                           });
                         } else {
+                          console.log('我是模块');
                           uni.navigateTo({
                             url: "/pages/door-lock-module/door-lock-module?item=" + scanDeviced
                           });
                         }
                       }
+                      // 		if (arr1) {
+
+                      // 			uni.showToast({
+                      // 				icon: "error",
+                      // 				title: "未找到该设备"
+                      // 			})
+
+                      // 		} else {
+
+                      // 			if (arr1.type == 0) {
+                      // 				console.log(2);
+                      // 				uni.navigateTo({
+                      // 					url: "/pages/cat-eye-test/cat-eye-test?item=" +
+                      // 						scanDeviced
+                      // 				})
+                      // 			} else if (arr1.type == 1 && arr1.subType == 0 || arr1.subType ==
+                      // 				null) {
+
+                      // 				uni.navigateTo({
+                      // 					url: "/pages/lock-test/lock-test?item=" + scanDeviced
+                      // 				})
+                      // 			} else {
+                      // 				uni.navigateTo({
+                      // 					url: "/pages/door-lock-module/door-lock-module?item=" +
+                      // 						scanDeviced
+                      // 				})
+                      // 			}
+                      // 		}
                     }
                   });
                 } else {
                   _this2.$u.toast("\u8BF7\u91CD\u65B0\u83B7\u53D6\u84DD\u7259\u8BBE\u5907");
                 }
-              case 9:
+              case 10:
               case "end":
                 return _context2.stop();
             }
@@ -571,21 +604,27 @@ var _default = {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
+                if (uni.getStorageSync('testProjectId')) {
+                  _context4.next = 2;
+                  break;
+                }
+                return _context4.abrupt("return", _this5.$u.toast("\u672A\u67E5\u8BE2\u5230\u6D4B\u8BD5\u9879\u76EE\uFF0C\u8BF7\u524D\u5F80\u540E\u53F0\u6DFB\u52A0\u6D4B\u8BD5\u9879\u76EE"));
+              case 2:
+                _this5.loading_skeleton = true;
                 console.log(11);
                 _this5.gatewayFlag = 0;
                 // uni.showLoading({
                 // 	mask: true,
                 // 	title: '数据加载中'
                 // })
-                _context4.next = 4;
+                _context4.next = 7;
                 return uni.$http.post('/api/v1/test/testResult/queryByCondition', _this5.parameter);
-              case 4:
+              case 7:
                 _yield$uni$$http$post4 = _context4.sent;
                 res = _yield$uni$$http$post4.data;
                 uni.hideLoading();
                 console.log(res);
                 if (res.code === 200) {
-                  uni.$showMsg('数据加载成功');
                   // let badge1 = res.data.records.filter((item) => {
                   // 	return item.status = 2
                   // })
@@ -598,14 +637,18 @@ var _default = {
                   } else if (_this5.parameter.status == 1) {
                     _this5.tabList[2].badge.value = res.data.total;
                   }
+                  uni.$showMsg('数据加载成功');
+                  _this5.loading_skeleton = false;
+                  _this5.productList = [];
                   _this5.productList = [].concat((0, _toConsumableArray2.default)(_this5.productList), (0, _toConsumableArray2.default)(res.data.records));
                 } else {
                   // uni.$showMsg('数据加载失败')
                   console.log('数据加载失败');
+                  _this5.loading_skeleton = false;
                 }
 
                 // console.log(this.productList);
-              case 9:
+              case 12:
               case "end":
                 return _context4.stop();
             }
@@ -659,13 +702,19 @@ var _default = {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
-                _context6.next = 2;
+                if (uni.getStorageSync('testProjectId')) {
+                  _context6.next = 2;
+                  break;
+                }
+                return _context6.abrupt("return", _this7.$u.toast("\u672A\u67E5\u8BE2\u5230\u6D4B\u8BD5\u9879\u76EE\uFF0C\u8BF7\u524D\u5F80\u540E\u53F0\u6DFB\u52A0\u6D4B\u8BD5\u9879\u76EE"));
+              case 2:
+                _context6.next = 4;
                 return uni.$http.post('/api/v1/test/testResult/queryByCondition', {
                   testProjectId: uni.getStorageSync("testProjectId"),
                   pageSize: 100,
                   pageNo: 1
                 });
-              case 2:
+              case 4:
                 _yield$uni$$http$post6 = _context6.sent;
                 res = _yield$uni$$http$post6.data;
                 badge1 = res.data.records.filter(function (item) {
@@ -681,7 +730,7 @@ var _default = {
                 _this7.tabList[0].badge.value = badge1.length;
                 _this7.tabList[1].badge.value = badge3.length;
                 _this7.tabList[2].badge.value = badge2.length;
-              case 11:
+              case 13:
               case "end":
                 return _context6.stop();
             }
@@ -692,7 +741,7 @@ var _default = {
   },
   onShow: function onShow() {
     var _this8 = this;
-    this.searchBluetooth().then(function () {
+    this.getNum().then(function () {
       if (_this8.gatewayFlag = 1) {
         _this8.getBluetoothList();
       }
@@ -712,6 +761,11 @@ var _default = {
     this.parameter.testProjectId = uni.getStorageSync('testProjectId');
     console.log(this.parameter.testProjectId);
     this.getNum();
+    this.searchBluetooth().then(function () {
+      if (_this9.gatewayFlag = 1) {
+        _this9.getBluetoothList();
+      }
+    });
   }
 };
 exports.default = _default;

+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/bluetooth/bluetooth.json

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "u-tabs": "/uni_modules/uview-ui/components/u-tabs/u-tabs",
+    "u-skeleton": "/uni_modules/uview-ui/components/u-skeleton/u-skeleton",
     "u-swipe-action": "/uni_modules/uview-ui/components/u-swipe-action/u-swipe-action",
     "u-swipe-action-item": "/uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item",
     "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon",

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/bluetooth/bluetooth.wxml


+ 14 - 11
unpackage/dist/dev/mp-weixin/pages/cat-eye-test/cat-eye-test.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-navbar/u-navbar.vue */ 375))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-navbar/u-navbar.vue */ 383))
     },
     uSteps: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-steps/u-steps */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-steps/u-steps")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-steps/u-steps.vue */ 383))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-steps/u-steps */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-steps/u-steps")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-steps/u-steps.vue */ 391))
     },
     uStepsItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-steps-item/u-steps-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-steps-item/u-steps-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-steps-item/u-steps-item.vue */ 391))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-steps-item/u-steps-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-steps-item/u-steps-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-steps-item/u-steps-item.vue */ 399))
     },
     uButton: function () {
       return Promise.all(/*! import() | uni_modules/uview-ui/components/u-button/u-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-button/u-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-button/u-button.vue */ 292))
@@ -116,16 +116,16 @@ try {
       return Promise.all(/*! import() | uni_modules/uview-ui/components/u-modal/u-modal */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-modal/u-modal")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-modal/u-modal.vue */ 310))
     },
     uPopup: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 399))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 407))
     },
     "u-Input": function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--input/u--input.vue */ 407))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--input/u--input.vue */ 415))
     },
     uRadioGroup: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue */ 413))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue */ 421))
     },
     uRadio: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-radio/u-radio */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-radio/u-radio")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-radio/u-radio.vue */ 421))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-radio/u-radio */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-radio/u-radio")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-radio/u-radio.vue */ 429))
     },
   }
 } catch (e) {
@@ -385,6 +385,9 @@ var _default = {
                 uni.hideLoading();
                 if (res.code == 200) {
                   _this2.$u.toast("\u91CD\u7F6E\u6210\u529F");
+                  uni.switchTab({
+                    url: "/pages/bluetooth/bluetooth"
+                  });
                 } else {
                   _this2.$u.toast("\u91CD\u7F6E\u5931\u8D25");
                 }
@@ -402,7 +405,7 @@ var _default = {
         this.$set(this.uploadMsg, 'signalNum', this.signalNum);
         this.$set(this.uploadMsg, 'status', 0);
         // this.$set(this.uploadMsg, 'faceOpenRes', true)
-        this.$set(this.uploadMsg, 'signlRes', false);
+        this.$set(this.uploadMsg, 'signalRes', false);
         this.$set(this.uploadMsg, 'faceOpenRes', false);
         this.$set(this.uploadMsg, 'powerRes', false);
         this.uploadTest();
@@ -410,7 +413,7 @@ var _default = {
       if (this.flag == 3 || this.flag == 4) {
         this.$set(this.uploadMsg, 'signalNum', this.signalNum);
         this.$set(this.uploadMsg, 'status', 0);
-        this.$set(this.uploadMsg, 'signlRes', true);
+        this.$set(this.uploadMsg, 'signalRes', true);
         this.$set(this.uploadMsg, 'faceOpenRes', false);
         this.$set(this.uploadMsg, 'powerRes', false);
         this.uploadTest();
@@ -418,7 +421,7 @@ var _default = {
       if (this.flag == 5) {
         this.$set(this.uploadMsg, 'signalNum', this.signalNum);
         this.$set(this.uploadMsg, 'status', 0);
-        this.$set(this.uploadMsg, 'signlRes', true);
+        this.$set(this.uploadMsg, 'signalRes', true);
         this.$set(this.uploadMsg, 'faceOpenRes', true);
         this.$set(this.uploadMsg, 'powerRes', false);
         this.$set(this.uploadMsg, 'powerNum', this.powerNum);
@@ -428,7 +431,7 @@ var _default = {
       if (this.flag == 6) {
         this.$set(this.uploadMsg, 'signalNum', this.signalNum);
         this.$set(this.uploadMsg, 'status', 1);
-        this.$set(this.uploadMsg, 'signlRes', true);
+        this.$set(this.uploadMsg, 'signalRes', true);
         this.$set(this.uploadMsg, 'faceOpenRes', true);
         this.$set(this.uploadMsg, 'powerRes', true);
         this.$set(this.uploadMsg, 'powerNum', this.powerNum);

+ 12 - 9
unpackage/dist/dev/mp-weixin/pages/door-lock-module/door-lock-module.js

@@ -101,28 +101,28 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-navbar/u-navbar.vue */ 375))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-navbar/u-navbar.vue */ 383))
     },
     uSteps: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-steps/u-steps */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-steps/u-steps")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-steps/u-steps.vue */ 383))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-steps/u-steps */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-steps/u-steps")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-steps/u-steps.vue */ 391))
     },
     uStepsItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-steps-item/u-steps-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-steps-item/u-steps-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-steps-item/u-steps-item.vue */ 391))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-steps-item/u-steps-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-steps-item/u-steps-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-steps-item/u-steps-item.vue */ 399))
     },
     uButton: function () {
       return Promise.all(/*! import() | uni_modules/uview-ui/components/u-button/u-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-button/u-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-button/u-button.vue */ 292))
     },
     uPopup: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 399))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 407))
     },
     "u-Input": function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--input/u--input.vue */ 407))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--input/u--input.vue */ 415))
     },
     uRadioGroup: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue */ 413))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue */ 421))
     },
     uRadio: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-radio/u-radio */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-radio/u-radio")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-radio/u-radio.vue */ 421))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-radio/u-radio */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-radio/u-radio")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-radio/u-radio.vue */ 429))
     },
   }
 } catch (e) {
@@ -514,7 +514,7 @@ var _default = {
         }
         this.$set(this.uploadMsg, 'signalNum', this.signalNum);
         this.$set(this.uploadMsg, 'status', 0);
-        this.$set(this.uploadMsg, 'signlRes', true);
+        this.$set(this.uploadMsg, 'signalRes', true);
         this.$set(this.uploadMsg, 'doorOpenRes', true);
         this.$set(this.uploadMsg, 'powerRes', false);
         this.uploadTest();
@@ -525,7 +525,7 @@ var _default = {
         }
         this.$set(this.uploadMsg, 'signalNum', this.signalNum);
         this.$set(this.uploadMsg, 'status', 1);
-        this.$set(this.uploadMsg, 'signlRes', true);
+        this.$set(this.uploadMsg, 'signalRes', true);
         this.$set(this.uploadMsg, 'doorOpenRes', true);
         this.$set(this.uploadMsg, 'powerRes', true);
         this.$set(this.uploadMsg, 'powerNum', this.powerNum);
@@ -564,6 +564,9 @@ var _default = {
                 uni.hideLoading();
                 if (res.code == 200) {
                   _this6.$u.toast("\u91CD\u7F6E\u6210\u529F");
+                  uni.switchTab({
+                    url: "/pages/bluetooth/bluetooth"
+                  });
                 } else {
                   _this6.$u.toast("\u91CD\u7F6E\u5931\u8D25");
                 }

+ 24 - 20
unpackage/dist/dev/mp-weixin/pages/lock-test/lock-test.js

@@ -101,28 +101,28 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-navbar/u-navbar.vue */ 375))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-navbar/u-navbar.vue */ 383))
     },
     uSteps: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-steps/u-steps */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-steps/u-steps")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-steps/u-steps.vue */ 383))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-steps/u-steps */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-steps/u-steps")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-steps/u-steps.vue */ 391))
     },
     uStepsItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-steps-item/u-steps-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-steps-item/u-steps-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-steps-item/u-steps-item.vue */ 391))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-steps-item/u-steps-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-steps-item/u-steps-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-steps-item/u-steps-item.vue */ 399))
     },
     uButton: function () {
       return Promise.all(/*! import() | uni_modules/uview-ui/components/u-button/u-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-button/u-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-button/u-button.vue */ 292))
     },
     uPopup: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 399))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 407))
     },
     "u-Input": function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--input/u--input.vue */ 407))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--input/u--input.vue */ 415))
     },
     uRadioGroup: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue */ 413))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue */ 421))
     },
     uRadio: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-radio/u-radio */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-radio/u-radio")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-radio/u-radio.vue */ 421))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-radio/u-radio */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-radio/u-radio")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-radio/u-radio.vue */ 429))
     },
   }
 } catch (e) {
@@ -596,19 +596,23 @@ var _default = {
                 uni.hideLoading();
                 if (res.code == 200) {
                   _this8.$u.toast("\u91CD\u7F6E\u6210\u529F");
-                } else {
-                  _this8.$u.toast("\u91CD\u7F6E\u5931\u8D25");
-                  uni.showModal({
-                    title: '提示',
-                    content: '设备重置失败,点击确定继续重置',
-                    success: function success(res) {
-                      if (res.confirm) {
-                        this.resetDevice();
-                      } else if (res.cancel) {
-                        console.log('用户点击取消');
-                      }
-                    }
+                  uni.switchTab({
+                    url: "/pages/bluetooth/bluetooth"
                   });
+                } else {
+                  // this.$u.toast(`重置失败`)
+                  _this8.resetDevice();
+                  // uni.showModal({
+                  // 	title: '提示',
+                  // 	content: '设备重置失败,点击确定继续重置',
+                  // 	success: function(res) {
+                  // 		if (res.confirm) {
+                  // 			this.resetDevice()
+                  // 		} else if (res.cancel) {
+                  // 			console.log('用户点击取消');
+                  // 		}
+                  // 	}
+                  // });
                 }
               case 8:
               case "end":
@@ -675,7 +679,7 @@ var _default = {
           this.$set(this.uploadMsg, 'subType', 0);
         }
         this.$set(this.uploadMsg, 'status', 1);
-        this.$set(this.uploadMsg, 'signlRes', true);
+        this.$set(this.uploadMsg, 'signalRes', true);
         this.$set(this.uploadMsg, 'doorOpenRes', true);
         this.$set(this.uploadMsg, 'powerRes', true);
         this.$set(this.uploadMsg, 'cardOpenRes', true);

+ 20 - 15
unpackage/dist/dev/mp-weixin/pages/mine/mine.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uCellGroup: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-cell-group/u-cell-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-cell-group/u-cell-group")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-cell-group/u-cell-group.vue */ 351))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-cell-group/u-cell-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-cell-group/u-cell-group")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-cell-group/u-cell-group.vue */ 359))
     },
     uCell: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-cell/u-cell */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-cell/u-cell")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-cell/u-cell.vue */ 359))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-cell/u-cell */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-cell/u-cell")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-cell/u-cell.vue */ 367))
     },
     uPicker: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-picker/u-picker.vue */ 367))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-picker/u-picker.vue */ 375))
     },
   }
 } catch (e) {
@@ -234,17 +234,22 @@ var _default = {
       console.log('弹出');
     },
     confirm: function confirm(e) {
+      console.log(1);
       console.log('confirm', e);
       console.log(this.arr, '全部项目');
+      if (this.arr.length == 0) {
+        this.show = false;
+        return this.$u.toast("\u672A\u68C0\u6D4B\u5230\u6D4B\u8BD5\u9879\u76EE");
+      }
       var getWay = this.arr.filter(function (item) {
-        return item.description == e.value[0];
+        return item.name == e.value[0];
       });
       console.log(getWay, '过滤');
       // console.log(getWay);
       uni.setStorageSync('testProjectId', getWay[0].id);
       uni.setStorageSync('gatewayDeviceId', getWay[0].gatewayDeviceId);
       // uni.setStorageSync('testProjectId', e.value[0].id)
-      this.value = getWay[0].description;
+      this.value = getWay[0].name;
       this.show = false;
     },
     selectClick: function selectClick(index) {
@@ -288,7 +293,7 @@ var _default = {
     getProjectList: function getProjectList() {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _yield$uni$$http$post, res, _filter, filter;
+        var _yield$uni$$http$post, res, filter;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -304,19 +309,19 @@ var _default = {
                   if (res.data.records.length == 0) {
                     _this.$u.toast("\u672A\u68C0\u6D4B\u5230\u6D4B\u8BD5\u9879\u76EE");
                   } else {
-                    _filter = [];
+                    filter = [];
                     res.data.records.forEach(function (item) {
-                      _filter.push(item.description);
+                      filter.push(item.name);
                     });
-                    _this.columns[0] = _filter;
+                    _this.columns[0] = filter;
                     _this.arr = res.data.records;
                   }
-                  filter = [];
-                  res.data.records.forEach(function (item) {
-                    filter.push(item.description);
-                  });
-                  _this.columns[0] = filter;
-                  _this.arr = res.data.records;
+                  // let filter = []
+                  // res.data.records.forEach((item) => {
+                  // 	filter.push(item.description)
+                  // })
+                  // this.columns[0] = filter
+                  // this.arr = res.data.records
                 } else {
                   _this.$u.toast("\u8BF7\u6C42\u5931\u8D25");
                 }

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/project-list/project-list.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uSwipeAction: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 333))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 341))
     },
     uSwipeActionItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 339))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 347))
     },
     uToast: function () {
       return __webpack_require__.e(/*! import() | uni_modules/uview-ui/components/u-toast/u-toast */ "uni_modules/uview-ui/components/u-toast/u-toast").then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-toast/u-toast.vue */ 318))

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/tabbar/Bluetooth/Bluetooth.js

@@ -99,10 +99,10 @@ var components
 try {
   components = {
     uTabbar: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue */ 429))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue */ 437))
     },
     uTabbarItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 437))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 445))
     },
   }
 } catch (e) {

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/tabbar/gateway/gateway.js

@@ -99,10 +99,10 @@ var components
 try {
   components = {
     uTabbar: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue */ 429))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue */ 437))
     },
     uTabbarItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 437))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 445))
     },
   }
 } catch (e) {

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.js

@@ -99,10 +99,10 @@ var components
 try {
   components = {
     uTabbar: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue */ 429))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue */ 437))
     },
     uTabbarItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 437))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 445))
     },
   }
 } catch (e) {

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.js

@@ -99,10 +99,10 @@ var components
 try {
   components = {
     uTabbar: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue */ 429))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue */ 437))
     },
     uTabbarItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 437))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 445))
     },
   }
 } catch (e) {

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/tabbar/room/room.js

@@ -99,10 +99,10 @@ var components
 try {
   components = {
     uTabbar: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue */ 429))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue */ 437))
     },
     uTabbarItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 437))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 445))
     },
   }
 } catch (e) {

File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--form/u--form.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--input/u--input.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--text/u--text.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--textarea/u--textarea.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uLoadingIcon: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-loading-icon/u-loading-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-loading-icon/u-loading-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.vue */ 465))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-loading-icon/u-loading-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-loading-icon/u-loading-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.vue */ 473))
     },
     uIcon: function () {
       return Promise.all(/*! import() | uni_modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-icon/u-icon.vue */ 283))

File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-cell-group/u-cell-group.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-cell/u-cell.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form-item/u-form-item.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form/u-form.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-gap/u-gap.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-line/u-line.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-link/u-link.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js


+ 3 - 3
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-modal/u-modal.js

@@ -80,13 +80,13 @@ var components
 try {
   components = {
     uPopup: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 399))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 407))
     },
     uLine: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-line/u-line */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-line/u-line")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-line/u-line.vue */ 473))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-line/u-line */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-line/u-line")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-line/u-line.vue */ 481))
     },
     uLoadingIcon: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-loading-icon/u-loading-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-loading-icon/u-loading-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.vue */ 465))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-loading-icon/u-loading-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-loading-icon/u-loading-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.vue */ 473))
     },
   }
 } catch (e) {

File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-navbar/u-navbar.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js


File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js


File diff suppressed because it is too large
+ 19 - 19
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-radio-group/u-radio-group.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-radio/u-radio.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js


File diff suppressed because it is too large
+ 346 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-skeleton/u-skeleton.js


+ 4 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-skeleton/u-skeleton.json

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

File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-skeleton/u-skeleton.wxml


+ 83 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-skeleton/u-skeleton.wxss

@@ -0,0 +1,83 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* uni.scss */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-3bb5bf6e, scroll-view.data-v-3bb5bf6e, swiper-item.data-v-3bb5bf6e {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-skeleton.data-v-3bb5bf6e {
+  flex: 1;
+}
+.u-skeleton__wrapper.data-v-3bb5bf6e {
+  display: flex;
+  flex-direction: row;
+}
+.u-skeleton__wrapper__avatar.data-v-3bb5bf6e {
+  background: linear-gradient(90deg, #F1F2F4 25%, #e6e6e6 37%, #F1F2F4 50%);
+  background-size: 400% 100%;
+  margin-right: 15px;
+}
+.u-skeleton__wrapper__avatar--circle.data-v-3bb5bf6e {
+  border-radius: 100px;
+}
+.u-skeleton__wrapper__avatar--square.data-v-3bb5bf6e {
+  border-radius: 4px;
+}
+.u-skeleton__wrapper__content.data-v-3bb5bf6e {
+  flex: 1;
+}
+.u-skeleton__wrapper__content__rows.data-v-3bb5bf6e, .u-skeleton__wrapper__content__title.data-v-3bb5bf6e {
+  background: linear-gradient(90deg, #F1F2F4 25%, #e6e6e6 37%, #F1F2F4 50%);
+  background-size: 400% 100%;
+  border-radius: 3px;
+}
+.animate.data-v-3bb5bf6e {
+  -webkit-animation: skeleton-data-v-3bb5bf6e 1.8s ease infinite;
+          animation: skeleton-data-v-3bb5bf6e 1.8s ease infinite;
+}
+@-webkit-keyframes skeleton-data-v-3bb5bf6e {
+0% {
+    background-position: 100% 50%;
+}
+100% {
+    background-position: 0 50%;
+}
+}
+@keyframes skeleton-data-v-3bb5bf6e {
+0% {
+    background-position: 100% 50%;
+}
+100% {
+    background-position: 0 50%;
+}
+}
+

File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-steps-item/u-steps-item.js


+ 0 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-steps/u-steps.js


Some files were not shown because too many files changed in this diff