完善

wx/App.vue

@@ -1,7 +1,7 @@
 <script>
 export default {
 	onLaunch: function() {
-		console.log('App Launch');
+		uni.clearStorageSync();
 	},
 	onShow: function() {
 		console.log('App Show');

wx/colorui/components/cu-custom.vue

@@ -1,14 +1,12 @@
 <template>
 	<view>
-		<view class="cu-custom" :style="[{height:CustomBar + 'px'}]">
-			<view class="cu-bar fixed" :style="style" :class="[bgImage!=''?'none-bg text-white bg-img':'',bgColor]">
+		<view class="cu-custom" :style="[{ height: CustomBar + 'px' }]">
+			<view class="cu-bar fixed" :style="style" :class="[bgImage != '' ? 'none-bg text-white bg-img' : '', bgColor]">
 				<view class="action" @tap="BackPage" v-if="isBack">
 					<text class="cuIcon-back"></text>
 					<slot name="backText"></slot>
 				</view>
-				<view class="content" :style="[{top:StatusBar + 'px'}]">
-					<slot name="content"></slot>
-				</view>
+				<view class="content" :style="[{ top: StatusBar + 'px' }]"><slot name="content"></slot></view>
 				<slot name="right"></slot>
 			</view>
 		</view>
@@ -16,61 +14,62 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				StatusBar: this.StatusBar,
-				CustomBar: this.CustomBar
-			};
-		},
-		name: 'cu-custom',
-		computed: {
-			style() {
-				var StatusBar= this.StatusBar;
-				var CustomBar= this.CustomBar;
-				var bgImage = this.bgImage;
-				var style = `height:${CustomBar}px;padding-top:${StatusBar}px;`;
-				if (this.bgImage) {
-					style = `${style}background-image:url(${bgImage});`;
-				}
-				return style
+export default {
+	data() {
+		return {
+			StatusBar: this.StatusBar,
+			CustomBar: this.CustomBar
+		};
+	},
+	name: 'cu-custom',
+	computed: {
+		style() {
+			var StatusBar = this.StatusBar;
+			var CustomBar = this.CustomBar;
+			var bgImage = this.bgImage;
+			var style = `height:${CustomBar}px;padding-top:${StatusBar}px;`;
+			if (this.bgImage) {
+				style = `${style}background-image:url(${bgImage});`;
 			}
+			return style;
+		}
+	},
+	created() {
+		this.StatusBar = this.$global.systemInfo.StatusBar;
+		this.CustomBar = this.$global.systemInfo.CustomBar;
+	},
+	props: {
+		bgColor: {
+			type: String,
+			default: ''
 		},
-		created(){
-			this.StatusBar= this.$global.systemInfo.StatusBar;
-			this.CustomBar= this.$global.systemInfo.CustomBar;
-		},
-		props: {
-			bgColor: {
-				type: String,
-				default: ''
-			},
-			isBack: {
-				type: [Boolean, String],
-				default: false
-			},
-			bgImage: {
-				type: String,
-				default: ''
-			},
+		isBack: {
+			type: [Boolean, String],
+			default: false
 		},
-		methods: {
-			BackPage() {
-				if (getCurrentPages().length < 2 && 'undefined' !== typeof __wxConfig) {
-					let url = '/' + __wxConfig.pages[0]
-					return uni.redirectTo({url})
-				}
-				uni.navigateBack({
-					delta: 1
-				});
+		bgImage: {
+			type: String,
+			default: ''
+		}
+	},
+	methods: {
+		BackPage() {
+			if (getCurrentPages().length < 2 && 'undefined' !== typeof __wxConfig) {
+				let url = '/' + __wxConfig.pages[0];
+				return uni.redirectTo({ url });
 			}
+			uni.navigateBack({
+				delta: 1
+			});
 		}
 	}
+};
 </script>
 
 <style>
-	/* 自定义 */
- .header-blue{
- 	background-color: #018bed;
- }
+/* 自定义 */
+.header-blue {
+	background-color: #018bed;
+	color: #fff;
+}
 </style>

wx/colorui/components/cu-login-userinfo.vue

@@ -4,7 +4,7 @@
 			<view class="image">
 				<image :src="userImage" style="width: 100%;height: 100%;"  mode="aspectFill" />
 			</view>
-			<view  style="height: 100rpx;" class="flex align-center justify-center">{{userName}}</view>
+			<view  style="height: 80rpx;" class="flex text-bold align-center justify-center">{{userName}}</view>
 		</view>
 	</view>
 </template>
@@ -40,7 +40,7 @@ $blue: #018bed;
 		width: 300rpx;
 		height:250rpx;
 		top: 0rpx;left: calc(50% - 150rpx);
-		z-index: 9999;
+		z-index: 99;
 		.image{
 			width: 150rpx;height: 150rpx;
 			margin: 0 auto;
@@ -68,7 +68,7 @@ $blue: #018bed;
 		background-color: #fff;
 		border-radius: 20rpx;
 		box-shadow: 0 0 10rpx #999;
-		z-index: 998;
+		z-index: 98;
 	}
 }
 </style>

wx/manifest.json

@@ -50,9 +50,10 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx9bf5de3fd1a15538",
+        "appid" : "wx99bd3af055be9f6d",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "postcss" : true
         },
         "usingComponents" : true
     },

wx/pages.json

@@ -3,7 +3,9 @@
 		{
 			"path": "pages/login/index",
 			"style": {
-
+				"usingComponents":{
+						"van-action-sheet": "/wxcomponents/vant/dist/action-sheet/index"
+				}
 			}
 		},
 		{
@@ -15,9 +17,11 @@
 		{
 			"path": "pages/information/index",
 			"style": {
+				 "onReachBottomDistance":300,
 				"usingComponents": {
 					"van-empty": "/wxcomponents/vant/dist/empty/index",
 					"van-dialog": "/wxcomponents/vant/dist/dialog/index"
+					 
 				}
 			}
 		},
@@ -35,7 +39,10 @@
 		{
 			"path": "pages/status/index",
 			"style": {
-                
+               "onReachBottomDistance":300,
+			   "usingComponents":{
+				   "van-empty": "/wxcomponents/vant/dist/empty/index"
+			   }
 			}
 		}
 	],
@@ -48,7 +55,7 @@
 		"backgroundColor": "#F8F8F8",
 		"navigationBarTextStyle": "white",
 		"navigationStyle": "custom",
-		"usingComponents":{
+		"usingComponents": {
 			"van-icon": "/wxcomponents/vant/dist/icon/index"
 		}
 	}

wx/pages/binding/index.vue

@@ -1,7 +1,9 @@
 <template>
 	<view class="binding">
 		<!-- header -->
-		<cu-custom bgColor="bg-gradual-blue" isBack><view slot="content">设备绑定</view></cu-custom>
+		<cu-custom bgColor="bg-gradual-blue" isBack>
+			<view slot="content">{{ id ? '设备换绑' : '设备绑定' }}</view>
+		</cu-custom>
 		<!-- section -->
 		<van-cell-group>
 			<van-field label="姓名" :error-message="err.name" @change="onChange($event, 'name')" :value="value.name" required placeholder="请输入用户名" />
@@ -18,7 +20,7 @@
 				placeholder="请输入短信验证码"
 				use-button-slot
 			>
-				<van-button @click="sendfunc" :disabled="time" slot="button" size="small" type="primary">{{time ? time+"s" : "发送验证码"}}</van-button>
+				<van-button @click="sendfunc" :disabled="time" slot="button" size="small" type="primary">{{ time ? time + 's' : '获取验证码' }}</van-button>
 			</van-field>
 			<van-field :error-message="err.car" @change="onChange($event, 'car')" label="车型" :value="value.car" required placeholder="请输入车型" />
 			<van-field label="车牌号码" @change="onChange($event, 'code')" :value="value.code" :error-message="err.code" required placeholder="请输入车牌号码" />
@@ -35,6 +37,7 @@ import Dialog from '@/wxcomponents/vant/dist/dialog/dialog';
 export default {
 	data() {
 		return {
+			id: 0,
 			value: {
 				name: '',
 				tel: '',
@@ -43,42 +46,69 @@ export default {
 				code: ''
 			},
 			err: {
-			name: '',
-			tel: '',
-			yan: '',
-			car: '',
-			code: ''
+				name: '',
+				tel: '',
+				yan: '',
+				car: '',
+				code: ''
 			},
-			yan: true,
-			timer:null,
-			time:0
+			yan: false,
+			timer: null,
+			time: 0
+		};
+	},
+	onLoad(options) {
+		if (options.hasOwnProperty('value')) {
+			options.value = JSON.parse(options.value);
+			this.id = options.value.id;
+			// name, tel, number: code, model: car,vcode:yan
+			this.value = {
+				name: options.value.name,
+				tel: options.value.tel,
+				code: options.value.number,
+				car: options.value.model
+			};
+			var telReg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+			this.yan = this.$store.state.userInfo.tel !== options.value.tel && telReg.test(options.value.tel) ? true : false;
 		}
+		if (this.id == 0) this.value.tel = this.$store.state.userInfo.tel;
 	},
-	onLoad() {},
 	beforeDestroy() {
 		clearInterval(this.timer);
 	},
 	methods: {
 		// 请求验证码
-		sendfunc(){
-		this.time=60;
-		clearInterval(this.timer)
-          this.timer=setInterval(()=>{
-			  this.time= this.time-1;
-			  if(this.time<=0) clearInterval(this.timer);
-		  },1000)
+		async sendfunc() {
+			var res = await this.$global.request({
+				method: 'get',
+				header: {
+					'Content-Type': 'application/x-www-form-urlencoded',
+					Authorization: uni.getStorageSync('token')
+				},
+				url: '/customer/vehicle/vcode/send/',
+				data: { tel: this.value.tel, appid: this.$store.state.userInfo.appid }
+			});
+			this.time = 60;
+			clearInterval(this.timer);
+			this.timer = setInterval(() => {
+				this.time = this.time - 1;
+				if (this.time <= 0) clearInterval(this.timer);
+			}, 1000);
 		},
 		// 双向绑定
-		onChange(e,name){
-		  var value = JSON.parse(JSON.stringify(this.value));
-		  value[name]=e.detail;
-		  this.value=value;
+		onChange(e, name) {
+			var value = JSON.parse(JSON.stringify(this.value));
+			value[name] = e.detail;
+			var telReg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+			if (name == 'tel') {
+				this.yan = this.$store.state.userInfo.tel !== e.detail && telReg.test(value.tel) ? true : false;
+			}
+			this.value = value;
 		},
 		// 验证
 		yanfunc() {
 			var value = JSON.parse(JSON.stringify(this.value));
 			var err = JSON.parse(JSON.stringify(this.err));
-			console.log(value);
 			// 去空格 并且 清空错误集
 			Object.keys(value).forEach(item => {
 				value[item] = value[item].trim();
@@ -100,10 +130,36 @@ export default {
 			return Object.keys(err).some(item => err[item]);
 		},
 		// 提交
-		onClick() {
-			if (this.yanfunc()) {
-				Dialog.alert({ message: '请检查所填数据!' }).then(() => {});
-				return false;
+		async onClick() {
+			try {
+				if (this.yanfunc()) {
+					Dialog.alert({ message: '请检查所填数据!' }).then(() => {});
+					return false;
+				}
+				var { name, tel, car, code, yan } = this.value;
+				var res = await this.$global.request({
+					method: this.id ? 'put' : 'post',
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded',
+						Authorization: uni.getStorageSync('token')
+					},
+					url: this.id ? `/customer/vehicle/${this.id}/` : '/customer/vehicle/',
+					data: { name, tel, number: code, model: car, vcode: yan }
+				});
+				uni.showToast({
+					icon: 'none',
+					title: '成功绑定',
+					success() {
+						uni.navigateBack({
+							delta: 1
+						});
+					}
+				});
+			} catch (err) {
+				wx.showToast({
+					icon: 'none',
+					title: err
+				});
 			}
 		}
 	}

wx/pages/index/index.vue

@@ -1,25 +0,0 @@
-<template>
-	<view class="index">
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				title: 'Hello'
-			}
-		},
-		onLoad() {
-
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	
-</style>

wx/pages/information/index.vue

@@ -6,10 +6,10 @@
 		<view v-for="(item, index) in value.value" :key="index" class="bg-white  padding-top-sm radius margin-lr margin-top">
 			<view class="padding-sm">
 				<view class="padding-bottom-sm text-black text-bold ">{{ item.name }}：{{ item.tel }}</view>
-				<view class="padding-bottom-sm text-black text-bold ">车型：{{ item.car }}</view>
-				<view class="text-black text-bold ">车牌号：{{ item.code }}</view>
+				<view class="padding-bottom-sm text-black text-bold ">车型：{{ item.model }}</view>
+				<view class="text-black text-bold ">车牌号：{{ item.number }}</view>
 			</view>
-			<button style="border-radius: 0 0 6rpx 6rpx;" @click="onClick(item)"  class="cu-btn block bg-green  padding-tb-sm">换绑</button>
+			<button style="border-radius: 0 0 6rpx 6rpx;" @click="onClick(item)" class="cu-btn block bg-green  padding-tb-sm">换绑</button>
 		</view>
 		<van-empty v-if="value.value.length == 0 && value.no_more" description="暂无设备" />
 		<view v-else :class="!value.no_more && value.pageCount <= value.totalPage ? 'cu-load bg-grey loading margin-top' : 'cu-load bg-grey over margin-top'"></view>
@@ -26,9 +26,8 @@
 				<view class="action text-gray"></view>
 			</view>
 		</view>
-	    <!-- 功能工具 -->
+		<!-- 功能工具 -->
 		<van-dialog id="van-dialog" />
-		
 	</view>
 </template>
 
@@ -41,48 +40,77 @@ export default {
 				no_more: false, //没有更多
 				pageCount: 1,
 				totalPage: 1,
-				value: [
-					{
-						name: '姓名',
-						tel: '电话',
-						car: '车型',
-						code: '车牌号'
-					},
-					{
-						name: '姓名',
-						tel: '电话',
-						car: '车型',
-						code: '车牌号'
-					}
-				]
+				value: []
 			}
 		};
 	},
-	onLoad() {},
+	onShow() {
+		this.value = {
+			no_more: false, //没有更多
+			pageCount: 1,
+			totalPage: 1,
+			value: []
+		};
+		this.request();
+	},
+	// 页面上拉触底事件
+	onReachBottom: function() {
+		this.request();
+	},
 	methods: {
+		// 请求
+		async request() {
+			var { pageCount, totalPage, no_more, value } = JSON.parse(JSON.stringify(this.value));
+			if (pageCount > totalPage) return false;
+			var res = await this.$global.request({
+				url: '/customer/vehicle/',
+				method: 'get',
+				header: {
+					'Content-Type': 'application/x-www-form-urlencoded',
+					Authorization: uni.getStorageSync('token')
+				},
+				data: { page: pageCount, limit: 20 }
+			});
+			pageCount++;
+			totalPage = res.totalPage;
+			if (pageCount > totalPage) no_more = true;
+			value = value.concat(res.data);
+			this.value = { pageCount, totalPage, no_more, value };
+		},
+
 		// 换绑
-		onClick(item){
-			Dialog.confirm({title:"提示",message:"确定换绑该设备？"}).then(()=>console.log(item)).catch(()=>false)
+		onClick(item) {
+			Dialog.confirm({ title: '提示', message: '确定换绑该设备？' })
+				.then(() => this.vehicleChange(item))
+				.catch(() => false);
+		},
+		// 换绑请求
+		async vehicleChange(item) {
+			uni.navigateTo({
+				url: `/pages/binding/index?value=${JSON.stringify(item)}`
+			});
 		},
 		// 添加设备
-		addClick(){
+		addClick() {
 			uni.navigateTo({
-				url:"/pages/binding/index"
-			})
+				url: '/pages/binding/index'
+			});
 		}
 	}
 };
 </script>
 
 <style lang="scss" scoped>
-	.information{
-		.footer{
-			height: calc(150rpx + env(safe-area-inset-bottom));
-			.footer-concent{
-				position: fixed;
-				z-index: 9999;
-				bottom: 0;left: 0;width: 100%;
-			}
+.information {
+	.footer {
+		height: calc(150rpx + env(safe-area-inset-bottom));
+		.footer-concent {
+			position: fixed;
+			z-index: 9999;
+			bottom: 0;
+			left: 0;
+			width: 100%;
 		}
 	}
+}
 </style>

wx/pages/login/index.vue

@@ -1,41 +1,203 @@
 <template>
+	<!-- wx9bf5de3fd1a15538 -->
+	<!-- wx99bd3af055be9f6d -->
 	<view class="login">
+		<!-- 头部功能组件 -->
+		<cu-loadding :show="showloading" />
 		<!-- header -->
-		<view class="header">
-			<cu-custom bgColor="header-blue" />
-			<cu-login-userinfo />
+		<view @click="userfunc" class="header">
+			<cu-custom bgColor="header-blue"><view v-if="show" slot="content">设置</view></cu-custom>
+			<cu-login-userinfo :userImage="userinfo.face" :userName="userinfo.name" />
 		</view>
 		<!-- section -->
 		<view class="bg-white">
 			<view class="cu-list menu card-menu shadow-lg radius">
-				<view @click="navfunc('/pages/information/index')" class="cu-item arrow">
-					<view class="content flex align-center"><van-icon name="info-o" /><text class="margin-left-sm">设备信息</text></view>
+				<view @click="navfunc('/pages/information/index', true)" class="cu-item arrow">
+					<view class="content flex align-center">
+						<van-icon name="info-o" />
+						<text class="margin-left-sm">设备信息</text>
+					</view>
 				</view>
-				<view @click="navfunc('/pages/status/index')" class="cu-item arrow">
-					<view class="content flex align-center"><van-icon name="hotel-o" /><text class="margin-left-sm">设备状态</text></view>
+				<view @click="navfunc('/pages/status/index', true)" class="cu-item arrow">
+					<view class="content flex align-center">
+						<van-icon name="hotel-o" />
+						<text class="margin-left-sm">设备状态</text>
+					</view>
 				</view>
 			</view>
 		</view>
 		<view class="bg-white margin-top">
-			<view class="cu-list menu card-menu margin-bottom-xl shadow-lg radius">
+			<view class="cu-list menu card-menu  shadow-lg radius">
 				<view @click="navfunc('/pages/privacy/index')" class="cu-item arrow ">
-					<view class="content flex align-center"><van-icon  name="shield-o" /><text class="margin-left-sm">隐私声明</text></view>
+					<view class="content flex align-center">
+						<van-icon name="shield-o" />
+						<text class="margin-left-sm">隐私声明</text>
+					</view>
+				</view>
+				<view @click="show = true" class="cu-item arrow ">
+					<view class="content flex align-center">
+						<van-icon name="setting-o" />
+						<text class="margin-left-sm">设置</text>
+					</view>
 				</view>
 			</view>
 		</view>
+		<!-- footer -->
+		<!-- 功能栏 -->
+		<van-action-sheet :show="show" :actions="actions" @close="show = false" @select="onSelect" @getphonenumber="onGetUserInfo" />
 	</view>
 </template>
 
 <script>
 export default {
 	data() {
-		return {};
+		return {
+			showloading: true, //加载
+			show: false, //设置
+			actions: [],
+			userinfo: {
+				face: '',
+				name: ''
+			}
+		};
+	},
+	onLoad() {
+		this.initRequest();
 	},
-	onLoad() {},
 	methods: {
+		// 报错
+		showErr(content) {
+			content = JSON.stringify(content) === '{}' ? '未知错误' : content;
+			uni.showModal({
+				content,
+				showCancel: false,
+				success: res => console.log(res)
+			});
+		},
+		// 进入页面请求
+		async initRequest() {
+			try {
+				var { appid, code } = await this.codeAppid();
+				// codeSession
+				var res = await this.$global.request({
+					url: '/customer/code2Session/',
+					method: 'post',
+					data: {
+						code,
+						appid
+					}
+				});
+				if (res.data.token) uni.setStorageSync('token', 'JWT ' + res.data.token);
+				this.$store.commit('userInfo', { appid, code, ...res.data });
+				// 设置
+				this.changeUser();
+			} catch (err) {
+				console.log(err);
+				this.showErr(err);
+			} finally {
+				this.showloading = false;
+			}
+		},
+		// 获取 code appid
+		codeAppid() {
+			return new Promise((resolve, reject) => {
+				const appid = uni.getAccountInfoSync().miniProgram.appId;
+				uni.login({ success, fail: err => reject(err) });
+				function success(res) {
+					var { code } = res;
+					resolve({ code, appid });
+				}
+			});
+		},
+		// 头像点击事件
+		userfunc() {
+			if (!uni.getStorageSync('token')) this.show = true;
+		},
+		// 更新用户显示资料
+		changeUser() {
+			this.userinfo = {
+				face: this.$store.state.userInfo.face || 'https://img.yzcdn.cn/vant/cat.jpeg',
+				name: this.$store.state.userInfo.name || '昵称'
+			};
+			this.actions = [
+				{ name: '微信快捷登录', color: uni.getStorageSync('token') ? '#666666' : '#39b54a', disabled: uni.getStorageSync('token'), openType: 'getPhoneNumber' },
+				{ name: '更新资料', disabled: !uni.getStorageSync('token') }
+			];
+		},
+		// 微信快捷登录
+		async onGetUserInfo(e) {
+			try {
+				var { encryptedData, iv } = e.detail;
+				var { openid, appid } = this.$store.state.userInfo;
+				var res = await this.$global.request({ url: '/customer/wxbind/', method: 'post', data: { openid, appid, encryptedData, iv } });
+				if (res.data.token) uni.setStorageSync('token', 'JWT ' + res.data.token);
+				this.$store.commit('userInfo', res.data);
+				this.changeUser();
+				uni.showToast({
+					icon: 'none',
+					title: '登录成功'
+				});
+			} catch (err) {
+				this.showErr(err);
+			} finally {
+				this.show = false;
+			}
+		},
+		// 获取用户信息权限
+		getUserInfoRoot() {
+			return new Promise((resolve, reject) => {
+				uni.getUserProfile({
+					desc: '用于完善会员资料',
+					success: res => resolve(res),
+					fail: err => reject(err)
+				});
+			});
+		},
 		// 跳转
-		navfunc(url){
-			uni.navigateTo({url})
+		navfunc(url, status = false) {
+			if (status && !uni.getStorageSync('token')) {
+				this.show = true;
+				return false;
+			}
+			uni.navigateTo({ url });
+		},
+		// 更新资料
+		async updateUserInfo() {
+			// customer/setUserInfo/
+			try {
+				var res = await this.getUserInfoRoot();
+				var { iv, encryptedData } = res;
+				res = await this.$global.request({
+					url: '/customer/setinfo/',
+					data: {
+						iv,
+						encryptedData,
+						appid: this.$store.state.userInfo.appid,
+						openid: this.$store.state.userInfo.openid
+					},
+					method: 'post',
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded',
+						Authorization: uni.getStorageSync('token')
+					}
+				});
+				this.$store.commit('userInfo', res.data);
+				this.changeUser();
+				uni.showToast({
+					icon: 'none',
+					title: '更新成功'
+				});
+			} catch (err) {
+				this.showErr(err);
+			}
+		},
+		// 选中
+		onSelect(event) {
+			switch (event.detail.name) {
+				case '更新资料':
+					this.updateUserInfo();
+					break;
+			}
 		}
 	}
 };

wx/pages/privacy/index.vue

@@ -1,9 +1,13 @@
 <template>
 	<view class="privacy">
+		<!-- 头部功能组件 -->
+		<cu-loadding :show="show" />
 		<!-- header -->
 		<cu-custom bgColor="bg-gradual-blue" isBack><view slot="content">隐私声明</view></cu-custom>
 		<!-- section -->
-		<rich-text style="width: 100vw;" :nodes="describe"></rich-text>
+		<view class="padding">
+			<rich-text :nodes="describe"></rich-text>
+		</view>
 	</view>
 </template>
 
@@ -11,11 +15,36 @@
 export default {
 	data() {
 		return {
-			describe:""
+			describe:"",
+			show:true,//加载
 		};
 	},
-	onLoad() {},
-	methods: {}
+	onLoad() {
+		this.requestData();
+	},
+	methods: {
+		// 请求富文本
+		async requestData(){
+			try{
+				var res=await this.$global.request({method:"get",url:"/customer/statement/"});
+				this.describe=this.$global.richTextChange(res.data.privacy_statement);
+			}catch(err){
+				this.showErr(err)
+			}finally{
+				this.show=false;
+			}
+		},
+		// 报错
+		showErr(content) {
+			content = JSON.stringify(content) === '{}' ? '未知错误' : content;
+			uni.showModal({
+				content,
+				showCancel: false,
+				success: res => console.log(res)
+			});
+		},
+		
+	}
 };
 </script>
 

wx/pages/status/index.vue

@@ -5,15 +5,15 @@
 		<!-- section -->
 		<view v-for="(item, index) in value.value" :key="index" class="bg-white  padding-top-sm radius margin-lr margin-top">
 			<view class="padding-sm">
-				<view class="padding-bottom-sm text-black text-bold ">车辆状态：</view>
-				<view class="padding-bottom-sm text-black text-bold ">电源是否欠压：</view>
-				<view class="padding-bottom-sm text-black text-bold ">GPS位置信息：</view>
-				<view class="padding-bottom-sm text-black text-bold ">视频信息：</view>
-				<view class="padding-bottom-sm text-black text-bold ">疲劳驾驶：</view>
-				<view class="padding-bottom-sm text-black text-bold ">驾驶辅助（ADAS）：</view>
-				<view class="padding-bottom-sm text-black text-bold ">预警信息（DMS）：</view>
-				<view class="padding-bottom-sm text-black text-bold ">压胎信息：</view>
-				<view class="padding-bottom-sm text-black text-bold ">油耗信息：</view>
+				<view class="padding-bottom-sm text-black text-bold ">车辆状态：即将上线</view>
+				<view class="padding-bottom-sm text-black text-bold ">电源是否欠压：即将上线</view>
+				<view class="padding-bottom-sm text-black text-bold ">GPS位置信息：即将上线</view>
+				<view class="padding-bottom-sm text-black text-bold ">视频信息：即将上线</view>
+				<view class="padding-bottom-sm text-black text-bold ">疲劳驾驶：即将上线</view>
+				<view class="padding-bottom-sm text-black text-bold ">驾驶辅助（ADAS）：即将上线</view>
+				<view class="padding-bottom-sm text-black text-bold ">预警信息（DMS）：即将上线</view>
+				<view class="padding-bottom-sm text-black text-bold ">压胎信息：即将上线</view>
+				<view class="padding-bottom-sm text-black text-bold ">油耗信息：即将上线</view>
 			</view>
 		</view>
 		<van-empty v-if="value.value.length == 0 && value.no_more" description="暂无设备" />
@@ -22,28 +22,45 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				value: {
-					no_more: false, //没有更多
-					pageCount: 1,
-					totalPage: 1,
-					value: [
-					  {}
-					]
-				}
+export default {
+	data() {
+		return {
+			value: {
+				no_more: false, //没有更多
+				pageCount: 1,
+				totalPage: 1,
+				value: []
 			}
-		},
-		onLoad() {
-
-		},
-		methods: {
-
+		};
+	},
+	onLoad() {
+		this.request()
+	},
+	// 页面上拉触底事件
+	onReachBottom: function() {
+		this.request();
+	},
+	methods: {
+		async request() {
+			var { pageCount, totalPage, no_more, value } = JSON.parse(JSON.stringify(this.value));
+			if(pageCount>totalPage) return false;
+			var res = await this.$global.request({
+				url: '/customer/vehicle/',
+				method: 'get',
+				header: {
+					'Content-Type': 'application/x-www-form-urlencoded',
+					Authorization: uni.getStorageSync('token')
+				},
+				data: { page: pageCount, limit: 20 }
+			});
+			pageCount++;
+			totalPage=res.totalPage;
+			if(pageCount>totalPage) no_more=true;
+			value=value.concat(res.data);
+			this.value={pageCount, totalPage, no_more, value};
 		}
 	}
+};
 </script>
 
-<style lang="scss" scoped>
-	
-</style>
+<style lang="scss" scoped></style>

wx/unpackage/dist/dev/mp-weixin/colorui/components/cu-custom.wxss

@@ -67,10 +67,9 @@
 
 
 
-
-
-	/* 自定义 */
-.header-blue{
- 	background-color: #018bed;
+/* 自定义 */
+.header-blue {
+	background-color: #018bed;
+	color: #fff;
 }
 

wx/unpackage/dist/dev/mp-weixin/colorui/components/cu-loadding.json

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

wx/unpackage/dist/dev/mp-weixin/colorui/components/cu-loadding.wxml

@@ -0,0 +1 @@
+<block wx:if="{{show}}"><view class="cu-loadding bg-gradual-pink _div data-v-43c36a4c"><view class="box data-v-43c36a4c"><view class="spinner data-v-43c36a4c"><view class="double-bounce1 data-v-43c36a4c"></view><view class="double-bounce2 data-v-43c36a4c"></view></view><view class="text--center text-sm data-v-43c36a4c">加载中...</view></view></view></block>

wx/unpackage/dist/dev/mp-weixin/colorui/components/cu-loadding.wxss

@@ -0,0 +1,78 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.cu-loadding.data-v-43c36a4c {
+  position: fixed;
+  z-index: 10000;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.cu-loadding .spinner.data-v-43c36a4c {
+  width: 40px;
+  height: 40px;
+  position: relative;
+  margin: 20rpx auto;
+}
+.cu-loadding .spinner .double-bounce1.data-v-43c36a4c, .cu-loadding .spinner .double-bounce2.data-v-43c36a4c {
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  background-color: #fff;
+  opacity: 0.6;
+  position: absolute;
+  top: 0;
+  left: 0;
+  -webkit-animation: sk-bounce-data-v-43c36a4c 2.0s infinite ease-in-out;
+  animation: sk-bounce-data-v-43c36a4c 2.0s infinite ease-in-out;
+}
+.cu-loadding .spinner .double-bounce2.data-v-43c36a4c {
+  -webkit-animation-delay: -1.0s;
+  animation-delay: -1.0s;
+}
+@-webkit-keyframes sk-bounce-data-v-43c36a4c {
+0%, 100% {
+    -webkit-transform: scale(0);
+}
+50% {
+    -webkit-transform: scale(1);
+}
+}
+@keyframes sk-bounce-data-v-43c36a4c {
+0%, 100% {
+    transform: scale(0);
+    -webkit-transform: scale(0);
+}
+50% {
+    transform: scale(1);
+    -webkit-transform: scale(1);
+}
+}
+

wx/unpackage/dist/dev/mp-weixin/colorui/components/cu-login-userinfo.wxml

@@ -1 +1 @@
-<view class="cu-login-userinfo data-v-3222c7c5"><view class="userinfo data-v-3222c7c5"><view class="image data-v-3222c7c5"><image style="width:100%;height:100%;" src="{{userImage}}" mode="aspectFill" class="data-v-3222c7c5"></image></view><view class="flex align-center justify-center data-v-3222c7c5" style="height:100rpx;">{{userName}}</view></view></view>
+<view class="cu-login-userinfo data-v-3222c7c5"><view class="userinfo data-v-3222c7c5"><view class="image data-v-3222c7c5"><image style="width:100%;height:100%;" src="{{userImage}}" mode="aspectFill" class="data-v-3222c7c5"></image></view><view class="flex text-bold align-center justify-center data-v-3222c7c5" style="height:80rpx;">{{userName}}</view></view></view>

wx/unpackage/dist/dev/mp-weixin/colorui/components/cu-login-userinfo.wxss

@@ -35,7 +35,7 @@
   height: 250rpx;
   top: 0rpx;
   left: calc(50% - 150rpx);
-  z-index: 9999;
+  z-index: 99;
 }
 .cu-login-userinfo .userinfo .image.data-v-3222c7c5 {
   width: 150rpx;
@@ -64,6 +64,6 @@
   background-color: #fff;
   border-radius: 20rpx;
   box-shadow: 0 0 10rpx #999;
-  z-index: 998;
+  z-index: 98;
 }
 

wx/unpackage/dist/dev/mp-weixin/common/main.js

@@ -91,10 +91,10 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default =
 {
   onLaunch: function onLaunch() {
-    console.log('App Launch');
+    uni.clearStorageSync();
   },
   onShow: function onShow() {
     console.log('App Show');
@@ -102,6 +102,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
   onHide: function onHide() {
     console.log('App Hide');
   } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
 /* 9 */

wx/unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"colorui/components/cu-custom":1,"colorui/components/cu-login-userinfo":1};
+/******/ 		var cssChunks = {"colorui/components/cu-custom":1,"colorui/components/cu-loadding":1,"colorui/components/cu-login-userinfo":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"colorui/components/cu-custom":"colorui/components/cu-custom","colorui/components/cu-login-userinfo":"colorui/components/cu-login-userinfo"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"colorui/components/cu-custom":"colorui/components/cu-custom","colorui/components/cu-loadding":"colorui/components/cu-loadding","colorui/components/cu-login-userinfo":"colorui/components/cu-login-userinfo"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

wx/unpackage/dist/dev/mp-weixin/pages/binding/index.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/binding/index"],{
 
-/***/ 38:
+/***/ 41:
 /*!********************************************************************************************************!*\
   !*** D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/main.js?{"page":"pages%2Fbinding%2Findex"} ***!
   \********************************************************************************************************/
@@ -10,13 +10,13 @@
 "use strict";
 /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pages/binding/index.vue */ 39));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pages/binding/index.vue */ 42));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
 
 /***/ }),
 
-/***/ 39:
+/***/ 42:
 /*!*************************************************************************************!*\
   !*** D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/binding/index.vue ***!
   \*************************************************************************************/
@@ -25,8 +25,8 @@ createPage(_index.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_4e3245c2_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=4e3245c2&scoped=true& */ 40);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 42);
+/* harmony import */ var _index_vue_vue_type_template_id_4e3245c2_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=4e3245c2&scoped=true& */ 43);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 45);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 11);
 
@@ -55,7 +55,7 @@ component.options.__file = "pages/binding/index.vue"
 
 /***/ }),
 
