Merge branch 'dev-ft' into 'main'

预览打包小程序完成

See merge request huang/thingskit-app!22

@@ -71,16 +71,11 @@
 		<view v-if="list.status !== 'CLEARED_ACK'" style="width: 500rpx;margin-left: 80rpx;margin-top: 44rpx;">
 		<view v-if="list.status !== 'CLEARED_ACK'" style="width: 500rpx;margin-left: 80rpx;margin-top: 44rpx;">
 			<u-button @click="handleSubmit" type="primary" shape="circle" text="处理"></u-button>
 			<u-button @click="handleSubmit" type="primary" shape="circle" text="处理"></u-button>
 		</view>
 		</view>
-		<f-tabbar></f-tabbar>
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 export default {
 export default {
-	components: {
-		fTabbar
-	},
 	data() {
 	data() {
 		return {
 		return {
 			formModel: {
 			formModel: {

 import store from '@/store';
 import store from '@/store';
 import base from "@/config/baseUrl";
 import base from "@/config/baseUrl";
-import QQMapWX from '@/plugins/qqmap-wx-jssdk.js';
+// import QQMapWX from '@/plugins/qqmap-wx-jssdk.js';
 import {
 import {
 	getAppLatLon
 	getAppLatLon
 } from '@/plugins/utils';
 } from '@/plugins/utils';

 import base from "@/config/baseUrl";
 import base from "@/config/baseUrl";
-import store from '@/store';
-import {
-	judgeLogin
-} from '@/config/login';
+import store from "@/store";
+import { judgeLogin } from "@/config/login";
 
 
 // 初始化请求配置
 // 初始化请求配置
 uni.$u.http.setConfig((config) => {
 uni.$u.http.setConfig((config) => {
-	const token = store.state.userInfo.isToken || (uni.getStorageSync('userInfo').isToken || undefined)
-	// #ifdef H5
-	window.sessionStorage.getItem('userInfo').isToken;
-	// #endif
-	/* config 为默认全局配置*/
-	config.baseURL = base.baseUrl; /* 根域名 */
-	config.header = {
-		'Content-Type': 'application/json',
-		'Authorization': 'Bearer ' + token
-	}
-	config.custom = {
-		load: true, //是否显示加载动画
-		isFactory: true, //true:返回的数据成功只返回data  false:返回response
-		catch: true, //默认数据返回不成功进入catch返回
-		auth: true, //token
-	}
-	return config
-})
+  const token =
+    store.state.userInfo.isToken ||
+    uni.getStorageSync("userInfo").isToken ||
+    undefined;
+  // #ifdef H5
+  window.sessionStorage.getItem("userInfo").isToken;
+  // #endif
+  /* config 为默认全局配置*/
+  config.baseURL = base.baseUrl; /* 根域名 */
+  config.header = {
+    "Content-Type": "application/json",
+    Authorization: "Bearer " + token,
+  };
+  config.custom = {
+    load: true, //是否显示加载动画
+    isFactory: true, //true:返回的数据成功只返回data  false:返回response
+    catch: true, //默认数据返回不成功进入catch返回
+    auth: true, //token
+  };
+  return config;
+});
 
 
 // 请求拦截
 // 请求拦截
-uni.$u.http.interceptors.request.use((config) => { // 可使用async await 做异步操作
-	// 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
-	config.data = config.data || {}
-	// 根据custom参数中配置的是否需要token，添加对应的请求头
-	if (config?.custom?.auth) {
-		config.header.Authorization = 'Bearer ' + store.state.userInfo.isToken || (uni.getStorageSync(
-			'userInfo').isToken || undefined)
-	}
-	console.log("请求开始", config);
-	if (config?.custom?.load) {
-		//打开加载动画
-		store.commit("setLoadingShow", true);
-	}
+uni.$u.http.interceptors.request.use(
+  (config) => {
+    // 可使用async await 做异步操作
+    // 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
+    config.data = config.data || {};
+    // 根据custom参数中配置的是否需要token，添加对应的请求头
+    if (config?.custom?.auth) {
+      config.header.Authorization =
+        "Bearer " + store.state.userInfo.isToken ||
+        uni.getStorageSync("userInfo").isToken ||
+        undefined;
+    }
+    console.log("请求开始", config);
+    if (config?.custom?.load) {
+      //打开加载动画
+      store.commit("setLoadingShow", true);
+    }
 
 
-	return config
-}, config => { // 可使用async await 做异步操作
-	return Promise.reject(config)
-})
+    return config;
+  },
+  (config) => {
+    // 可使用async await 做异步操作
+    return Promise.reject(config);
+  }
+);
 
 
 // 响应拦截
 // 响应拦截
-uni.$u.http.interceptors.response.use((response) => {
-	/* 对响应成功做点什么 可使用async await 做异步操作*/
-	// 关闭加载动画
-	store.commit("setLoadingShow", false);
-	const data = response.data
-	// 自定义参数
-	const custom = response.config?.custom
-	// code:  200、请求成功 其他，没有更多参数 401、被迫下线重新登录、
-	if (response.statusCode == 200) {
-		return Promise.resolve(data)
-		// if (!custom.isFactory) {
-		// 	return Promise.reject(response.data)
-		// } else {
-		// 	return data.data === undefined ? {} :  Promise.reject(response.data)
-		// }
-	} else if (response.statusCode == 401) { //被迫下线重新登录
-		// 清空登录信息
-		store.commit("emptyUserInfo");
-		// 20秒节流，弹窗登录
-		uni.$u.throttle(judgeLogin(), 20000)
-		return new Promise(() => {})
-	} else {
-		// 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
-		if (custom.toast !== false) {
-			uni.$u.toast(data.message || data.msg)
-		}
-		// 如果需要catch返回，则进行reject
-		if (custom?.catch) {
-			return Promise.reject(data)
-		} else {
-			// 否则返回一个pending中的promise，请求不会进入catch中
-			return new Promise(() => {})
-		}
-	}
-}, (response) => {
-	// 关闭加载动画
-	store.commit("setLoadingShow", false);
-	// 对响应错误做点什么 （statusCode !== 200）
-	let errorData = '请检查网络或服务器'
-	let message = response.data?.message || response?.errMsg
-	if (message == "request:fail url not in domain list") {
-		errorData = '检查请求域名是否添加了域名白名单'
-	} else if (message == 'request:fail timeout') {
-		errorData = '请求超时:请检查网络'
-	} else if (message == 'Token has expired') {
-		errorData = 'Token失效，请重新登录'
-		uni.reLaunch({
-			url: '/pages/public/login'
-		})
-		store.commit('emptyUserInfo')
-	} else if (message == 'Invalid username or password') {
-		errorData = '用户名或者密码无效'
-		uni.reLaunch({
-			url: '/pages/public/login'
-		})
-		store.commit('emptyUserInfo')
-	} else {
-		errorData = message || '请检查网络或服务器'
-	}
-	uni.$u.toast(errorData)
-	return Promise.reject(response)
-})
+uni.$u.http.interceptors.response.use(
+  (response) => {
+    /* 对响应成功做点什么 可使用async await 做异步操作*/
+    // 关闭加载动画
+    store.commit("setLoadingShow", false);
+    const data = response.data;
+    // 自定义参数
+    const custom = response.config?.custom;
+    // code:  200、请求成功 其他，没有更多参数 401、被迫下线重新登录、
+    if (response.statusCode == 200) {
+      return Promise.resolve(data);
+      // if (!custom.isFactory) {
+      // 	return Promise.reject(response.data)
+      // } else {
+      // 	return data.data === undefined ? {} :  Promise.reject(response.data)
+      // }
+    } else if (response.statusCode == 401) {
+      //被迫下线重新登录
+      // 清空登录信息
+      store.commit("emptyUserInfo");
+      // 20秒节流，弹窗登录
+      uni.$u.throttle(judgeLogin(), 20000);
+      return new Promise(() => {});
+    } else {
+      // 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
+      if (custom.toast !== false) {
+        uni.$u.toast(data.message || data.msg);
+      }
+      // 如果需要catch返回，则进行reject
+      if (custom?.catch) {
+        return Promise.reject(data);
+      } else {
+        // 否则返回一个pending中的promise，请求不会进入catch中
+        return new Promise(() => {});
+      }
+    }
+  },
+  (response) => {
+    // 关闭加载动画
+    store.commit("setLoadingShow", false);
+    // 对响应错误做点什么 （statusCode !== 200）
+    let errorData = "请检查网络或服务器";
+    let message = response.data?.message || response?.errMsg;
+    if (message == "request:fail url not in domain list") {
+      errorData = "检查请求域名是否添加了域名白名单";
+    } else if (message == "request:fail timeout") {
+      errorData = "请求超时:请检查网络";
+    } else if (message == "Token has expired") {
+      errorData = "Token失效，请重新登录";
+      uni.reLaunch({
+        url: "/publicLoginSubPage/public/login",
+      });
+      store.commit("emptyUserInfo");
+    } else if (message == "Invalid username or password") {
+      errorData = "用户名或者密码无效";
+      uni.reLaunch({
+        url: "/publicLoginSubPage/public/login",
+      });
+      store.commit("emptyUserInfo");
+    } else {
+      errorData = message || "请检查网络或服务器";
+    }
+    uni.$u.toast(errorData);
+    return Promise.reject(response);
+  }
+);

-<template>
-	<view class="device-detail-page">
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
-		<u-sticky bgColor="#fff"><u-tabs :list="list" :current="currentTab" @click="handleTabClick"></u-tabs></u-sticky>
-		<view style="margin-top:30rpx;">
-			<basicInfo v-if="currentTab == 0" :deviceDetail="deviceDetail" />
-			<realTimeData v-if="currentTab === 1" />
-			<historyData v-if="currentTab === 2" :keys="keys" />
-			<alarmHistory v-if="currentTab === 3" />
-			<commondRecord v-if="currentTab === 4" />
-		</view>
-		<f-tabbar></f-tabbar>
-	</view>
-</template>
-
-<script>
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
-import basicInfo from './tabDetail/basicInfo.vue';
-import realTimeData from './tabDetail/realtimeData.vue';
-import alarmHistory from './tabDetail/alarmHistory.vue';
-import historyData from './tabDetail/historyData.vue';
-import commondRecord from './tabDetail/commondRecord.vue';
-import { getDeviceKeys } from './api/index.js';
-export default {
-	components: {
-		fTabbar,
-		basicInfo,
-		realTimeData,
-		alarmHistory,
-		historyData,
-		commondRecord
-	},
-	data() {
-		return {
-			list: [{ name: '基础信息' }, { name: '实时数据' }, { name: '历史数据' }, { name: '告警记录' }, { name: '命令记录' }],
-			currentTab: 0,
-			id: '',
-			deviceDetail: {},
-			keys:[]
-		};
-	},
-	async onLoad(options) {
-		const { id, alarmStatus, lastOnlineTime, tbDeviceId } = options;
-		const res = await uni.$u.http.get(`/yt/device/${id}`);
-		this.deviceDetail = { ...res, alarmStatus, lastOnlineTime };
-
-		// var socketTask = uni.connectSocket({
-		// 	url: 'wss://dev.thingskit.com:8080/api/ws/plugins/telemetry?token=' + uni.getStorageSync('userInfo').isToken, //仅为示例，并非真实接口地址。
-		// 	complete: ()=> {}
-		// });
-		// uni.onSocketOpen((header)=>{
-		// 	console.log('连接成功',header)
-		// })
-		// // socketTask.onMessage(function(data) {
-		// // 	console.log('收到消息了', data);
-		// // });
-		// socketTask.send({
-		// 	data: JSON.stringify({
-		// 		attrSubCmds: [],
-		// 		tsSubCmds: [
-		// 			{
-		// 				entityType: 'DEVICE',
-		// 				entityId: id,
-		// 				scope: 'LATEST_TELEMETRY',
-		// 				cmdId: 1
-		// 			}
-		// 		],
-		// 		historyCmds: [],
-		// 		entityDataCmds: [],
-		// 		entityDataUnsubscribeCmds: [],
-		// 		alarmDataCmds: [],
-		// 		alarmDataUnsubscribeCmds: [],
-		// 		entityCountCmds: [],
-		// 		entityCountUnsubscribeCmds: []
-		// 	}),
-		// 	success() {
-		// 		console.log('发送成功了');
-		// 	}
-		// });
-
-		
-		const keys = await getDeviceKeys(tbDeviceId);
-		// 隐藏原生的tabbar'
-		this.keys = [keys]
-		uni.hideTabBar();
-	},
-	methods: {
-		handleTabClick({ index }) {
-			this.currentTab = index;
-		}
-	}
-};
+<template>
+	<view class="device-detail-page">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<u-sticky bgColor="#fff"><u-tabs :list="list" :current="currentTab" @click="handleTabClick"></u-tabs></u-sticky>
+		<view style="margin-top:30rpx;">
+			<basicInfo v-if="currentTab == 0" :deviceDetail="deviceDetail" />
+			<realTimeData v-if="currentTab === 1" />
+			<historyData v-if="currentTab === 2" :keys="keys" />
+			<alarmHistory v-if="currentTab === 3" />
+			<commondRecord v-if="currentTab === 4" />
+		</view>
+		<f-tabbar></f-tabbar>
+	</view>
+</template>
+
+<script>
+import fTabbar from '@/components/module/f-tabbar/f-tabbar';
+import basicInfo from './tabDetail/basicInfo.vue';
+import realTimeData from './tabDetail/realtimeData.vue';
+import alarmHistory from './tabDetail/alarmHistory.vue';
+import historyData from './tabDetail/historyData.vue';
+import commondRecord from './tabDetail/commondRecord.vue';
+import { getDeviceKeys } from '../../pages/device/api/index';
+export default {
+	components: {
+		fTabbar,
+		basicInfo,
+		realTimeData,
+		alarmHistory,
+		historyData,
+		commondRecord
+	},
+	data() {
+		return {
+			list: [{ name: '基础信息' }, { name: '实时数据' }, { name: '历史数据' }, { name: '告警记录' }, { name: '命令记录' }],
+			currentTab: 0,
+			id: '',
+			deviceDetail: {},
+			keys:[]
+		};
+	},
+	async onLoad(options) {
+		const { id, alarmStatus, lastOnlineTime, tbDeviceId } = options;
+		const res = await uni.$u.http.get(`/yt/device/${id}`);
+		this.deviceDetail = { ...res, alarmStatus, lastOnlineTime };
+
+		// var socketTask = uni.connectSocket({
+		// 	url: 'wss://dev.thingskit.com:8080/api/ws/plugins/telemetry?token=' + uni.getStorageSync('userInfo').isToken, //仅为示例，并非真实接口地址。
+		// 	complete: ()=> {}
+		// });
+		// uni.onSocketOpen((header)=>{
+		// 	console.log('连接成功',header)
+		// })
+		// // socketTask.onMessage(function(data) {
+		// // 	console.log('收到消息了', data);
+		// // });
+		// socketTask.send({
+		// 	data: JSON.stringify({
+		// 		attrSubCmds: [],
+		// 		tsSubCmds: [
+		// 			{
+		// 				entityType: 'DEVICE',
+		// 				entityId: id,
+		// 				scope: 'LATEST_TELEMETRY',
+		// 				cmdId: 1
+		// 			}
+		// 		],
+		// 		historyCmds: [],
+		// 		entityDataCmds: [],
+		// 		entityDataUnsubscribeCmds: [],
+		// 		alarmDataCmds: [],
+		// 		alarmDataUnsubscribeCmds: [],
+		// 		entityCountCmds: [],
+		// 		entityCountUnsubscribeCmds: []
+		// 	}),
+		// 	success() {
+		// 		console.log('发送成功了');
+		// 	}
+		// });
+
+		
+		const keys = await getDeviceKeys(tbDeviceId);
+		// 隐藏原生的tabbar'
+		this.keys = [keys]
+		uni.hideTabBar();
+	},
+	methods: {
+		handleTabClick({ index }) {
+			this.currentTab = index;
+		}
+	}
+};
 </script>
 </script>

-<template>
-	<view class="alert-page">
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
-		<view style="width: 192rpx;margin: 19rpx;"><u-button @click="openSearchDialog" shape="circle" type="info" icon="search" text="筛选"></u-button></view>
-		<view class="device-list">
-			<view @click="openDeviceDetail(item.id)" class="list-item" v-for="(item, index) in list" :key="index">
-				<view class="u-flex item" style="justify-content: flex-start;flex-direction: column;align-items: center;">
-					<view style="width: 400rpx;text-align: left;">
-						<text style="color:#333;font-size: 15px;">{{ item.name1 }}</text>
-					</view>
-					<view style="width: 400rpx;text-align: left;">
-						<text style="color:#666;font-size: 15px;">{{ item.name2 }}</text>
-					</view>
-					<view style="width: 400rpx;text-align: left;">
-						<text style="color:#666;font-size: 15px;">{{ item.name3 }}</text>
-					</view>
-					<view style="width: 400rpx;text-align: left;">
-						<text style="color:#999;font-size: 15px;">{{ item.time }}</text>
-					</view>
-				</view>
-				<view class="item">
-					<view class="u-flex" style="margin-top: -6rpx;">
-						<image style="width: 30rpx;height: 30rpx;margin-top: 5rpx;margin-right: 5rpx;" :src="item.name4" mode=""></image>
-						<view>
-							<text style="color: #377DFF;font-size: 13px;margin-left: 5rpx;margin-top: 20rpx;">{{ item.name5 }}</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view style="height: 30rpx;"></view>
-		<!-- 告警筛选 -->
-		<u-popup @close="close" closeable bgColor="transparent" :overlay="true" :show="show" mode="bottom">
-			<view style="height: 1100rpx;background:#fff;border-radius: 20rpx;overflow-y: scroll;">
-				<view style="text-align: center;position: relative;top: 68rpx;margin-top: -40rpx;"><text style="font-size: 16px;color: #333333;">筛选条件</text></view>
-				<view style="margin-top: 97rpx;margin-left: 43rpx;">
-					<view style="width: 750rpx;margin-left: 14rpx;"><text style="color: #333333;font-size: 14px;">告警状态</text></view>
-					<view
-						class="u-flex"
-						style="margin-top: 15rpx;width:650rpx;height: 60rpx;
-					flex-wrap: wrap;justify-content: space-between; align-content: space-between;"
-					>
-						<view
-							v-for="(item, index) in alertStatus"
-							:key="index"
-							style="margin: 10rpx;line-height: 50rpx;text-align: center;
-						width:180rpx;height: 60rpx;
-						background-color:#F6F6F6;border-radius:32px"
-						>
-							<text style="color:#333333;font-size: 13px;">{{ item.name }}</text>
-						</view>
-					</view>
-				</view>
-				<view style="margin-top: 145rpx;margin-left: 43rpx;">
-					<view style="width: 750rpx;margin-left: 14rpx;"><text style="color: #333333;font-size: 14px;">设备类型</text></view>
-					<view
-						class="u-flex"
-						style="margin-top: 15rpx;width:650rpx;height: 60rpx;
-				flex-wrap: wrap;justify-content: space-between; align-content: space-between;"
-					>
-						<view
-							v-for="(item, index) in deviceType"
-							:key="index"
-							style="margin: 10rpx;line-height: 50rpx;text-align: center;
-					width:180rpx;height: 60rpx;
-					background-color:#F6F6F6;border-radius:32px"
-						>
-							<text style="color:#333;font-size: 13px;">{{ item.name }}</text>
-						</view>
-					</view>
-				</view>
-				<view style="margin-top: 136rpx;margin-left: 43rpx;">
-					<view style="width: 750rpx;margin-left: 14rpx;"><text style="color: #333;font-size: 14px;">告警等级</text></view>
-					<view
-						class="u-flex"
-						style="margin-top: 15rpx;width:650rpx;height: 60rpx;
-					flex-wrap: wrap;justify-content: space-between; align-content: space-between;"
-					>
-						<view
-							v-for="(item, index) in alertLevel"
-							:key="index"
-							style="margin: 10rpx;line-height: 50rpx;text-align: center;
-						width:180rpx;height: 60rpx;
-						background-color:#F6F6F6;border-radius:32px"
-						>
-							<text style="color:#333333;font-size: 13px;">{{ item.name }}</text>
-						</view>
-					</view>
-				</view>
-				<view style="margin-top: 136rpx;margin-left: 43rpx;">
-					<view style="width: 750rpx;margin-left: 14rpx;"><text style="color: #333333;font-size: 14px;">选择时间</text></view>
-					<view
-						class="u-flex"
-						style="margin-top: 15rpx;width:650rpx;height: 60rpx;
-					flex-wrap: wrap;justify-content: space-between; align-content: space-between;"
-					>
-						<view
-							v-for="(item, index) in timeArea"
-							:key="index"
-							style="margin: 10rpx;line-height: 50rpx;text-align: center;
-						width:180rpx;height: 60rpx;
-						background-color:#F6F6F6;border-radius:32px"
-						>
-							<text style="color:#333333;font-size: 13px;">{{ item.name }}</text>
-						</view>
-					</view>
-				</view>
-				<view style="margin-top: 136rpx;margin-left: 43rpx;">
-					<view class="u-flex" style="margin-left: 10rpx;margin-top: 15rpx;width:750rpx;height: 60rpx;">
-						<u--form labelPosition="left" :model="timeData" :rules="rules" ref="form1" style="padding-left: 26rpx;width: 617rpx!important;">
-							<u-form-item
-								style="font-size: 14px;"
-								label="选择日期"
-								prop="selectTime"
-								labelWidth="80"
-								borderBottom
-								@click="
-									showCalendar = true;
-									hideKeyboard();
-								"
-							>
-								<u--input v-model="timeData.selectTime" placeholder="请选择日期" border="none"></u--input>
-							</u-form-item>
-						</u--form>
-					</view>
-				</view>
-				<view class="u-flex" style="margin-top: 128rpx;margin-left: 55rpx;">
-					<view style="width: 300rpx"><u-button type="info" shape="circle" text="重置"></u-button></view>
-					<view style="width: 300rpx;margin-left:46rpx ;"><u-button type="primary" shape="circle" text="确认"></u-button></view>
-				</view>
-				<view style="height: 30rpx;"></view>
-			</view>
-		</u-popup>
-		<u-calendar
-			:show="showCalendar"
-			mode="range"
-			@confirm="calendarConfirm"
-			@close="calendarClose"
-			startText="开始时间"
-			endText="结束时间"
-			confirmDisabledText="请选择日期"
-			:formatter="formatter"
-		></u-calendar>
-		<f-tabbar :isFillHeight="false"></f-tabbar>
-	</view>
-</template>
-
-<script>
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
-export default {
-	components: {
-		fTabbar
-	},
-	data() {
-		return {
-			show: false,
-			timeData: {
-				selectTime: '',
-				getTimeGap: ''
-			},
-			showCalendar: false,
-			alertStatus: [
-				{
-					index: 1,
-					name: '全部',
-					bgColor: '#377DFF',
-					textColor: '#377DFF'
-				},
-				{
-					index: 2,
-					name: '激活未确认',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 3,
-					name: '激活已确认',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 4,
-					name: '清除未确认',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 5,
-					name: '清除已确认',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 6,
-					name: '清除已确认',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				}
-			],
-			deviceType: [
-				{
-					index: 1,
-					name: '全部',
-					bgColor: '#377DFF',
-					textColor: '#377DFF'
-				},
-				{
-					index: 2,
-					name: '网关设备',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 3,
-					name: '网关子设备',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 4,
-					name: '直连设备',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				}
-			],
-			alertLevel: [
-				{
-					index: 1,
-					name: '全部',
-					bgColor: '#377DFF',
-					textColor: '#377DFF'
-				},
-				{
-					index: 2,
-					name: '危险',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 3,
-					name: '重要',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 4,
-					name: '次要',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 4,
-					name: '警告',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 4,
-					name: '不确定',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				}
-			],
-			timeArea: [
-				{
-					index: 1,
-					name: '全部',
-					value: '全部',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 2,
-					name: '30分钟',
-					value: '30',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 3,
-					name: '1小时',
-					value: '30',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 4,
-					name: '2小时',
-					value: '120',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 5,
-					name: '近一天',
-					value: '24',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				},
-				{
-					index: 6,
-					name: '',
-					value: '',
-					bgColor: '#F6F6F6',
-					textColor: '#F6F6F6'
-				}
-			],
-			list: [
-				{
-					name1: '1号楼1楼三单元水表',
-					name2: 'CO₂：65.32',
-					name3: '告警状态：清除已确认',
-					name4: '../../../static/danger.png',
-					name5: '危险',
-					time: '2022-04-01 02:12:23',
-					id: 'xx1'
-				},
-				{
-					name1: '2号楼1楼三单元水表',
-					name2: 'PH：9.8',
-					name3: '告警状态：激活未确认',
-					name4: '../../../static/major.png',
-					name5: '重要',
-					time: '2022-04-01 02:12:23',
-					id: 'xx2'
-				},
-				{
-					name1: '3号楼1楼三单元水表',
-					name2: 'NH3：600',
-					name3: '告警状态：激活未确认',
-					name4: '../../../static/secondary.png',
-					name5: '次要',
-					time: '2022-04-01 02:12:23',
-					id: 'xx3'
-				},
-				{
-					name1: '4号楼1楼三单元水表',
-					name2: '水深：1.4',
-					name3: '告警状态：激活未确认',
-					name4: '../../../static/secondary.png',
-					name5: '次要',
-					time: '2022-04-01 02:12:23',
-					id: 'xx4'
-				},
-				{
-					name1: '5号楼1楼三单元水表',
-					name2: 'COD：125',
-					name3: '告警状态：激活未确认',
-					name4: '../../../static/noshue.png',
-					name5: '不确定',
-					time: '2022-04-01 02:12:23',
-					id: 'xx5'
-				}
-			]
-		};
-	},
-	onLoad(e) {
-		// 隐藏原生的tabbar
-		uni.hideTabBar();
-	},
-	methods: {
-		open() {},
-		close() {
-			this.show = false;
-		},
-		openSearchDialog() {
-			this.show = true;
-		},
-		hideKeyboard() {
-			uni.hideKeyboard();
-		},
-		calendarConfirm(e) {
-			this.showCalendar = false;
-			this.timeData.selectTime = `${e[0]} / ${e[e.length - 1]}`;
-		},
-		calendarClose() {
-			this.showCalendar = false;
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.alert-page {
-	margin-top: -39rpx;
-}
-.device-list {
-	display: flex;
-	flex-direction: column;
-	padding-left: 18rpx;
-	margin-top: -18rpx;
-	.list-item {
-		width: 713rpx;
-		height: 233rpx;
-		background-color: #fff;
-		margin-top: 24rpx;
-		display: flex;
-
-		border-radius: 10px;
-		justify-content: space-between;
-		.item {
-			margin: 30rpx;
-		}
-	}
-}
+<template>
+	<view class="alert-page">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<view style="width: 192rpx;margin: 19rpx;"><u-button @click="openSearchDialog" shape="circle" type="info" icon="search" text="筛选"></u-button></view>
+		<view class="device-list">
+			<view @click="openDeviceDetail(item.id)" class="list-item" v-for="(item, index) in list" :key="index">
+				<view class="u-flex item" style="justify-content: flex-start;flex-direction: column;align-items: center;">
+					<view style="width: 400rpx;text-align: left;">
+						<text style="color:#333;font-size: 15px;">{{ item.name1 }}</text>
+					</view>
+					<view style="width: 400rpx;text-align: left;">
+						<text style="color:#666;font-size: 15px;">{{ item.name2 }}</text>
+					</view>
+					<view style="width: 400rpx;text-align: left;">
+						<text style="color:#666;font-size: 15px;">{{ item.name3 }}</text>
+					</view>
+					<view style="width: 400rpx;text-align: left;">
+						<text style="color:#999;font-size: 15px;">{{ item.time }}</text>
+					</view>
+				</view>
+				<view class="item">
+					<view class="u-flex" style="margin-top: -6rpx;">
+						<image style="width: 30rpx;height: 30rpx;margin-top: 5rpx;margin-right: 5rpx;" :src="item.name4" mode=""></image>
+						<view>
+							<text style="color: #377DFF;font-size: 13px;margin-left: 5rpx;margin-top: 20rpx;">{{ item.name5 }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view style="height: 30rpx;"></view>
+		<!-- 告警筛选 -->
+		<u-popup @close="close" closeable bgColor="transparent" :overlay="true" :show="show" mode="bottom">
+			<view style="height: 1100rpx;background:#fff;border-radius: 20rpx;overflow-y: scroll;">
+				<view style="text-align: center;position: relative;top: 68rpx;margin-top: -40rpx;"><text style="font-size: 16px;color: #333333;">筛选条件</text></view>
+				<view style="margin-top: 97rpx;margin-left: 43rpx;">
+					<view style="width: 750rpx;margin-left: 14rpx;"><text style="color: #333333;font-size: 14px;">告警状态</text></view>
+					<view
+						class="u-flex"
+						style="margin-top: 15rpx;width:650rpx;height: 60rpx;
+					flex-wrap: wrap;justify-content: space-between; align-content: space-between;"
+					>
+						<view
+							v-for="(item, index) in alertStatus"
+							:key="index"
+							style="margin: 10rpx;line-height: 50rpx;text-align: center;
+						width:180rpx;height: 60rpx;
+						background-color:#F6F6F6;border-radius:32px"
+						>
+							<text style="color:#333333;font-size: 13px;">{{ item.name }}</text>
+						</view>
+					</view>
+				</view>
+				<view style="margin-top: 145rpx;margin-left: 43rpx;">
+					<view style="width: 750rpx;margin-left: 14rpx;"><text style="color: #333333;font-size: 14px;">设备类型</text></view>
+					<view
+						class="u-flex"
+						style="margin-top: 15rpx;width:650rpx;height: 60rpx;
+				flex-wrap: wrap;justify-content: space-between; align-content: space-between;"
+					>
+						<view
+							v-for="(item, index) in deviceType"
+							:key="index"
+							style="margin: 10rpx;line-height: 50rpx;text-align: center;
+					width:180rpx;height: 60rpx;
+					background-color:#F6F6F6;border-radius:32px"
+						>
+							<text style="color:#333;font-size: 13px;">{{ item.name }}</text>
+						</view>
+					</view>
+				</view>
+				<view style="margin-top: 136rpx;margin-left: 43rpx;">
+					<view style="width: 750rpx;margin-left: 14rpx;"><text style="color: #333;font-size: 14px;">告警等级</text></view>
+					<view
+						class="u-flex"
+						style="margin-top: 15rpx;width:650rpx;height: 60rpx;
+					flex-wrap: wrap;justify-content: space-between; align-content: space-between;"
+					>
+						<view
+							v-for="(item, index) in alertLevel"
+							:key="index"
+							style="margin: 10rpx;line-height: 50rpx;text-align: center;
+						width:180rpx;height: 60rpx;
+						background-color:#F6F6F6;border-radius:32px"
+						>
+							<text style="color:#333333;font-size: 13px;">{{ item.name }}</text>
+						</view>
+					</view>
+				</view>
+				<view style="margin-top: 136rpx;margin-left: 43rpx;">
+					<view style="width: 750rpx;margin-left: 14rpx;"><text style="color: #333333;font-size: 14px;">选择时间</text></view>
+					<view
+						class="u-flex"
+						style="margin-top: 15rpx;width:650rpx;height: 60rpx;
+					flex-wrap: wrap;justify-content: space-between; align-content: space-between;"
+					>
+						<view
+							v-for="(item, index) in timeArea"
+							:key="index"
+							style="margin: 10rpx;line-height: 50rpx;text-align: center;
+						width:180rpx;height: 60rpx;
+						background-color:#F6F6F6;border-radius:32px"
+						>
+							<text style="color:#333333;font-size: 13px;">{{ item.name }}</text>
+						</view>
+					</view>
+				</view>
+				<view style="margin-top: 136rpx;margin-left: 43rpx;">
+					<view class="u-flex" style="margin-left: 10rpx;margin-top: 15rpx;width:750rpx;height: 60rpx;">
+						<u--form labelPosition="left" :model="timeData" :rules="rules" ref="form1" style="padding-left: 26rpx;width: 617rpx!important;">
+							<u-form-item
+								style="font-size: 14px;"
+								label="选择日期"
+								prop="selectTime"
+								labelWidth="80"
+								borderBottom
+								@click="
+									showCalendar = true;
+									hideKeyboard();
+								"
+							>
+								<u--input v-model="timeData.selectTime" placeholder="请选择日期" border="none"></u--input>
+							</u-form-item>
+						</u--form>
+					</view>
+				</view>
+				<view class="u-flex" style="margin-top: 128rpx;margin-left: 55rpx;">
+					<view style="width: 300rpx"><u-button type="info" shape="circle" text="重置"></u-button></view>
+					<view style="width: 300rpx;margin-left:46rpx ;"><u-button type="primary" shape="circle" text="确认"></u-button></view>
+				</view>
+				<view style="height: 30rpx;"></view>
+			</view>
+		</u-popup>
+		<u-calendar
+			:show="showCalendar"
+			mode="range"
+			@confirm="calendarConfirm"
+			@close="calendarClose"
+			startText="开始时间"
+			endText="结束时间"
+			confirmDisabledText="请选择日期"
+			:formatter="formatter"
+		></u-calendar>
+		<f-tabbar :isFillHeight="false"></f-tabbar>
+	</view>
+</template>
+
+<script>
+import fTabbar from '@/components/module/f-tabbar/f-tabbar';
+export default {
+	components: {
+		fTabbar
+	},
+	data() {
+		return {
+			show: false,
+			timeData: {
+				selectTime: '',
+				getTimeGap: ''
+			},
+			showCalendar: false,
+			alertStatus: [
+				{
+					index: 1,
+					name: '全部',
+					bgColor: '#377DFF',
+					textColor: '#377DFF'
+				},
+				{
+					index: 2,
+					name: '激活未确认',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 3,
+					name: '激活已确认',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 4,
+					name: '清除未确认',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 5,
+					name: '清除已确认',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 6,
+					name: '清除已确认',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				}
+			],
+			deviceType: [
+				{
+					index: 1,
+					name: '全部',
+					bgColor: '#377DFF',
+					textColor: '#377DFF'
+				},
+				{
+					index: 2,
+					name: '网关设备',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 3,
+					name: '网关子设备',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 4,
+					name: '直连设备',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				}
+			],
+			alertLevel: [
+				{
+					index: 1,
+					name: '全部',
+					bgColor: '#377DFF',
+					textColor: '#377DFF'
+				},
+				{
+					index: 2,
+					name: '危险',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 3,
+					name: '重要',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 4,
+					name: '次要',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 4,
+					name: '警告',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 4,
+					name: '不确定',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				}
+			],
+			timeArea: [
+				{
+					index: 1,
+					name: '全部',
+					value: '全部',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 2,
+					name: '30分钟',
+					value: '30',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 3,
+					name: '1小时',
+					value: '30',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 4,
+					name: '2小时',
+					value: '120',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 5,
+					name: '近一天',
+					value: '24',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				},
+				{
+					index: 6,
+					name: '',
+					value: '',
+					bgColor: '#F6F6F6',
+					textColor: '#F6F6F6'
+				}
+			],
+			list: [
+				{
+					name1: '1号楼1楼三单元水表',
+					name2: 'CO₂：65.32',
+					name3: '告警状态：清除已确认',
+					name4: '../../../static/danger.png',
+					name5: '危险',
+					time: '2022-04-01 02:12:23',
+					id: 'xx1'
+				},
+				{
+					name1: '2号楼1楼三单元水表',
+					name2: 'PH：9.8',
+					name3: '告警状态：激活未确认',
+					name4: '../../../static/major.png',
+					name5: '重要',
+					time: '2022-04-01 02:12:23',
+					id: 'xx2'
+				},
+				{
+					name1: '3号楼1楼三单元水表',
+					name2: 'NH3：600',
+					name3: '告警状态：激活未确认',
+					name4: '../../../static/secondary.png',
+					name5: '次要',
+					time: '2022-04-01 02:12:23',
+					id: 'xx3'
+				},
+				{
+					name1: '4号楼1楼三单元水表',
+					name2: '水深：1.4',
+					name3: '告警状态：激活未确认',
+					name4: '../../../static/secondary.png',
+					name5: '次要',
+					time: '2022-04-01 02:12:23',
+					id: 'xx4'
+				},
+				{
+					name1: '5号楼1楼三单元水表',
+					name2: 'COD：125',
+					name3: '告警状态：激活未确认',
+					name4: '../../../static/noshue.png',
+					name5: '不确定',
+					time: '2022-04-01 02:12:23',
+					id: 'xx5'
+				}
+			]
+		};
+	},
+	onLoad(e) {
+		// 隐藏原生的tabbar
+		uni.hideTabBar();
+	},
+	methods: {
+		open() {},
+		close() {
+			this.show = false;
+		},
+		openSearchDialog() {
+			this.show = true;
+		},
+		hideKeyboard() {
+			uni.hideKeyboard();
+		},
+		calendarConfirm(e) {
+			this.showCalendar = false;
+			this.timeData.selectTime = `${e[0]} / ${e[e.length - 1]}`;
+		},
+		calendarClose() {
+			this.showCalendar = false;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.alert-page {
+	margin-top: -39rpx;
+}
+.device-list {
+	display: flex;
+	flex-direction: column;
+	padding-left: 18rpx;
+	margin-top: -18rpx;
+	.list-item {
+		width: 713rpx;
+		height: 233rpx;
+		background-color: #fff;
+		margin-top: 24rpx;
+		display: flex;
+
+		border-radius: 10px;
+		justify-content: space-between;
+		.item {
+			margin: 30rpx;
+		}
+	}
+}
 </style>
 </style>

-<template>
-	<view class="basic-page">
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module />
-		<view class="u-flex" style="justify-content: space-between;height: 140rpx;background-color: #fff;border-radius: 18px;">
-			<view class="u-flex">
-				<view style="margin-left: 20rpx;">
-						{{deviceDetail.name}}
-				</view>
-				<view style="margin-left: 20rpx; font-size: 14px;" :style="{color:deviceDetail.deviceState==='INACTIVE'?'#666':deviceDetail.deviceState==='ONLINE'?'#377DFF':'#DE4437'}">
-					{{deviceDetail.deviceState==='INACTIVE'?'未激活':deviceDetail.deviceState==='ONLINE'?'在线':'离线'}}
-				</view>
-			</view>
-			<view style="margin-right: 20rpx;">
-				<u-button type="primary" shape="circle" size="mini" text="下发命令" @click="showModal"/>
-			</view>
-		</view>
-		<view style="margin-top: 40rpx;height: 577rpx;background-color: #fff;border-radius: 20px;">
-			<u-list>
-				<u-list-item>
-				
-					<u-cell  :title="deviceDetail.sn">
-						<view slot="icon">设备编号</view>
-					</u-cell>
-				</u-list-item>
-				<u-list-item>
-					<u-cell  :title="deviceType">
-						<view slot="icon">设备类型</view>
-					</u-cell>
-				</u-list-item>
-				<u-list-item>
-					<u-cell  :title="deviceDetail.organizationDTO.name">
-						<view slot="icon">所属组织</view>
-					</u-cell>
-				</u-list-item>
-				<u-list-item>
-					<u-cell  :title="formatLastOnlineTime">
-						<view slot="icon">最后连接时间</view>
-					</u-cell>
-				</u-list-item>
-				<u-list-item>
-					<u-cell  :title="alarmStatus">
-						<view slot="icon">是否告警</view>
-					</u-cell>
-				</u-list-ite>
-					<u-cell  :title="deviceDetail.description">
-						<view slot="icon">设备描述</view>
-					</u-cell>
-				</u-list-item>
-			</u-list>
-		</view>
-		<!-- 下发指令 -->
-		<u-modal  :show="showModel" title="命令下发" closeOnClickOverlay showCancelButton @close="hiddenModal" @cancel="hiddenModal" @confirm="handleConfirm" >
-			<u--textarea placeholder="请输入命令内容" v-model="formModel.intro" count />
-		</u-modal>
-		<f-tabbar />
-	</view>
-</template>
-
-<script>
-import {formatToDate} from '@/plugins/utils.js';
-export default {
-	props:{
-		deviceDetail:{
-			type:Object,
-			default:()=>({}),
-		}
-	},
-	data() {
-		return {
-			showModel: false,
-		};
-	},
-	computed:{
-		deviceType(){
-			return this.deviceDetail.deviceType==='DIRECT_CONNECTION'?'直连设备':this.deviceDetail.deviceType==='GATEWAY'?'网关设备':this.deviceDetail.deviceType==='SENSOR'?'网关子设备':''
-		},
-		alarmStatus(){
-			return this.deviceDetail.alarmStatus === '0'?'否':'是'
-		},
-		formatLastOnlineTime(){
-			return formatToDate(Number(this.deviceDetail.lastOnlineTime),'YYYY-MM-DD HH:mm:ss')
-		}
-	},
-	onLoad(e) {
-		// 隐藏原生的tabbar
-		uni.hideTabBar();
-	},
-	onMounted(){
-		console.log(this.deviceDetail)
-		
-	},
-	methods: {
-		showModal() {
-			this.showModel = true;
-		},
-		hiddenModal(){
-			this.showModel = false;
-		},
-		handleConfirm(){
-			console.log('确定')
-		}
-	}
-};
-</script>
+<template>
+	<view class="basic-page">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module />
+		<view class="u-flex" style="justify-content: space-between;height: 140rpx;background-color: #fff;border-radius: 18px;">
+			<view class="u-flex">
+				<view style="margin-left: 20rpx;">
+						{{deviceDetail.name}}
+				</view>
+				<view style="margin-left: 20rpx; font-size: 14px;" :style="{color:deviceDetail.deviceState==='INACTIVE'?'#666':deviceDetail.deviceState==='ONLINE'?'#377DFF':'#DE4437'}">
+					{{deviceDetail.deviceState==='INACTIVE'?'未激活':deviceDetail.deviceState==='ONLINE'?'在线':'离线'}}
+				</view>
+			</view>
+			<view style="margin-right: 20rpx;">
+				<u-button type="primary" shape="circle" size="mini" text="下发命令" @click="showModal"/>
+			</view>
+		</view>
+		<view style="margin-top: 40rpx;height: 577rpx;background-color: #fff;border-radius: 20px;">
+			<u-list>
+				<u-list-item>
+				
+					<u-cell  :title="deviceDetail.sn">
+						<view slot="icon">设备编号</view>
+					</u-cell>
+				</u-list-item>
+				<u-list-item>
+					<u-cell  :title="deviceType">
+						<view slot="icon">设备类型</view>
+					</u-cell>
+				</u-list-item>
+				<u-list-item>
+					<u-cell  :title="deviceDetail.organizationDTO.name">
+						<view slot="icon">所属组织</view>
+					</u-cell>
+				</u-list-item>
+				<u-list-item>
+					<u-cell  :title="formatLastOnlineTime">
+						<view slot="icon">最后连接时间</view>
+					</u-cell>
+				</u-list-item>
+				<u-list-item>
+					<u-cell  :title="alarmStatus">
+						<view slot="icon">是否告警</view>
+					</u-cell>
+				</u-list-ite>
+					<u-cell  :title="deviceDetail.description">
+						<view slot="icon">设备描述</view>
+					</u-cell>
+				</u-list-item>
+			</u-list>
+		</view>
+		<!-- 下发指令 -->
+		<u-modal  :show="showModel" title="命令下发" closeOnClickOverlay showCancelButton @close="hiddenModal" @cancel="hiddenModal" @confirm="handleConfirm" >
+			<u--textarea placeholder="请输入命令内容" v-model="formModel.intro" count />
+		</u-modal>
+		<f-tabbar />
+	</view>
+</template>
+
+<script>
+import {formatToDate} from '@/plugins/utils.js';
+export default {
+	props:{
+		deviceDetail:{
+			type:Object,
+			default:()=>({}),
+		}
+	},
+	data() {
+		return {
+			showModel: false,
+		};
+	},
+	computed:{
+		deviceType(){
+			return this.deviceDetail.deviceType==='DIRECT_CONNECTION'?'直连设备':this.deviceDetail.deviceType==='GATEWAY'?'网关设备':this.deviceDetail.deviceType==='SENSOR'?'网关子设备':''
+		},
+		alarmStatus(){
+			return this.deviceDetail.alarmStatus === '0'?'否':'是'
+		},
+		formatLastOnlineTime(){
+			return formatToDate(Number(this.deviceDetail.lastOnlineTime),'YYYY-MM-DD HH:mm:ss')
+		}
+	},
+	onLoad(e) {
+		// 隐藏原生的tabbar
+		uni.hideTabBar();
+	},
+	onMounted(){
+		console.log(this.deviceDetail)
+		
+	},
+	methods: {
+		showModal() {
+			this.showModel = true;
+		},
+		hiddenModal(){
+			this.showModel = false;
+		},
+		handleConfirm(){
+			console.log('确定')
+		}
+	}
+};
+</script>

-<template>
-	<view class="historyData">
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
-		<view class="historyData-top">
-			<u-form :label-style="{ 'font-size': '0rpx' }">
-				<u-form-item @click="openCalendar">
-					<u-input v-model="timeData.selectTime" disabled disabledColor="#fff" placeholder="请选择日期" border="none">
-						<template slot="prefix">
-							<image class="icon" src="../../../static/can-der.png"></image>
-						</template>
-					</u-input>
-				</u-form-item>
-				<u-form-item @click="openTimeGap">
-					<u-input v-model="timeData.getTimeGap" disabled disabledColor="#fff" placeholder="请选择时间区间" border="none">
-						<template slot="prefix">
-							<image class="icon" src="../../../static/time.png"></image>
-						</template>
-					</u-input>
-				</u-form-item>
-				<u-form-item @click="openType"><u-input shape="circle" v-model="timeData.getType" placeholder="请选择属性" disabled disabledColor="#377DFF0D" /></u-form-item>
-			</u-form>
-			<!-- <qiun-data-charts type="tarea" :chartData="chartData" canvas2d /> -->
-		</view>
-		<view class="historyData-bottom">
-			<view class="table">
-				<view class="tr bg-w">
-					<view class="th">变量值</view>
-					<view class="th">更新时间</view>
-				</view>
-				<view class="tr bg-g">
-					<view class="td">10</view>
-					<view class="td">2022-03-01 18:16:33</view>
-				</view>
-				
-			</view>
-		</view>
-		<u-calendar
-			:show="showCalendar"
-			closeOnClickOverlay
-			mode="range"
-			startText="开始时间"
-			endText="结束时间"
-			confirmDisabledText="请选择日期"
-			@confirm="calendarConfirm"
-			@close="calendarClose"
-		></u-calendar>
-		<u-picker :show="showTimeGap" :columns="columns" keyName="label" closeOnClickOverlay @confirm="confirmTimeGap" @cancel="cancelTimeGap" @close="cancelTimeGap"></u-picker>
-		<u-picker :show="showSelectType" :columns="keys" closeOnClickOverlay @confirm="confirmTypeGap" @cancel="cancelTypeGap" @close="cancelTypeGap"></u-picker>
-		<f-tabbar></f-tabbar>
-	</view>
-</template>
-
-<script>
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
-import qiunDataCharts from '@/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue';
-import { getDeviceKeys, getHistroyData } from '../api/index.js';
-export default {
-	components: {
-		fTabbar,
-		qiunDataCharts
-	},
-	props:{
-		keys:{
-			type:Array,
-			default:()=>[]
-		}
-	},
-	data() {
-		return {
-			showCalendar: false,
-			showTimeGap: false,
-			showSelectType: false,
-			columns: [
-				[
-					{
-						label: '5分钟',
-						value: 300
-					},
-					{
-						label: '10分钟',
-						value: 600
-					},
-					{
-						label: '15分钟',
-						value: 900
-					},
-					{
-						label: '30分钟',
-						value: 1800
-					},
-					{
-						label: '1小时',
-						value: 3600
-					},
-					{
-						label: '2小时',
-						value: 7200
-					},
-					{
-						label: '6小时',
-						value: 21600
-					}
-				]
-			],
-			timeData: {
-				selectTime: '',
-				getTimeGap: '',
-				getType: ''
-			}
-		};
-	},
-	methods: {
-		openCalendar() {
-			this.showCalendar = true;
-		},
-		openTimeGap() {
-			this.showTimeGap = true;
-		},
-		openType() {
-			this.showSelectType = true;
-		},
-		calendarConfirm(date) {
-			this.showCalendar = false;
-			this.timeData.selectTime = `${date[0]} 至 ${date[1]}`;
-		},
-		calendarClose() {
-			this.showCalendar = false;
-		},
-		confirmTimeGap(time) {
-			this.showTimeGap = false;
-			this.timeData.getTimeGap = time.value[0].label;
-		},
-
-		cancelTimeGap() {
-			this.showTimeGap = false;
-		},
-		confirmTypeGap(time) {
-			this.showSelectType = false;
-			this.timeData.getType = time.value[0];
-		},
-		cancelTypeGap() {
-			this.showSelectType = false;
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.historyData {
-	margin: 30rpx;
-	.historyData-top {
-		padding: 30rpx;
-		background-color: #fff;
-		height: 870rpx;
-		border-radius: 20rpx;
-		.icon {
-			width: 28rpx;
-			height: 28rpx;
-			margin-right: 15rpx;
-		}
-	}
-	.historyData-bottom {
-		margin-top: 30rpx;
-		background-color: #fff;
-		border-radius: 20rpx;
-		.table {
-			border: 0px solid darkgray;
-			.tr {
-				display: flex;
-				width: 100%;
-				justify-content: center;
-				height: 3rem;
-				align-items: center;
-				.th {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					width: 50%;
-					color: #333;
-					font-weight: 500;
-				}
-				.td {
-					color: #999;
-					width: 50%;
-					display: flex;
-					justify-content: center;
-					text-align: center;
-				}
-			}
-		}
-	}
-}
-.odd {
-	background-color: #f9fcff;
-}
+<template>
+	<view class="historyData">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<view class="historyData-top">
+			<u-form :label-style="{ 'font-size': '0rpx' }">
+				<u-form-item @click="openCalendar">
+					<u-input v-model="timeData.selectTime" disabled disabledColor="#fff" placeholder="请选择日期" border="none">
+						<template slot="prefix">
+							<image class="icon" src="../../../static/can-der.png"></image>
+						</template>
+					</u-input>
+				</u-form-item>
+				<u-form-item @click="openTimeGap">
+					<u-input v-model="timeData.getTimeGap" disabled disabledColor="#fff" placeholder="请选择时间区间" border="none">
+						<template slot="prefix">
+							<image class="icon" src="../../../static/time.png"></image>
+						</template>
+					</u-input>
+				</u-form-item>
+				<u-form-item @click="openType"><u-input shape="circle" v-model="timeData.getType" placeholder="请选择属性" disabled disabledColor="#377DFF0D" /></u-form-item>
+			</u-form>
+			<!-- <qiun-data-charts type="tarea" :chartData="chartData" canvas2d /> -->
+		</view>
+		<view class="historyData-bottom">
+			<view class="table">
+				<view class="tr bg-w">
+					<view class="th">变量值</view>
+					<view class="th">更新时间</view>
+				</view>
+				<view class="tr bg-g">
+					<view class="td">10</view>
+					<view class="td">2022-03-01 18:16:33</view>
+				</view>
+				
+			</view>
+		</view>
+		<u-calendar
+			:show="showCalendar"
+			closeOnClickOverlay
+			mode="range"
+			startText="开始时间"
+			endText="结束时间"
+			confirmDisabledText="请选择日期"
+			@confirm="calendarConfirm"
+			@close="calendarClose"
+		></u-calendar>
+		<u-picker :show="showTimeGap" :columns="columns" keyName="label" closeOnClickOverlay @confirm="confirmTimeGap" @cancel="cancelTimeGap" @close="cancelTimeGap"></u-picker>
+		<u-picker :show="showSelectType" :columns="keys" closeOnClickOverlay @confirm="confirmTypeGap" @cancel="cancelTypeGap" @close="cancelTypeGap"></u-picker>
+		<f-tabbar></f-tabbar>
+	</view>
+</template>
+
+<script>
+import fTabbar from '@/components/module/f-tabbar/f-tabbar';
+import qiunDataCharts from '@/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue';
+import { getDeviceKeys, getHistroyData } from '../../../pages/device/api/index';
+export default {
+	components: {
+		fTabbar,
+		qiunDataCharts
+	},
+	props:{
+		keys:{
+			type:Array,
+			default:()=>[]
+		}
+	},
+	data() {
+		return {
+			showCalendar: false,
+			showTimeGap: false,
+			showSelectType: false,
+			columns: [
+				[
+					{
+						label: '5分钟',
+						value: 300
+					},
+					{
+						label: '10分钟',
+						value: 600
+					},
+					{
+						label: '15分钟',
+						value: 900
+					},
+					{
+						label: '30分钟',
+						value: 1800
+					},
+					{
+						label: '1小时',
+						value: 3600
+					},
+					{
+						label: '2小时',
+						value: 7200
+					},
+					{
+						label: '6小时',
+						value: 21600
+					}
+				]
+			],
+			timeData: {
+				selectTime: '',
+				getTimeGap: '',
+				getType: ''
+			}
+		};
+	},
+	methods: {
+		openCalendar() {
+			this.showCalendar = true;
+		},
+		openTimeGap() {
+			this.showTimeGap = true;
+		},
+		openType() {
+			this.showSelectType = true;
+		},
+		calendarConfirm(date) {
+			this.showCalendar = false;
+			this.timeData.selectTime = `${date[0]} 至 ${date[1]}`;
+		},
+		calendarClose() {
+			this.showCalendar = false;
+		},
+		confirmTimeGap(time) {
+			this.showTimeGap = false;
+			this.timeData.getTimeGap = time.value[0].label;
+		},
+
+		cancelTimeGap() {
+			this.showTimeGap = false;
+		},
+		confirmTypeGap(time) {
+			this.showSelectType = false;
+			this.timeData.getType = time.value[0];
+		},
+		cancelTypeGap() {
+			this.showSelectType = false;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.historyData {
+	margin: 30rpx;
+	.historyData-top {
+		padding: 30rpx;
+		background-color: #fff;
+		height: 870rpx;
+		border-radius: 20rpx;
+		.icon {
+			width: 28rpx;
+			height: 28rpx;
+			margin-right: 15rpx;
+		}
+	}
+	.historyData-bottom {
+		margin-top: 30rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		.table {
+			border: 0px solid darkgray;
+			.tr {
+				display: flex;
+				width: 100%;
+				justify-content: center;
+				height: 3rem;
+				align-items: center;
+				.th {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					width: 50%;
+					color: #333;
+					font-weight: 500;
+				}
+				.td {
+					color: #999;
+					width: 50%;
+					display: flex;
+					justify-content: center;
+					text-align: center;
+				}
+			}
+		}
+	}
+}
+.odd {
+	background-color: #f9fcff;
+}
 </style>
 </style>

@@ -26,21 +26,6 @@ Vue.use(f_show_modal)
 import uView from '@/uni_modules/uview-ui'
 import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)
 Vue.use(uView)
 
 
-// #ifdef MP
-// 引入uView对小程序分享的mixin封装
-const mpShare = require('@/uni_modules/uview-ui/libs/mixin/mpShare.js')
-Vue.mixin(mpShare)
-// #endif
-
-// #ifdef H5
-//微信公众号(分享、扫码、获取位置等)
-import '@/plugins/jwxUtils.js';
-// #endif
-
-// 基于iconfont图标库组件
-// import fIcon from "@/components/module/f-icon/f-icon.vue";
-// Vue.component("f-icon", fIcon);
-
 // 公共组件
 // 公共组件
 import publicModule from "@/components/common/public-module.vue";
 import publicModule from "@/components/common/public-module.vue";
 Vue.component("public-module", publicModule);
 Vue.component("public-module", publicModule);

 {
 {
-	"name": "yun-teng-app",
-	"appid": "__UNI__C873643",
-	"description": "云腾app、小程序",
-	"versionName": "1.0.0",
-	"versionCode": 100,
-	"transformPx": false,
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {},
-		"distribute": {
-			"android": {
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			"ios": {},
-			"sdkConfigs": {
-				"ad": {},
-				"geolocation": {
-					"system": {
-						"__platform__": ["ios", "android"]
-					},
-					"amap": {
-						"__platform__": ["ios", "android"],
-						"appkey_ios": "",
-						"appkey_android": ""
-					}
-				},
-				"maps": {}
-			}
-		}
-	},
-	"quickapp": {},
-	"mp-weixin": {
-		"appid": "wx0ad61d7bf6808e02",
-		"setting": {
-			"urlCheck": false,
-			"minified": true,
-			"es6": true
-		},
-		"usingComponents": true,
-		"permission": {
-			"scope.userLocation": {
-				"desc": "你的位置信息将用于小程序位置接口的效果展示"
-			}
-		},
-		"lazyCodeLoading": "requiredComponents"
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "2",
-	"h5": {
-		"sdkConfigs": {
-			"maps": {}
-		},
-		"router": {
-			"base": "minImage/h5/"
-		}
-	}
+    "name" : "yun-teng-app",
+    "appid" : "__UNI__C873643",
+    "description" : "thingskit小程序",
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
+    "transformPx" : false,
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            "sdkConfigs" : {
+                "ad" : {},
+                "geolocation" : {
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
+                    },
+                    "amap" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "",
+                        "appkey_android" : ""
+                    }
+                },
+                "maps" : {}
+            }
+        }
+    },
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "wxd5d018355f38262b",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "es6" : true,
+            "postcss" : true
+        },
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+            }
+        },
+        "lazyCodeLoading" : "requiredComponents",
+        //开启分包优化
+        "optimization" : {
+            "subPackages" : true
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {}
+        },
+        "router" : {
+            "base" : "minImage/h5/"
+        }
+    }
 }
 }

@@ -4,7 +4,8 @@
 	"description": "### 项目结构",
 	"description": "### 项目结构",
 	"main": "main.js",
 	"main": "main.js",
 	"scripts": {
 	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 1"
+		"test": "echo \"Error: no test specified\" && exit 1",
+		"dev:mp-wenxin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch --minimize"
 	},
 	},
 	"repository": {
 	"repository": {
 		"type": "git",
 		"type": "git",

@@ -14,12 +14,12 @@
 				"navigationBarTitleText": "设备"
 				"navigationBarTitleText": "设备"
 			}
 			}
 		},
 		},
-		{
-			"path": "pages/device/deviceDetail",
-			"style": {
-				"navigationBarTitleText": "设备详情"
-			}
-		},
+		// {
+		// 	"path": "pages/device/deviceDetail",
+		// 	"style": {
+		// 		"navigationBarTitleText": "设备详情"
+		// 	}
+		// },
 		{
 		{
 			"path": "pages/device/org/org",
 			"path": "pages/device/org/org",
 			"style": {
 			"style": {
@@ -33,9 +33,9 @@
 			}
 			}
 		},
 		},
 		{
 		{
-			"path": "pages/alarm/alarmDetail",
+			"path": "pages/alarm/org/org",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "告警详情"
+				"navigationBarTitleText": "组织筛选"
 			}
 			}
 		},
 		},
 		{
 		{
@@ -43,44 +43,8 @@
 			"style": {
 			"style": {
 				"navigationBarTitleText": "个人中心"
 				"navigationBarTitleText": "个人中心"
 			}
 			}
-		}, {
-			"path": "pages/personal/code",
-			"style": {
-				"navigationBarTitleText": "验证码登录"
-			}
-
-		}, {
-			"path": "pages/personal/findPassword",
-			"style": {
-				"navigationBarTitleText": "找回密码"
-			}
-
-		}, {
-			"path": "pages/personal/set",
-			"style": {
-				"navigationBarTitleText": "个人资料"
-			}
-
-		}, {
-			"path": "pages/systemNotify/systemNotify",
-			"style": {
-				"navigationBarTitleText": "通知列表"
-			}
 		},
 		},
 		{
 		{
-			"path": "pages/systemNotify/notifyDetail",
-			"style": {
-				"navigationBarTitleText": "通知详情"
-			}
-		}, {
-			"path": "pages/feedback/feedback",
-			"style": {
-				"navigationBarTitleText": "意见反馈",
-				"app-plus": {
-					"scrollIndicator": "none"
-				}
-			}
-		}, {
 			"path": "pages/index/camera/camera",
 			"path": "pages/index/camera/camera",
 			"style": {
 			"style": {
 				"navigationBarTitleText": "查看摄像头"
 				"navigationBarTitleText": "查看摄像头"
@@ -98,33 +62,86 @@
 			}
 			}
 
 
 		},
 		},
-	
 		{
 		{
 			"path": "pages/index/configuration/configurationDetail",
 			"path": "pages/index/configuration/configurationDetail",
 			"style": {
 			"style": {
 				"navigationBarTitleText": "组态详情"
 				"navigationBarTitleText": "组态详情"
 			}
 			}
-
+		}
+	],
+	"subPackages": [{
+			"root": "alarmSubPage",
+			"pages": [{
+				"path": "alarmDetailPage/alarmDetail",
+				"style": {
+					"navigationBarTitleText": "告警详情"
+				}
+			}]
 		},
 		},
 		{
 		{
-			"path": "pages/alarm/org/org",
-			"style": {
-				"navigationBarTitleText": "组织筛选"
-			}
-
+			"root": "deviceSubPage",
+			"pages": [{
+				"path": "deviceDetailPage/deviceDetail",
+				"style": {
+					"navigationBarTitleText": "设备详情"
+				}
+			}]
 		},
 		},
 		{
 		{
-			"path": "pages/public/login",
-			"style": {
-				"navigationBarTitleText": "登录"
-			}
-
+			"root": "sysNotifySubPage",
+			"pages": [{
+					"path": "sysNotifyPage/systemNotify",
+					"style": {
+						"navigationBarTitleText": "系统通知"
+					}
+				},
+				{
+					"path": "sysNotifyPage/notifyDetail",
+					"style": {
+						"navigationBarTitleText": "通知详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "feedBackSubPage",
+			"pages": [{
+				"path": "feedback/feedback",
+				"style": {
+					"navigationBarTitleText": "意见反馈"
+				}
+			}]
+		},
+		{
+			"root": "publicLoginSubPage",
+			"pages": [{
+					"path": "public/login",
+					"style": {
+						"navigationBarTitleText": "登录"
+					}
+				},
+				{
+					"path": "other/set",
+					"style": {
+						"navigationBarTitleText": "个人资料"
+					}
+				},
+				{
+					"path": "other/code",
+					"style": {
+						"navigationBarTitleText": "验证码登录"
+					}
+				},
+				{
+					"path": "other/findPassword",
+					"style": {
+						"navigationBarTitleText": "忘记密码"
+					}
+				}
+			]
 		}
 		}
 	],
 	],
 	"globalStyle": {
 	"globalStyle": {
-		"mp-alipay": {
-			"allowsBounceVertical": "NO"
-		},
 		"navigationBarTextStyle": "black",
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "云腾app",
 		"navigationBarTitleText": "云腾app",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"navigationBarBackgroundColor": "#FFFFFF",

@@ -427,7 +427,8 @@ export default {
 				status: e.status
 				status: e.status
 			};
 			};
 			uni.navigateTo({
 			uni.navigateTo({
-				url: './alarmDetail?data=' + JSON.stringify(obj)
+				url:'/alarmSubPage/alarmDetailPage/alarmDetail?data='+JSON.stringify(obj)
+				// url: '/' + JSON.stringify(obj)
 			});
 			});
 		}
 		}
 	}
 	}

@@ -225,7 +225,7 @@ export default {
 		},
 		},
 		openDeviceDetail(id, alarmStatus, lastOnlineTime,tbDeviceId) {
 		openDeviceDetail(id, alarmStatus, lastOnlineTime,tbDeviceId) {
 			uni.navigateTo({
 			uni.navigateTo({
-				url: `deviceDetail?id=${id}&alarmStatus=${alarmStatus}&lastOnlineTime=${lastOnlineTime}&tbDeviceId=${tbDeviceId}`
+				url: `/deviceSubPage/deviceDetailPage/deviceDetail?id=${id}&alarmStatus=${alarmStatus}&lastOnlineTime=${lastOnlineTime}&tbDeviceId=${tbDeviceId}`
 			});
 			});
 		},
 		},
 		handleClickTag(currentIndex, list) {
 		handleClickTag(currentIndex, list) {
@@ -296,4 +296,4 @@ export default {
 		}
 		}
 	}
 	}
 }
 }
-</style>
+</style>

@@ -102,7 +102,7 @@ export default {
 			uni.$u.http.get('/yt/video', { params: httpData, custom: { load: false } }).then(res => {
 			uni.$u.http.get('/yt/video', { params: httpData, custom: { load: false } }).then(res => {
 				if (res) {
 				if (res) {
 					console.log('Video', res);
 					console.log('Video', res);
-					// this.list = res.items;
+					this.list = res.items;
 				}
 				}
 			});
 			});
 		},
 		},

@@ -7,7 +7,7 @@
 			<!-- 登录 -->
 			<!-- 登录 -->
 			<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30">
 			<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30">
 				<block v-if="userInfo.isToken">
 				<block v-if="userInfo.isToken">
-					<view @click="openPersonalInfo" class="u-m-r-20"><image class="avatar" mode="aspectFill" :src="userInfo.avatar || '../../static/default-avatar.png'"></image></view>
+					<view @click="openPersonalInfo" class="u-m-r-20"><image class="avatar" mode="aspectFill" :src="userInfo.avatar"></image></view>
 					<view @click="openPersonalInfo" class="u-flex-1">
 					<view @click="openPersonalInfo" class="u-flex-1">
 						<view class="nickName u-flex">
 						<view class="nickName u-flex">
 							<view class="name u-m-r-10" v-if="userInfo.realName">
 							<view class="name u-m-r-10" v-if="userInfo.realName">
@@ -34,7 +34,7 @@
 			<!-- 登录 -->
 			<!-- 登录 -->
 			<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30">
 			<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30">
 				<block v-if="userInfo.isToken">
 				<block v-if="userInfo.isToken">
-					<view @click="openPersonalInfo" class="u-m-r-20"><image class="avatar" mode="aspectFill" :src="userInfo.avatar||'../../static/default-avatar.png'"></image></view>
+					<view @click="openPersonalInfo" class="u-m-r-20"><image class="avatar" mode="aspectFill" :src="userInfo.avatar"></image></view>
 					<view @click="openPersonalInfo" class="u-flex-1">
 					<view @click="openPersonalInfo" class="u-flex-1">
 						<view class="nickName u-flex">
 						<view class="nickName u-flex">
 							<view class="name u-m-r-10" v-if="userInfo.realName">
 							<view class="name u-m-r-10" v-if="userInfo.realName">
@@ -60,12 +60,12 @@
 		</view>
 		</view>
 		<view class="u-flex my-nav">
 		<view class="u-flex my-nav">
 			<view class="nav-main">
 			<view class="nav-main">
-				<view @click="onTokenJump('../systemNotify/systemNotify')" class="u-flex nav-link">
+				<view @click="onTokenJump('/sysNotifySubPage/sysNotifyPage/systemNotify')" class="u-flex nav-link">
 					<view class="nav-image"><image class="image" src="../../static/sys-not.png"></image></view>
 					<view class="nav-image"><image class="image" src="../../static/sys-not.png"></image></view>
 					<view class="nav-center"><text class="text">系统通知</text></view>
 					<view class="nav-center"><text class="text">系统通知</text></view>
 					<view class="nav-right"><image class="image" src="../../static/arrow-right.png"></image></view>
 					<view class="nav-right"><image class="image" src="../../static/arrow-right.png"></image></view>
 				</view>
 				</view>
-				<view @click="onTokenJump('../feedback/feedback')" class="u-flex nav-link">
+				<view @click="onTokenJump('/feedBackSubPage/feedback/feedback')" class="u-flex nav-link">
 					<view class="nav-image"><image class="image" src="../../static/find-sugg.png"></image></view>
 					<view class="nav-image"><image class="image" src="../../static/find-sugg.png"></image></view>
 					<view class="nav-center"><text class="text">意见反馈</text></view>
 					<view class="nav-center"><text class="text">意见反馈</text></view>
 					<view class="nav-right"><image class="image" src="../../static/arrow-right.png"></image></view>
 					<view class="nav-right"><image class="image" src="../../static/arrow-right.png"></image></view>
@@ -173,18 +173,6 @@ export default {
 			title: '绑定账号',
 			title: '绑定账号',
 			systemInfo: base.systemInfo,
 			systemInfo: base.systemInfo,
 			PrimaryButtonColor: '#0079fe', //主题色
 			PrimaryButtonColor: '#0079fe', //主题色
-			list: [
-				{
-					title: '系统通知',
-					url: '../systemNotify/systemNotify',
-					icon: 'setting-fill'
-				},
-				{
-					title: '意见反馈',
-					url: '../feedback/feedback',
-					icon: 'more-circle-fill'
-				}
-			]
 		};
 		};
 	},
 	},
 	onLoad() {
 	onLoad() {
@@ -204,16 +192,6 @@ export default {
 				});
 				});
 			});
 			});
 		},
 		},
