删除多余文件

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	// baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.changyuntong56.com',
-	baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'http://192.168.110.82:8099',
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
 	// baseUrlNew: 'http://192.168.110.67:8999/',
 	h5Appid: 'wxb66b599f7f61b46f',
@@ -10,4 +10,4 @@ const dev = {
 
 export function def() {
 	return dev
-}
+}

pages.json

@@ -79,7 +79,7 @@
 				"navigationBarTitleText": "反馈处理结果",
 				"enablePullDownRefresh": false
 			}
-		},{
+		}, {
 			"path": "pages/news/newsSee",
 			"style": {
 				"navigationBarTitleText": "系统消息",
@@ -147,9 +147,9 @@
 						}]
 					},
 					"pullToRefresh": {
-					    "support": true,
-					    "color": "#2772FB", //小圈圈的颜色
-					    "style": "circle" //小圈圈的样式
+						"support": true,
+						"color": "#2772FB", //小圈圈的颜色
+						"style": "circle" //小圈圈的样式
 					}
 				}
 			}
@@ -176,7 +176,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/mine/helpDescription",
 			"style": {
 				"navigationBarTitleText": "操作说明",
@@ -248,22 +248,6 @@
 				"enablePullDownRefresh": false
 			}
 
-		},
-		{
-			"path": "pages/mine/camera/idcard/idcard",
-			"style": {
-				"navigationStyle": "custom",
-				"backgroundColor": "#000000"
-			}
-
-		},
-		{
-			"path": "pages/mine/camera/video/video",
-			"style": {
-				"navigationStyle": "custom",
-				"backgroundColor": "#000000"
-			}
-
 		},
 		{
 			"path": "pages/mine/agency/agency",
@@ -294,7 +278,7 @@
 				"navigationBarTitleText": "提现详情",
 				"enablePullDownRefresh": false
 			}
-		
+
 		},
 		{
 			"path": "pages/mine/myAccount/withdrawal",
@@ -372,7 +356,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/mine/company/companyvideo",
 			"style": {
 				"navigationBarTitleText": "视频认证",
@@ -514,9 +498,9 @@
 						}]
 					},
 					"pullToRefresh": {
-					    "support": true,
-					    "color": "#2772FB", //小圈圈的颜色
-					    "style": "circle" //小圈圈的样式
+						"support": true,
+						"color": "#2772FB", //小圈圈的颜色
+						"style": "circle" //小圈圈的样式
 					}
 				}
 			}
@@ -574,35 +558,29 @@
 				"navigationStyle": "custom"
 			}
 
+		}, {
+			"path": "pages/mine/settings/fankui",
+			"style": {
+				"navigationBarTitleText": "意见反馈",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/public/serviceAgreement/serviceAgreement",
+			"style": {
+				"navigationBarTitleText": "服务协议",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/public/cytScrectAgreement/cytScrectAgreement",
+			"style": {
+				"navigationBarTitleText": "隐私声明",
+				"enablePullDownRefresh": false
+			}
+
 		}
-	    ,{
-            "path" : "pages/mine/settings/fankui",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "意见反馈",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/public/serviceAgreement/serviceAgreement",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "服务协议",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/public/cytScrectAgreement/cytScrectAgreement",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "隐私声明",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

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="dotype == 'idcardface' ? '/static/live-camera/outline/idcardface.png' : '/static/live-camera/outline/idcardbadge.png'"
-					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;
-		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/idphoto/idphoto.nvue

@@ -1,240 +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="1"
-				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="/static/live-camera/outline/idphotoskin.png" 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 {
-			dotype: 'idphoto', //操作类型
-			message: '', //提示
-			aspect: '2:3', //比例
-			cameraWidth: '', //相机画面宽度
-			cameraHeight: '', //相机画面宽度
-			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;
-					_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/video/video.nvue

@@ -1,259 +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/idcardface.png' : '/static/live-camera/outline/idcardbadge.png'"
-					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="start" src="/static/live-camera/shutter.png"></cover-image>
-			<cover-image class="menu-snapshot" @tap="stop" 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('````````````````````````````````````')
-				//状态改变
-				console.log(e);
-				if (e.detail.code == 1007) {
-					_this.camerastate = true;
-				} else if (e.detail.code == -1301) {
-					_this.camerastate = false;
-				}
-			},
-
-			//返回
-			back() {
-				uni.navigateBack();
-			},
-			start: function() {
-				console.log('开启直播流')
-				this.livePusher.start({
-					success: (a) => {
-						console.log("livePusher.start:" + JSON.stringify(a));
-					}
-				});
-			},
-			stop: function() {
-				console.log('结束直播流')
-				this.livePusher.stop({
-					success: (a) => {
-						console.log("livePusher.end:" + JSON.stringify(a));
-					}
-				});
-			},
-			//抓拍
-			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/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/release/release.vue

@@ -22,7 +22,8 @@
 			<view class="row" @click="selectCargoOwner">
 
 				<view class="left select-sf" :class='dataObj.cargoOwner?"":"select-sf1"'>
-					{{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}</view>
+					{{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}
+				</view>
 				<view class="right">
 					<image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image>
 				</view>
@@ -520,7 +521,7 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
-			lookContract(){
+			lookContract() {
 				uni.downloadFile({
 					url: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/hzContract.pdf",
 					success: function(res) {
@@ -573,6 +574,10 @@
 				this.isBusinessType = false
 			},
 			getSFList() {
+				uni.showLoading({
+					mask: true,
+					title: '加载中'
+				})
 				this.dataObj.commonId = this.userInfo.id
 				this.$request.baseRequest('get', '/cargoOwnerCompInfo/cargoOwnerList', {
 						commonId: this.userInfo.id
@@ -620,6 +625,7 @@
 								.companyName)
 						}
 						this.$forceUpdate()
+						uni.hideLoading()
 					})
 					.catch(res => {});
 
@@ -904,10 +910,10 @@
 				this.dataObj.commonId = this.userInfo.id
 				uni.$u.route('/pages/order/signContract', {
 					obj: JSON.stringify(this.dataObj),
-					type:1
+					type: 1
 				});
 				// this.$request.baseRequest('post', '/publishTaskInfo/api/addTask', this.dataObj).then(res => {
-					
+
 				// 	if(res.code == 200){
 				// 		uni.removeStorage({
 				// 			key: 'storage_saddress'
@@ -925,7 +931,7 @@
 				// 		// 		url: "/pages/release/release"
 				// 		// })
 				// 		this.dataObj.id = res.data 
-						
+
 				// 	}
 				// 	})
 				// 	.catch(res => {
@@ -1370,6 +1376,7 @@
 		box-sizing: border-box;
 		border-radius: 10rpx;
 	}
+
 	uni-navigator {
 		display: inline-block;
 		color: #2772FB;