-/***/ 40:
+/***/ 43:
 /*!********************************************************************************************************************************!*\
   !*** D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/binding/index.vue?vue&type=template&id=4e3245c2&scoped=true& ***!
   \********************************************************************************************************************************/
@@ -64,7 +64,7 @@ component.options.__file = "pages/binding/index.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_4e3245c2_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=4e3245c2&scoped=true& */ 41);
+/* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_4e3245c2_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=4e3245c2&scoped=true& */ 44);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_4e3245c2_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_4e3245c2_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -77,7 +77,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 41:
+/***/ 44:
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/binding/index.vue?vue&type=template&id=4e3245c2&scoped=true& ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -94,7 +94,7 @@ var components
 try {
   components = {
     cuCustom: function() {
-      return __webpack_require__.e(/*! import() | colorui/components/cu-custom */ "colorui/components/cu-custom").then(__webpack_require__.bind(null, /*! @/colorui/components/cu-custom.vue */ 50))
+      return __webpack_require__.e(/*! import() | colorui/components/cu-custom */ "colorui/components/cu-custom").then(__webpack_require__.bind(null, /*! @/colorui/components/cu-custom.vue */ 60))
     }
   }
 } catch (e) {
@@ -127,7 +127,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 42:
+/***/ 45:
 /*!**************************************************************************************************************!*\
   !*** D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/binding/index.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************************************/
@@ -136,14 +136,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 43);
+/* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 46);
 /* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 43:
+/***/ 46:
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/binding/index.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -151,7 +151,13 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _regenerator = _interopRequireDefault(__webpack_require__(/*! ./node_modules/@babel/runtime/regenerator */ 21));
+
+
+
+
+
+
 
 
 
