删除多余文件

config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	// baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'http://192.168.110.9:8099',
-	// baseUrlNew: 'http://192.168.110.82:8099',
-	baseUrlNew: 'https://api.changyuntong56.com',
+	baseUrlNew: 'http://192.168.110.82:8099',
+	// baseUrlNew: 'https://api.changyuntong56.com',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false,
 	//部网络货运 持续定位

pages.json

@@ -63,7 +63,7 @@
 				"navigationBarTextStyle": "white"
 			}
 
-		},{
+		}, {
 			"path": "pages/news/newsSee",
 			"style": {
 				"navigationBarTitleText": "系统消息",
@@ -76,7 +76,7 @@
 				"navigationStyle": "custom"
 			}
 
-		},{
+		}, {
 			"path": "pages/mine/index1",
 			"style": {
 				"navigationBarTitleText": "测试定位",
@@ -120,11 +120,11 @@
 							"text": "\ue7c3",
 							"fontSrc": "/static/addfleet/iconfont.ttf",
 							"fontSize": "22"
-							 // "redDot": "true"
+							// "redDot": "true"
 						}]
 					}
 				}
-		
+
 			}
 		},
 		{
@@ -139,11 +139,11 @@
 							"text": "\ue7c3",
 							"fontSrc": "/static/addfleet/iconfont.ttf",
 							"fontSize": "22"
-							 // "redDot": "true"
+							// "redDot": "true"
 						}]
 					}
 				}
-		
+
 			}
 		},
 		{
@@ -158,11 +158,11 @@
 							"text": "\ue622",
 							"fontSrc": "/static/addfleet/iconfont.ttf",
 							"fontSize": "22"
-							 // "redDot": "true"
+							// "redDot": "true"
 						}]
 					}
 				}
-		
+
 			}
 		},
 		{
@@ -179,7 +179,7 @@
 				"navigationBarTitleText": "举报",
 				"enablePullDownRefresh": false
 			}
-		
+
 		},
 		{
 			"path": "pages/riders/checkPage",
@@ -216,16 +216,16 @@
 							"text": "保存",
 							"fontSrc": "/static/addfleet/iconfont.ttf",
 							"fontSize": "30rpx",
-							 "color": "#2772FB",
-							 "width":"80rpx",
-							 "textAlign":"left",
-							 "fontWeight":"600"
+							"color": "#2772FB",
+							"width": "80rpx",
+							"textAlign": "left",
+							"fontWeight": "600"
 						}]
 					}
 				}
 			}
-		
-		},{
+
+		}, {
 			"path": "pages/riders/noticeSee",
 			"style": {
 				"navigationBarTitleText": "公告详情",
@@ -275,9 +275,9 @@
 							"text": "提交",
 							"fontSrc": "/static/addfleet/iconfont.ttf",
 							"fontSize": "28rpx",
-							 "color": "#2772FB",
-							 "width":"80rpx",
-							 "textAlign":"left"
+							"color": "#2772FB",
+							"width": "80rpx",
+							"textAlign": "left"
 						}]
 					}
 				}
@@ -294,14 +294,14 @@
 							"text": "完成",
 							"fontSrc": "/static/addfleet/iconfont.ttf",
 							"fontSize": "28rpx",
-							 "color": "#2772FB",
-							 "width":"80rpx",
-							 "textAlign":"left"
+							"color": "#2772FB",
+							"width": "80rpx",
+							"textAlign": "left"
 						}]
 					}
 				}
 			}
-		},{
+		}, {
 			"path": "pages/riders/fleetInvitation",
 			"style": {
 				"navigationBarTitleText": "车队邀请",
@@ -371,7 +371,7 @@
 			}
 
 		},
-		
+
 		{
 			"path": "pages/mine/often/addRoute",
 			"style": {
@@ -394,7 +394,7 @@
 				"navigationBarTitleText": "管理车辆",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "white"
-				
+
 			}
 		}, {
 			"path": "pages/mine/manageVehicles/addVehicle",
@@ -432,21 +432,21 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/mine/fleet/bindingCarCaptain",
 			"style": {
 				"navigationBarTitleText": "绑定车队长",
 				"enablePullDownRefresh": false
-				
+
 			}
-		},{
+		}, {
 			"path": "pages/mine/fleet/addBinding",
 			"style": {
 				"navigationBarTitleText": "绑定",
 				"enablePullDownRefresh": false
-				
+
 			}
-		},{
+		}, {
 			"path": "pages/mine/fleet/fleetManage",
 			"style": {
 				"navigationBarTitleText": "管理车队",
@@ -458,26 +458,26 @@
 							"text": "账单",
 							"fontSrc": "/static/addfleet/iconfont.ttf",
 							"fontSize": "16",
-							 "textAlign":"left"
-							 // "redDot": "true"
+							"textAlign": "left"
+							// "redDot": "true"
 						}]
 					}
 				}
 			}