-		// openSysNotify() {
-		// 	uni.navigateTo({
-		// 		url: '../systemNotify/systemNotify'
-		// 	});
-		// },
-		// openFeedBack() {
-		// 	uni.navigateTo({
-		// 		url: '../feedback/feedback'
-		// 	});
-		// },
 		onJump(url) {
 		onJump(url) {
 			uni.navigateTo({
 			uni.navigateTo({
 				url: url
 				url: url
@@ -221,7 +199,7 @@ export default {
 		},
 		},
 		openLoginFunc() {
 		openLoginFunc() {
 			uni.navigateTo({
 			uni.navigateTo({
-				url: '../public/login'
+				url: '/publicLoginSubPage/public/login'
 			});
 			});
 		},
 		},
 		openPersonalInfo() {
 		openPersonalInfo() {
@@ -229,7 +207,7 @@ export default {
 				data: this.userInfo
 				data: this.userInfo
 			};
 			};
 			uni.navigateTo({
 			uni.navigateTo({
-				url: './set?data=' + JSON.stringify(obj)
+				url: '/publicLoginSubPage/other/set?data=' + JSON.stringify(obj)
 			});
 			});
 		},
 		},
 		clickAccountFunc() {
 		clickAccountFunc() {
@@ -306,7 +284,7 @@ export default {
 						that.showLogout = false;
 						that.showLogout = false;
 						setTimeout(() => {
 						setTimeout(() => {
 							uni.navigateTo({
 							uni.navigateTo({
-								url: '../public/login'
+								url: '/publicLoginSubPage/public/login'
 							});
 							});
 						}, 500);
 						}, 500);
 					} else if (res.cancel) {
 					} else if (res.cancel) {

-!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(this,function(e,n){function i(n,i,t){e.WeixinJSBridge?WeixinJSBridge.invoke(n,o(i),function(e){c(n,e,t)}):u(n,t)}function t(n,i,t){e.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),c(n,e,i)}):t?u(n,t):u(n,i)}function o(e){return e=e||{},e.appId=C.appId,e.verifyAppId=C.appId,e.verifySignType="sha1",e.verifyTimestamp=C.timestamp+"",e.verifyNonceStr=C.nonceStr,e.verifySignature=C.signature,e}function r(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function a(e){return e.postalCode=e.addressPostalCode,delete e.addressPostalCode,e.provinceName=e.proviceFirstStageName,delete e.proviceFirstStageName,e.cityName=e.addressCitySecondStageName,delete e.addressCitySecondStageName,e.countryName=e.addressCountiesThirdStageName,delete e.addressCountiesThirdStageName,e.detailInfo=e.addressDetailInfo,delete e.addressDetailInfo,e}function c(e,n,i){"openEnterpriseChat"==e&&(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg;t||(t=n.err_msg,delete n.err_msg,t=s(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",C.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n));var o=t.indexOf(":");switch(t.substring(o+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function s(e,n){var i=e,t=v[i];t&&(i=t);var o="ok";if(n){var r=n.indexOf(":");"confirm"==(o=n.substring(r+1))&&(o="ok"),"failed"==o&&(o="fail"),-1!=o.indexOf("failed_")&&(o=o.substring(7)),-1!=o.indexOf("fail_")&&(o=o.substring(5)),"access denied"!=(o=(o=o.replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=o||(o="permission denied"),"config"==i&&"function not exist"==o&&(o="ok"),""==o&&(o="fail")}return n=i+":"+o}function d(e){if(e){for(var n=0,i=e.length;n<i;++n){var t=e[n],o=h[t];o&&(e[n]=o)}return e}}function u(e,n){if(!(!C.debug||n&&n.isInnerInvoke)){var i=v[e];i&&(e=i),n&&n._complete&&delete n._complete,console.log('"'+e+'",',n||"")}}function l(e){if(!(k||w||C.debug||x<"6.0.2"||V.systemType<0)){var n=new Image;V.appId=C.appId,V.initTime=A.initEndTime-A.initStartTime,V.preVerifyTime=A.preVerifyEndTime-A.preVerifyStartTime,N.getNetworkType({isInnerInvoke:!0,success:function(e){V.networkType=e.networkType;var i="https://open.weixin.qq.com/sdk/report?v="+V.version+"&o="+V.isPreVerifyOk+"&s="+V.systemType+"&c="+V.clientVersion+"&a="+V.appId+"&n="+V.networkType+"&i="+V.initTime+"&p="+V.preVerifyTime+"&u="+V.url;n.src=i}})}}function p(){return(new Date).getTime()}function f(n){T&&(e.WeixinJSBridge?n():S.addEventListener&&S.addEventListener("WeixinJSBridgeReady",n,!1))}function m(){N.invoke||(N.invoke=function(n,i,t){e.WeixinJSBridge&&WeixinJSBridge.invoke(n,o(i),t)},N.on=function(n,i){e.WeixinJSBridge&&WeixinJSBridge.on(n,i)})}function g(e){if("string"==typeof e&&e.length>0){var n=e.split("?")[0],i=e.split("?")[1];return n+=".html",void 0!==i?n+"?"+i:n}}if(!e.jWeixin){var h={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},v=function(){var e={};for(var n in h)e[h[n]]=n;return e}(),S=e.document,I=S.title,y=navigator.userAgent.toLowerCase(),_=navigator.platform.toLowerCase(),k=!(!_.match("mac")&&!_.match("win")),w=-1!=y.indexOf("wxdebugger"),T=-1!=y.indexOf("micromessenger"),M=-1!=y.indexOf("android"),P=-1!=y.indexOf("iphone")||-1!=y.indexOf("ipad"),x=function(){var e=y.match(/micromessenger\/(\d+\.\d+\.\d+)/)||y.match(/micromessenger\/(\d+\.\d+)/);return e?e[1]:""}(),A={initStartTime:p(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},V={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:P?1:M?2:-1,clientVersion:x,url:encodeURIComponent(location.href)},C={},L={_completes:[]},B={state:0,data:{}};f(function(){A.initEndTime=p()});var O=!1,E=[],N={config:function(e){C=e,u("config",e);var n=!1!==C.check;f(function(){if(n)i(h.config,{verifyJsApiList:d(C.jsApiList)},function(){L._complete=function(e){A.preVerifyEndTime=p(),B.state=1,B.data=e},L.success=function(e){V.isPreVerifyOk=0},L.fail=function(e){L._fail?L._fail(e):B.state=-1};var e=L._completes;return e.push(function(){l()}),L.complete=function(n){for(var i=0,t=e.length;i<t;++i)e[i]();L._completes=[]},L}()),A.preVerifyStartTime=p();else{B.state=1;for(var e=L._completes,t=0,o=e.length;t<o;++t)e[t]();L._completes=[]}}),m()},ready:function(e){0!=B.state?e():(L._completes.push(e),!T&&C.debug&&e())},error:function(e){x<"6.0.2"||(-1==B.state?e(B.data):L._fail=e)},checkJsApi:function(e){var n=function(e){var n=e.checkResult;for(var i in n){var t=v[i];t&&(n[t]=n[i],delete n[i])}return e};i("checkJsApi",{jsApiList:d(e.jsApiList)},(e._complete=function(e){if(M){var i=e.checkResult;i&&(e.checkResult=JSON.parse(i))}e=n(e)},e))},onMenuShareTimeline:function(e){t(h.onMenuShareTimeline,{complete:function(){i("shareTimeline",{title:e.title||I,desc:e.title||I,img_url:e.imgUrl||"",link:e.link||location.href,type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareAppMessage:function(e){t(h.onMenuShareAppMessage,{complete:function(n){"favorite"===n.scene?i("sendAppMessage",{title:e.title||I,desc:e.desc||"",link:e.link||location.href,img_url:e.imgUrl||"",type:e.type||"link",data_url:e.dataUrl||""}):i("sendAppMessage",{title:e.title||I,desc:e.desc||"",link:e.link||location.href,img_url:e.imgUrl||"",type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareQQ:function(e){t(h.onMenuShareQQ,{complete:function(){i("shareQQ",{title:e.title||I,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareWeibo:function(e){t(h.onMenuShareWeibo,{complete:function(){i("shareWeiboApp",{title:e.title||I,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareQZone:function(e){t(h.onMenuShareQZone,{complete:function(){i("shareQZone",{title:e.title||I,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},updateTimelineShareData:function(e){i("updateTimelineShareData",{title:e.title,link:e.link,imgUrl:e.imgUrl},e)},updateAppMessageShareData:function(e){i("updateAppMessageShareData",{title:e.title,desc:e.desc,link:e.link,imgUrl:e.imgUrl},e)},startRecord:function(e){i("startRecord",{},e)},stopRecord:function(e){i("stopRecord",{},e)},onVoiceRecordEnd:function(e){t("onVoiceRecordEnd",e)},playVoice:function(e){i("playVoice",{localId:e.localId},e)},pauseVoice:function(e){i("pauseVoice",{localId:e.localId},e)},stopVoice:function(e){i("stopVoice",{localId:e.localId},e)},onVoicePlayEnd:function(e){t("onVoicePlayEnd",e)},uploadVoice:function(e){i("uploadVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadVoice:function(e){i("downloadVoice",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},translateVoice:function(e){i("translateVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},chooseImage:function(e){i("chooseImage",{scene:"1|2",count:e.count||9,sizeType:e.sizeType||["original","compressed"],sourceType:e.sourceType||["album","camera"]},(e._complete=function(e){if(M){var n=e.localIds;try{n&&(e.localIds=JSON.parse(n))}catch(e){}}},e))},getLocation:function(e){},previewImage:function(e){i(h.previewImage,{current:e.current,urls:e.urls},e)},uploadImage:function(e){i("uploadImage",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadImage:function(e){i("downloadImage",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},getLocalImgData:function(e){!1===O?(O=!0,i("getLocalImgData",{localId:e.localId},(e._complete=function(e){if(O=!1,E.length>0){var n=E.shift();wx.getLocalImgData(n)}},e))):E.push(e)},getNetworkType:function(e){var n=function(e){var n=e.errMsg;e.errMsg="getNetworkType:ok";var i=e.subtype;if(delete e.subtype,i)e.networkType=i;else{var t=n.indexOf(":"),o=n.substring(t+1);switch(o){case"wifi":case"edge":case"wwan":e.networkType=o;break;default:e.errMsg="getNetworkType:fail"}}return e};i("getNetworkType",{},(e._complete=function(e){e=n(e)},e))},openLocation:function(e){i("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},getLocation:function(e){e=e||{},i(h.getLocation,{type:e.type||"wgs84"},(e._complete=function(e){delete e.type},e))},hideOptionMenu:function(e){i("hideOptionMenu",{},e)},showOptionMenu:function(e){i("showOptionMenu",{},e)},closeWindow:function(e){i("closeWindow",{},e=e||{})},hideMenuItems:function(e){i("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){i("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){i("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){i("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){i("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){if(P){var n=e.resultStr;if(n){var i=JSON.parse(n);e.resultStr=i&&i.scan_code&&i.scan_code.scan_result}}},e))},openAddress:function(e){i(h.openAddress,{},(e._complete=function(e){e=a(e)},e))},openProductSpecificView:function(e){i(h.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,t=[],o=0,r=n.length;o<r;++o){var a=n[o],c={card_id:a.cardId,card_ext:a.cardExt};t.push(c)}i(h.addCard,{card_list:t},(e._complete=function(e){var n=e.card_list;if(n){for(var i=0,t=(n=JSON.parse(n)).length;i<t;++i){var o=n[i];o.cardId=o.card_id,o.cardExt=o.card_ext,o.isSuccess=!!o.is_succ,delete o.card_id,delete o.card_ext,delete o.is_succ}e.cardList=n,delete e.card_list}},e))},chooseCard:function(e){i("chooseCard",{app_id:C.appId,location_id:e.shopId||"",sign_type:e.signType||"SHA1",card_id:e.cardId||"",card_type:e.cardType||"",card_sign:e.cardSign,time_stamp:e.timestamp+"",nonce_str:e.nonceStr},(e._complete=function(e){e.cardList=e.choose_card_info,delete e.choose_card_info},e))},openCard:function(e){for(var n=e.cardList,t=[],o=0,r=n.length;o<r;++o){var a=n[o],c={card_id:a.cardId,code:a.code};t.push(c)}i(h.openCard,{card_list:t},e)},consumeAndShareCard:function(e){i(h.consumeAndShareCard,{consumedCardId:e.cardId,consumedCode:e.code},e)},chooseWXPay:function(e){i(h.chooseWXPay,r(e),e)},openEnterpriseRedPacket:function(e){i(h.openEnterpriseRedPacket,r(e),e)},startSearchBeacons:function(e){i(h.startSearchBeacons,{ticket:e.ticket},e)},stopSearchBeacons:function(e){i(h.stopSearchBeacons,{},e)},onSearchBeacons:function(e){t(h.onSearchBeacons,e)},openEnterpriseChat:function(e){i("openEnterpriseChat",{useridlist:e.userIds,chatname:e.groupName},e)},launchMiniProgram:function(e){i("launchMiniProgram",{targetAppId:e.targetAppId,path:g(e.path),envVersion:e.envVersion},e)},miniProgram:{navigateBack:function(e){e=e||{},f(function(){i("invokeMiniProgramAPI",{name:"navigateBack",arg:{delta:e.delta||1}},e)})},navigateTo:function(e){f(function(){i("invokeMiniProgramAPI",{name:"navigateTo",arg:{url:e.url}},e)})},redirectTo:function(e){f(function(){i("invokeMiniProgramAPI",{name:"redirectTo",arg:{url:e.url}},e)})},switchTab:function(e){f(function(){i("invokeMiniProgramAPI",{name:"switchTab",arg:{url:e.url}},e)})},reLaunch:function(e){f(function(){i("invokeMiniProgramAPI",{name:"reLaunch",arg:{url:e.url}},e)})},postMessage:function(e){f(function(){i("invokeMiniProgramAPI",{name:"postMessage",arg:e.data||{}},e)})},getEnv:function(n){f(function(){n({miniprogram:"miniprogram"===e.__wxjs_environment})})}}},b=1,R={};return S.addEventListener("error",function(e){if(!M){var n=e.target,i=n.tagName,t=n.src;if(("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i)&&-1!=t.indexOf("wxlocalresource://")){e.preventDefault(),e.stopPropagation();var o=n["wx-id"];if(o||(o=b++,n["wx-id"]=o),R[o])return;R[o]=!0,wx.ready(function(){wx.getLocalImgData({localId:t,success:function(e){n.src=e.localData}})})}}},!0),S.addEventListener("load",function(e){if(!M){var n=e.target,i=n.tagName;n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i){var t=n["wx-id"];t&&(R[t]=!1)}}},!0),n&&(e.wx=e.jWeixin=N),N}});

-// 获取微信公众号SDK权限
-import base from '@/config/baseUrl';
-import { isWechat } from '@/config/h5Utils';
-
-//获取地理位置
-export const getLocation = () => {
-	return new Promise((resolve, reject) => {
-		jWeixin.ready(function () {
-			jWeixin.getLocation({
-				type: 'gcj02',
-				success: function (res) {
-					resolve(res);
-				},
-				fail: (err) => {
-					reject(err);
-				}
-			});
-		});
-	});
-}
-export const shareData = (info) => {
-    let item = {
-        title: info.title || base.share.title, // 分享标题
-        desc: info.desc || base.share.desc, // 分享描述
-        imgUrl: info.imgUrl || base.share.imgUrl, // 分享链接
-        link: info.link || base.share.link, // 分享图标
-    }
-    return item
-}
-//设置分享信息
-export const setShare = (data, callback) => {
-	//配置校验成功后执行
-	jWeixin.ready(function () {
-		if (!data.link) {
-			let url = window.location.href;
-			let index = url.indexOf("?");
-			if (index != -1) {
-				if (url.indexOf("#") != -1 && url.indexOf("#") > index) {
-					url = url.substring(0, index) + url.substring(url.indexOf("#"));
-				} else {
-					url = url.substr(0, index);
-				}
-			}
-			data.link = url;
-		}
-		jWeixin.updateAppMessageShareData(shareData(data));
-		jWeixin.updateTimelineShareData(shareData(data));
-	});
-}
-//微信扫一扫
-export const scanQRCode = ( callback,needResult = 0) => {
-	//配置校验成功后执行
-	jWeixin.ready(function () {
-		jWeixin.scanQRCode({
-		  needResult: needResult, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
-		  scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
-		  success: function (res) {
-			callback && callback(res);
-		  }
-		});
-	});
-}
-//获取微信JSSDK授权
-window.onload = function () {
-    // 需配置公众号appId
-    if (!(base.publicAppId && isWechat())) {
-        return;
-    }
-    //获取当前页面地址
-    let url = window.location.href;
-    url = url.substring(0, url.indexOf("#"));
-    //获取微信公众号SDK权限的签名、随机数、时间戳
-    uni.$u.http.post("api/jWeixinConfig", {
-        url: url
-    }).then(res => {
-        // 微信SDK配置
-        jWeixin.config({
-            debug: false,
-            appId: base.publicAppId, // 必填，公众号的唯一标识
-            timestamp: res.timestamp, // 必填，生成签名的时间戳
-            nonceStr: res.noncestr, // 必填，生成签名的随机串
-            signature: res.signature,// 必填，签名
-            jsApiList: [
-                'scanQRCode',
-                "getLocation",
-                "updateAppMessageShareData",
-                "updateTimelineShareData",
-                'onMenuShareAppMessage',  //旧的接口，即将废弃
-                'onMenuShareTimeline' //旧的接口，即将废弃
-            ]
-        });
-        //设置分享内容
-        setShare();
-    });
-    //配置校验失败后执行
-    jWeixin.error(function (res) {
-        // config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
-        console.log(res);
-    });
-};

-/*  
- * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message  
- * Digest Algorithm, as defined in RFC 1321.  
- * Version 1.1 Copyright (C) Paul Johnston 1999 - 2002.  
- * Code also contributed by Greg Holt  
- * See http://pajhome.org.uk/site/legal.html for details.  
- */
-
-/*  
- * Add integers, wrapping at 2^32. This uses 16-bit operations internally  
- * to work around bugs in some JS interpreters.  
- */
-function safe_add(x, y) {
-  var lsw = (x & 0xFFFF) + (y & 0xFFFF)
-  var msw = (x >> 16) + (y >> 16) + (lsw >> 16)
-  return (msw << 16) | (lsw & 0xFFFF)
-}
-
-/*  
- * Bitwise rotate a 32-bit number to the left.  
- */
-function rol(num, cnt) {
-  return (num << cnt) | (num >>> (32 - cnt))
-}
-
-/*  
- * These functions implement the four basic operations the algorithm uses.  
- */
-function cmn(q, a, b, x, s, t) {
-  return safe_add(rol(safe_add(safe_add(a, q), safe_add(x, t)), s), b)
-}
-function ff(a, b, c, d, x, s, t) {
-  return cmn((b & c) | ((~b) & d), a, b, x, s, t)
-}
-function gg(a, b, c, d, x, s, t) {
-  return cmn((b & d) | (c & (~d)), a, b, x, s, t)
-}
-function hh(a, b, c, d, x, s, t) {
-  return cmn(b ^ c ^ d, a, b, x, s, t)
-}
-function ii(a, b, c, d, x, s, t) {
-  return cmn(c ^ (b | (~d)), a, b, x, s, t)
-}
-
-/*  
- * Calculate the MD5 of an array of little-endian words, producing an array  
- * of little-endian words.  
- */
-function coreMD5(x) {
-  var a = 1732584193
-  var b = -271733879
-  var c = -1732584194
-  var d = 271733878
-
-  for (var i = 0; i < x.length; i += 16) {
-    var olda = a
-    var oldb = b
-    var oldc = c
-    var oldd = d
-
-    a = ff(a, b, c, d, x[i + 0], 7, -680876936)
-    d = ff(d, a, b, c, x[i + 1], 12, -389564586)
-    c = ff(c, d, a, b, x[i + 2], 17, 606105819)
-    b = ff(b, c, d, a, x[i + 3], 22, -1044525330)
-    a = ff(a, b, c, d, x[i + 4], 7, -176418897)
-    d = ff(d, a, b, c, x[i + 5], 12, 1200080426)
-    c = ff(c, d, a, b, x[i + 6], 17, -1473231341)
-    b = ff(b, c, d, a, x[i + 7], 22, -45705983)
-    a = ff(a, b, c, d, x[i + 8], 7, 1770035416)
-    d = ff(d, a, b, c, x[i + 9], 12, -1958414417)
-    c = ff(c, d, a, b, x[i + 10], 17, -42063)
-    b = ff(b, c, d, a, x[i + 11], 22, -1990404162)
-    a = ff(a, b, c, d, x[i + 12], 7, 1804603682)
-    d = ff(d, a, b, c, x[i + 13], 12, -40341101)
-    c = ff(c, d, a, b, x[i + 14], 17, -1502002290)
-    b = ff(b, c, d, a, x[i + 15], 22, 1236535329)
-
-    a = gg(a, b, c, d, x[i + 1], 5, -165796510)
-    d = gg(d, a, b, c, x[i + 6], 9, -1069501632)
-    c = gg(c, d, a, b, x[i + 11], 14, 643717713)
-    b = gg(b, c, d, a, x[i + 0], 20, -373897302)
-    a = gg(a, b, c, d, x[i + 5], 5, -701558691)
-    d = gg(d, a, b, c, x[i + 10], 9, 38016083)
-    c = gg(c, d, a, b, x[i + 15], 14, -660478335)
-    b = gg(b, c, d, a, x[i + 4], 20, -405537848)
-    a = gg(a, b, c, d, x[i + 9], 5, 568446438)
-    d = gg(d, a, b, c, x[i + 14], 9, -1019803690)
-    c = gg(c, d, a, b, x[i + 3], 14, -187363961)
-    b = gg(b, c, d, a, x[i + 8], 20, 1163531501)
-    a = gg(a, b, c, d, x[i + 13], 5, -1444681467)
-    d = gg(d, a, b, c, x[i + 2], 9, -51403784)
-    c = gg(c, d, a, b, x[i + 7], 14, 1735328473)
-    b = gg(b, c, d, a, x[i + 12], 20, -1926607734)
-
-    a = hh(a, b, c, d, x[i + 5], 4, -378558)
-    d = hh(d, a, b, c, x[i + 8], 11, -2022574463)
-    c = hh(c, d, a, b, x[i + 11], 16, 1839030562)
-    b = hh(b, c, d, a, x[i + 14], 23, -35309556)
-    a = hh(a, b, c, d, x[i + 1], 4, -1530992060)
-    d = hh(d, a, b, c, x[i + 4], 11, 1272893353)
-    c = hh(c, d, a, b, x[i + 7], 16, -155497632)
-    b = hh(b, c, d, a, x[i + 10], 23, -1094730640)
-    a = hh(a, b, c, d, x[i + 13], 4, 681279174)
-    d = hh(d, a, b, c, x[i + 0], 11, -358537222)
-    c = hh(c, d, a, b, x[i + 3], 16, -722521979)
-    b = hh(b, c, d, a, x[i + 6], 23, 76029189)
-    a = hh(a, b, c, d, x[i + 9], 4, -640364487)
-    d = hh(d, a, b, c, x[i + 12], 11, -421815835)
-    c = hh(c, d, a, b, x[i + 15], 16, 530742520)
-    b = hh(b, c, d, a, x[i + 2], 23, -995338651)
-
-    a = ii(a, b, c, d, x[i + 0], 6, -198630844)
-    d = ii(d, a, b, c, x[i + 7], 10, 1126891415)
-    c = ii(c, d, a, b, x[i + 14], 15, -1416354905)
-    b = ii(b, c, d, a, x[i + 5], 21, -57434055)
-    a = ii(a, b, c, d, x[i + 12], 6, 1700485571)
-    d = ii(d, a, b, c, x[i + 3], 10, -1894986606)
-    c = ii(c, d, a, b, x[i + 10], 15, -1051523)
-    b = ii(b, c, d, a, x[i + 1], 21, -2054922799)
-    a = ii(a, b, c, d, x[i + 8], 6, 1873313359)
-    d = ii(d, a, b, c, x[i + 15], 10, -30611744)
-    c = ii(c, d, a, b, x[i + 6], 15, -1560198380)
-    b = ii(b, c, d, a, x[i + 13], 21, 1309151649)
-    a = ii(a, b, c, d, x[i + 4], 6, -145523070)
-    d = ii(d, a, b, c, x[i + 11], 10, -1120210379)
-    c = ii(c, d, a, b, x[i + 2], 15, 718787259)
-    b = ii(b, c, d, a, x[i + 9], 21, -343485551)
-
-    a = safe_add(a, olda)
-    b = safe_add(b, oldb)
-    c = safe_add(c, oldc)
-    d = safe_add(d, oldd)
-  }
-  return [a, b, c, d]
-}
-
-/*  
- * Convert an array of little-endian words to a hex string.  
- */
-function binl2hex(binarray) {
-  var hex_tab = "0123456789abcdef"
-  var str = ""
-  for (var i = 0; i < binarray.length * 4; i++) {
-    str += hex_tab.charAt((binarray[i >> 2] >> ((i % 4) * 8 + 4)) & 0xF) +
-      hex_tab.charAt((binarray[i >> 2] >> ((i % 4) * 8)) & 0xF)
-  }
-  return str
-}
-
-/*  
- * Convert an array of little-endian words to a base64 encoded string.  
- */
-function binl2b64(binarray) {
-  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-  var str = ""
-  for (var i = 0; i < binarray.length * 32; i += 6) {
-    str += tab.charAt(((binarray[i >> 5] << (i % 32)) & 0x3F) |
-      ((binarray[i >> 5 + 1] >> (32 - i % 32)) & 0x3F))
-  }
-  return str
-}
-
-/*  
- * Convert an 8-bit character string to a sequence of 16-word blocks, stored  
- * as an array, and append appropriate padding for MD4/5 calculation.  
- * If any of the characters are >255, the high byte is silently ignored.  
- */
-function str2binl(str) {
-  var nblk = ((str.length + 8) >> 6) + 1 // number of 16-word blocks    
-  var blks = new Array(nblk * 16)
-  for (var i = 0; i < nblk * 16; i++) blks[i] = 0
-  for (var i = 0; i < str.length; i++)
-    blks[i >> 2] |= (str.charCodeAt(i) & 0xFF) << ((i % 4) * 8)
-  blks[i >> 2] |= 0x80 << ((i % 4) * 8)
-  blks[nblk * 16 - 2] = str.length * 8
-  return blks
-}
-
-/*  
- * Convert a wide-character string to a sequence of 16-word blocks, stored as  
- * an array, and append appropriate padding for MD4/5 calculation.  
- */
-function strw2binl(str) {
-  var nblk = ((str.length + 4) >> 5) + 1 // number of 16-word blocks    
-  var blks = new Array(nblk * 16)
-  for (var i = 0; i < nblk * 16; i++) blks[i] = 0
-  for (var i = 0; i < str.length; i++)
-    blks[i >> 1] |= str.charCodeAt(i) << ((i % 2) * 16)
-  blks[i >> 1] |= 0x80 << ((i % 2) * 16)
-  blks[nblk * 16 - 2] = str.length * 16
-  return blks
-}
-
-/*  
- * External interface  
- */
-function md5(str) { return binl2hex(coreMD5(str2binl(str))) }
-function hexMD5w(str) { return binl2hex(coreMD5(strw2binl(str))) }
-function b64MD5(str) { return binl2b64(coreMD5(str2binl(str))) }
-function b64MD5w(str) { return binl2b64(coreMD5(strw2binl(str))) }
-/* Backward compatibility */
-function calcMD5(str) { return binl2hex(coreMD5(str2binl(str))) }
-module.exports = md5

-var ERROR_CONF={KEY_ERR:311,KEY_ERR_MSG:'key格式错误',PARAM_ERR:310,PARAM_ERR_MSG:'请求参数信息有误',SYSTEM_ERR:600,SYSTEM_ERR_MSG:'系统错误',WX_ERR_CODE:1000,WX_OK_CODE:200};var BASE_URL='https://apis.map.qq.com/ws/';var URL_SEARCH=BASE_URL+'place/v1/search';var URL_SUGGESTION=BASE_URL+'place/v1/suggestion';var URL_GET_GEOCODER=BASE_URL+'geocoder/v1/';var URL_CITY_LIST=BASE_URL+'district/v1/list';var URL_AREA_LIST=BASE_URL+'district/v1/getchildren';var URL_DISTANCE=BASE_URL+'distance/v1/';var URL_DIRECTION=BASE_URL+'direction/v1/';var MODE={driving:'driving',transit:'transit'};var EARTH_RADIUS=6378136.49;var Utils={safeAdd(x,y){var lsw=(x&0xffff)+(y&0xffff);var msw=(x>>16)+(y>>16)+(lsw>>16);return(msw<<16)|(lsw&0xffff)},bitRotateLeft(num,cnt){return(num<<cnt)|(num>>>(32-cnt))},md5cmn(q,a,b,x,s,t){return this.safeAdd(this.bitRotateLeft(this.safeAdd(this.safeAdd(a,q),this.safeAdd(x,t)),s),b)},md5ff(a,b,c,d,x,s,t){return this.md5cmn((b&c)|(~b&d),a,b,x,s,t)},md5gg(a,b,c,d,x,s,t){return this.md5cmn((b&d)|(c&~d),a,b,x,s,t)},md5hh(a,b,c,d,x,s,t){return this.md5cmn(b^c^d,a,b,x,s,t)},md5ii(a,b,c,d,x,s,t){return this.md5cmn(c^(b|~d),a,b,x,s,t)},binlMD5(x,len){x[len>>5]|=0x80<<(len%32);x[((len+64)>>>9<<4)+14]=len;var i;var olda;var oldb;var oldc;var oldd;var a=1732584193;var b=-271733879;var c=-1732584194;var d=271733878;for(i=0;i<x.length;i+=16){olda=a;oldb=b;oldc=c;oldd=d;a=this.md5ff(a,b,c,d,x[i],7,-680876936);d=this.md5ff(d,a,b,c,x[i+1],12,-389564586);c=this.md5ff(c,d,a,b,x[i+2],17,606105819);b=this.md5ff(b,c,d,a,x[i+3],22,-1044525330);a=this.md5ff(a,b,c,d,x[i+4],7,-176418897);d=this.md5ff(d,a,b,c,x[i+5],12,1200080426);c=this.md5ff(c,d,a,b,x[i+6],17,-1473231341);b=this.md5ff(b,c,d,a,x[i+7],22,-45705983);a=this.md5ff(a,b,c,d,x[i+8],7,1770035416);d=this.md5ff(d,a,b,c,x[i+9],12,-1958414417);c=this.md5ff(c,d,a,b,x[i+10],17,-42063);b=this.md5ff(b,c,d,a,x[i+11],22,-1990404162);a=this.md5ff(a,b,c,d,x[i+12],7,1804603682);d=this.md5ff(d,a,b,c,x[i+13],12,-40341101);c=this.md5ff(c,d,a,b,x[i+14],17,-1502002290);b=this.md5ff(b,c,d,a,x[i+15],22,1236535329);a=this.md5gg(a,b,c,d,x[i+1],5,-165796510);d=this.md5gg(d,a,b,c,x[i+6],9,-1069501632);c=this.md5gg(c,d,a,b,x[i+11],14,643717713);b=this.md5gg(b,c,d,a,x[i],20,-373897302);a=this.md5gg(a,b,c,d,x[i+5],5,-701558691);d=this.md5gg(d,a,b,c,x[i+10],9,38016083);c=this.md5gg(c,d,a,b,x[i+15],14,-660478335);b=this.md5gg(b,c,d,a,x[i+4],20,-405537848);a=this.md5gg(a,b,c,d,x[i+9],5,568446438);d=this.md5gg(d,a,b,c,x[i+14],9,-1019803690);c=this.md5gg(c,d,a,b,x[i+3],14,-187363961);b=this.md5gg(b,c,d,a,x[i+8],20,1163531501);a=this.md5gg(a,b,c,d,x[i+13],5,-1444681467);d=this.md5gg(d,a,b,c,x[i+2],9,-51403784);c=this.md5gg(c,d,a,b,x[i+7],14,1735328473);b=this.md5gg(b,c,d,a,x[i+12],20,-1926607734);a=this.md5hh(a,b,c,d,x[i+5],4,-378558);d=this.md5hh(d,a,b,c,x[i+8],11,-2022574463);c=this.md5hh(c,d,a,b,x[i+11],16,1839030562);b=this.md5hh(b,c,d,a,x[i+14],23,-35309556);a=this.md5hh(a,b,c,d,x[i+1],4,-1530992060);d=this.md5hh(d,a,b,c,x[i+4],11,1272893353);c=this.md5hh(c,d,a,b,x[i+7],16,-155497632);b=this.md5hh(b,c,d,a,x[i+10],23,-1094730640);a=this.md5hh(a,b,c,d,x[i+13],4,681279174);d=this.md5hh(d,a,b,c,x[i],11,-358537222);c=this.md5hh(c,d,a,b,x[i+3],16,-722521979);b=this.md5hh(b,c,d,a,x[i+6],23,76029189);a=this.md5hh(a,b,c,d,x[i+9],4,-640364487);d=this.md5hh(d,a,b,c,x[i+12],11,-421815835);c=this.md5hh(c,d,a,b,x[i+15],16,530742520);b=this.md5hh(b,c,d,a,x[i+2],23,-995338651);a=this.md5ii(a,b,c,d,x[i],6,-198630844);d=this.md5ii(d,a,b,c,x[i+7],10,1126891415);c=this.md5ii(c,d,a,b,x[i+14],15,-1416354905);b=this.md5ii(b,c,d,a,x[i+5],21,-57434055);a=this.md5ii(a,b,c,d,x[i+12],6,1700485571);d=this.md5ii(d,a,b,c,x[i+3],10,-1894986606);c=this.md5ii(c,d,a,b,x[i+10],15,-1051523);b=this.md5ii(b,c,d,a,x[i+1],21,-2054922799);a=this.md5ii(a,b,c,d,x[i+8],6,1873313359);d=this.md5ii(d,a,b,c,x[i+15],10,-30611744);c=this.md5ii(c,d,a,b,x[i+6],15,-1560198380);b=this.md5ii(b,c,d,a,x[i+13],21,1309151649);a=this.md5ii(a,b,c,d,x[i+4],6,-145523070);d=this.md5ii(d,a,b,c,x[i+11],10,-1120210379);c=this.md5ii(c,d,a,b,x[i+2],15,718787259);b=this.md5ii(b,c,d,a,x[i+9],21,-343485551);a=this.safeAdd(a,olda);b=this.safeAdd(b,oldb);c=this.safeAdd(c,oldc);d=this.safeAdd(d,oldd)}return[a,b,c,d]},binl2rstr(input){var i;var output='';var length32=input.length*32;for(i=0;i<length32;i+=8){output+=String.fromCharCode((input[i>>5]>>>(i%32))&0xff)}return output},rstr2binl(input){var i;var output=[];output[(input.length>>2)-1]=undefined;for(i=0;i<output.length;i+=1){output[i]=0}var length8=input.length*8;for(i=0;i<length8;i+=8){output[i>>5]|=(input.charCodeAt(i/8)&0xff)<<(i%32)}return output},rstrMD5(s){return this.binl2rstr(this.binlMD5(this.rstr2binl(s),s.length*8))},rstrHMACMD5(key,data){var i;var bkey=this.rstr2binl(key);var ipad=[];var opad=[];var hash;ipad[15]=opad[15]=undefined;if(bkey.length>16){bkey=this.binlMD5(bkey,key.length*8)}for(i=0;i<16;i+=1){ipad[i]=bkey[i]^0x36363636;opad[i]=bkey[i]^0x5c5c5c5c}hash=this.binlMD5(ipad.concat(this.rstr2binl(data)),512+data.length*8);return this.binl2rstr(this.binlMD5(opad.concat(hash),512+128))},rstr2hex(input){var hexTab='0123456789abcdef';var output='';var x;var i;for(i=0;i<input.length;i+=1){x=input.charCodeAt(i);output+=hexTab.charAt((x>>>4)&0x0f)+hexTab.charAt(x&0x0f)}return output},str2rstrUTF8(input){return unescape(encodeURIComponent(input))},rawMD5(s){return this.rstrMD5(this.str2rstrUTF8(s))},hexMD5(s){return this.rstr2hex(this.rawMD5(s))},rawHMACMD5(k,d){return this.rstrHMACMD5(this.str2rstrUTF8(k),str2rstrUTF8(d))},hexHMACMD5(k,d){return this.rstr2hex(this.rawHMACMD5(k,d))},md5(string,key,raw){if(!key){if(!raw){return this.hexMD5(string)}return this.rawMD5(string)}if(!raw){return this.hexHMACMD5(key,string)}return this.rawHMACMD5(key,string)},getSig(requestParam,sk,feature,mode){var sig=null;var requestArr=[];Object.keys(requestParam).sort().forEach(function(key){requestArr.push(key+'='+requestParam[key])});if(feature=='search'){sig='/ws/place/v1/search?'+requestArr.join('&')+sk}if(feature=='suggest'){sig='/ws/place/v1/suggestion?'+requestArr.join('&')+sk}if(feature=='reverseGeocoder'){sig='/ws/geocoder/v1/?'+requestArr.join('&')+sk}if(feature=='geocoder'){sig='/ws/geocoder/v1/?'+requestArr.join('&')+sk}if(feature=='getCityList'){sig='/ws/district/v1/list?'+requestArr.join('&')+sk}if(feature=='getDistrictByCityId'){sig='/ws/district/v1/getchildren?'+requestArr.join('&')+sk}if(feature=='calculateDistance'){sig='/ws/distance/v1/?'+requestArr.join('&')+sk}if(feature=='direction'){sig='/ws/direction/v1/'+mode+'?'+requestArr.join('&')+sk}sig=this.md5(sig);return sig},location2query(data){if(typeof data=='string'){return data}var query='';for(var i=0;i<data.length;i++){var d=data[i];if(!!query){query+=';'}if(d.location){query=query+d.location.lat+','+d.location.lng}if(d.latitude&&d.longitude){query=query+d.latitude+','+d.longitude}}return query},rad(d){return d*Math.PI/180.0},getEndLocation(location){var to=location.split(';');var endLocation=[];for(var i=0;i<to.length;i++){endLocation.push({lat:parseFloat(to[i].split(',')[0]),lng:parseFloat(to[i].split(',')[1])})}return endLocation},getDistance(latFrom,lngFrom,latTo,lngTo){var radLatFrom=this.rad(latFrom);var radLatTo=this.rad(latTo);var a=radLatFrom-radLatTo;var b=this.rad(lngFrom)-this.rad(lngTo);var distance=2*Math.asin(Math.sqrt(Math.pow(Math.sin(a/2),2)+Math.cos(radLatFrom)*Math.cos(radLatTo)*Math.pow(Math.sin(b/2),2)));distance=distance*EARTH_RADIUS;distance=Math.round(distance*10000)/10000;return parseFloat(distance.toFixed(0))},getWXLocation(success,fail,complete){wx.getLocation({type:'gcj02',success:success,fail:fail,complete:complete})},getLocationParam(location){if(typeof location=='string'){var locationArr=location.split(',');if(locationArr.length===2){location={latitude:location.split(',')[0],longitude:location.split(',')[1]}}else{location={}}}return location},polyfillParam(param){param.success=param.success||function(){};param.fail=param.fail||function(){};param.complete=param.complete||function(){}},checkParamKeyEmpty(param,key){if(!param[key]){var errconf=this.buildErrorConfig(ERROR_CONF.PARAM_ERR,ERROR_CONF.PARAM_ERR_MSG+key+'参数格式有误');param.fail(errconf);param.complete(errconf);return true}return false},checkKeyword(param){return!this.checkParamKeyEmpty(param,'keyword')},checkLocation(param){var location=this.getLocationParam(param.location);if(!location||!location.latitude||!location.longitude){var errconf=this.buildErrorConfig(ERROR_CONF.PARAM_ERR,ERROR_CONF.PARAM_ERR_MSG+' location参数格式有误');param.fail(errconf);param.complete(errconf);return false}return true},buildErrorConfig(errCode,errMsg){return{status:errCode,message:errMsg}},handleData(param,data,feature){if(feature=='search'){var searchResult=data.data;var searchSimplify=[];for(var i=0;i<searchResult.length;i++){searchSimplify.push({id:searchResult[i].id||null,title:searchResult[i].title||null,latitude:searchResult[i].location&&searchResult[i].location.lat||null,longitude:searchResult[i].location&&searchResult[i].location.lng||null,address:searchResult[i].address||null,category:searchResult[i].category||null,tel:searchResult[i].tel||null,adcode:searchResult[i].ad_info&&searchResult[i].ad_info.adcode||null,city:searchResult[i].ad_info&&searchResult[i].ad_info.city||null,district:searchResult[i].ad_info&&searchResult[i].ad_info.district||null,province:searchResult[i].ad_info&&searchResult[i].ad_info.province||null})}param.success(data,{searchResult:searchResult,searchSimplify:searchSimplify})}else if(feature=='suggest'){var suggestResult=data.data;var suggestSimplify=[];for(var i=0;i<suggestResult.length;i++){suggestSimplify.push({adcode:suggestResult[i].adcode||null,address:suggestResult[i].address||null,category:suggestResult[i].category||null,city:suggestResult[i].city||null,district:suggestResult[i].district||null,id:suggestResult[i].id||null,latitude:suggestResult[i].location&&suggestResult[i].location.lat||null,longitude:suggestResult[i].location&&suggestResult[i].location.lng||null,province:suggestResult[i].province||null,title:suggestResult[i].title||null,type:suggestResult[i].type||null})}param.success(data,{suggestResult:suggestResult,suggestSimplify:suggestSimplify})}else if(feature=='reverseGeocoder'){var reverseGeocoderResult=data.result;var reverseGeocoderSimplify={address:reverseGeocoderResult.address||null,latitude:reverseGeocoderResult.location&&reverseGeocoderResult.location.lat||null,longitude:reverseGeocoderResult.location&&reverseGeocoderResult.location.lng||null,adcode:reverseGeocoderResult.ad_info&&reverseGeocoderResult.ad_info.adcode||null,city:reverseGeocoderResult.address_component&&reverseGeocoderResult.address_component.city||null,district:reverseGeocoderResult.address_component&&reverseGeocoderResult.address_component.district||null,nation:reverseGeocoderResult.address_component&&reverseGeocoderResult.address_component.nation||null,province:reverseGeocoderResult.address_component&&reverseGeocoderResult.address_component.province||null,street:reverseGeocoderResult.address_component&&reverseGeocoderResult.address_component.street||null,street_number:reverseGeocoderResult.address_component&&reverseGeocoderResult.address_component.street_number||null,recommend:reverseGeocoderResult.formatted_addresses&&reverseGeocoderResult.formatted_addresses.recommend||null,rough:reverseGeocoderResult.formatted_addresses&&reverseGeocoderResult.formatted_addresses.rough||null};if(reverseGeocoderResult.pois){var pois=reverseGeocoderResult.pois;var poisSimplify=[];for(var i=0;i<pois.length;i++){poisSimplify.push({id:pois[i].id||null,title:pois[i].title||null,latitude:pois[i].location&&pois[i].location.lat||null,longitude:pois[i].location&&pois[i].location.lng||null,address:pois[i].address||null,category:pois[i].category||null,adcode:pois[i].ad_info&&pois[i].ad_info.adcode||null,city:pois[i].ad_info&&pois[i].ad_info.city||null,district:pois[i].ad_info&&pois[i].ad_info.district||null,province:pois[i].ad_info&&pois[i].ad_info.province||null})}param.success(data,{reverseGeocoderResult:reverseGeocoderResult,reverseGeocoderSimplify:reverseGeocoderSimplify,pois:pois,poisSimplify:poisSimplify})}else{param.success(data,{reverseGeocoderResult:reverseGeocoderResult,reverseGeocoderSimplify:reverseGeocoderSimplify})}}else if(feature=='geocoder'){var geocoderResult=data.result;var geocoderSimplify={title:geocoderResult.title||null,latitude:geocoderResult.location&&geocoderResult.location.lat||null,longitude:geocoderResult.location&&geocoderResult.location.lng||null,adcode:geocoderResult.ad_info&&geocoderResult.ad_info.adcode||null,province:geocoderResult.address_components&&geocoderResult.address_components.province||null,city:geocoderResult.address_components&&geocoderResult.address_components.city||null,district:geocoderResult.address_components&&geocoderResult.address_components.district||null,street:geocoderResult.address_components&&geocoderResult.address_components.street||null,street_number:geocoderResult.address_components&&geocoderResult.address_components.street_number||null,level:geocoderResult.level||null};param.success(data,{geocoderResult:geocoderResult,geocoderSimplify:geocoderSimplify})}else if(feature=='getCityList'){var provinceResult=data.result[0];var cityResult=data.result[1];var districtResult=data.result[2];param.success(data,{provinceResult:provinceResult,cityResult:cityResult,districtResult:districtResult})}else if(feature=='getDistrictByCityId'){var districtByCity=data.result[0];param.success(data,districtByCity)}else if(feature=='calculateDistance'){var calculateDistanceResult=data.result.elements;var distance=[];for(var i=0;i<calculateDistanceResult.length;i++){distance.push(calculateDistanceResult[i].distance)}param.success(data,{calculateDistanceResult:calculateDistanceResult,distance:distance})}else if(feature=='direction'){var direction=data.result.routes;param.success(data,direction)}else{param.success(data)}},buildWxRequestConfig(param,options,feature){var that=this;options.header={"content-type":"application/json"};options.method='GET';options.success=function(res){var data=res.data;if(data.status===0){that.handleData(param,data,feature)}else{param.fail(data)}};options.fail=function(res){res.statusCode=ERROR_CONF.WX_ERR_CODE;param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE,res.errMsg))};options.complete=function(res){var statusCode=+res.statusCode;switch(statusCode){case ERROR_CONF.WX_ERR_CODE:{param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE,res.errMsg));break}case ERROR_CONF.WX_OK_CODE:{var data=res.data;if(data.status===0){param.complete(data)}else{param.complete(that.buildErrorConfig(data.status,data.message))}break}default:{param.complete(that.buildErrorConfig(ERROR_CONF.SYSTEM_ERR,ERROR_CONF.SYSTEM_ERR_MSG))}}};return options},locationProcess(param,locationsuccess,locationfail,locationcomplete){var that=this;locationfail=locationfail||function(res){res.statusCode=ERROR_CONF.WX_ERR_CODE;param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE,res.errMsg))};locationcomplete=locationcomplete||function(res){if(res.statusCode==ERROR_CONF.WX_ERR_CODE){param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE,res.errMsg))}};if(!param.location){that.getWXLocation(locationsuccess,locationfail,locationcomplete)}else if(that.checkLocation(param)){var location=Utils.getLocationParam(param.location);locationsuccess(location)}}};class QQMapWX{constructor(options){if(!options.key){throw Error('key值不能为空')}this.key=options.key};search(options){var that=this;options=options||{};Utils.polyfillParam(options);if(!Utils.checkKeyword(options)){return}var requestParam={keyword:options.keyword,orderby:options.orderby||'_distance',page_size:options.page_size||10,page_index:options.page_index||1,output:'json',key:that.key};if(options.address_format){requestParam.address_format=options.address_format}if(options.filter){requestParam.filter=options.filter}var distance=options.distance||"1000";var auto_extend=options.auto_extend||1;var region=null;var rectangle=null;if(options.region){region=options.region}if(options.rectangle){rectangle=options.rectangle}var locationsuccess=function(result){if(region&&!rectangle){requestParam.boundary="region("+region+","+auto_extend+","+result.latitude+","+result.longitude+")";if(options.sig){requestParam.sig=Utils.getSig(requestParam,options.sig,'search')}}else if(rectangle&&!region){requestParam.boundary="rectangle("+rectangle+")";if(options.sig){requestParam.sig=Utils.getSig(requestParam,options.sig,'search')}}else{requestParam.boundary="nearby("+result.latitude+","+result.longitude+","+distance+","+auto_extend+")";if(options.sig){requestParam.sig=Utils.getSig(requestParam,options.sig,'search')}}wx.request(Utils.buildWxRequestConfig(options,{url:URL_SEARCH,data:requestParam},'search'))};Utils.locationProcess(options,locationsuccess)};getSuggestion(options){var that=this;options=options||{};Utils.polyfillParam(options);if(!Utils.checkKeyword(options)){return}var requestParam={keyword:options.keyword,region:options.region||'全国',region_fix:options.region_fix||0,policy:options.policy||0,page_size:options.page_size||10,page_index:options.page_index||1,get_subpois:options.get_subpois||0,output:'json',key:that.key};if(options.address_format){requestParam.address_format=options.address_format}if(options.filter){requestParam.filter=options.filter}if(options.location){var locationsuccess=function(result){requestParam.location=result.latitude+','+result.longitude;if(options.sig){requestParam.sig=Utils.getSig(requestParam,options.sig,'suggest')}wx.request(Utils.buildWxRequestConfig(options,{url:URL_SUGGESTION,data:requestParam},"suggest"))};Utils.locationProcess(options,locationsuccess)}else{if(options.sig){requestParam.sig=Utils.getSig(requestParam,options.sig,'suggest')}wx.request(Utils.buildWxRequestConfig(options,{url:URL_SUGGESTION,data:requestParam},"suggest"))}};reverseGeocoder(options){var that=this;options=options||{};Utils.polyfillParam(options);var requestParam={coord_type:options.coord_type||5,get_poi:options.get_poi||0,output:'json',key:that.key};if(options.poi_options){requestParam.poi_options=options.poi_options}var locationsuccess=function(result){requestParam.location=result.latitude+','+result.longitude;if(options.sig){requestParam.sig=Utils.getSig(requestParam,options.sig,'reverseGeocoder')}wx.request(Utils.buildWxRequestConfig(options,{url:URL_GET_GEOCODER,data:requestParam},'reverseGeocoder'))};Utils.locationProcess(options,locationsuccess)};geocoder(options){var that=this;options=options||{};Utils.polyfillParam(options);if(Utils.checkParamKeyEmpty(options,'address')){return}var requestParam={address:options.address,output:'json',key:that.key};if(options.region){requestParam.region=options.region}if(options.sig){requestParam.sig=Utils.getSig(requestParam,options.sig,'geocoder')}wx.request(Utils.buildWxRequestConfig(options,{url:URL_GET_GEOCODER,data:requestParam},'geocoder'))};getCityList(options){var that=this;options=options||{};Utils.polyfillParam(options);var requestParam={output:'json',key:that.key};if(options.sig){requestParam.sig=Utils.getSig(requestParam,options.sig,'getCityList')}wx.request(Utils.buildWxRequestConfig(options,{url:URL_CITY_LIST,data:requestParam},'getCityList'))};getDistrictByCityId(options){var that=this;options=options||{};Utils.polyfillParam(options);if(Utils.checkParamKeyEmpty(options,'id')){return}var requestParam={id:options.id||'',output:'json',key:that.key};if(options.sig){requestParam.sig=Utils.getSig(requestParam,options.sig,'getDistrictByCityId')}wx.request(Utils.buildWxRequestConfig(options,{url:URL_AREA_LIST,data:requestParam},'getDistrictByCityId'))};calculateDistance(options){var that=this;options=options||{};Utils.polyfillParam(options);if(Utils.checkParamKeyEmpty(options,'to')){return}var requestParam={mode:options.mode||'walking',to:Utils.location2query(options.to),output:'json',key:that.key};if(options.from){options.location=options.from}if(requestParam.mode=='straight'){var locationsuccess=function(result){var locationTo=Utils.getEndLocation(requestParam.to);var data={message:"query ok",result:{elements:[]},status:0};for(var i=0;i<locationTo.length;i++){data.result.elements.push({distance:Utils.getDistance(result.latitude,result.longitude,locationTo[i].lat,locationTo[i].lng),duration:0,from:{lat:result.latitude,lng:result.longitude},to:{lat:locationTo[i].lat,lng:locationTo[i].lng}})}var calculateResult=data.result.elements;var distanceResult=[];for(var i=0;i<calculateResult.length;i++){distanceResult.push(calculateResult[i].distance)}return options.success(data,{calculateResult:calculateResult,distanceResult:distanceResult})};Utils.locationProcess(options,locationsuccess)}else{var locationsuccess=function(result){requestParam.from=result.latitude+','+result.longitude;if(options.sig){requestParam.sig=Utils.getSig(requestParam,options.sig,'calculateDistance')}wx.request(Utils.buildWxRequestConfig(options,{url:URL_DISTANCE,data:requestParam},'calculateDistance'))};Utils.locationProcess(options,locationsuccess)}};direction(options){var that=this;options=options||{};Utils.polyfillParam(options);if(Utils.checkParamKeyEmpty(options,'to')){return}var requestParam={output:'json',key:that.key};if(typeof options.to=='string'){requestParam.to=options.to}else{requestParam.to=options.to.latitude+','+options.to.longitude}var SET_URL_DIRECTION=null;options.mode=options.mode||MODE.driving;SET_URL_DIRECTION=URL_DIRECTION+options.mode;if(options.from){options.location=options.from}if(options.mode==MODE.driving){if(options.from_poi){requestParam.from_poi=options.from_poi}if(options.heading){requestParam.heading=options.heading}if(options.speed){requestParam.speed=options.speed}if(options.accuracy){requestParam.accuracy=options.accuracy}if(options.road_type){requestParam.road_type=options.road_type}if(options.to_poi){requestParam.to_poi=options.to_poi}if(options.from_track){requestParam.from_track=options.from_track}if(options.waypoints){requestParam.waypoints=options.waypoints}if(options.policy){requestParam.policy=options.policy}if(options.plate_number){requestParam.plate_number=options.plate_number}}if(options.mode==MODE.transit){if(options.departure_time){requestParam.departure_time=options.departure_time}if(options.policy){requestParam.policy=options.policy}}var locationsuccess=function(result){requestParam.from=result.latitude+','+result.longitude;if(options.sig){requestParam.sig=Utils.getSig(requestParam,options.sig,'direction',options.mode)}wx.request(Utils.buildWxRequestConfig(options,{url:SET_URL_DIRECTION,data:requestParam},'direction'))};Utils.locationProcess(options,locationsuccess)}};module.exports=QQMapWX;

@@ -122,22 +122,12 @@ export default {
 						uni.showToast({
 						uni.showToast({
 							title: '登录成功~',
 							title: '登录成功~',
 							icon: 'none'
 							icon: 'none'
+						}).then(res => {
+							uni.reLaunch({	
+							url: '/pages/personal/personal'	
 						});
 						});
-						this.saveUserInfo();
-						// #ifndef MP
-						// setTimeout(() => {
-						// 	uni.navigateBack();
-						// }, 500);
-						uni.switchTab({
-							url: '../personal/personal'
-						});
-						// #endif
-						// #ifdef MP
-						// uni.navigateBack();
-						uni.switchTab({
-							url: '../personal/personal'
 						});
 						});
-						// #endif
+						this.saveUserInfo();
 					}
 					}
 				})
 				})
 				.catch(e => {
 				.catch(e => {
@@ -154,12 +144,12 @@ export default {
 		},
 		},
 		openCodeFunc() {
 		openCodeFunc() {
 			uni.navigateTo({
 			uni.navigateTo({
-				url: '../personal/code'
+				url: '../other/code'
 			});
 			});
 		},
 		},
 		findPassrordFunc() {
 		findPassrordFunc() {
 			uni.navigateTo({
 			uni.navigateTo({
-				url: '../personal/findPassword'
+				url: '../other/findPassword'
 			});
 			});
 		},
 		},
 		showPasswordMode() {
 		showPasswordMode() {

@@ -7,14 +7,13 @@
 				<u-form-item
 				<u-form-item
 					label="类型"
 					label="类型"
 					prop="userInfo.sex"
 					prop="userInfo.sex"
-					borderBottom
 					@click="
 					@click="
 						showType = true;
 						showType = true;
 						hideKeyboard();
 						hideKeyboard();
 					"
 					"
 					ref="item1"
 					ref="item1"
 				>
 				>
-					<u--input v-model="model1.userInfo.type" placeholder="请选择类型" border="none"></u--input>
+					<u--input v-model="model1.userInfo.type" placeholder="请选择类型" border="surround"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				</u-form-item>
 			</u--form>
 			</u--form>
@@ -38,19 +37,15 @@
 				</view>
 				</view>
 			</mescroll-body>
 			</mescroll-body>
 		</view>
 		</view>
-		<f-tabbar></f-tabbar>
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 
 
 export default {
 export default {
 	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
 	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
-	components: {
-		fTabbar
-	},
+
 	data() {
 	data() {
 		return {
 		return {
 			model1: {
 			model1: {
@@ -61,6 +56,10 @@ export default {
 			showType: false,
 			showType: false,
 			actions: [
 			actions: [
 				{
 				{
+					name: '全部',
+					value: ''
+				},
+				{
 					name: '会议',
 					name: '会议',
 					value: 'MEETING'
 					value: 'MEETING'
 				},
 				},

-export default {
-    props: {
-        // 显示文字
-        title: {
-            type: String,
-            default: uni.$u.props.alert.title
-        },
-        // 主题，success/warning/info/error
-        type: {
-            type: String,
-            default: uni.$u.props.alert.type
-        },
-        // 辅助性文字
-        description: {
-            type: String,
-            default: uni.$u.props.alert.description
-        },
-        // 是否可关闭
-        closable: {
-            type: Boolean,
-            default: uni.$u.props.alert.closable
-        },
-        // 是否显示图标
-        showIcon: {
-            type: Boolean,
-            default: uni.$u.props.alert.showIcon
-        },
-        // 浅或深色调，light-浅色，dark-深色
-        effect: {
-            type: String,
-            default: uni.$u.props.alert.effect
-        },
-        // 文字是否居中
-        center: {
-            type: Boolean,
-            default: uni.$u.props.alert.center
-        },
-        // 字体大小
-        fontSize: {
-            type: [String, Number],
-            default: uni.$u.props.alert.fontSize
-        }
-    }
-}

-<template>
-	<u-transition
-	    mode="fade"
-	    :show="show"
-	>
-		<view
-		    class="u-alert"
-		    :class="[`u-alert--${type}--${effect}`]"
-		    @tap.stop="clickHandler"
-		    :style="[$u.addStyle(customStyle)]"
-		>
-			<view
-			    class="u-alert__icon"
-			    v-if="showIcon"
-			>
-				<u-icon
-				    :name="iconName"
-				    size="18"
-				    :color="iconColor"
-				></u-icon>
-			</view>
-			<view
-			    class="u-alert__content"
-			    :style="[{
-					paddingRight: closable ? '20px' : 0
-				}]"
-			>
-				<text
-				    class="u-alert__content__title"
-				    v-if="title"
-					:style="[{
-						fontSize: $u.addUnit(fontSize),
-						textAlign: center ? 'center' : 'left'
-					}]"
-				    :class="[effect === 'dark' ? 'u-alert__text--dark' : `u-alert__text--${type}--light`]"
-				>{{ title }}</text>
-				<text
-				    class="u-alert__content__desc"
-					v-if="description"
-					:style="[{
-						fontSize: $u.addUnit(fontSize),
-						textAlign: center ? 'center' : 'left'
-					}]"
-				    :class="[effect === 'dark' ? 'u-alert__text--dark' : `u-alert__text--${type}--light`]"
-				>{{ description }}</text>
-			</view>
-			<view
-			    class="u-alert__close"
-			    v-if="closable"
-			    @tap.stop="closeHandler"
-			>
-				<u-icon
-				    name="close"
-				    :color="iconColor"
-				    size="15"
-				></u-icon>
-			</view>
-		</view>
-	</u-transition>
-</template>
-
-<script>
-	import props from './props.js';
-	/**
-	 * Alert  警告提示
-	 * @description 警告提示，展现需要关注的信息。
-	 * @tutorial https://www.uviewui.com/components/alertTips.html
-	 * 
-	 * @property {String}			title       显示的文字 
-	 * @property {String}			type        使用预设的颜色  （默认 'warning' ）
-	 * @property {String}			description 辅助性文字，颜色比title浅一点，字号也小一点，可选  
-	 * @property {Boolean}			closable    关闭按钮(默认为叉号icon图标)  （默认 false ）
-	 * @property {Boolean}			showIcon    是否显示左边的辅助图标   （ 默认 false ）
-	 * @property {String}			effect      多图时，图片缩放裁剪的模式  （默认 'light' ）
-	 * @property {Boolean}			center		文字是否居中  （默认 false ）
-	 * @property {String | Number}	fontSize    字体大小  （默认 14 ）
-	 * @property {Object}			customStyle	定义需要用到的外部样式
-	 * @event    {Function}        click       点击组件时触发
-	 * @example  <u-alert :title="title"  type = "warning" :closable="closable" :description = "description"></u-alert>
-	 */
-	export default {
-		name: 'u-alert',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
-		data() {
-			return {
-				show: true
-			}
-		},
-		computed: {
-			iconColor() {
-				return this.effect === 'light' ? this.type : '#fff'
-			},
-			// 不同主题对应不同的图标
-			iconName() {
-				switch (this.type) {
-					case 'success':
-						return 'checkmark-circle-fill';
-						break;
-					case 'error':
-						return 'close-circle-fill';
-						break;
-					case 'warning':
-						return 'error-circle-fill';
-						break;
-					case 'info':
-						return 'info-circle-fill';
-						break;
-					case 'primary':
-						return 'more-circle-fill';
-						break;
-					default: 
-						return 'error-circle-fill';
-				}
-			}
-		},
-		methods: {
-			// 点击内容
-			clickHandler() {
-				this.$emit('click')
-			},
-			// 点击关闭按钮
-			closeHandler() {
-				this.show = false
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
-
-	.u-alert {
-		position: relative;
-		background-color: $u-primary;
-		padding: 8px 10px;
-		@include flex(row);
-		align-items: center;
-		border-top-left-radius: 4px;
-		border-top-right-radius: 4px;
-		border-bottom-left-radius: 4px;
-		border-bottom-right-radius: 4px;
-
-		&--primary--dark {
-			background-color: $u-primary;
-		}
-
-		&--primary--light {
-			background-color: #ecf5ff;
-		}
-
-		&--error--dark {
-			background-color: $u-error;
-		}
-
-		&--error--light {
-			background-color: #FEF0F0;
-		}
-
-		&--success--dark {
-			background-color: $u-success;
-		}
-
-		&--success--light {
-			background-color: #f5fff0;
-		}
-
-		&--warning--dark {
-			background-color: $u-warning;
-		}
-
-		&--warning--light {
-			background-color: #FDF6EC;
-		}
-
-		&--info--dark {
-			background-color: $u-info;
-		}
-
-		&--info--light {
-			background-color: #f4f4f5;
-		}
-
-		&__icon {
-			margin-right: 5px;
-		}
-
-		&__content {
-			@include flex(column);
-			flex: 1;
-
-			&__title {
-				color: $u-main-color;
-				font-size: 14px;
-				font-weight: bold;
-				color: #fff;
-				margin-bottom: 2px;
-			}
-
-			&__desc {
-				color: $u-main-color;
-				font-size: 14px;
-				flex-wrap: wrap;
-				color: #fff;
-			}
-		}
-
-		&__title--dark,
-		&__desc--dark {
-			color: #FFFFFF;
-		}
-
-		&__text--primary--light,
-		&__text--primary--light {
-			color: $u-primary;
-		}
-
-		&__text--success--light,
-		&__text--success--light {
-			color: $u-success;
-		}
-
-		&__text--warning--light,
-		&__text--warning--light {
-			color: $u-warning;
-		}
-
-		&__text--error--light,
-		&__text--error--light {
-			color: $u-error;
-		}
-
-		&__text--info--light,
-		&__text--info--light {
-			color: $u-info;
-		}
-
-		&__close {
-			position: absolute;
-			top: 11px;
-			right: 10px;
-		}
-	}
-</style>

-export default {
-    props: {
-        // 最大输入长度
-        maxlength: {
-            type: [String, Number],
-            default: uni.$u.props.codeInput.maxlength
-        },
-        // 是否用圆点填充
-        dot: {
-            type: Boolean,
-            default: uni.$u.props.codeInput.dot
-        },
-        // 显示模式，box-盒子模式，line-底部横线模式
-        mode: {
-            type: String,
-            default: uni.$u.props.codeInput.mode
-        },
-        // 是否细边框
-        hairline: {
-            type: Boolean,
-            default: uni.$u.props.codeInput.hairline
-        },
-        // 字符间的距离
-        space: {
-            type: [String, Number],
-            default: uni.$u.props.codeInput.space
-        },
-        // 预置值
-        value: {
-            type: [String, Number],
-            default: uni.$u.props.codeInput.value
-        },
-        // 是否自动获取焦点
-        focus: {
-            type: Boolean,
-            default: uni.$u.props.codeInput.focus
-        },
-        // 字体是否加粗
-        bold: {
-            type: Boolean,
-            default: uni.$u.props.codeInput.bold
-        },
-        // 字体颜色
-        color: {
-            type: String,
-            default: uni.$u.props.codeInput.color
-        },
-        // 字体大小
-        fontSize: {
-            type: [String, Number],
-            default: uni.$u.props.codeInput.fontSize
-        },
-        // 输入框的大小，宽等于高
-        size: {
-            type: [String, Number],
-            default: uni.$u.props.codeInput.size
-        },
-        // 是否隐藏原生键盘，如果想用自定义键盘的话，需设置此参数为true
-        disabledKeyboard: {
-            type: Boolean,
-            default: uni.$u.props.codeInput.disabledKeyboard
-        },
-        // 边框和线条颜色
-        borderColor: {
-            type: String,
-            default: uni.$u.props.codeInput.borderColor
-        },
-		// 是否禁止输入"."符号
-		disabledDot: {
-			type: Boolean,
-			default: uni.$u.props.codeInput.disabledDot
-		}
-    }
-}

-<template>
-	<view class="u-code-input">
-		<view
-			class="u-code-input__item"
-			:style="[itemStyle(index)]"
-			v-for="(item, index) in codeLength"
-			:key="index"
-		>
-			<view
-				class="u-code-input__item__dot"
-				v-if="dot && codeArray.length > index"
-			></view>
-			<text
-				v-else
-				:style="{
-					fontSize: $u.addUnit(fontSize),
-					fontWeight: bold ? 'bold' : 'normal',
-					color: color
-				}"
-			>{{codeArray[index]}}</text>
-			<view
-				class="u-code-input__item__line"
-				v-if="mode === 'line'"
-				:style="[lineStyle]"
-			></view>
-		</view>
-		<input
-			:disabled="disabledKeyboard"
-			type="number"
-			:focus="focus"
-			:value="inputValue"
-			:maxlength="maxlength"
-			class="u-code-input__input"
-			@input="inputHandler"
-			:style="{
-				height: $u.addUnit(size) 
-			}"
-		/>
-	</view>
-</template>
-
-<script>
-	import props from './props.js';
-	/**
-	 * CodeInput 验证码输入
-	 * @description 该组件一般用于验证用户短信验证码的场景，也可以结合uView的键盘组件使用
-	 * @tutorial https://www.uviewui.com/components/codeInput.html
-	 * @property {String | Number}	maxlength			最大输入长度 （默认 6 ）
-	 * @property {Boolean}			dot					是否用圆点填充 （默认 false ）
-	 * @property {String}			mode				显示模式，box-盒子模式，line-底部横线模式 （默认 'box' ）
-	 * @property {Boolean}			hairline			是否细边框 （默认 false ）
-	 * @property {String | Number}	space				字符间的距离 （默认 10 ）
-	 * @property {String | Number}	value				预置值
-	 * @property {Boolean}			focus				是否自动获取焦点 （默认 false ）
-	 * @property {Boolean}			bold				字体和输入横线是否加粗 （默认 false ）
-	 * @property {String}			color				字体颜色 （默认 '#606266' ）
-	 * @property {String | Number}	fontSize			字体大小，单位px （默认 18 ）
-	 * @property {String | Number}	size				输入框的大小，宽等于高 （默认 35 ）
-	 * @property {Boolean}			disabledKeyboard	是否隐藏原生键盘，如果想用自定义键盘的话，需设置此参数为true （默认 false ）
-	 * @property {String}			borderColor			边框和线条颜色 （默认 '#c9cacc' ）
-	 * @property {Boolean}			disabledDot			是否禁止输入"."符号 （默认 true ）
-	 * 
-	 * @event {Function}	change	输入内容发生改变时触发，具体见上方说明			value：当前输入的值
-	 * @event {Function}	finish	输入字符个数达maxlength值时触发，见上方说明	value：当前输入的值
-	 * @example	<u-code-input v-model="value4" :focus="true"></u-code-input>
-	 */
-	export default {
-		name: 'u-code-input',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
-		data() {
-			return {
-				inputValue: ''
-			}
-		},
-		watch: {
-			value: {
-				immediate: true,
-				handler(val) {
-					// 转为字符串，超出部分截掉
-					this.inputValue = String(val).substring(0, this.maxlength)
-				}
-			},
-		},
-		computed: {
-			// 根据长度，循环输入框的个数，因为头条小程序数值不能用于v-for
-			codeLength() {
-				return new Array(Number(this.maxlength))
-			},
-			// 循环item的样式
-			itemStyle() {
-				return index => {
-					const addUnit = uni.$u.addUnit
-					const style = {
-						width: addUnit(this.size),
-						height: addUnit(this.size)
-					}
-					// 盒子模式下，需要额外进行处理
-					if (this.mode === 'box') {
-						// 设置盒子的边框，如果是细边框，则设置为0.5px宽度
-						style.border = `${this.hairline ? 0.5 : 1}px solid ${this.borderColor}`
-						// 如果盒子间距为0的话
-						if (uni.$u.getPx(this.space) === 0) {
-							// 给第一和最后一个盒子设置圆角
-							if (index === 0) {
-								style.borderTopLeftRadius = '3px'
-								style.borderBottomLeftRadius = '3px'
-							}
-							if (index === this.codeLength.length - 1) {
-								style.borderTopRightRadius = '3px'
-								style.borderBottomRightRadius = '3px'
-							}
-							// 最后一个盒子的右边框需要保留
-							if (index !== this.codeLength.length - 1) {
-								style.borderRight = 'none'
-							}
-						}
-					}
-					if (index !== this.codeLength.length - 1) {
-						// 设置验证码字符之间的距离，通过margin-right设置，最后一个字符，无需右边框
-						style.marginRight = addUnit(this.space)
-					} else {
-						// 最后一个盒子的有边框需要保留
-						style.marginRight = 0
-					}
-
-					return style
-				}
-			},
-			// 将输入的值，转为数组，给item历遍时，根据当前的索引显示数组的元素
-			codeArray() {
-				return String(this.inputValue).split('')
-			},
-			// 下划线模式下，横线的样式
-			lineStyle() {
-				const style = {}
-				style.height = this.hairline ? '2px' : '4px'
-				style.width = uni.$u.addUnit(this.size)
-				// 线条模式下，背景色即为边框颜色
-				style.backgroundColor = this.borderColor
-				return style
-			}
-		},
-		methods: {
-			// 监听输入框的值发生变化
-			inputHandler(e) {
-				const value = e.detail.value
-				this.inputValue = value
-				// 是否允许输入“.”符号
-				if(this.disabledDot) {
-					this.$nextTick(() => {
-						this.inputValue = value.replace('.', '')
-					})
-				}
-				// 未达到maxlength之前，发送change事件，达到后发送finish事件
-				this.$emit('change', value)
-				// 修改通过v-model双向绑定的值
-				this.$emit('input', value)
-				// 达到用户指定输入长度时，发出完成事件
-				if (String(value).length >= Number(this.maxlength)) {
-					this.$emit('finish', value)
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
-
-	.u-code-input {
-		@include flex;
-		position: relative;
-		overflow: hidden;
-
-		&__item {
-			@include flex;
-			justify-content: center;
-			align-items: center;
-
-			&__text {
-				font-size: 15px;
-				color: $u-content-color;
-			}
-
-			&__dot {
-				width: 7px;
-				height: 7px;
-				border-radius: 100px;
-				background-color: $u-content-color;
-			}
-
-			&__line {
-				position: absolute;
-				bottom: 0;
-				height: 4px;
-				border-radius: 100px;
-				width: 40px;
-				background-color: $u-content-color;
-			}
-		}
-
-		&__input {
-			// 之所以需要input输入框，是因为有它才能唤起键盘
-			// 这里将它设置为两倍的屏幕宽度，再将左边的一半移出屏幕，为了不让用户看到输入的内容
-			position: absolute;
-			left: -750rpx;
-			width: 1500rpx;
-			top: 0;
-			background-color: transparent;
-			text-align: left;
-		}
-	}
-</style>

-export default {
-    props: {
-        // 倒计时总秒数
-        seconds: {
-            type: [String, Number],
-            default: uni.$u.props.code.seconds
-        },
-        // 尚未开始时提示
-        startText: {
-            type: String,
-            default: uni.$u.props.code.startText
-        },
-        // 正在倒计时中的提示
-        changeText: {
-            type: String,
-            default: uni.$u.props.code.changeText
-        },
-        // 倒计时结束时的提示
-        endText: {
-            type: String,
-            default: uni.$u.props.code.endText
-        },
-        // 是否在H5刷新或各端返回再进入时继续倒计时
-        keepRunning: {
-            type: Boolean,
-            default: uni.$u.props.code.keepRunning
-        },
-        // 为了区分多个页面，或者一个页面多个倒计时组件本地存储的继续倒计时变了
-        uniqueKey: {
-            type: String,
-            default: uni.$u.props.code.uniqueKey
-        }
-    }
-}

-<template>
-	<view class="u-code">
-		<!-- 此组件功能由js完成，无需写html逻辑 -->
-	</view>
-</template>
-
-<script>
-	import props from './props.js';
-	/**
-	 * Code 验证码输入框
-	 * @description 考虑到用户实际发送验证码的场景，可能是一个按钮，也可能是一段文字，提示语各有不同，所以本组件 不提供界面显示，只提供提示语，由用户将提示语嵌入到具体的场景
-	 * @tutorial https://www.uviewui.com/components/code.html
-	 * @property {String | Number}	seconds			倒计时所需的秒数（默认 60 ）
-	 * @property {String}			startText		开始前的提示语，见官网说明（默认 '获取验证码' ）
-	 * @property {String}			changeText		倒计时期间的提示语，必须带有字母"x"，见官网说明（默认 'X秒重新获取' ）
-	 * @property {String}			endText			倒计结束的提示语，见官网说明（默认 '重新获取' ）
-	 * @property {Boolean}			keepRunning		是否在H5刷新或各端返回再进入时继续倒计时（ 默认false ）
-	 * @property {String}			uniqueKey		为了区分多个页面，或者一个页面多个倒计时组件本地存储的继续倒计时变了
-	 * 
-	 * @event {Function}	change	倒计时期间，每秒触发一次
-	 * @event {Function}	start	开始倒计时触发
-	 * @event {Function}	end		结束倒计时触发
-	 * @example <u-code ref="uCode" @change="codeChange" seconds="20"></u-code> 
-	 */
-	export default {
-		name: "u-code",
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
-		data() {
-			return {
-				secNum: this.seconds,
-				timer: null,
-				canGetCode: true, // 是否可以执行验证码操作
-			}
-		},
-		mounted() {
-			this.checkKeepRunning()
-		},
-		watch: {
-			seconds: {
-				immediate: true,
-				handler(n) {
-					this.secNum = n
-				}
-			}
-		},
-		methods: {
-			checkKeepRunning() {
-				// 获取上一次退出页面(H5还包括刷新)时的时间戳，如果没有上次的保存，此值可能为空
-				let lastTimestamp = Number(uni.getStorageSync(this.uniqueKey + '_$uCountDownTimestamp'))
-				if(!lastTimestamp) return this.changeEvent(this.startText)
-				// 当前秒的时间戳
-				let nowTimestamp = Math.floor((+ new Date()) / 1000)
-				// 判断当前的时间戳，是否小于上一次的本该按设定结束，却提前结束的时间戳
-				if(this.keepRunning && lastTimestamp && lastTimestamp > nowTimestamp) {
-					// 剩余尚未执行完的倒计秒数
-					this.secNum = lastTimestamp - nowTimestamp
-					// 清除本地保存的变量
-					uni.removeStorageSync(this.uniqueKey + '_$uCountDownTimestamp')
-					// 开始倒计时
-					this.start()
-				} else {
-					// 如果不存在需要继续上一次的倒计时，执行正常的逻辑
-					this.changeEvent(this.startText)
-				}
-			},
-			// 开始倒计时
-			start() {
-				// 防止快速点击获取验证码的按钮而导致内部产生多个定时器导致混乱
-				if(this.timer) {
-					clearInterval(this.timer)
-					this.timer = null
-				}
-				this.$emit('start')
-				this.canGetCode = false
-				// 这里放这句，是为了一开始时就提示，否则要等setInterval的1秒后才会有提示
-				this.changeEvent(this.changeText.replace(/x|X/, this.secNum))
-				this.setTimeToStorage()
-				this.timer = setInterval(() => {
-					if (--this.secNum) {
-						// 用当前倒计时的秒数替换提示字符串中的"x"字母
-						this.changeEvent(this.changeText.replace(/x|X/, this.secNum))
-					} else {
-						clearInterval(this.timer)
-						this.timer = null
-						this.changeEvent(this.endText)
-						this.secNum = this.seconds
-						this.$emit('end')
-						this.canGetCode = true
-					}
-				}, 1000)
-			},
-			// 重置，可以让用户再次获取验证码
-			reset() {
-				this.canGetCode = true
-				clearInterval(this.timer)
-				this.secNum = this.seconds
-				this.changeEvent(this.endText)
-			},
-			changeEvent(text) {
-				this.$emit('change', text)
-			},
-			// 保存时间戳，为了防止倒计时尚未结束，H5刷新或者各端的右上角返回上一页再进来
-			setTimeToStorage() {
-				if(!this.keepRunning || !this.timer) return
-				// 记录当前的时间戳，为了下次进入页面，如果还在倒计时内的话，继续倒计时
-				// 倒计时尚未结束，结果大于0；倒计时已经开始，就会小于初始值，如果等于初始值，说明没有开始倒计时，无需处理
-				if(this.secNum > 0 && this.secNum <= this.seconds) {
-					// 获取当前时间戳(+ new Date()为特殊写法)，除以1000变成秒，再去除小数部分
-					let nowTimestamp = Math.floor((+ new Date()) / 1000)
-					// 将本该结束时候的时间戳保存起来 => 当前时间戳 + 剩余的秒数
-					uni.setStorage({
-						key: this.uniqueKey + '_$uCountDownTimestamp',
-						data: nowTimestamp + Number(this.secNum)
-					})
-				}
-			}
-		},
-		// 组件销毁的时候，清除定时器，否则定时器会继续存在，系统不会自动清除
-		beforeDestroy() {
-			this.setTimeToStorage()
-			clearTimeout(this.timer)
-			this.timer = null
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
-</style>

-export default {
-    props: {
-        // 宫格的name
-        name: {
-            type: [String, Number, null],
-            default: uni.$u.props.gridItem.name
-        },
-        // 背景颜色
-        bgColor: {
-            type: String,
-            default: uni.$u.props.gridItem.bgColor
-        }
-    }
-}

-<template>
-	<!-- #ifndef APP-NVUE -->
-	<view
-	    class="u-grid-item"
-	    hover-class="u-grid-item--hover-class"
-	    :hover-stay-time="200"
-	    @tap="clickHandler"
-	    :class="classes"
-	    :style="[itemStyle]"
-	>
-		<slot />
-	</view>
-	<!-- #endif -->
-	<!-- #ifdef APP-NVUE -->
-	<view
-	    class="u-grid-item"
-	    :hover-stay-time="200"
-	    @tap="clickHandler"
-	    :class="classes"
-	    :style="[itemStyle]"
-	>
-		<slot />
-	</view>
-	<!-- #endif -->
-</template>
-
-<script>
-	import props from './props.js';
-	/**
-	 * gridItem 提示
-	 * @description 宫格组件一般用于同时展示多个同类项目的场景，可以给宫格的项目设置徽标组件(badge)，或者图标等，也可以扩展为左右滑动的轮播形式。搭配u-grid使用
-	 * @tutorial https://www.uviewui.com/components/grid.html
-	 * @property {String | Number}	name		宫格的name ( 默认 null )
-	 * @property {String}			bgColor		宫格的背景颜色 （默认 'transparent' ）
-	 * @property {Object}			customStyle	自定义样式，对象形式
-	 * @event {Function} click 点击宫格触发
-	 * @example <u-grid-item></u-grid-item>
-	 */
-	export default {
-		name: "u-grid-item",
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
-		data() {
-			return {
-				parentData: {
-					col: 3, // 父组件划分的宫格数
-					border: true, // 是否显示边框，根据父组件决定
-				},
-				// #ifdef APP-NVUE
-				width: 0, // nvue下才这么计算，vue下放到computed中，否则会因为延时造成闪烁
-				// #endif
-				classes: [], // 类名集合，用于判断是否显示右边和下边框
-			};
-		},
-		mounted() {
-			this.init()
-		},
-		computed: {
-			// #ifndef APP-NVUE
-			// vue下放到computed中，否则会因为延时造成闪烁
-			width() {
-				return 100 / Number(this.parentData.col) + '%'
-			},
-			// #endif
-			itemStyle() {
-				const style = {
-					background: this.bgColor,
-					width: this.width
-				}
-				return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle))
-			}
-		},
-		methods: {
-			init() {
-				// 用于在父组件u-grid的children中被添加入子组件时，
-				// 重新计算item的边框
-				uni.$on('$uGridItem', () => {
-					this.gridItemClasses()
-				})
-				// 父组件的实例
-				this.updateParentData()
-				// #ifdef APP-NVUE
-				// 获取元素该有的长度，nvue下要延时才准确
-				this.$nextTick(function(){
-					this.getItemWidth()
-				})
-				// #endif
-				// 发出事件，通知所有的grid-item都重新计算自己的边框
-				uni.$emit('$uGridItem')
-				this.gridItemClasses()
-			},
-			// 获取父组件的参数
-			updateParentData() {
-				// 此方法写在mixin中
-				this.getParentData('u-grid');
-			},
-			clickHandler() {
-				let name = this.name
-				// 如果没有设置name属性，历遍父组件的children数组，判断当前的元素是否和本实例this相等，找出当前组件的索引
-				const children = this.parent?.children
-				if(children && this.name === null) {
-					name = children.findIndex(child => child === this)
-				}
-				// 调用父组件方法，发出事件
-				this.parent && this.parent.childClick(name)
-				this.$emit('click', name)
-			},
-			async getItemWidth() {
-				// 如果是nvue，不能使用百分比，只能使用固定宽度
-				let width = 0
-				if(this.parent) {
-					// 获取父组件宽度后，除以栅格数，得出每个item的宽度
-					const parentWidth = await this.getParentWidth()
-					width = parentWidth / Number(this.parentData.col) + 'px'
-				}
-				this.width = width
-			},
-			// 获取父元素的尺寸
-			getParentWidth() {
-				// #ifdef APP-NVUE
-				// 返回一个promise，让调用者可以用await同步获取
-				const dom = uni.requireNativePlugin('dom')
-				return new Promise(resolve => {
-					// 调用父组件的ref
-					dom.getComponentRect(this.parent.$refs['u-grid'], res => {
-						resolve(res.size.width)
-					})
-				})
-				// #endif
-			},
-			gridItemClasses() {
-				if(this.parentData.border) {
-					const classes = []
-					this.parent.children.map((child, index) =>{
-						if(this === child) {
-							const len = this.parent.children.length
-							// 贴近右边屏幕边沿的child，并且最后一个（比如只有横向2个的时候），无需右边框
-							if((index + 1) % this.parentData.col !== 0 && index + 1 !== len) {
-								classes.push('u-border-right')
-							}
-							// 总的宫格数量对列数取余的值
-							// 如果取余后，值为0，则意味着要将最后一排的宫格，都不需要下边框
-							const lessNum = len % this.parentData.col === 0 ? this.parentData.col : len % this.parentData.col
-							// 最下面的一排child，无需下边框
-							if(index < len - lessNum) {
-								classes.push('u-border-bottom')
-							}
-						}
-					})
-					// 支付宝，头条小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
-					// #ifdef MP-ALIPAY || MP-TOUTIAO
-					classes = classes.join(' ')
-					// #endif
-					this.classes = classes
-				}
-			}
-		},
-		beforeDestroy() {
-			// 移除事件监听，释放性能
-			uni.$off('$uGridItem')
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
-      $u-grid-item-hover-class-opcatiy:.5 !default;
-      $u-grid-item-margin-top:1rpx !default;
-      $u-grid-item-border-right-width:0.5px !default;
-      $u-grid-item-border-bottom-width:0.5px !default;
-      $u-grid-item-border-right-color:$u-border-color !default;
-      $u-grid-item-border-bottom-color:$u-border-color !default;
-	.u-grid-item {
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		flex-direction: column;
-		/* #ifndef APP-NVUE */
-		box-sizing: border-box;
-		display: flex;
-		/* #endif */
-
-		/* #ifdef MP */
-		position: relative;
-		float: left;
-		/* #endif */
-
-		/* #ifdef MP-WEIXIN */
-		margin-top:$u-grid-item-margin-top;
-		/* #endif */
-
-		&--hover-class {
-			opacity:$u-grid-item-hover-class-opcatiy;
-		}
-	}
-
-	/* #ifdef APP-NVUE */
-	// 由于nvue不支持组件内引入app.vue中再引入的样式，所以需要写在这里
-	.u-border-right {
-		border-right-width:$u-grid-item-border-right-width;
-		border-color: $u-grid-item-border-right-color;
-	}
-
-	.u-border-bottom {
-		border-bottom-width:$u-grid-item-border-bottom-width;
-		border-color:$u-grid-item-border-bottom-color;
-	}
-
-	/* #endif */
-</style>

-export default {
-    props: {
-        // 分成几列
-        col: {
-            type: [String, Number],
-            default: uni.$u.props.grid.col
-        },
-        // 是否显示边框
-        border: {
-            type: Boolean,
-            default: uni.$u.props.grid.border
-        },
-        // 宫格对齐方式，表现为数量少的时候，靠左，居中，还是靠右
-        align: {
-            type: String,
-            default: uni.$u.props.grid.align
-        }
-    }
-}

-<template>
-	<view
-	    class="u-grid"
-		ref='u-grid'
-	    :style="[gridStyle]"
-	>
-		<slot />
-	</view>
-</template>
-
-<script>
-	import props from './props.js';
-	/**
-	 * grid 宫格布局
-	 * @description 宫格组件一般用于同时展示多个同类项目的场景，可以给宫格的项目设置徽标组件(badge)，或者图标等，也可以扩展为左右滑动的轮播形式。
-	 * @tutorial https://www.uviewui.com/components/grid.html
-	 * @property {String | Number}	col			宫格的列数（默认 3 ）
-	 * @property {Boolean}			border		是否显示宫格的边框（默认 false ）
-	 * @property {String}			align		宫格对齐方式，表现为数量少的时候，靠左，居中，还是靠右 （默认 'left' ）
-	 * @property {Object}			customStyle	定义需要用到的外部样式
-	 * @event {Function} click 点击宫格触发
-	 * @example <u-grid :col="3" @click="click"></u-grid>
-	 */
-	export default {
-		name: 'u-grid',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
-		data() {
-			return {
-				index: 0,
-				width: 0
-			}
-		},
-		watch: {
-			// 当父组件需要子组件需要共享的参数发生了变化，手动通知子组件
-			parentData() {
-				if (this.children.length) {
-					this.children.map(child => {
-						// 判断子组件(u-radio)如果有updateParentData方法的话，就就执行(执行的结果是子组件重新从父组件拉取了最新的值)
-						typeof(child.updateParentData) == 'function' && child.updateParentData();
-					})
-				}
-			},
-		},
-		created() {
-			// 如果将children定义在data中，在微信小程序会造成循环引用而报错
-			this.children = []
-		},
-		computed: {
-			// 计算父组件的值是否发生变化
-			parentData() {
-				return [this.hoverClass, this.col, this.size, this.border];
-			},
-			// 宫格对齐方式
-			gridStyle() {
-				let style = {};
-				switch (this.align) {
-					case 'left':
-						style.justifyContent = 'flex-start';
-						break;
-					case 'center':
-						style.justifyContent = 'center';
-						break;
-					case 'right':
-						style.justifyContent = 'flex-end';
-						break;
-					default:
-						style.justifyContent = 'flex-start';
-				};
-				return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle));
-			}
-		},
-		methods: {
-			// 此方法由u-grid-item触发，用于在u-grid发出事件
-			childClick(name) {
-				this.$emit('click', name)
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
-     $u-grid-width:100% !default;
-	.u-grid {
-		/* #ifdef MP */
-		width: $u-grid-width;
-		position: relative;
-		box-sizing: border-box;
-		overflow: hidden;
-		display: block;
-		/* #endif */
-		justify-content: center;
-		@include flex;
-		flex-wrap: wrap;
-		align-items: center;
-	}
-</style>

-export default {
-    props: {
-        // 标题
-        title: {
-            type: [String, Number],
-            default: uni.$u.props.stepsItem.title
-        },
-        // 描述文本
-        desc: {
-            type: [String, Number],
-            default: uni.$u.props.stepsItem.desc
-        },
-        // 图标大小
-        iconSize: {
-            type: [String, Number],
-            default: uni.$u.props.stepsItem.iconSize
-        },
-        // 当前步骤是否处于失败状态
-        error: {
-            type: Boolean,
-            default: uni.$u.props.stepsItem.error
-        }
-    }
-}

-<template>
-	<view class="u-steps-item" ref="u-steps-item" :class="[`u-steps-item--${parentData.direction}`]">
-		<view class="u-steps-item__line" v-if="index + 1 < childLength"
-			:class="[`u-steps-item__line--${parentData.direction}`]" :style="[lineStyle]"></view>
-		<view class="u-steps-item__wrapper"
-			:class="[`u-steps-item__wrapper--${parentData.direction}`, parentData.dot && `u-steps-item__wrapper--${parentData.direction}--dot`]">
-			<slot name="icon">
-				<view class="u-steps-item__wrapper__dot" v-if="parentData.dot" :style="{
-						backgroundColor: statusColor
-					}">
-
-				</view>
-				<view class="u-steps-item__wrapper__icon" v-else-if="parentData.activeIcon || parentData.inactiveIcon">
-					<u-icon :name="index <= parentData.current ? parentData.activeIcon : parentData.inactiveIcon"
-						:size="iconSize"
-						:color="index <= parentData.current ? parentData.activeColor : parentData.inactiveColor">
-					</u-icon>
-				</view>
-				<view v-else :style="{
-						backgroundColor: statusClass === 'process' ? parentData.activeColor : 'transparent',
-						borderColor: statusColor
-					}" class="u-steps-item__wrapper__circle">
-					<text v-if="statusClass === 'process' || statusClass === 'wait'"
-						class="u-steps-item__wrapper__circle__text" :style="{
-							color: index == parentData.current ? '#ffffff' : parentData.inactiveColor
-						}">{{ index + 1}}</text>
-					<u-icon v-else :color="statusClass === 'error' ? 'error' : parentData.activeColor" size="12"
-						:name="statusClass === 'error' ? 'close' : 'checkmark'"></u-icon>
-				</view>
-			</slot>
-		</view>
-		<view class="u-steps-item__content" :class="[`u-steps-item__content--${parentData.direction}`]"
-			:style="[contentStyle]">
-			<u--text :text="title" :type="parentData.current == index ? 'main' : 'content'" lineHeight="20px"
-				:size="parentData.current == index ? 14 : 13"></u--text>
-			<slot name="desc">
-				<u--text :text="desc" type="tips" size="12"></u--text>
-			</slot>
-		</view>
-		<!-- <view
-		    class="u-steps-item__line"
-		    v-if="showLine && parentData.direction === 'column'"
-			:class="[`u-steps-item__line--${parentData.direction}`]"
-		    :style="[lineStyle]"
-		></view> -->
-	</view>
-</template>
-
-<script>
-	import props from './props.js';
-	// #ifdef APP-NVUE
-	const dom = uni.requireNativePlugin('dom')
-	// #endif
-	/**
-	 * StepsItem 步骤条的子组件
-	 * @description 本组件需要和u-steps配合使用
-	 * @tutorial https://uviewui.com/components/steps.html
-	 * @property {String}			title			标题文字
-	 * @property {String}			current			描述文本
-	 * @property {String | Number}	iconSize		图标大小  (默认 17 )
-	 * @property {Boolean}			error			当前步骤是否处于失败状态  (默认 false )
-	 * @example <u-steps current="0"><u-steps-item title="已出库" desc="10:35" ></u-steps-item></u-steps>
-	 */
-	export default {
-		name: 'u-steps-item',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
-		data() {
-			return {
-				index: 0,
-				childLength: 0,
-				showLine: false,
-				size: {
-					height: 0,
-					width: 0
-				},
-				parentData: {
-					direction: 'row',
-					current: 0,
-					activeColor: '',
-					inactiveColor: '',
-					activeIcon: '',
-					inactiveIcon: '',
-					dot: false
-				}
-			}
-		},
-		watch: {
-			'parentData'(newValue, oldValue) {
-			}
-		},
-		created() {
-			this.init()
-		},
-		computed: {
-			lineStyle() {
-				const style = {}
-				if (this.parentData.direction === 'row') {
-					style.width = this.size.width + 'px'
-					style.left = this.size.width / 2 + 'px'
-				} else {
-					style.height = this.size.height + 'px'
-					// style.top = this.size.height / 2 + 'px'
-				}
-				style.backgroundColor = this.parent.children?.[this.index + 1]?.error ? uni.$u.color.error : this.index <
-					this
-					.parentData
-					.current ? this.parentData.activeColor : this.parentData.inactiveColor
-				return style
-			},
-			statusClass() {
-				const {
-					index,
-					error
-				} = this
-				const {
-					current
-				} = this.parentData
-				if (current == index) {
-					return error === true ? 'error' : 'process'
-				} else if (error) {
-					return 'error'
-				} else if (current > index) {
-					return 'finish'
-				} else {
-					return 'wait'
-				}
-			},
-			statusColor() {
-				let color = ''
-				switch (this.statusClass) {
-					case 'finish':
-						color = this.parentData.activeColor
-						break
-					case 'error':
-						color = uni.$u.color.error
-						break
-					case 'process':
-						color = this.parentData.dot ? this.parentData.activeColor : 'transparent'
-						break
-					default:
-						color = this.parentData.inactiveColor
-						break
-				}
-				return color
-			},
-			contentStyle() {
-				const style = {}
-				if (this.parentData.direction === 'column') {
-					style.marginLeft = this.parentData.dot ? '2px' : '6px'
-					style.marginTop = this.parentData.dot ? '0px' : '6px'
-				} else {
-					style.marginTop = this.parentData.dot ? '2px' : '6px'
-					style.marginLeft = this.parentData.dot ? '2px' : '6px'
-				}
-
-				return style
-			}
-		},
-		mounted() {
-			this.parent && this.parent.updateFromChild()
-			uni.$u.sleep().then(() => {
-				this.getStepsItemRect()
-			})
-		},
-		methods: {
-			init() {
-				// 初始化数据
-				this.updateParentData()
-				if (!this.parent) {
-					return uni.$u.error('u-steps-item必须要搭配u-steps组件使用')
-				}
-				this.index = this.parent.children.indexOf(this)
-				this.childLength = this.parent.children.length
-			},
-			updateParentData() {
-				// 此方法在mixin中
-				this.getParentData('u-steps')
-			},
-			// 父组件数据发生变化
-			updateFromParent() {
-				this.init()
-			},
-			// 获取组件的尺寸，用于设置横线的位置
-			getStepsItemRect() {
-				// #ifndef APP-NVUE
-				this.$uGetRect('.u-steps-item').then(size => {
-					this.size = size
-				})
-				// #endif
-
-				// #ifdef APP-NVUE
-				dom.getComponentRect(this.$refs['u-steps-item'], res => {
-					const {
-						size
-					} = res
-					this.size = size
-				})
-				// #endif
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
-
-	.u-steps-item {
-		flex: 1;
-		@include flex;
-
-		&--row {
-			flex-direction: column;
-			align-items: center;
-			position: relative;
-		}
-
-		&--column {
-			position: relative;
-			flex-direction: row;
-			justify-content: flex-start;
-			padding-bottom: 5px;
-		}
-
-		&__wrapper {
-			@include flex;
-			justify-content: center;
-			align-items: center;
-			position: relative;
-			background-color: #fff;
-
-			&--column {
-				width: 20px;
-				height: 32px;
-
-				&--dot {
-					height: 20px;
-					width: 20px;
-				}
-			}
-
-			&--row {
-				width: 32px;
-				height: 20px;
-
-				&--dot {
-					width: 20px;
-					height: 20px;
-				}
-			}
-
-			&__circle {
-				width: 20px;
-				height: 20px;
-				/* #ifndef APP-NVUE */
-				box-sizing: border-box;
-				flex-shrink: 0;
-				/* #endif */
-				border-radius: 100px;
-				border-width: 1px;
-				border-color: $u-tips-color;
-				border-style: solid;
-				@include flex(row);
-				align-items: center;
-				justify-content: center;
-				transition: background-color 0.3s;
-
-				&__text {
-					color: $u-tips-color;
-					font-size: 11px;
-					@include flex(row);
-					align-items: center;
-					justify-content: center;
-					text-align: center;
-					line-height: 11px;
-				}
-			}
-
-			&__dot {
-				width: 10px;
-				height: 10px;
-				border-radius: 100px;
-				background-color: $u-content-color;
-			}
-		}
-
-		&__content {
-			@include flex;
-			flex: 1;
-
-			&--row {
-				flex-direction: column;
-				align-items: center;
-			}
-
-			&--column {
-				flex-direction: column;
-				margin-left: 6px;
-			}
-		}
-
-		&__line {
-			position: absolute;
-			background: $u-tips-color;
-
-			&--row {
-				top: 10px;
-				height: 1px;
-			}
-
-			&--column {
-				width: 1px;
-				left: 10px;
-			}
-		}
-	}
-</style>

-export default {
-    props: {
-        // 排列方向
-        direction: {
-            type: String,
-            default: uni.$u.props.steps.direction
-        },
-        // 设置第几个步骤
-        current: {
-            type: [String, Number],
-            default: uni.$u.props.steps.current
-        },
-        // 激活状态颜色
-        activeColor: {
-            type: String,
-            default: uni.$u.props.steps.activeColor
-        },
-        // 未激活状态颜色
-        inactiveColor: {
-            type: String,
-            default: uni.$u.props.steps.inactiveColor
-        },
-        // 激活状态的图标
-        activeIcon: {
-            type: String,
-            default: uni.$u.props.steps.activeIcon
-        },
-        // 未激活状态图标
-        inactiveIcon: {
-            type: String,
-            default: uni.$u.props.steps.inactiveIcon
-        },
-        // 是否显示点类型
-        dot: {
-            type: Boolean,
-            default: uni.$u.props.steps.dot
-        }
-    }
-}

-<template>
-	<view
-	    class="u-steps"
-	    :class="[`u-steps--${direction}`]"
-	>
-		<slot></slot>
-	</view>
-</template>
-
-<script>
-	import props from './props.js';
-	/**
-	 * Steps 步骤条
-	 * @description 该组件一般用于完成一个任务要分几个步骤，标识目前处于第几步的场景。
-	 * @tutorial https://uviewui.com/components/steps.html
-	 * @property {String}			direction		row-横向，column-竖向 (默认 'row' )
-	 * @property {String | Number}	current			设置当前处于第几步 (默认 0 )
-	 * @property {String}			activeColor		激活状态颜色 (默认 '#3c9cff' )
-	 * @property {String}			inactiveColor	未激活状态颜色 (默认 '#969799' )
-	 * @property {String}			activeIcon		激活状态的图标
-	 * @property {String}			inactiveIcon	未激活状态图标 
-	 * @property {Boolean}			dot				是否显示点类型 (默认 false )
-	 * @example <u-steps current="0"><u-steps-item title="已出库" desc="10:35" ></u-steps-item></u-steps>
-	 */
-	export default {
-		name: 'u-steps',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
-		data() {
-			return {
-			}
-		},
-		watch: {
-			children() {
-				this.updateChildData()
-			},
-			parentData() {
-				this.updateChildData()
-			}
-		},
-		computed: {
-			// 监听参数的变化，通过watch中，手动去更新子组件的数据，否则子组件不会自动变化
-			parentData() {
-				return [this.current, this.direction, this.activeColor, this.inactiveColor, this.activeIcon, this.inactiveIcon, this.dot]
-			}
-		},
-		methods: {
-			// 更新子组件的数据
-			updateChildData() {
-				this.children.map(child => {
-					// 先判断子组件是否存在对应的方法
-					uni.$u.test.func((child || {}).updateFromParent()) && child.updateFromParent()
-				})
-			},
-			// 接受子组件的通知，去修改其他子组件的数据
-			updateFromChild() {
-				this.updateChildData()
-			}
-		},
-		created() {
-			this.children = []
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
-
-	.u-steps {
-		@include flex;
-
-		&--column {
-			flex-direction: column
-		}
-
-		&--row {
-			flex-direction: row;
-			flex: 1;
-		}
-	}
-</style>

-/**
- * 此为wxs模块，只支持APP-VUE，微信和QQ小程序以及H5平台
- * wxs内部不支持es6语法，变量只能使用var定义，无法使用解构，箭头函数等特性
- */
-
-// 开始触摸
-function touchstart(event, ownerInstance) {
-	// 触发事件的组件的ComponentDescriptor实例
-	var instance = event.instance
-	// wxs内的局部变量快照，此快照是属于整个组件的，在touchstart和touchmove事件中都能获取到相同的结果
-	var state = instance.getState()
-	if (state.disable) return
-	var touches = event.touches
-	// 如果进行的是多指触控，不允许进行操作
-	if (touches && touches.length > 1) return
-	// 标识当前为滑动中状态
-	state.moving = true
-	// 记录触摸开始点的坐标值
-	state.startX = touches[0].pageX
-	state.startY = touches[0].pageY
-}
-
-// 触摸滑动
-function touchmove(event, ownerInstance) {
-	// 触发事件的组件的ComponentDescriptor实例
-	var instance = event.instance
-	// wxs内的局部变量快照
-	var state = instance.getState()
-	if (state.disabled || !state.moving) return
-
-	var touches = event.touches
-	var pageX = touches[0].pageX
-	var pageY = touches[0].pageY
-	var moveX = pageX - state.startX
-	var moveY = pageY - state.startY
-	var buttonsWidth = state.buttonsWidth
-
-	// 移动的X轴距离大于Y轴距离，也即终点与起点位置连线，与X轴夹角小于45度时，禁止页面滚动
-	if (Math.abs(moveX) > Math.abs(moveY) || Math.abs(moveX) > state.threshold) {
-		event.preventDefault()
-		event.stopPropagation()
-	}
-	// 如果移动的X轴距离小于Y轴距离，也即终点位置与起点位置连线，与Y轴夹角小于45度时，认为是页面上下滑动，而不是左右滑动单元格
-	if (Math.abs(moveX) < Math.abs(moveY)) return
-
-	// 限制右滑的距离，不允许内容部分往右偏移，右滑会导致X轴偏移值大于0，以此做判断
-	// 此处不能直接return，因为滑动过程中会缺失某些关键点坐标，会导致错乱，最好的办法就是
-	// 在超出后，设置为0
-	if (state.status === 'open') {
-		// 在开启状态下，向左滑动，需忽略
-		if (moveX < 0) moveX = 0
-		// 想要收起菜单，最大能移动的距离为按钮的总宽度
-		if (moveX > buttonsWidth) moveX = buttonsWidth
-		// 如果是已经打开了的状态，向左滑动时，移动收起菜单
-		moveSwipeAction(-buttonsWidth + moveX, instance, ownerInstance)
-	} else {
-		// 关闭状态下，右滑动需忽略
-		if (moveX > 0) moveX = 0
-		// 滑动的距离不允许超过所有按钮的总宽度，此时只能是左滑，最终设置按钮的总宽度，同时为负数
-		if (Math.abs(moveX) > buttonsWidth) moveX = -buttonsWidth
-		// 只要是在滑过程中，就不断移动菜单的内容部分，从而使隐藏的菜单显示出来
-		moveSwipeAction(moveX, instance, ownerInstance)
-	}
-}
-
-// 触摸结束
-function touchend(event, ownerInstance) {
-	// 触发事件的组件的ComponentDescriptor实例
-	var instance = event.instance
-	// wxs内的局部变量快照
-	var state = instance.getState()
-	if (!state.moving || state.disabled) return
-	var touches = event.changedTouches ? event.changedTouches[0] : {}
-	var pageX = touches.pageX
-	var pageY = touches.pageY
-	var moveX = pageX - state.startX
-	if (state.status === 'open') {
-		// 在展开的状态下，继续左滑，无需操作
-		if (moveX < 0) return
-		// 在开启状态下，点击一下内容区域，moveX为0，也即没有进行移动，这时执行收起菜单逻辑
-		if (moveX === 0) {
-			return closeSwipeAction(instance, ownerInstance)
-		}
-		// 在开启状态下，滑动距离小于阈值，则默认为不关闭，同时恢复原来的打开状态
-		if (Math.abs(moveX) < state.threshold) {
-			openSwipeAction(instance, ownerInstance)
-		} else {
-			// 如果滑动距离大于阈值，则执行收起逻辑
-			closeSwipeAction(instance, ownerInstance)
-		}
-	} else {
-		// 在关闭的状态下，右滑，无需操作
-		if (moveX > 0) return
-		// 理由同上
-		if (Math.abs(moveX) < state.threshold) {
-			closeSwipeAction(instance, ownerInstance)
-		} else {
-			openSwipeAction(instance, ownerInstance)
-		}
-	}
-}
-
-// 获取过渡时间
-function getDuration(value) {
-	if (value.toString().indexOf('s') >= 0) return value
-	return value > 30 ? value + 'ms' : value + 's'
-}
-
-// 滑动结束时判断滑动的方向
-function getMoveDirection(instance, ownerInstance) {
-	var state = instance.getState()
-}
-
-// 移动滑动选择器内容区域，同时显示出其隐藏的菜单
-function moveSwipeAction(moveX, instance, ownerInstance) {
-	var state = instance.getState()
-	// 获取所有按钮的实例，需要通过它去设置按钮的位移
-	var buttons = ownerInstance.selectAllComponents('.u-swipe-action-item__right__button')
-	var len = buttons.length
-	var previewButtonsMoveX = 0
-
-	// 设置菜单内容部分的偏移
-	instance.requestAnimationFrame(function() {
-		instance.setStyle({
-			// 设置translateX的值
-			'transition': 'none',
-			transform: 'translateX(' + moveX + 'px)',
-			'-webkit-transform': 'translateX(' + moveX + 'px)'
-		})
-		// 折叠按钮动画
-		for (var i = len - 1; i >= 0; i--) {
-			// 通过比例，得出元素自身该移动的距离
-			var translateX = state.buttons[i].width / state.buttonsWidth * moveX
-			// 最终移动的距离，是通过自身比例算出的距离，再加上在它之前所有按钮移动的距离之和
-			var realTranslateX = translateX + previewButtonsMoveX
-			buttons[i].setStyle({
-				// 在移动期间，不能使用过渡效果，否则会造成卡顿，本质原因是每次移动一点，就要花一定时间去过渡这个过程
-				'transition': 'none',
-				'transform': 'translateX(' + realTranslateX + 'px)',
-				'-webkit-transform': 'translateX(' + realTranslateX + 'px)'
-			})
-			// 记录本按钮之前的所有按钮的移动距离之和
-			previewButtonsMoveX += translateX
-		}
-	})
-}
-
-// 一次性展开滑动菜单
-function openSwipeAction(instance, ownerInstance) {
-	var state = instance.getState()
-	// 获取所有按钮的实例，需要通过它去设置按钮的位移
-	var buttons = ownerInstance.selectAllComponents('.u-swipe-action-item__right__button')
-	var len = buttons.length
-	// 处理duration单位问题
-	const duration = getDuration(state.duration)
-	// 展开过程中，是向左移动，所以X的偏移应该为负值
-	var buttonsWidth = -state.buttonsWidth
-	var previewButtonsMoveX = 0
-	instance.requestAnimationFrame(function() {
-		// 设置菜单主体内容
-		instance.setStyle({
-			'transition': 'transform ' + duration,
-			'transform': 'translateX(' + buttonsWidth + 'px)',
-			'-webkit-transform': 'translateX(' + buttonsWidth + 'px)',
-		})
-		// 设置各个隐藏的按钮为展开的状态
-		for (var i = len - 1; i >= 0; i--) {
-			// 通过比例，得出元素自身该移动的距离
-			var translateX = state.buttons[i].width / state.buttonsWidth * buttonsWidth
-			// 最终移动的距离，是通过自身比例算出的距离，再加上在它之前所有按钮移动的距离之和
-			var realTranslateX = translateX + previewButtonsMoveX
-			buttons[i].setStyle({
-				// 在移动期间，需要加上动画效果
-				'transition': 'transform ' + duration,
-				'transform': 'translateX(' + realTranslateX + 'px)',
-				'-webkit-transform': 'translateX(' + realTranslateX + 'px)'
-			})
-			// 记录本按钮之前的所有按钮的移动距离之和
-			previewButtonsMoveX += translateX
-		}
-	})
-	setStatus('open', instance)
-}
-
-// 标记菜单的当前状态，open-已经打开，close-已经关闭
-function setStatus(status, instance) {
-	var state = instance.getState()
-	state.status = status
-}
-
-// 一次性收起滑动菜单
-function closeSwipeAction(instance, ownerInstance) {
-	var state = instance.getState()
-	// 获取所有按钮的实例，需要通过它去设置按钮的位移
-	var buttons = ownerInstance.selectAllComponents('.u-swipe-action-item__right__button')
-	var len = buttons.length
-	// 处理duration单位问题
-	const duration = getDuration(state.duration)
-	instance.requestAnimationFrame(function() {
-		// 设置菜单主体内容
-		instance.setStyle({
-			'transition': 'transform ' + duration,
-			'transform': 'translateX(0px)',
-			'-webkit-transform': 'translateX(0px)'
-		})
-		// 设置各个隐藏的按钮为收起的状态
-		for (var i = len - 1; i >= 0; i--) {
-			buttons[i].setStyle({
-				'transition': 'transform ' + duration,
-				'transform': 'translateX(0px)',
-				'-webkit-transform': 'translateX(0px)'
-			})
-		}
-	})
-	setStatus('close', instance)
-}
-
-// show的状态发生变化
-function showChange(newValue, oldValue, ownerInstance, instance) {
-	var state = instance.getState()
-	if (state.disabled) return
-	// 打开或关闭单元格
-	if (newValue) {
-		openSwipeAction(instance, ownerInstance)
-	} else {
-		closeSwipeAction(instance, ownerInstance)
-	}
-}
-
-// 菜单尺寸发生变化
-function sizeChange(newValue, oldValue, ownerInstance, instance) {
-	// wxs内的局部变量快照
-	var state = instance.getState()
-	state.disabled = newValue.disabled
-	state.duration = newValue.duration
-	state.show = newValue.show
-	state.threshold = newValue.threshold
-	state.buttons = newValue.buttons
-
-	var len = state.buttons.length
-	if (len) {
-		var buttonsWidth = 0
-		var buttons = newValue.buttons
-		for (var i = 0; i < len; i++) {
-			buttonsWidth += buttons[i].width
-		}
-	}
-	state.buttonsWidth = buttonsWidth
-}
-
-module.exports = {
-	touchstart: touchstart,
-	touchmove: touchmove,
-	touchend: touchend,
-	sizeChange: sizeChange
-}

-/**
- * 此为wxs模块，只支持APP-VUE，微信和QQ小程序以及H5平台
- * wxs内部不支持es6语法，变量只能使用var定义，无法使用解构，箭头函数等特性
- */
-
-// 开始触摸
-function touchstart(event, ownerInstance) {
-	// 触发事件的组件的ComponentDescriptor实例
-	var instance = event.instance
-	// wxs内的局部变量快照，此快照是属于整个组件的，在touchstart和touchmove事件中都能获取到相同的结果
-	var state = instance.getState()
-	if (state.disabled) return
-	var touches = event.touches
-	// 如果进行的是多指触控，不允许进行操作
-	if (touches && touches.length > 1) return
-	// 标识当前为滑动中状态
-	state.moving = true
-	// 记录触摸开始点的坐标值
-	state.startX = touches[0].pageX
-	state.startY = touches[0].pageY
-	
-	ownerInstance.callMethod('closeOther')
-}
-
-// 触摸滑动
-function touchmove(event, ownerInstance) {
-	// 触发事件的组件的ComponentDescriptor实例
-	var instance = event.instance
-	// wxs内的局部变量快照
-	var state = instance.getState()
-	if (state.disabled || !state.moving) return
-	var touches = event.touches
-	var pageX = touches[0].pageX
-	var pageY = touches[0].pageY
-	var moveX = pageX - state.startX
-	var moveY = pageY - state.startY
-	var buttonsWidth = state.buttonsWidth
-
-	// 移动的X轴距离大于Y轴距离，也即终点与起点位置连线，与X轴夹角小于45度时，禁止页面滚动
-	if (Math.abs(moveX) > Math.abs(moveY) || Math.abs(moveX) > state.threshold) {
-		event.preventDefault && event.preventDefault()
-		event.stopPropagation && event.stopPropagation()
-	}
-	// 如果移动的X轴距离小于Y轴距离，也即终点位置与起点位置连线，与Y轴夹角小于45度时，认为是页面上下滑动，而不是左右滑动单元格
-	if (Math.abs(moveX) < Math.abs(moveY)) return
-
-	// 限制右滑的距离，不允许内容部分往右偏移，右滑会导致X轴偏移值大于0，以此做判断
-	// 此处不能直接return，因为滑动过程中会缺失某些关键点坐标，会导致错乱，最好的办法就是
-	// 在超出后，设置为0
-	if (state.status === 'open') {
-		// 在开启状态下，向左滑动，需忽略
-		if (moveX < 0) moveX = 0
-		// 想要收起菜单，最大能移动的距离为按钮的总宽度
-		if (moveX > buttonsWidth) moveX = buttonsWidth
-		// 如果是已经打开了的状态，向左滑动时，移动收起菜单
-		moveSwipeAction(-buttonsWidth + moveX, instance, ownerInstance)
-	} else {
-		// 关闭状态下，右滑动需忽略
-		if (moveX > 0) moveX = 0
-		// 滑动的距离不允许超过所有按钮的总宽度，此时只能是左滑，最终设置按钮的总宽度，同时为负数
-		if (Math.abs(moveX) > buttonsWidth) moveX = -buttonsWidth
-		// 只要是在滑过程中，就不断移动单元格内容部分，从而使隐藏的菜单显示出来
-		moveSwipeAction(moveX, instance, ownerInstance)
-	}
-}
-
-// 触摸结束
-function touchend(event, ownerInstance) {
-	// 触发事件的组件的ComponentDescriptor实例
-	var instance = event.instance
-	// wxs内的局部变量快照
-	var state = instance.getState()
-	if (!state.moving || state.disabled) return
-	var touches = event.changedTouches ? event.changedTouches[0] : {}
-	var pageX = touches.pageX
-	var pageY = touches.pageY
-	var moveX = pageX - state.startX
-	if (state.status === 'open') {
-		// 在展开的状态下，继续左滑，无需操作
-		if (moveX < 0) return
-		// 在开启状态下，点击一下内容区域，moveX为0，也即没有进行移动，这时执行收起菜单逻辑
-		if (moveX === 0) {
-			return closeSwipeAction(instance, ownerInstance)
-		}
-		// 在开启状态下，滑动距离小于阈值，则默认为不关闭，同时恢复原来的打开状态
-		if (Math.abs(moveX) < state.threshold) {
-			openSwipeAction(instance, ownerInstance)
-		} else {
-			// 如果滑动距离大于阈值，则执行收起逻辑
-			closeSwipeAction(instance, ownerInstance)
-		}
-	} else {
-		// 在关闭的状态下，右滑，无需操作
-		if (moveX > 0) return
-		// 理由同上
-		if (Math.abs(moveX) < state.threshold) {
-			closeSwipeAction(instance, ownerInstance)
-		} else {
-			openSwipeAction(instance, ownerInstance)
-		}
-	}
-}
-
-// 获取过渡时间
-function getDuration(value) {
-	if (value.toString().indexOf('s') >= 0) return value
-	return value > 30 ? value + 'ms' : value + 's'
-}
-
-// 滑动结束时判断滑动的方向
-function getMoveDirection(instance, ownerInstance) {
-	var state = instance.getState()
-}
-
-// 移动滑动选择器内容区域，同时显示出其隐藏的菜单
-function moveSwipeAction(moveX, instance, ownerInstance) {
-	var state = instance.getState()
-	// 获取所有按钮的实例，需要通过它去设置按钮的位移
-	var buttons = ownerInstance.selectAllComponents('.u-swipe-action-item__right__button')
-
-	// 设置菜单内容部分的偏移
-	instance.requestAnimationFrame(function() {
-		instance.setStyle({
-			// 设置translateX的值
-			'transition': 'none',
-			transform: 'translateX(' + moveX + 'px)',
-			'-webkit-transform': 'translateX(' + moveX + 'px)'
-		})
-	})
-}
-
-// 一次性展开滑动菜单
-function openSwipeAction(instance, ownerInstance) {
-	var state = instance.getState()
-	// 获取所有按钮的实例，需要通过它去设置按钮的位移
-	var buttons = ownerInstance.selectAllComponents('.u-swipe-action-item__right__button')
-	// 处理duration单位问题
-	var duration = getDuration(state.duration)
-	// 展开过程中，是向左移动，所以X的偏移应该为负值
-	var buttonsWidth = -state.buttonsWidth
-	instance.requestAnimationFrame(function() {
-		// 设置菜单主体内容
-		instance.setStyle({
-			'transition': 'transform ' + duration,
-			'transform': 'translateX(' + buttonsWidth + 'px)',
-			'-webkit-transform': 'translateX(' + buttonsWidth + 'px)',
-		})
-	})
-	setStatus('open', instance, ownerInstance)
-}
-
-// 标记菜单的当前状态，open-已经打开，close-已经关闭
-function setStatus(status, instance, ownerInstance) {
-	var state = instance.getState()
-	state.status = status
-	ownerInstance.callMethod('setState', status)
-}
-
-// 一次性收起滑动菜单
-function closeSwipeAction(instance, ownerInstance) {
-	var state = instance.getState()
-	// 获取所有按钮的实例，需要通过它去设置按钮的位移
-	var buttons = ownerInstance.selectAllComponents('.u-swipe-action-item__right__button')
-	var len = buttons.length
-	// 处理duration单位问题
-	var duration = getDuration(state.duration)
-	instance.requestAnimationFrame(function() {
-		// 设置菜单主体内容
-		instance.setStyle({
-			'transition': 'transform ' + duration,
-			'transform': 'translateX(0px)',
-			'-webkit-transform': 'translateX(0px)'
-		})
-		// 设置各个隐藏的按钮为收起的状态
-		for (var i = len - 1; i >= 0; i--) {
-			buttons[i].setStyle({
-				'transition': 'transform ' + duration,
-				'transform': 'translateX(0px)',
-				'-webkit-transform': 'translateX(0px)'
-			})
-		}
-	})
-	setStatus('close', instance, ownerInstance)
-}
-
-// status的状态发生变化
-function statusChange(newValue, oldValue, ownerInstance, instance) {
-	var state = instance.getState()
-	if (state.disabled) return
-	// 打开或关闭单元格
-	if (newValue === 'close' && state.status === 'open') {
-		closeSwipeAction(instance, ownerInstance)
-	} else if(newValue === 'open' && state.status === 'close') {
-		openSwipeAction(instance, ownerInstance)
-	}
-}
-
-// 菜单尺寸发生变化
-function sizeChange(newValue, oldValue, ownerInstance, instance) {
-	// wxs内的局部变量快照
-	var state = instance.getState()
-	state.disabled = newValue.disabled
-	state.duration = newValue.duration
-	state.show = newValue.show
-	state.threshold = newValue.threshold
-	state.buttons = newValue.buttons
-
-	if (state.buttons) {
-		var len = state.buttons.length
-		var buttonsWidth = 0
-		var buttons = newValue.buttons
-		for (var i = 0; i < len; i++) {
-			buttonsWidth += buttons[i].width
-		}
-	}
-	state.buttonsWidth = buttonsWidth
-}
-
-module.exports = {
-	touchstart: touchstart,
-	touchmove: touchmove,
-	touchend: touchend,
-	sizeChange: sizeChange,
-	statusChange: statusChange
-}