@@ -180,58 +186,82 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 
 
+var _dialog = _interopRequireDefault(__webpack_require__(/*! @/wxcomponents/vant/dist/dialog/dialog */ 38));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};}var _default =
+{
+  data: function data() {
+    return {
+      id: 0,
+      value: {
+        name: '',
+        tel: '',
+        yan: '',
+        car: '',
+        code: '' },
 
+      err: {
+        name: '',
+        tel: '',
+        yan: '',
+        car: '',
+        code: '' },
 
+      yan: false,
+      timer: null,
+      time: 0 };
 
+  },
+  onLoad: function onLoad(options) {
+    if (options.hasOwnProperty('value')) {
+      options.value = JSON.parse(options.value);
+      this.id = options.value.id;
+      // name, tel, number: code, model: car,vcode:yan
+      this.value = {
+        name: options.value.name,
+        tel: options.value.tel,
+        code: options.value.number,
+        car: options.value.model };
 
-var _dialog = _interopRequireDefault(__webpack_require__(/*! @/wxcomponents/vant/dist/dialog/dialog */ 35));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-var _default = { data: function data() {return { value: { name: '', tel: '', yan: '', car: '', code: '' }, err: { name: '', tel: '', yan: '', car: '', code: '' }, yan: true, timer: null, time: 0 };}, onLoad: function onLoad() {}, beforeDestroy: function beforeDestroy() {clearInterval(this.timer);}, methods: { // 请求验证码
-    sendfunc: function sendfunc() {var _this = this;this.time = 60;clearInterval(this.timer);this.timer = setInterval(function () {_this.time = _this.time - 1;
-        if (_this.time <= 0) clearInterval(_this.timer);
-      }, 1000);
+      var telReg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      this.yan = this.$store.state.userInfo.tel !== options.value.tel && telReg.test(options.value.tel) ? true : false;
+    }
+    if (this.id == 0) this.value.tel = this.$store.state.userInfo.tel;
+  },
+  beforeDestroy: function beforeDestroy() {
+    clearInterval(this.timer);
+  },
+  methods: {
+    // 请求验证码
+    sendfunc: function sendfunc() {var _this = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var res;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:_context.next = 2;return (
+                  _this.$global.request({
+                    method: 'get',
+                    header: {
+                      'Content-Type': 'application/x-www-form-urlencoded',
+                      Authorization: uni.getStorageSync('token') },
+
+                    url: '/customer/vehicle/vcode/send/',
+                    data: { tel: _this.value.tel, appid: _this.$store.state.userInfo.appid } }));case 2:res = _context.sent;
+
+                _this.time = 60;
+                clearInterval(_this.timer);
+                _this.timer = setInterval(function () {
+                  _this.time = _this.time - 1;
+                  if (_this.time <= 0) clearInterval(_this.timer);
+                }, 1000);case 6:case "end":return _context.stop();}}}, _callee);}))();
     },
     // 双向绑定
     onChange: function onChange(e, name) {
       var value = JSON.parse(JSON.stringify(this.value));
       value[name] = e.detail;
+      var telReg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (name == 'tel') {
+        this.yan = this.$store.state.userInfo.tel !== e.detail && telReg.test(value.tel) ? true : false;
+      }
       this.value = value;
     },
     // 验证
     yanfunc: function yanfunc() {
       var value = JSON.parse(JSON.stringify(this.value));
       var err = JSON.parse(JSON.stringify(this.err));
-      console.log(value);
       // 去空格 并且 清空错误集
       Object.keys(value).forEach(function (item) {
         value[item] = value[item].trim();
@@ -253,14 +283,41 @@ var _default = { data: function data() {return { value: { name: '', tel: '', yan
       return Object.keys(err).some(function (item) {return err[item];});
     },
     // 提交
-    onClick: function onClick() {
-      if (this.yanfunc()) {
-        _dialog.default.alert({ message: '请检查所填数据!' }).then(function () {});
-        return false;
-      }
+    onClick: function onClick() {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee2() {var _this2$value, name, tel, car, code, yan, res;return _regenerator.default.wrap(function _callee2$(_context2) {while (1) {switch (_context2.prev = _context2.next) {case 0:_context2.prev = 0;if (!
+
+                _this2.yanfunc()) {_context2.next = 4;break;}
+                _dialog.default.alert({ message: '请检查所填数据!' }).then(function () {});return _context2.abrupt("return",
+                false);case 4:_this2$value =
+
+                _this2.value, name = _this2$value.name, tel = _this2$value.tel, car = _this2$value.car, code = _this2$value.code, yan = _this2$value.yan;_context2.next = 7;return (
+                  _this2.$global.request({
+                    method: _this2.id ? 'put' : 'post',
+                    header: {
+                      'Content-Type': 'application/x-www-form-urlencoded',
+                      Authorization: uni.getStorageSync('token') },
+
+                    url: _this2.id ? "/customer/vehicle/".concat(_this2.id, "/") : '/customer/vehicle/',
+                    data: { name: name, tel: tel, number: code, model: car, vcode: yan } }));case 7:res = _context2.sent;
+
+                uni.showToast({
+                  icon: 'none',
+                  title: '成功绑定',
+                  success: function success() {
+                    uni.navigateBack({
+                      delta: 1 });
+
+                  } });_context2.next = 14;break;case 11:_context2.prev = 11;_context2.t0 = _context2["catch"](0);
+
+
+                wx.showToast({
+                  icon: 'none',
+                  title: _context2.t0 });case 14:case "end":return _context2.stop();}}}, _callee2, null, [[0, 11]]);}))();
+
+
     } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ })
 
-},[[38,"common/runtime","common/vendor"]]]);
+},[[41,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/binding/index.js.map

wx/unpackage/dist/dev/mp-weixin/pages/information/index.json

@@ -1,4 +1,5 @@
 {
+  "onReachBottomDistance": 300,
   "usingComponents": {
     "cu-custom": "/colorui/components/cu-custom",
     "van-empty": "/wxcomponents/vant/dist/empty/index",

wx/unpackage/dist/dev/mp-weixin/pages/login/index.json

@@ -1,6 +1,8 @@
 {
   "usingComponents": {
+    "cu-loadding": "/colorui/components/cu-loadding",
     "cu-custom": "/colorui/components/cu-custom",
-    "cu-login-userinfo": "/colorui/components/cu-login-userinfo"
+    "cu-login-userinfo": "/colorui/components/cu-login-userinfo",
+    "van-action-sheet": "/wxcomponents/vant/dist/action-sheet/index"
   }
 }

wx/unpackage/dist/dev/mp-weixin/pages/privacy/index.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/privacy/index"],{
 
-/***/ 23:
+/***/ 26:
 /*!********************************************************************************************************!*\
   !*** D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/main.js?{"page":"pages%2Fprivacy%2Findex"} ***!
   \********************************************************************************************************/
@@ -10,13 +10,13 @@
 "use strict";
 /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pages/privacy/index.vue */ 24));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pages/privacy/index.vue */ 27));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
 
 /***/ }),
 