-		},{
+		}, {
 			"path": "pages/mine/fleet/fleetBill",
 			"style": {
 				"navigationBarTitleText": "账单",
 				"enablePullDownRefresh": false
 			}
-		},{
+		}, {
 			"path": "pages/mine/fleet/carCaptainAuthentication",
 			"style": {
 				"navigationBarTitleText": "车队长认证",
 				"enablePullDownRefresh": false
-				
+
 			}
-		},{
+		}, {
 			"path": "pages/mine/set",
 			"style": {
 				"navigationBarTitleText": "设置",
@@ -494,14 +494,6 @@
 				"navigationBarBackgroundColor": "white"
 			}
 
-		},
-		{
-			"path": "pages/mine/camera/idcard/idcard",
-			"style": {
-				"navigationStyle": "custom",
-				"backgroundColor": "#000000"
-			}
-
 		}, {
 			"path": "pages/goodSource/map",
 			"style": {
@@ -565,7 +557,7 @@
 				"navigationBarTitleText": "选择银行卡",
 				"enablePullDownRefresh": false
 			}
-		},{
+		}, {
 			"path": "pages/goodSource/jb",
 			"style": {
 				"navigationBarTitleText": "举报",
@@ -595,17 +587,15 @@
 				}
 			}
 
+		}, {
+			"path": "pages/mine/fankui",
+			"style": {
+				"navigationBarTitleText": "意见反馈",
+				"enablePullDownRefresh": false
+			}
+
 		}