-/***/ 24:
+/***/ 27:
 /*!*************************************************************************************!*\
   !*** D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/privacy/index.vue ***!
   \*************************************************************************************/
@@ -25,8 +25,8 @@ createPage(_index.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_0009ab3c_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=0009ab3c&scoped=true& */ 25);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 27);
+/* harmony import */ var _index_vue_vue_type_template_id_0009ab3c_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=0009ab3c&scoped=true& */ 28);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 30);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 11);
 
@@ -55,7 +55,7 @@ component.options.__file = "pages/privacy/index.vue"
 
 /***/ }),
 
-/***/ 25:
+/***/ 28:
 /*!********************************************************************************************************************************!*\
   !*** D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/privacy/index.vue?vue&type=template&id=0009ab3c&scoped=true& ***!
   \********************************************************************************************************************************/
@@ -64,7 +64,7 @@ component.options.__file = "pages/privacy/index.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_0009ab3c_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=0009ab3c&scoped=true& */ 26);
+/* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_0009ab3c_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=0009ab3c&scoped=true& */ 29);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_0009ab3c_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_0009ab3c_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -77,7 +77,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 26:
+/***/ 29:
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/privacy/index.vue?vue&type=template&id=0009ab3c&scoped=true& ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -93,8 +93,11 @@ __webpack_require__.r(__webpack_exports__);
 var components
 try {
   components = {
+    cuLoadding: function() {
+      return __webpack_require__.e(/*! import() | colorui/components/cu-loadding */ "colorui/components/cu-loadding").then(__webpack_require__.bind(null, /*! @/colorui/components/cu-loadding.vue */ 53))
+    },
     cuCustom: function() {
-      return __webpack_require__.e(/*! import() | colorui/components/cu-custom */ "colorui/components/cu-custom").then(__webpack_require__.bind(null, /*! @/colorui/components/cu-custom.vue */ 50))
+      return __webpack_require__.e(/*! import() | colorui/components/cu-custom */ "colorui/components/cu-custom").then(__webpack_require__.bind(null, /*! @/colorui/components/cu-custom.vue */ 60))
     }
   }
 } catch (e) {
@@ -127,7 +130,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 27:
+/***/ 30:
 /*!**************************************************************************************************************!*\
   !*** D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/privacy/index.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************************************/
@@ -136,14 +139,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 28);
+/* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 31);
 /* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 28:
+/***/ 31:
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/privacy/index.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -151,7 +154,11 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _regenerator = _interopRequireDefault(__webpack_require__(/*! ./node_modules/@babel/runtime/regenerator */ 21));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};} //
+//
+//
+//
+//
 //
 //
 //
@@ -164,13 +171,37 @@ var _default =
 {
   data: function data() {
     return {
-      describe: "" };
-
+      describe: "",
+      show: true //加载
+    };
   },
-  onLoad: function onLoad() {},
-  methods: {} };exports.default = _default;
+  onLoad: function onLoad() {
+    this.requestData();
+  },
+  methods: {
+    // 请求富文本
+    requestData: function requestData() {var _this = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var res;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:_context.prev = 0;_context.next = 3;return (
+
+                  _this.$global.request({ method: "get", url: "/customer/statement/" }));case 3:res = _context.sent;
+                _this.describe = _this.$global.richTextChange(res.data.privacy_statement);_context.next = 10;break;case 7:_context.prev = 7;_context.t0 = _context["catch"](0);
+
+                _this.showErr(_context.t0);case 10:_context.prev = 10;
+
+                _this.show = false;return _context.finish(10);case 13:case "end":return _context.stop();}}}, _callee, null, [[0, 7, 10, 13]]);}))();
+
+    },
+    // 报错
+    showErr: function showErr(content) {
+      content = JSON.stringify(content) === '{}' ? '未知错误' : content;
+      uni.showModal({
+        content: content,
+        showCancel: false,
+        success: function success(res) {return console.log(res);} });
+
+    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ })
 