-	    ,{
-            "path" : "pages/mine/fankui",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "意见反馈",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

pages/goodSource/index.vue

@@ -1,6 +1,7 @@
 <!-- 货源 -->
 <template>
-	<view @touchend="end" @touchmove="move" :class="{popupShow:isShowAlert}" class="content">
+	<!-- @touchend="end" @touchmove="move" -->
+	<view :class="{popupShow:isShowAlert}" class="content">
 		<!-- 		<fh-no-network></fh-no-network> -->
 		<view class="banner">
 			<image class="banner-img" src="@/static/images/goodSource/banner@2x.png" mode='widthFix'></image>

pages/mine/camera/camera.nvue

@@ -1,213 +0,0 @@
-<template>
-	<view class="live-camera" :style="{ width: windowWidth, height: windowHeight }">
-		<live-pusher
-			id="livePusher"
-			ref="livePusher"
-			class="livePusher"
-			mode="FHD"
-			beauty="0"
-			whiteness="0"
-			:aspect="aspect"
-			min-bitrate="1000"
-			audio-quality="16KHz"
-			device-position="back"
-			:auto-focus="true"
-			:muted="true"
-			:enable-camera="true"
-			:enable-mic="false"
-			:zoom="false"
-			@statechange="statechange"
-			:style="{ width: windowWidth, height: windowHeight }"
-		></live-pusher>
-
-		<view class="menu">
-			<!--底部菜单区域背景-->
-			<cover-image class="menu-mask" src="/static/live-camera/bar.png"></cover-image>
-
-			<!--返回键-->
-			<cover-image class="menu-back" @tap="back" src="/static/live-camera/back.png"></cover-image>
-
-			<!--快门键-->
-			<cover-image class="menu-snapshot" @tap="snapshot" src="/static/live-camera/shutter.png"></cover-image>
-
-			<!--反转键-->
-			<cover-image class="menu-flip" @tap="flip" src="/static/live-camera/flip.png"></cover-image>
-		</view>
-	</view>
-</template>
-
-<script>
-let _this = null;
-export default {
-	data() {
-		return {
-			poenCarmeInterval:null,//打开相机的轮询
-			aspect: '2:3', //比例
-			windowWidth: '', //屏幕可用宽度
-			windowHeight: '', //屏幕可用高度
-			camerastate: false, //相机准备好了
-			livePusher: null, //流视频对象
-			snapshotsrc: null //快照
-		};
-	},
-	onLoad(e) {
-		_this = this;
-		this.initCamera();
-	},
-	onReady() {
-		this.livePusher = uni.createLivePusherContext('livePusher', this);
-		this.startPreview(); //开启预览并设置摄像头
-		this.poenCarme();
-	},
-	methods: {
-		
-		//轮询打开
-		poenCarme(){
-			//#ifdef APP-PLUS
-			if (plus.os.name == 'Android') {
-				this.poenCarmeInterval = setInterval(function() {
-					console.log(_this.camerastate);
-					if (!_this.camerastate) _this.startPreview();
-				}, 2500);
-			}
-			//#endif
-		},
-		//初始化相机
-		initCamera() {
-			uni.getSystemInfo({
-				success: function(res) {
-					_this.windowWidth = res.windowWidth;
-					_this.windowHeight = res.windowHeight;
-					let zcs = _this.aliquot(_this.windowWidth,_this.windowHeight);
-					_this.aspect = (_this.windowWidth/zcs)+':'+(_this.windowHeight/zcs);
-					console.log('画面比例：'+_this.aspect);
-				}
-			});
-		},
-		
-		//整除数计算
-		aliquot(x, y) {
-			if (x % y == 0) return y;
-			return this.aliquot(y, x % y);
-		},
-
-		//开始预览
-		startPreview() {
-			this.livePusher.startPreview({
-				success: a => {
-					console.log(a)
-				}
-			});
-		},
-		
-		//停止预览
-		stopPreview() {
-			this.livePusher.stopPreview({
-				success: a => {
-					_this.camerastate = false; //标记相机未启动
-				}
-			});
-		},
-		
-		//状态
-		statechange(e) {
-			//状态改变
-			console.log(e);
-			if (e.detail.code == 1007) {
-				_this.camerastate = true;
-			} else if (e.detail.code == -1301) {
-				_this.camerastate = false;
-			}
-		},
-		
-
-		//返回
-		back() {
-			uni.navigateBack();
-		},
-
-		//抓拍
-		snapshot() {
-			//震动
-			uni.vibrateShort({
-			    success: function () {
-			        console.log('success');
-			    }
-			});
-			//拍照
-			this.livePusher.snapshot({
-				success: e => {
-					_this.snapshotsrc = e.message.tempImagePath;
-					_this.stopPreview();
-					_this.setImage();
-					uni.navigateBack();
-				}
-			});
-		},
-
-		//反转
-		flip() {
-			this.livePusher.switchCamera();
-		},
-
-		//设置
-		setImage() {
-			let pages = getCurrentPages();
-			let prevPage = pages[pages.length - 2]; //上一个页面
-
-			//直接调用上一个页面的setImage()方法，把数据存到上一个页面中去
-			prevPage.$vm.setImage({ path: _this.snapshotsrc });
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.live-camera {
-	justify-content: center;
-	align-items: center;
-	.menu {
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 750rpx;
-		height: 180rpx;
-		z-index: 98;
-		align-items: center;
-		justify-content: center;
-		.menu-mask {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 750rpx;
-			height: 180rpx;
-			z-index: 98;
-		}
-		.menu-back {
-			position: absolute;
-			left: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-		.menu-snapshot {
-			width: 130rpx;
-			height: 130rpx;
-			z-index: 99;
-		}
-		.menu-flip {
-			position: absolute;
-			right: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-	}
-}
-</style>

pages/mine/camera/idcard/idcard.nvue

@@ -1,246 +0,0 @@
-<template>
-	<view class="live-camera" :style="{ width: windowWidth, height: windowHeight }">
-		<view class="preview" :style="{ width: windowWidth, height: windowHeight - 80 }">
-			<live-pusher id="livePusher" ref="livePusher" class="livePusher" mode="FHD" beauty="0" whiteness="0"
-				:aspect="aspect" min-bitrate="1000" audio-quality="16KHz" device-position="back" :auto-focus="true"
-				:muted="true" :enable-camera="true" :enable-mic="false" :zoom="false" @statechange="statechange"
-				:style="{ width: cameraWidth, height: cameraHeight }"></live-pusher>
-
-			<!--提示语-->
-			<cover-view class="remind">
-				<text class="remind-text" style="">{{ message }}</text>
-			</cover-view>
-
-			<!--辅助线-->
-			<cover-view class="outline-box" :style="{ width: windowWidth, height: windowHeight - 80 }">
-				<cover-image class="outline-img" :src="src" style=""></cover-image>
-			</cover-view>
-		</view>
-
-		<view class="menu">
-			<!--底部菜单区域背景-->
-			<cover-image class="menu-mask" src="/static/live-camera/bar.png"></cover-image>
-
-			<!--返回键-->
-			<cover-image class="menu-back" @tap="back" src="/static/live-camera/back.png"></cover-image>
-
-			<!--快门键-->
-			<cover-image class="menu-snapshot" @tap="snapshot" src="/static/live-camera/shutter.png"></cover-image>
-
-			<!--反转键-->
-			<cover-image class="menu-flip" @tap="flip" src="/static/live-camera/flip.png"></cover-image>
-		</view>
-	</view>
-</template>
-
-<script>
-	let _this = null;
-	export default {
-		data() {
-			return {
-				poenCarmeInterval: null, //打开相机的轮询
-				dotype: 'face', //操作类型
-				message: '', //提示
-				aspect: '2:3', //比例
-				cameraWidth: '', //相机画面宽度
-				cameraHeight: '', //相机画面宽度
-				windowWidth: '', //屏幕可用宽度
-				windowHeight: '', //屏幕可用高度
-				camerastate: false, //相机准备好了
-				livePusher: null, //流视频对象
-				snapshotsrc: null //快照
-			};
-		},
-		onLoad(e) {
-			_this = this;
-			this.dotype = e.dotype;
-			if (e.dotype == 'idcardface') {
-				this.src = '/static/live-camera/outline/idcardface1.png';
-			} else if (e.dotype == 'bank') {
-				this.src = '/static/live-camera/outline/idphotoskin1.png'
-			} else {
-				this.src = '/static/live-camera/outline/idcardbadge1.png'
-			}
-			this.initCamera();
-		},
-		onReady() {
-			this.livePusher = uni.createLivePusherContext('livePusher', this);
-			this.startPreview(); //开启预览并设置摄像头
-			this.poenCarme();
-		},
-		methods: {
-			//轮询打开
-			poenCarme() {
-				//#ifdef APP-PLUS
-				if (plus.os.name == 'Android') {
-					this.poenCarmeInterval = setInterval(function() {
-						console.log(_this.camerastate);
-						if (!_this.camerastate) _this.startPreview();
-					}, 2500);
-				}
-				//#endif
-			},
-			//初始化相机
-			initCamera() {
-				//处理安卓手机异步授权问题
-				uni.getSystemInfo({
-					success: function(res) {
-						_this.windowWidth = res.windowWidth;
-						_this.windowHeight = res.windowHeight;
-						_this.cameraWidth = res.windowWidth;
-						_this.cameraHeight = res.windowWidth * 1.5;
-					}
-				});
-			},
-
-			//开始预览
-			startPreview() {
-				this.livePusher.startPreview({
-					success: a => {
-						console.log(a);
-					}
-				});
-			},
-
-			//停止预览
-			stopPreview() {
-				this.livePusher.stopPreview({
-					success: a => {
-						_this.camerastate = false; //标记相机未启动
-					}
-				});
-			},
-
-			//状态
-			statechange(e) {
-				//状态改变
-				console.log(e);
-				if (e.detail.code == 1007) {
-					_this.camerastate = true;
-				} else if (e.detail.code == -1301) {
-					_this.camerastate = false;
-				}
-			},
-
-			//返回
-			back() {
-				uni.navigateBack();
-			},
-
-			//抓拍
-			snapshot() {
-				this.livePusher.snapshot({
-					success: e => {
-						_this.snapshotsrc = e.message.tempImagePath;
-						_this.stopPreview();
-						_this.setImage();
-						uni.navigateBack();
-					}
-				});
-			},
-
-			//反转
-			flip() {
-				this.livePusher.switchCamera();
-			},
-
-			//设置
-			setImage() {
-				let pages = getCurrentPages();
-				let prevPage = pages[pages.length - 2]; //上一个页面
-
-				//直接调用上一个页面的setImage()方法，把数据存到上一个页面中去
-				prevPage.$vm.setImage({
-					path: _this.snapshotsrc,
-					dotype: this.dotype
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.live-camera {
-		.preview {
-			justify-content: center;
-			align-items: center;
-
-			.outline-box {
-				position: absolute;
-				top: 0;
-				left: 0;
-				bottom: 0;
-				z-index: 99;
-				align-items: center;
-				justify-content: center;
-
-				.outline-img {
-					width: 750rpx;
-					height: 1125rpx;
-				}
-			}
-
-			.remind {
-				position: absolute;
-				top: 880rpx;
-				width: 750rpx;
-				z-index: 100;
-				align-items: center;
-				justify-content: center;
-
-				.remind-text {
-					color: #dddddd;
-					font-weight: bold;
-				}
-			}
-		}
-
-		.menu {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 750rpx;
-			height: 180rpx;
-			z-index: 98;
-			align-items: center;
-			justify-content: center;
-
-			.menu-mask {
-				position: absolute;
-				left: 0;
-				bottom: 0;
-				width: 750rpx;
-				height: 180rpx;
-				z-index: 98;
-			}
-
-			.menu-back {
-				position: absolute;
-				left: 30rpx;
-				bottom: 50rpx;
-				width: 80rpx;
-				height: 80rpx;
-				z-index: 99;
-				align-items: center;
-				justify-content: center;
-			}
-
-			.menu-snapshot {
-				width: 130rpx;
-				height: 130rpx;
-				z-index: 99;
-			}
-
-			.menu-flip {
-				position: absolute;
-				right: 30rpx;
-				bottom: 50rpx;
-				width: 80rpx;
-				height: 80rpx;
-				z-index: 99;
-				align-items: center;
-				justify-content: center;
-			}
-		}
-	}
-</style>

pages/mine/camera/idcard/idphoto.nvue

@@ -1,246 +0,0 @@
-<template>
-	<view class="live-camera" :style="{ width: windowWidth, height: windowHeight }">
-		<view class="preview" :style="{ width: windowWidth, height: windowHeight - 80 }">
-			<live-pusher
-				id="livePusher"
-				ref="livePusher"
-				class="livePusher"
-				mode="FHD"
-				beauty="0"
-				whiteness="0"
-				:aspect="aspect"
-				min-bitrate="1000"
-				audio-quality="16KHz"
-				device-position="back"
-				:auto-focus="true"
-				:muted="true"
-				:enable-camera="true"
-				:enable-mic="false"
-				:zoom="false"
-				@statechange="statechange"
-				:style="{ width: cameraWidth, height: cameraHeight }"
-			></live-pusher>
-
-			<!--提示语-->
-			<cover-view class="remind">
-				<text class="remind-text" style="">{{ message }}</text>
-			</cover-view>
-
-			<!--辅助线-->
-			<cover-view class="outline-box" :style="{ width: windowWidth, height: windowHeight - 80 }">
-				<cover-image
-					class="outline-img"
-					:src="dotype == 'idcardface' ? '/static/live-camera/outline/idcardface1.png' : '/static/live-camera/outline/idcardbadge1.png'"
-					style="width:526rpx;height:696rpx;"
-				></cover-image>
-			</cover-view>
-		</view>
-
-		<view class="menu">
-			<!--底部菜单区域背景-->
-			<cover-image class="menu-mask" src="/static/live-camera/bar.png"></cover-image>
-
-			<!--返回键-->
-			<cover-image class="menu-back" @tap="back" src="/static/live-camera/back.png"></cover-image>
-
-			<!--快门键-->
-			<cover-image class="menu-snapshot" @tap="snapshot" src="/static/live-camera/shutter.png"></cover-image>
-
-			<!--反转键-->
-			<cover-image class="menu-flip" @tap="flip" src="/static/live-camera/flip.png"></cover-image>
-		</view>
-	</view>
-</template>
-
-<script>
-let _this = null;
-export default {
-	data() {
-		return {
-			poenCarmeInterval: null, //打开相机的轮询
-			dotype: 'face', //操作类型
-			message: '', //提示
-			aspect: '2:3', //比例
-			cameraWidth: '', //相机画面宽度
-			cameraHeight: '', //相机画面宽度
-			windowWidth: '', //屏幕可用宽度
-			windowHeight: '', //屏幕可用高度
-			camerastate: false, //相机准备好了
-			livePusher: null, //流视频对象
-			snapshotsrc: null //快照
-		};
-	},
-	onLoad(e) {
-		_this = this;
-		this.dotype = e.dotype;
-		this.initCamera();
-	},
-	onReady() {
-		this.livePusher = uni.createLivePusherContext('livePusher', this);
-		this.startPreview(); //开启预览并设置摄像头
-		this.poenCarme();
-	},
-	methods: {
-		//轮询打开
-		poenCarme() {
-			//#ifdef APP-PLUS
-			if (plus.os.name == 'Android') {
-				this.poenCarmeInterval = setInterval(function() {
-					console.log(_this.camerastate);
-					if (!_this.camerastate) _this.startPreview();
-				}, 2500);
-			}
-			//#endif
-		},
-		//初始化相机
-		initCamera() {
-			//处理安卓手机异步授权问题
-			uni.getSystemInfo({
-				success: function(res) {
-					_this.windowWidth = res.windowWidth;
-					_this.windowHeight = res.windowHeight;
-					_this.cameraWidth = res.windowWidth;
-					_this.cameraHeight = res.windowWidth * 1.5;
-				}
-			});
-		},
-
-		//开始预览
-		startPreview() {
-			this.livePusher.startPreview({
-				success: a => {
-					console.log(a);
-				}
-			});
-		},
-
-		//停止预览
-		stopPreview() {
-			this.livePusher.stopPreview({
-				success: a => {
-					_this.camerastate = false; //标记相机未启动
-				}
-			});
-		},
-
-		//状态
-		statechange(e) {
-			//状态改变
-			console.log(e);
-			if (e.detail.code == 1007) {
-				_this.camerastate = true;
-			} else if (e.detail.code == -1301) {
-				_this.camerastate = false;
-			}
-		},
-
-		//返回
-		back() {
-			uni.navigateBack();
-		},
-
-		//抓拍
-		snapshot() {
-			this.livePusher.snapshot({
-				success: e => {
-					_this.snapshotsrc = e.message.tempImagePath;
-					_this.stopPreview();
-					_this.setImage();
-					uni.navigateBack();
-				}
-			});
-		},
-
-		//反转
-		flip() {
-			this.livePusher.switchCamera();
-		},
-
-		//设置
-		setImage() {
-			let pages = getCurrentPages();
-			let prevPage = pages[pages.length - 2]; //上一个页面
-
-			//直接调用上一个页面的setImage()方法，把数据存到上一个页面中去
-			prevPage.$vm.setImage({ path: _this.snapshotsrc, dotype: this.dotype });
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.live-camera {
-	.preview {
-		justify-content: center;
-		align-items: center;
-		.outline-box {
-			position: absolute;
-			top: 0;
-			left: 0;
-			bottom: 0;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-			.outline-img {
-				width: 750rpx;
-				height: 1125rpx;
-			}
-		}
-		.remind {
-			position: absolute;
-			top: 880rpx;
-			width: 750rpx;
-			z-index: 100;
-			align-items: center;
-			justify-content: center;
-			.remind-text {
-				color: #dddddd;
-				font-weight: bold;
-			}
-		}
-	}
-	.menu {
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 750rpx;
-		height: 180rpx;
-		z-index: 98;
-		align-items: center;
-		justify-content: center;
-		.menu-mask {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 750rpx;
-			height: 180rpx;
-			z-index: 98;
-		}
-		.menu-back {
-			position: absolute;
-			left: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-		.menu-snapshot {
-			width: 130rpx;
-			height: 130rpx;
-			z-index: 99;
-		}
-		.menu-flip {
-			position: absolute;
-			right: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-	}
-}
-</style>

pages/mine/camera/portrait/portrait.nvue

@@ -1,214 +0,0 @@
-<template>
-	<view class="live-camera" :style="{ width: windowWidth, height: windowHeight }">
-		<live-pusher
-			id="livePusher"
-			ref="livePusher"
-			class="livePusher"
-			mode="FHD"
-			beauty="0"
-			whiteness="0"
-			:aspect="aspect"
-			min-bitrate="1000"
-			audio-quality="16KHz"
-			device-position="back"
-			:auto-focus="true"
-			:muted="true"
-			:enable-camera="true"
-			:enable-mic="false"
-			:zoom="false"
-			:style="{ width: windowWidth, height: windowHeight }"
-		></live-pusher>
-
-		<!--提示语-->
-		<cover-view class="remind">
-			<text class="remind-text" style="">{{ message }}</text>
-		</cover-view>
-
-		<!--辅助线-->
-		<cover-view class="outline">
-			<cover-image class="outline" src="/static/live-camera/outline/portrait.png" style=""></cover-image>
-		</cover-view>
-		
-
-		<view class="menu">
-			<!--底部菜单区域背景-->
-			<cover-image class="menu-mask" src="/static/live-camera/bar.png"></cover-image>
-
-			<!--返回键-->
-			<cover-image class="menu-back" @tap="back" src="/static/live-camera/back.png"></cover-image>
-
-			<!--快门键-->
-			<cover-image class="menu-snapshot" @tap="snapshot" src="/static/live-camera/shutter.png"></cover-image>
-
-			<!--反转键-->
-			<cover-image class="menu-flip" @tap="flip" src="/static/live-camera/flip.png"></cover-image>
-		</view>
-	</view>
-</template>
-
-<script>
-let _this = null;
-export default {
-	data() {
-		return {
-			message:'请拍摄苛学加',//提示
-			aspect: '2:3', //比例
-			windowWidth: '', //屏幕可用宽度
-			windowHeight: '', //屏幕可用高度
-			camerastate: false, //相机准备好了
-			livePusher: null, //流视频对象
-			snapshotsrc: null //快照
-		};
-	},
-	onLoad(e) {
-		_this = this;
-		this.initCamera();
-	},
-	onReady() {
-		this.livePusher = uni.createLivePusherContext('livePusher', this);
-		this.startPreview(); //开启预览并设置摄像头
-	},
-	methods: {
-		//初始化相机
-		initCamera() {
-			uni.getSystemInfo({
-				success: function(res) {
-					_this.windowWidth = res.windowWidth;
-					_this.windowHeight = res.windowHeight;
-					let zcs = _this.aliquot(_this.windowWidth, _this.windowHeight);
-					_this.aspect = _this.windowWidth / zcs + ':' + _this.windowHeight / zcs;
-				}
-			});
-		},
-
-		//整除数计算
-		aliquot(x, y) {
-			if (x % y == 0) return y;
-			return this.aliquot(y, x % y);
-		},
-
-		//开始预览
-		startPreview() {
-			this.livePusher.startPreview({
-				success: a => {
-					if (a.errMsg == 'startPreview:ok' || a.errMsg == 'operateLivePusher:ok') {
-						_this.camerastate = true; //标记相机启动成功
-					}
-				}
-			});
-		},
-		//停止预览
-		stopPreview() {
-			this.livePusher.stopPreview({
-				success: a => {
-					_this.camerastate = false; //标记相机未启动
-				}
-			});
-		},
-
-		//返回
-		back() {
-			uni.navigateBack();
-		},
-
-		//抓拍
-		snapshot() {
-			this.livePusher.snapshot({
-				success: e => {
-					_this.snapshotsrc = e.message.tempImagePath;
-					_this.stopPreview();
-					_this.setImage();
-					uni.navigateBack();
-				}
-			});
-		},
-
-		//反转
-		flip() {
-			this.livePusher.switchCamera();
-		},
-
-		//设置
-		setImage() {
-			let pages = getCurrentPages();
-			let prevPage = pages[pages.length - 2]; //上一个页面
-
-			//直接调用上一个页面的setImage()方法，把数据存到上一个页面中去
-			prevPage.$vm.setImage({ path: _this.snapshotsrc });
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.live-camera {
-	justify-content: center;
-	align-items: center;
-	.outline {
-		position: absolute;
-		top: 0;
-		left: 0;
-		bottom: 0;
-		width: 750rpx;
-		height: 1125rpx;
-		z-index: 99;
-		align-items: center;
-		justify-content: center;
-	}
-	.remind {
-		position: absolute;
-		top: 880rpx;
-		width: 750rpx;
-		z-index: 100;
-		align-items: center;
-		justify-content: center;
-		.remind-text {
-			color: #dddddd;
-			font-weight: bold;
-		}
-	}
-	.menu {
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 750rpx;
-		height: 180rpx;
-		z-index: 98;
-		align-items: center;
-		justify-content: center;
-		.menu-mask {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 750rpx;
-			height: 180rpx;
-			z-index: 98;
-		}
-		.menu-back {
-			position: absolute;
-			left: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-		.menu-snapshot {
-			width: 130rpx;
-			height: 130rpx;
-			z-index: 99;
-		}
-		.menu-flip {
-			position: absolute;
-			right: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-	}
-}
-</style>

pages/mine/camera/watermark/watermark.nvue

@@ -1,228 +0,0 @@
-<template>
-	<view class="live-camera" :style="{ width: windowWidth, height: windowHeight }">
-		<view class="preview" :style="{ width: windowWidth, height: windowHeight}">
-			<live-pusher
-				id="livePusher"
-				ref="livePusher"
-				class="livePusher"
-				mode="FHD"
-				beauty="0"
-				whiteness="0"
-				:aspect="aspect"
-				min-bitrate="1000"
-				audio-quality="16KHz"
-				device-position="back"
-				:auto-focus="true"
-				:muted="true"
-				:enable-camera="true"
-				:enable-mic="false"
-				:zoom="false"
-				@statechange="statechange"
-				:style="{ width: windowWidth, height: windowHeight }"
-			></live-pusher>
-			<!--提示语-->
-			<cover-view class="remind">
-				<text class="remind-text" style="">{{ message }}</text>
-			</cover-view>
-		</view>
-		<view class="menu">
-			<!--底部菜单区域背景-->
-			<cover-image class="menu-mask" src="/static/live-camera/bar.png"></cover-image>
-
-			<!--返回键-->
-			<cover-image class="menu-back" @tap="back" src="/static/live-camera/back.png"></cover-image>
-
-			<!--快门键-->
-			<cover-image class="menu-snapshot" @tap="snapshot" src="/static/live-camera/shutter.png"></cover-image>
-
-			<!--反转键-->
-			<cover-image class="menu-flip" @tap="flip" src="/static/live-camera/flip.png"></cover-image>
-		</view>
-	</view>
-</template>
-
-<script>
-let _this = null;
-export default {
-	data() {
-		return {
-			dotype:'watermark',
-			message:'live-camer',//水印内容
-			poenCarmeInterval: null, //打开相机的轮询
-			aspect: '2:3', //比例
-			windowWidth: '', //屏幕可用宽度
-			windowHeight: '', //屏幕可用高度
-			camerastate: false, //相机准备好了
-			livePusher: null, //流视频对象
-			snapshotsrc: null //快照
-		};
-	},
-	onLoad(e) {
-		_this = this;
-		if (e.dotype != undefined) this.dotype = e.dotype;
-		this.initCamera();
-	},
-	onReady() {
-		this.livePusher = uni.createLivePusherContext('livePusher', this);
-		this.startPreview(); //开启预览并设置摄像头
-		this.poenCarme();
-	},
-	methods: {
-		//轮询打开
-		poenCarme() {
-			//#ifdef APP-PLUS
-			if (plus.os.name == 'Android') {
-				this.poenCarmeInterval = setInterval(function() {
-					console.log(_this.camerastate);
-					if (!_this.camerastate) _this.startPreview();
-				}, 2500);
-			}
-			//#endif
-		},
-		//初始化相机
-		initCamera() {
-			uni.getSystemInfo({
-				success: function(res) {
-					_this.windowWidth = res.windowWidth;
-					_this.windowHeight = res.windowHeight;
-					let zcs = _this.aliquot(_this.windowWidth, _this.windowHeight);
-					_this.aspect = _this.windowWidth / zcs + ':' + _this.windowHeight / zcs;
-					console.log('画面比例：'+_this.aspect);
-				}
-			});
-		},
-
-		//整除数计算
-		aliquot(x, y) {
-			if (x % y == 0) return y;
-			return this.aliquot(y, x % y);
-		},
-
-		//开始预览
-		startPreview() {
-			this.livePusher.startPreview({
-				success: a => {
-					console.log(a);
-				}
-			});
-		},
-
-		//停止预览
-		stopPreview() {
-			this.livePusher.stopPreview({
-				success: a => {
-					_this.camerastate = false; //标记相机未启动
-				}
-			});
-		},
-
-		//状态
-		statechange(e) {
-			//状态改变
-			console.log(e);
-			if (e.detail.code == 1007) {
-				_this.camerastate = true;
-			} else if (e.detail.code == -1301) {
-				_this.camerastate = false;
-			}
-		},
-
-		//返回
-		back() {
-			uni.navigateBack();
-		},
-
-		//抓拍
-		snapshot() {
-			this.livePusher.snapshot({
-				success: e => {
-					_this.snapshotsrc = e.message.tempImagePath;
-					_this.stopPreview();
-					_this.setImage();
-					uni.navigateBack();
-				}
-			});
-		},
-
-		//反转
-		flip() {
-			this.livePusher.switchCamera();
-		},
-
-		//设置
-		setImage() {
-			let pages = getCurrentPages();
-			let prevPage = pages[pages.length - 2]; //上一个页面
-
-			//直接调用上一个页面的setImage()方法，把数据存到上一个页面中去
-			prevPage.$vm.setImage({ path: _this.snapshotsrc , dotype: this.dotype });
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.live-camera {
-	justify-content: center;
-	align-items: center;
-	.preview {
-		justify-content: center;
-		align-items: center;
-		.remind {
-			position: absolute;
-			top: 60rpx;
-			left: 20rpx;
-			width: 130px;
-			z-index: 100;
-			.remind-text {
-				color: #dddddd;
-				font-size: 40rpx;
-				text-shadow: #fff 1px 0 0, #fff 0 1px 0, #fff -1px 0 0, #fff 0 -1px 0;
-			}
-		}
-	}
-	.menu {
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 750rpx;
-		height: 180rpx;
-		z-index: 98;
-		align-items: center;
-		justify-content: center;
-		.menu-mask {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 750rpx;
-			height: 180rpx;
-			z-index: 98;
-		}
-		.menu-back {
-			position: absolute;
-			left: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-		.menu-snapshot {
-			width: 130rpx;
-			height: 130rpx;
-			z-index: 99;
-		}
-		.menu-flip {
-			position: absolute;
-			right: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-	}
-}
-</style>

pages/mine/driverCertificationNext.vue

@@ -529,7 +529,7 @@
 				// 	return true
 				// }
 
-				// if (this.dataDetails.qualificationCertificateNumber.length != 19 && this.dataDetails
+				// if (this.dataDetails.qualificationCertificateNumber.length != 19 || this.dataDetails
 				// 	.qualificationCertificateNumber.length != 18) {
 				// 	this.$refs.uToast.show({
 				// 		type: 'error',

pages/news/index.vue

@@ -3,7 +3,7 @@
 		style="background-color: #F5F6FA;"> -->
 	<view>
 		<u-navbar title="消息中心" leftIconSize='0' :bgColor="bgColor" :placeholder='true' leftIconColor="#fff"
-			titleStyle='color:#fff' rightText='全部已读' @rightClick="rightClick">
+			titleStyle='color:#fff' rightText='一键已读' @rightClick="rightClick">
 		</u-navbar>
 		<view class="top-bgc"></view>
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
@@ -16,7 +16,8 @@
 						<image src="@/static/images/news/xt.png" class="img" v-else>
 						</image>
 					</view>
-					<view class="right" :style="{'border-bottom':index==news.length-1?'1px solid #fff':'1px solid #e6e6e6'}">
+					<view class="right"
+						:style="{'border-bottom':index==news.length-1?'1px solid #fff':'1px solid #e6e6e6'}">
 						<view class="row1 flex flex-space-between">
 							<view class="title">
 								{{item.newsType}}
@@ -363,4 +364,4 @@
 			}
 		}
 	}
-</style>
+</style>