-},[[23,"common/runtime","common/vendor"]]]);
+},[[26,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/privacy/index.js.map

wx/unpackage/dist/dev/mp-weixin/pages/privacy/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
+    "cu-loadding": "/colorui/components/cu-loadding",
     "cu-custom": "/colorui/components/cu-custom"
   }
 }

wx/unpackage/dist/dev/mp-weixin/pages/privacy/index.wxml

@@ -1 +1 @@
-<view class="privacy data-v-0009ab3c"><cu-custom vue-id="012aba38-1" bgColor="bg-gradual-blue" isBack="{{true}}" class="data-v-0009ab3c" bind:__l="__l" vue-slots="{{['content']}}"><view slot="content" class="data-v-0009ab3c">隐私声明</view></cu-custom><rich-text style="width:100vw;" nodes="{{describe}}" class="data-v-0009ab3c"></rich-text></view>
+<view class="privacy data-v-0009ab3c"><cu-loadding vue-id="012aba38-1" show="{{show}}" class="data-v-0009ab3c" bind:__l="__l"></cu-loadding><cu-custom vue-id="012aba38-2" bgColor="bg-gradual-blue" isBack="{{true}}" class="data-v-0009ab3c" bind:__l="__l" vue-slots="{{['content']}}"><view slot="content" class="data-v-0009ab3c">隐私声明</view></cu-custom><view class="padding data-v-0009ab3c"><rich-text nodes="{{describe}}" class="data-v-0009ab3c"></rich-text></view></view>

wx/unpackage/dist/dev/mp-weixin/pages/status/index.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/status/index"],{
 
-/***/ 44:
+/***/ 47:
 /*!*******************************************************************************************************!*\
   !*** D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/main.js?{"page":"pages%2Fstatus%2Findex"} ***!
   \*******************************************************************************************************/
@@ -10,13 +10,13 @@
 "use strict";
 /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pages/status/index.vue */ 45));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pages/status/index.vue */ 48));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
 
 /***/ }),
 
-/***/ 45:
+/***/ 48:
 /*!************************************************************************************!*\
   !*** D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/status/index.vue ***!
   \************************************************************************************/
@@ -25,8 +25,8 @@ createPage(_index.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_25c95a24_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=25c95a24&scoped=true& */ 46);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 48);
+/* harmony import */ var _index_vue_vue_type_template_id_25c95a24_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=25c95a24&scoped=true& */ 49);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 51);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 11);
 
@@ -55,7 +55,7 @@ component.options.__file = "pages/status/index.vue"
 
 /***/ }),
 
-/***/ 46:
+/***/ 49:
 /*!*******************************************************************************************************************************!*\
   !*** D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/status/index.vue?vue&type=template&id=25c95a24&scoped=true& ***!
   \*******************************************************************************************************************************/
@@ -64,7 +64,7 @@ component.options.__file = "pages/status/index.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_25c95a24_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=25c95a24&scoped=true& */ 47);
+/* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_25c95a24_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=25c95a24&scoped=true& */ 50);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_25c95a24_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_25c95a24_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -77,7 +77,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 47:
+/***/ 50:
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/status/index.vue?vue&type=template&id=25c95a24&scoped=true& ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -94,7 +94,7 @@ var components
 try {
   components = {
     cuCustom: function() {
-      return __webpack_require__.e(/*! import() | colorui/components/cu-custom */ "colorui/components/cu-custom").then(__webpack_require__.bind(null, /*! @/colorui/components/cu-custom.vue */ 50))
+      return __webpack_require__.e(/*! import() | colorui/components/cu-custom */ "colorui/components/cu-custom").then(__webpack_require__.bind(null, /*! @/colorui/components/cu-custom.vue */ 60))
     }
   }
 } catch (e) {
@@ -127,7 +127,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 48:
+/***/ 51:
 /*!*************************************************************************************************************!*\
   !*** D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/status/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************/
@@ -136,14 +136,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 49);
+/* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../360Downloads/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 52);
 /* harmony import */ var _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_360Downloads_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 49:
+/***/ 52:
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/Lxd_worker/Reacts/LXD/Work/work/20220330_集配美车联网/wx/pages/status/index.vue?vue&type=script&lang=js& ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -151,7 +151,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _regenerator = _interopRequireDefault(__webpack_require__(/*! ./node_modules/@babel/runtime/regenerator */ 21));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};} //
 //
 //
 //
@@ -182,18 +182,39 @@ var _default =
         no_more: false, //没有更多
         pageCount: 1,
         totalPage: 1,
-        value: [
-        {}] } };
-
+        value: [] } };
 
 
   },
   onLoad: function onLoad() {
-
+    this.request();
+  },
+  // 页面上拉触底事件
+  onReachBottom: function onReachBottom() {
+    this.request();
   },
-  methods: {} };exports.default = _default;
+  methods: {
+    request: function request() {var _this = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var _JSON$parse, pageCount, totalPage, no_more, value, res;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:_JSON$parse =
+                JSON.parse(JSON.stringify(_this.value)), pageCount = _JSON$parse.pageCount, totalPage = _JSON$parse.totalPage, no_more = _JSON$parse.no_more, value = _JSON$parse.value;if (!(
+                pageCount > totalPage)) {_context.next = 3;break;}return _context.abrupt("return", false);case 3:_context.next = 5;return (
+                  _this.$global.request({
+                    url: '/customer/vehicle/',
+                    method: 'get',
+                    header: {
+                      'Content-Type': 'application/x-www-form-urlencoded',
+                      Authorization: uni.getStorageSync('token') },
+
+                    data: { page: pageCount, limit: 20 } }));case 5:res = _context.sent;
+
+                pageCount++;
+                totalPage = res.totalPage;
+                if (pageCount > totalPage) no_more = true;
+                value = value.concat(res.data);
+                _this.value = { pageCount: pageCount, totalPage: totalPage, no_more: no_more, value: value };case 11:case "end":return _context.stop();}}}, _callee);}))();
+    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ })
 
-},[[44,"common/runtime","common/vendor"]]]);
+},[[47,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/status/index.js.map

wx/unpackage/dist/dev/mp-weixin/pages/status/index.json

@@ -1,5 +1,7 @@
 {
+  "onReachBottomDistance": 300,
   "usingComponents": {
-    "cu-custom": "/colorui/components/cu-custom"
+    "cu-custom": "/colorui/components/cu-custom",
+    "van-empty": "/wxcomponents/vant/dist/empty/index"
   }
 }

wx/unpackage/dist/dev/mp-weixin/pages/status/index.wxml

@@ -1 +1 @@
-<view class="status data-v-25c95a24"><cu-custom vue-id="9360e850-1" bgColor="bg-gradual-blue" isBack="{{true}}" class="data-v-25c95a24" bind:__l="__l" vue-slots="{{['content']}}"><view slot="content" class="data-v-25c95a24">设备状态</view></cu-custom><block wx:for="{{value.value}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="bg-white  padding-top-sm radius margin-lr margin-top data-v-25c95a24"><view class="padding-sm data-v-25c95a24"><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">车辆状态：</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">电源是否欠压：</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">GPS位置信息：</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">视频信息：</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">疲劳驾驶：</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">驾驶辅助（ADAS）：</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">预警信息（DMS）：</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">压胎信息：</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">油耗信息：</view></view></view></block><block wx:if="{{value.value.length==0&&value.no_more}}"><van-empty vue-id="9360e850-2" description="暂无设备" class="data-v-25c95a24" bind:__l="__l"></van-empty></block><block wx:else><view class="{{['data-v-25c95a24',!value.no_more&&value.pageCount<=value.totalPage?'cu-load bg-grey loading margin-top':'cu-load bg-grey over margin-top']}}"></view></block></view>
+<view class="status data-v-25c95a24"><cu-custom vue-id="9360e850-1" bgColor="bg-gradual-blue" isBack="{{true}}" class="data-v-25c95a24" bind:__l="__l" vue-slots="{{['content']}}"><view slot="content" class="data-v-25c95a24">设备状态</view></cu-custom><block wx:for="{{value.value}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="bg-white  padding-top-sm radius margin-lr margin-top data-v-25c95a24"><view class="padding-sm data-v-25c95a24"><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">车辆状态：即将上线</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">电源是否欠压：即将上线</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">GPS位置信息：即将上线</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">视频信息：即将上线</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">疲劳驾驶：即将上线</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">驾驶辅助（ADAS）：即将上线</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">预警信息（DMS）：即将上线</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">压胎信息：即将上线</view><view class="padding-bottom-sm text-black text-bold  data-v-25c95a24">油耗信息：即将上线</view></view></view></block><block wx:if="{{value.value.length==0&&value.no_more}}"><van-empty vue-id="9360e850-2" description="暂无设备" data-com-type="wx" class="data-v-25c95a24" bind:__l="__l"></van-empty></block><block wx:else><view class="{{['data-v-25c95a24',!value.no_more&&value.pageCount<=value.totalPage?'cu-load bg-grey loading margin-top':'cu-load bg-grey over margin-top']}}"></view></block></view>

wx/unpackage/dist/dev/mp-weixin/project.config.json

@@ -5,27 +5,56 @@
   },
   "setting": {
     "urlCheck": false,
-    "es6": true
+    "es6": true,
+    "enhance": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useIsolateContext": true,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "disableUseStrict": false,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false,
+    "ignoreUploadUnusedFiles": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
-  "appid": "wx9bf5de3fd1a15538",
+  "appid": "wx99bd3af055be9f6d",
   "projectname": "wx",
   "condition": {
     "search": {
-      "current": -1,
       "list": []
     },
     "conversation": {
-      "current": -1,
       "list": []
     },
     "game": {
-      "current": -1,
       "list": []
     },
     "miniprogram": {
-      "current": -1,
       "list": []
     }
   }

wx/utils/global.js

@@ -1,4 +1,4 @@
-const REQUESTURL = "http://192.168.2.164:8888"; //请求路径
+const REQUESTURL = "http://192.168.2.164:8099"; //请求路径
 // 短文字提示框
 const LOADING = function(msg) {
 	uni.showLoading({
@@ -29,14 +29,28 @@ class global {
 		this.prev = Date.now(); //节流使用
 	}
 	// 获取二维码参数 options.scene
-	qrcodeValue(scene){
-     scene=decodeURIComponent(scene).split("&");
-	 scene = scene.map(item => (item.split("=")));
-	 return Object.fromEntries(scene);
+	qrcodeValue(scene) {
+		scene = decodeURIComponent(scene).split("&");
+		scene = scene.map(item => (item.split("=")));
+		return Object.fromEntries(scene);
 	}
-	
+	//  formatRichText = html => {
+	//   let newContent= html.replace(/<img[^>]*>/gi,function(match,capture){
+	//     match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+	//     match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+	//     match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+	//     return match;
+	//   });
+	//   newContent = newContent.replace(/style="[^"]+"/gi,function(match,capture){
+	//     match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi, 'max-width:100%;');
+	//     return match;
+	//   });
+	//   newContent = newContent.replace(/<br[^>]*\/>/gi, '');
+	//   newContent = newContent.replace(/\<img/gi, '< img style="max-width:100%;height:auto;display:block;margin-top:0;margin-bottom:0;"');
+	//   return newContent;
+	// }
 	// 富文本处理
-	richTextChange(value){
+	richTextChange(value) {
 		/**
 		 * 此代码段处理目的为，匹配富文本代码中的 <img> 标签，并将其图片的宽度修改为适应屏幕
 		 * max-width:100% 		--- 图片宽度加以限制，避免超出屏幕
@@ -44,7 +58,9 @@ class global {
 		 * display:block       	--- 此代码，可以去掉图片之间的空白间隔，个人觉得好用
 		 */
 		value = value.replace(/<img/gi, '<img style="max-width:100%;height:auto;display:block" ');
-	    return value;
+		// 去掉
+		value = value.replace(/white-space: nowrap;/gi, '')
+		return value;
 	}
 
 	// 数字转字符串占位