改bug

pages.json

@@ -583,5 +583,15 @@
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "white",
 		"backgroundColor": "#F8F8F8"
+	},
+	"condition" : { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [
+			{
+				"name": "", //模式名称
+				"path": "", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			}
+		]
 	}
 }

pages/carSource/index.vue

@@ -58,7 +58,10 @@
 						</view>
 					</view>
 				</view>
-				<u-loadmore :status="status"  :nomore-text="nomoreText" />
+				<view v-if='status=="nomore"' style='text-align:center;'>
+					<image style='width:140px;height:140px;' src="../../static/images/carSource/mescroll-empty.png" mode=""></image>
+					<u-loadmore :status="status"  :nomore-text="nomoreText" />
+				</view>
 			</view>
 			<!-- <view v-if="routeData.length == 0" style="background: #FFFFFF;text-align: center;">
 				暂无数据
@@ -110,7 +113,11 @@
 						</view>
 					</view>
 				</view>
-				<u-loadmore :status="status"  :nomore-text="nomoreText" />
+				<view v-if='status=="nomore"' style='text-align:center;'>
+					<image style='width:140px;height:140px;' src="../../static/images/carSource/mescroll-empty.png" mode=""></image>
+					<u-loadmore :status="status"  :nomore-text="nomoreText" />
+				</view>
+				
 			</view>
 
 		<!-- 	<view v-if="formData.length == 0" style="background: #FFFFFF;text-align: center;">
@@ -171,7 +178,7 @@
 					paddingTop: "0",
 				},
 				status: 'loadmore',
-				 nomoreText: '实在没有了'
+				 nomoreText: '~ 空空如也 ~'
 			}
 		},
 		created() {},

pages/mine/cargoowner/addEnerprise.vue

@@ -71,6 +71,7 @@
 			</u-picker>
 
 		</view>
+		<u-toast ref="uToast"></u-toast>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 			@select="imgTypeSelect" @cancel='isShowimgType=false' :closeOnClickOverlay="true" :closeOnClickAction="true"
 			@close="isShowimgType=false">
@@ -152,8 +153,8 @@
 				console.log(event);
 				this.pathArr = event;
 			},
-			uploadFilePromise(file, url) {
-				uploadImage('image', file, url, 'appData/',
+			uploadFilePromise(file, url) {debugger
+				uploadImage('image',url, 'appData/',
 					result => {
 						// 上传成功回调函数
 						console.log('图片地址', result)
@@ -167,9 +168,10 @@
 				this[`fileList${event.name}`].splice(event.index, 1)
 			},
 			// 新增图片
-			async afterRead(event) {
+			async afterRead(event) {debugger
 				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
+				console.log(event)
 				let fileListLen = this[`fileList${event.name}`].length
 				lists.map((item) => {
 					this[`fileList${event.name}`].push({
@@ -255,28 +257,55 @@
 			// 		})
 			// 	});
 			// },
-
-			submit() {
+			validate() {
+				// true 为校验不通过
+				// if (uni.$u.test.isEmpty(this.dataDetails.payeeAddressUrl)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "请上传银行卡卡号页！",
+				// 	})
+				// 	return true
+				// }
+				if (uni.$u.test.isEmpty(this.dataDetails.certificateAddressUrl)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "企业授权书不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.authorizationDeadline)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "营业期限截止日期不能为空！",
+					})
+					return true
+				}
 				if (!this.checked) {
 					uni.showToast({
 						title: '请勾选协议',
 						icon: 'none',
 						duration: 2000
 					})
+					return true
+				}
+			},
+			submit() {
+				if(this.validate()){
 					return
 				}
 				uni.showLoading({
 					title: '加载中',
 					mask: true
 				})
-
 				var _this = this
 				this.dataDetails.commonId = this.userInfo.id
 				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/addCargoOwnerComp', _this.dataDetails).then(
 						res => {
 							uni.hideLoading()
-							uni.removeStorage('cargoOwnerId')
-							uni.removeStorage('currectcompany')
+							// uni.removeStorage('cargoOwnerId')
+							// uni.removeStorage('currectcompany')
+							uni.removeStorageSync('cargoOwnerId')
+							uni.removeStorageSync('currectcompany')
 							uni.$u.toast('提交成功')
 							_this.goDetailPage('/pages/mine/cargoowner/cargoowner')
 						})

pages/mine/cargoowner/cargoowner.vue

@@ -130,9 +130,10 @@
 					mask:true,
 					title:'加载中...'
 				})
+				var that=this
 				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/deleteCargoOwnerComp',{id:val.id} ).then(res => {
 					uni.hideLoading()
-						this.getList()
+						that.getList()
 				})
 				.catch(res => {
 					uni.hideLoading()
@@ -161,8 +162,11 @@
 						if (res.data) {
 							this.datastatus = true
 							this.personage = res.data
-							if (res.data.cargoOwnerCompInfoList) {
-								this.enterprise = res.data.cargoOwnerCompInfoList
+							if (res.data.hyCargoOwnerCompInfoList) {
+								this.enterprise = res.data.hyCargoOwnerCompInfoList
+								
+							}else{
+								this.enterprise =[]
 							}
 							if (this.personage) {
 								// this.statustext = this.personage.authenticationStatus

pages/mine/cargoowner/editEnerprise.vue

@@ -115,16 +115,24 @@
 			// this.getList()
 			
 			this.dataDetails = options
-			this.fileList1 = [{
-				url:options.certificateAddressUrl
-			}]
+			if(options.certificateAddressUrl){
+				var arr=options.certificateAddressUrl.split(',')
+				this.fileList1=[]
+				for(var i=0;i<arr.length;i++){
+					if(arr[i]!=''){
+						this.fileList1.push({url:arr[i]})
+					}
+				}
+			}
+			
+			
 		},
 		onShow() {
 		
 		},
 		methods: {
 			uploadFilePromise(file,url) {
-				uploadImage('image',file,url, 'appData/',
+				uploadImage('image',url, 'appData/',
 					result => {
 						// 上传成功回调函数
 						console.log('图片地址', result)

pages/mine/cargoowner/editpersonalinformation.vue

@@ -1,7 +1,39 @@
 <template>
 	<view class="content">
 		<view class='content1'>
-
+			<view style='padding:5px 0 10px;border-bottom:1px solid #eee;' class="flex width100">
+				<view style='width:100px;font-size:14px;'>姓名</view>
+				<view class="flex">
+					<u--input @input='nameinput' placeholder="输入姓名" inputAlign='left' border="none" v-model="dataDetails.name">
+					</u--input>
+				</view>
+			</view>
+			<view style='padding:10px 0 5px;border-bottom:1px solid #eee;' class="flex width100">
+				<view style='width:100px;font-size:14px;'>联系电话</view>
+				<view class="flex">
+					<u--input disabledColor='#fff' disabled placeholder="输入联系电话" inputAlign='left' border="none"
+						v-model="dataDetails.phone">
+					</u--input>
+				</view>
+			</view>
+			<view class="flex row" style='padding:10px 0 5px;border-bottom:1px solid #eee;'>
+				<view style='width:100px;font-size:14px;'>性别</view>
+				<u-radio-group v-model="dataDetails.sex" placement="row">
+					<u-radio :customStyle="radioCustomStyle" v-for="(item, index) in radiolist1" :key="index"
+						:label="item.name" :name="item.name" @change="radioChange">
+					</u-radio>
+				</u-radio-group>
+			</view>
+			<view class="flex row row-ch" style='padding:10px 0 5px;'>
+				<view style='width:100px;font-size:14px;'>称呼</view>
+				<u--input placeholder="输入姓氏" class="ch-style" inputAlign='left' border="none"
+					v-model="dataDetails.call">
+				</u--input>
+				<view class="flex align-center" v-if="dataDetails.sex=='男'">先生</view>
+				<view class="flex align-center" v-else>女士</view>
+			</view>
+		</view>
+		<view class="content2 content-other">
 			<view class="title">上传身份证人像面</view>
 			<view @click.stop="uploadImg(1,index)" class="picture picture1" v-if="!dataDetails.cardAddressUrl">
 				<image class="xj-image" src="@/static/mine/ic_shanchuan@2x.png"></image>
@@ -31,44 +63,10 @@
 
 				<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit"></image>
 			</view>
-		</view>
-		<view class="content2 content-other">
-			<view style='padding:5px 0 10px;border-bottom:1px solid #eee;' class="flex width100">
-				<view style='width:100px;font-size:14px;'>姓名</view>
-				<view class="flex">
-					<u--input @input='nameinput' placeholder="输入姓名" inputAlign='left' border="none"
-						v-model="dataDetails.name">
-					</u--input>
-				</view>
-			</view>
-			<view style='padding:10px 0 5px;border-bottom:1px solid #eee;' class="flex width100">
-				<view style='width:100px;font-size:14px;'>联系电话</view>
-				<view class="flex">
-					<u--input disabledColor='#fff' disabled placeholder="输入联系电话" inputAlign='left' border="none"
-						v-model="dataDetails.phone">
-					</u--input>
-				</view>
-			</view>
-			<view class="flex row" style='padding:10px 0 5px;border-bottom:1px solid #eee;'>
-				<view style='width:100px;font-size:14px;'>性别</view>
-				<u-radio-group v-model="dataDetails.sex" placement="row">
-					<u-radio :customStyle="radioCustomStyle" v-for="(item, index) in radiolist1" :key="index"
-						:label="item.name" :name="item.name" @change="radioChange">
-					</u-radio>
-				</u-radio-group>
-			</view>
-			<view class="flex row row-ch" style='padding:10px 0 5px;'>
-				<view style='width:100px;font-size:14px;'>称呼</view>
-				<u--input placeholder="输入姓氏" class="ch-style" inputAlign='left' border="none"
-					v-model="dataDetails.call">
-				</u--input>
-				<view class="flex align-center">{{sexText}}</view>
-			</view>
 
 			<view class="flex row">
 				<view class="left-text">身份证号</view>
-				<u--input :disabled='dataDetails.id' placeholder="请输入身份证号" inputAlign='left' border="none"
-					v-model="dataDetails.cardNumber">
+				<u--input :disabled='dataDetails.id' placeholder="请输入身份证号" inputAlign='left' border="none" v-model="dataDetails.cardNumber">
 				</u--input>
 			</view>
 
@@ -112,7 +110,6 @@
 			@select="imgTypeSelect" @cancel='isShowimgType=false' :closeOnClickOverlay="true" :closeOnClickAction="true"
 			@close="isShowimgType=false">
 		</u-action-sheet>
-		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -139,7 +136,6 @@
 						disabled: false
 					},
 				],
-				sexText: "先生",
 				uploadType: '',
 				isShowimgType: false,
 				dataDetails: {
@@ -150,8 +146,7 @@
 					cardAddressUrl: '',
 					cardBackAddressUrl: '',
 					cardValidityDate: '',
-					driverSex: '男',
-					sex: ''
+					driverSex: '男'
 				},
 				checked: false,
 				isShowcardValidity: false,
@@ -172,17 +167,13 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
-			nameinput() {
-				this.dataDetails.call = this.dataDetails.name[0]
+			nameinput(){
+				this.dataDetails.call=this.dataDetails.name[0]
 			},
 			// 性别切换
 			radioChange(n) {
+				console.log('radioChange', n);
 				this.dataDetails.sex = n
-				if (n == "男") {
-					this.sexText = "先生"
-				} else {
-					this.sexText = "女士"
-				}
 			},
 			consent() {
 				this.checked = !this.checked
@@ -192,6 +183,8 @@
 			},
 			//设置图片
 			setImage(e) {
+				// 
+				console.log(e);
 				//显示在页面
 				//this.imagesrc = e.path;
 				if (e.dotype == 'idphoto') {
@@ -206,7 +199,7 @@
 			savePhoto(path) {
 				// 
 				this.imagesrc = path;
-				uploadImage('image', path, 'appData/',
+				uploadImage(path, 'appData/',
 					result => {
 						// 上传成功
 						console.log('图片地址', result)
@@ -245,6 +238,7 @@
 				// }
 			},
 			confirmValidityPeriod(e) {
+				console.log('confirm', e)
 				if (e.value[0] == '长期') {
 					this.dataDetails.cardValidityDate = e.value[0]
 				} else {
@@ -255,8 +249,10 @@
 			},
 			uploadImg(type, index) {
 				this.uploadType = type
-				this.isShowimgType = true
 				this.index = index
+				this.imgTypeSelect()
+				// this.isShowimgType = true
+				
 			},
 			validate() {
 				if (uni.$u.test.isEmpty(this.dataDetails.name)) {
@@ -266,14 +262,14 @@
 					})
 					return true
 				}
-				if (this.dataDetails.name.length < 2 || this.dataDetails.name.length > 10) {
+				if (this.dataDetails.name.length<2||this.dataDetails.name.length<10) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "姓名输入错误！",
 					})
 					return true
 				}
-				if (this.dataDetails.call.length > 4) {
+				if (this.dataDetails.call.length<4) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "称呼输入错误！",
@@ -287,13 +283,20 @@
 					})
 					return true
 				}
-				if (this.dataDetails.cardNumber.length < 18) {
+				if (this.dataDetails.call.length<18) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "身份证号输入错误！",
 					})
 					return true
 				}
+				if(!this.checked){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请勾选细则！",
+					})
+					return true
+				}
 			},
 			submit() {
 				if (this.validate()) return
@@ -305,10 +308,7 @@
 				this.$request.baseRequest('post', '/cargoOwnerInfo/api/editCargoOwner', _this.dataDetails).then(res => {
 						uni.hideLoading()
 						uni.$u.toast('提交成功')
-						// uni.$u.route('/pages/mine/cargoowner/cargoowner')
-						uni.navigateBack({
-							delta: 1
-						})
+						uni.$u.route('/pages/mine/cargoowner/cargoowner')
 					})
 					.catch(res => {
 						uni.hideLoading()
@@ -325,7 +325,8 @@
 				uni.chooseImage({
 					count: 1,
 					success: function(res) {
-						uploadImage('image', res.tempFilePaths[0], 'appData/',
+						console.log(JSON.stringify(res.tempFilePaths));
+						uploadImage(res.tempFilePaths[0], 'appData/',
 							result => {
 								// 上传成功
 								console.log('图片地址', result)
@@ -338,17 +339,17 @@
 
 			imgTypeSelect(val) {
 				let that = this
-				if (val.name == '相册') {
+				console.log(val)
+				console.log(this.uploadType)
 					uni.chooseImage({
 						count: 1,
-						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image', res.tempFilePaths[0], 'appData/',
+							uploadImage(res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
 									console.log('图片地址', result)
-
+									
 									switch (that.uploadType) {
 										// 身份正面
 										case 1:
@@ -359,16 +360,6 @@
 														personImg: result,
 													}).then(res => {
 													that.dataDetails.cardNumber = res.data.recPersonNo
-													//性别设置默认
-													let i = res.data.recPersonNo.substr(16, 1)
-													if (i % 2 == 0) {
-														that.dataDetails.sex = "女"
-														that.sexText = "女士"
-													} else {
-														that.dataDetails.sex = "男"
-														that.sexText = "先生"
-													}
-
 													if (!that.dataDetails.name) {
 														that.dataDetails.name = res.data.recPerson
 													}
@@ -388,19 +379,15 @@
 							)
 						}
 					});
-
-				} else {
-					switch (this.uploadType) {
-						case 1:
-							uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=idcardface');
-							console.log('身份正面')
-							break
-						case 2:
-							uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=badge');
-							console.log('身份反面')
-							break
-					}
-				}
+				// 	switch (this.uploadType) {
+				// 		case 1:
+				// 			uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=idcardface');
+				// 			console.log('身份正面')
+				// 			break
+				// 		case 2:
+				// 			uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=badge');
+				// 			console.log('身份反面')
+				// 			break
 
 			},
 			//身份证正面
@@ -439,19 +426,15 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/.content {
-		margin-bottom: 160px;
-	}
-
+	
 	// .preview-card-img {
 	// 	/deep/uni-image>div, uni-image>img {
 	// 	    transform: scale(1.5) rotate(-90deg);
 	// 	}
 	// }
-	/deep/.uni-input-input:disabled {
-		background: #fff;
+	/deep/.uni-input-input:disabled{
+		background:#fff;
 	}
-
 	.picture {
 		margin-top: 20rpx;
 		background: #F5F6FA;
@@ -470,7 +453,6 @@
 		margin: 20rpx;
 		padding: 20rpx;
 		border-radius: 20rpx;
-
 		.row-ch {
 			padding-right: 180rpx;
 			box-sizing: border-box;
@@ -517,28 +499,40 @@
 			height: 80rpx;
 		}
 
+		.picture {
+			width: 100%;
+			height: 440rpx;
+			position: relative;
+			.text {
+				margin-top: 20rpx;
+			}
+		}
 
-	}
+		.picture1 {
+			background: url(../../../static/mine/zm.png);
+			background-size: 100% 100%;
+		}
 
-	.picture {
-		width: 100%;
-		height: 440rpx;
-		position: relative;
+		.picture2 {
+			background: url(../../../static/mine/gh.png);
+			background-size: 100% 100%;
+		}
 
-		.text {
-			margin-top: 20rpx;
+		.picture3 {
+			background: url(../../../static/mine/yhkzm.png);
+			background-size: 100% 100%;
 		}
-	}
 
-	.xj-image {
-		width: 100rpx;
-		height: 100rpx;
-	}
+		.xj-image {
+			width: 100rpx;
+			height: 100rpx;
+		}
 
-	.title {
-		color: #999999;
-		margin: 20rpx 0;
-		font-size: 14px;
+		.title {
+			color: #999999;
+			margin: 20rpx 0;
+			font-size: 14px;
+		}
 	}
 
 	.u-input {
@@ -584,23 +578,7 @@
 		height: 80rpx;
 		z-index: 9;
 	}
-
-	.bz {
+	.bz{
 		font-size: 28rpx;
 	}
-
-	.picture1 {
-		background: url(../../../static/mine/zm.png);
-		background-size: 100% 100%;
-	}
-
-	.picture2 {
-		background: url(../../../static/mine/gh.png);
-		background-size: 100% 100%;
-	}
-
-	.picture3 {
-		background: url(../../../static/mine/yhkzm.png);
-		background-size: 100% 100%;
-	}
 </style>

pages/mine/cargoowner/selectcompany.vue

@@ -87,19 +87,28 @@
 				this.$request.baseRequest('get', '/cargoOwnerInfo/selectCargoOwner', {
 						commonId: this.userInfo.id
 					}).then(res => {
-						debugger
+						
 						uni.hideLoading()
 						if (res.data) {
+							console.log(111111)
 							if(res.data.name==item.legalPersonName){
+								console.log(22222)
 								uni.showToast({
 									title: '您已经具备该公司货主身份',
 									icon: 'none',
 									duration: 2000
 								})
 							}else if(res.data.hyCargoOwnerCompInfoList){
-								if(!res.data.hyCargoOwnerCompInfoList.every(item=>{
-									return item.company==item.companyName
+								res.data.hyCargoOwnerCompInfoList.every(items=>{
+									 console.log(items.company,item.companyName)
+								})
+								if(res.data.hyCargoOwnerCompInfoList.every(items=>{
+									return items.company!=item.companyName
 								})){
+
+									uni.setStorageSync('currectcompany', item)
+									that.goDetailPage('pages/mine/cargoowner/addEnerprise')
+								}else{
 									for (var i = 0; i < res.data.hyCargoOwnerCompInfoList.length; i++) {
 										if(res.data.hyCargoOwnerCompInfoList[i].company==item.companyName){
 											uni.showToast({
@@ -112,9 +121,10 @@
 								}
 								
 							}else{
-									uni.setStorageSync('currectcompany', item)
-									that.goDetailPage('pages/mine/cargoowner/addEnerprise')
-								}
+								uni.setStorageSync('currectcompany', item)
+								that.goDetailPage('pages/mine/cargoowner/addEnerprise')
+								console.log(4444)
+							}
 						}
 					})
 					.catch(res => {
@@ -232,7 +242,9 @@
 			width: 90%;
 		}
 	}
-
+	.center{
+		margin-top:30px;
+	}
 	.legal_person {
 		color: #2772FB;
 		font-size: 20rpx;

pages/mine/company/addcompany.vue

@@ -522,11 +522,12 @@
 				this.isShowcardValidity = false
 			},
 			imgTypeSelect(val) {
+				debugger
 				var _this = this
-				if (val.name == '相册') {
+				// if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
-						sourceType: this.$helper.chooseImage.sourceType,
+						// sourceType: ,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
 							uploadImage('image', res.tempFilePaths[0], 'appData/',
@@ -544,21 +545,26 @@
 														licenseImg: result,
 													}).then(res => {
 													if (res.code == '200') {
-														if (res.data.validPeriod == '29991231') {
-															_this.dataDetails.businessTermDate = '长期'
+														if(res.data){
+															if (res.data.validPeriod == '29991231') {
+																_this.dataDetails.businessTermDate = '长期'
+															}
+															_this.dataDetails.unifiedSocialCreditCode = res
+																.data.regNum
+															_this.dataDetails.legalPersonName = res.data
+																.licensePerson
+															_this.dataDetails.companyName = res.data
+																.licenseName
+															console.log(res)
+															_this.$forceUpdate()
+														}else{
+															uni.$u.toast('请上传营业执照');
 														}
-														_this.dataDetails.unifiedSocialCreditCode = res
-															.data.regNum
-														_this.dataDetails.legalPersonName = res.data
-															.licensePerson
-														_this.dataDetails.companyName = res.data
-															.licenseName
-														console.log(res)
-														_this.$forceUpdate()
 													}
 
 												})
 												.catch(res => {
+													console.log(res)
 													uni.$u.toast(res.message);
 												});
 											console.log(_this.dataDetails.businessLicenseAddressUrl)
@@ -575,62 +581,63 @@
 							)
 						}
 					});
-				} else {
-					uni.chooseImage({
-						count: 1,
-						sourceType: ['camera'],
-						success: function(res) {
-							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image', res.tempFilePaths[0], 'appData/',
-								result => {
-									// 上传成功回调函数
-									console.log('图片地址', result)
-									switch (_this.uploadType) {
-										// 身份正面
-										case 1:
-											// 识别
-											_this.$request.baseRequest('get',
-													'/cargoOwnerInfo/api/licenseShibie', {
-														licenseImg: result,
-													}).then(res => {
-													if (res.code == '200') {
-														if (res.data.validPeriod == '29991231') {
-															_this.dataDetails.businessTermDate = '长期'
-														}
-														_this.dataDetails.unifiedSocialCreditCode = res
-															.data.regNum
-														_this.dataDetails.legalPersonName = res.data
-															.licensePerson
-														_this.dataDetails.companyName = res.data
-															.licenseName
-														console.log(res)
-														_this.$forceUpdate()
-													}
-
-												})
-												.catch(res => {
-													uni.$u.toast(res.message);
-												});
-											_this.dataDetails.businessLicenseAddressUrl = result
-											console.log(_this.dataDetails.businessLicenseAddressUrl)
-											break
-											// 身份反面
-										case 2:
-											_this.dataDetails.propertyAddressUrl = result
-											console.log(_this.dataDetails.propertyAddressUrl)
-											break
-										case 3:
-											break;
-									}
-								}
-							)
-						}
-					});
-				}
+				// } else {
+				// 	uni.chooseImage({
+				// 		count: 1,
+				// 		sourceType: ['camera'],
+				// 		success: function(res) {
+				// 			console.log(JSON.stringify(res.tempFilePaths));
+				// 			uploadImage('image', res.tempFilePaths[0], 'appData/',
+				// 				result => {
+				// 					// 上传成功回调函数
+				// 					console.log('图片地址', result)
+				// 					switch (_this.uploadType) {
+				// 						// 身份正面
+				// 						case 1:
+				// 							// 识别
+				// 							_this.$request.baseRequest('get',
+				// 									'/cargoOwnerInfo/api/licenseShibie', {
+				// 										licenseImg: result,
+				// 									}).then(res => {
+				// 									if (res.code == '200') {
+				// 										if (res.data.validPeriod == '29991231') {
+				// 											_this.dataDetails.businessTermDate = '长期'
+				// 										}
+				// 										_this.dataDetails.unifiedSocialCreditCode = res
+				// 											.data.regNum
+				// 										_this.dataDetails.legalPersonName = res.data
+				// 											.licensePerson
+				// 										_this.dataDetails.companyName = res.data
+				// 											.licenseName
+				// 										console.log(res)
+				// 										_this.$forceUpdate()
+				// 									}
+
+				// 								})
+				// 								.catch(res => {
+				// 									uni.$u.toast(res.message);
+				// 								});
+				// 							_this.dataDetails.businessLicenseAddressUrl = result
+				// 							console.log(_this.dataDetails.businessLicenseAddressUrl)
+				// 							break
+				// 							// 身份反面
+				// 						case 2:
+				// 							_this.dataDetails.propertyAddressUrl = result
+				// 							console.log(_this.dataDetails.propertyAddressUrl)
+				// 							break
+				// 						case 3:
+				// 							break;
+				// 					}
+				// 				}
+				// 			)
+				// 		}
+				// 	});
+				// }
 			},
 			uploadImg(type) {
 				this.uploadType = type
-				this.isShowimgType = true
+				this.imgTypeSelect()
+				// this.isShowimgType = true
 				// this.index = index
 			},
 			goDetailPage(src) {
@@ -639,7 +646,8 @@
 			},
 			selectValidityPeriod(type) {
 				this.ValidityPeriodType = type
-				this.isShowcardValidity = true
+				this.imgTypeSelect()
+				// this.isShowcardValidity = true
 			},
 			confirmValidityPeriod(e) {
 				switch (this.ValidityPeriodType) {

pages/mine/index.vue

@@ -149,7 +149,7 @@
 				phone: '',
 				status: false,
 				alertContent: '您尚未登录，是否立即登录？',
-				cargoCall:"先生",
+				cargoCall:"",
 			};
 		},
 		onShow() {
@@ -197,6 +197,9 @@
 				})
 				this.phone = this.userInfo.phone ? this.userInfo.phone.replace(this.userInfo.phone.substring(3, 7),
 					"****") : ''
+				if(!this.cargoCall){
+					this.userName=this.userInfo.userName
+				}
 				if (!this.hasLogin) {
 					this.isShowAlert = true
 					return

pages/mine/manageBankCards/addBankCard.vue

@@ -201,8 +201,8 @@
 				// });
 			},
 			uploadImg() {
-
-				this.isShowimgType = true
+				this.imgTypeSelect()
+				// this.isShowimgType = true
 			},
 			validate() {
 				// true 为校验不通过
@@ -252,10 +252,10 @@
 
 			imgTypeSelect(val) {
 				console.log(val)
-				if (val.name == '相册') {
+				// if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
-						sourceType: this.$helper.chooseImage.sourceType,
+						// sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
 							uploadImage('image', res.tempFilePaths[0], 'appData/',
@@ -291,9 +291,9 @@
 						}
 					});
 
-				} else {
-					uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=bank');
-				}
+				// } else {
+				// 	uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=bank');
+				// }
 
 			},
 			submit() {
@@ -323,6 +323,10 @@
 					})
 					return
 				} else {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
 					that.$request.baseRequest('get', '/driverPayeeInfo/bankCradShibie', { //三要素验证
 						name: that.dataDetails.cardholderName, //持卡人姓名
 						idCard: this.id, //货主身份证号
@@ -338,6 +342,7 @@
 											type: 'success',
 											message: "提交成功",
 										}
+										uni.hideLoading()
 										that.$refs.uToast.show({
 											...params
 										})

pages/mine/settings/editAvatar.vue

@@ -39,15 +39,15 @@
 		},
 		methods: {
 			upload() {
-				this.isShowimgType = true
-			
+				// this.isShowimgType = true
+			this.imgTypeSelect()
 			},
 			imgTypeSelect(val) {
 				console.log(val)
-				if (val.name == '相册') {
+				// if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
-						sourceType: this.$helper.chooseImage.sourceType,
+						// sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
 							uploadImage('image',res.tempFilePaths[0], 'appData/',
@@ -61,9 +61,9 @@
 						}
 					});
 			
-				} else {
+			// 	} else {
 			
-				}
+			// 	}
 			
 			},
 			submit(){

pages/mine/settings/editPassword.vue

@@ -4,23 +4,22 @@
 		<view class="wrapper">
 				<h2 class="Semibold">重置密码</h2>
 			<u--form labelPosition="left" :model="registerData" ref="registerForm" labelWidth="80">
-				<u-form-item label="电话" prop="phone" borderBottom>
+				<u-form-item label="手机号" prop="phone" borderBottom>
 					<u--input v-model="registerData.phone" border="none" placeholder="请输入手机号码"></u--input>
 				</u-form-item>
 			
 				<u-form-item label="验证码" prop="code"borderBottom>
 					<u--input v-model="registerData.verifyCode" border="none" placeholder="请填写验证码"></u--input>
-					<u-button slot="right" @tap="getCode" :text="tips" size="mini" :disabled="disabled1" class="code-style">
-					</u-button>
+					<button  :disabled="disabled1" class="code-style code-small" @tap="getCode">{{tips}}</button>
 				</u-form-item>
 				<u-form-item label="新密码" prop="password" borderBottom>
 					<u--input v-model="registerData.password" border="none" placeholder="请输入新密码，6-16位字符"></u--input>
 				</u-form-item>
 			
-				<u-code ref="uCode" @change="codeChange" seconds="20" @start="disabled1 = true" @end="disabled1 = false">
+				<u-code ref="uCode" @change="codeChange" seconds="60" @start="disabled1 = true" @end="disabled1 = false">
 				</u-code>
 			</u--form>
-			<u-button class="code-style reset" @click='reset'>重置密码</u-button>
+			<button class="code-style reset">重置密码</button>
 		</view>
 
 
@@ -206,4 +205,9 @@
 	.Semibold{
 		margin-bottom: 50rpx;
 	}
+	.code-small{
+		width:200rpx;
+		height:60rpx;
+		font-size:24rpx;
+	}
 </style>

pages/news/index.vue

@@ -20,7 +20,7 @@
 							{{item.newsType}}
 						</view>
 						<view class="time">
-							{{item.updateDate}}
+							{{item.createDate}}
 						</view>
 					</view>
 					<view class="row2 flex flex-space-between align-center">
@@ -95,6 +95,8 @@
 
 		},
 		onShow() {
+			var that=this
+			console.log(122232)
 			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 				reCommonId: this.userInfo.id,
 			}).then(res3 => {
@@ -118,6 +120,16 @@
 					}
 				}
 			})
+			this.$request.baseRequest('get', '/newsInfo/selectNewsInfo', {
+					reCommonId: this.userInfo.id,
+					pageSize: 10,
+					currentPage: 1,
+				}).then(res => {
+					this.news = res.data.records //追加新数据
+				})
+				.catch(res => {
+					uni.$u.toast(res.message);
+				});
 			// this.mescroll.resetUpScroll()
 		},
 		computed: {

pages/order/confirmLoading.vue

@@ -70,11 +70,11 @@
 					{{detailData.loadingDate?detailData.loadingDate:'来自合同'}}
 				</view>
 			</view>
-			<view class='s-flex'>
+			<!-- <view class='s-flex'>
 				<view class="" style="margin:20rpx 0;">上传装车照片</view>
 				<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
 					name="1" multiple :maxCount="3"></u-upload>
-			</view>
+			</view> -->
 
 		</view>
 		<view class="bottom-btn">

pages/order/orderDetails.vue

@@ -50,7 +50,7 @@
 			</view>
 			<view class="item3 flex flex-space-between align-center">
 				<view class="left flex align-center" @click="goTodriverDetail">
-					<u--image :showLoading="true" :src="src" width="44px" height="44px" @click="" shape='circle'>
+					<u--image :showLoading="true" :src="dataObj.driverPortrait" width="44px" height="44px" @click="" shape='circle'>
 					</u--image>
 					<view class="name">{{dataObj.driverName}}</view>
 					<view class="flex align-center">

pages/public/login.vue

@@ -5,7 +5,7 @@
 			<image style='width:38px;height:38px;margin:223rpx 0 20px 0;' src='@/static/logo.png'></image>
 			<h2 class="title Semibold">欢迎使用畅运通货主端</h2>
 			<view
-				style='position:relative;width:100%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;align-items: center;'
+				style='position:relative;width:93%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;align-items: center;'
 				class="flex">
 				<view class="phone-before-num NumberMedium">+86</view>
 				<view style='width:85%;'>
@@ -20,13 +20,20 @@
 				<!-- <u--input class='password' border="none" v-model='password'
 					placeholder="请输入密码，6-16位字符" :type="type" value="">
 					</u--input> -->
-				<u-input 	v-if="isShowPassword=='password'" class='password' border="none" v-model='password' placeholder="请输入密码，6-16位字符"
-					type="password" :clearable='true'>
-					<template slot="suffix">
-						<u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
+				<view style='position:relative;'>
+					
+					<input class='password' v-model='password' v-if="isShowPassword=='password'" placeholder="请输入密码" type="password">
+					<input class='password' v-model='password' v-else type="text" placeholder="请输入密码">
+					<u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
 							v-if="isShowPassword=='password'"></u-icon>
-						<u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
+					<u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
 						</u-icon>
+				</view>
+				<!-- <u-input v-if="isShowPassword=='password'" class='password' border="none" v-model='password' placeholder="请输入密码，6-16位字符"
+					type="password" :clearable='true'>
+					
+					<template slot="suffix">
+						
 					</template>
 				</u-input>
 				<u-input v-else class='password' border="none" v-model='password' placeholder="请输入密码，6-16位字符"
@@ -37,7 +44,7 @@
 						<u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
 						</u-icon>
 					</template>
-				</u-input>
+				</u-input> -->
 			</view>
 			<button :class='phone!=""&&password!=""?"active":""' @click='passlogin'
 				class='Regular verificationCode'>登录</button>
@@ -249,7 +256,12 @@
 		position: absolute;
 		right: 0px;
 	}
-
+	.u-icon{
+		position:absolute;
+		right:0;
+		top:50%;
+		transform: translate(-50%,-50%);
+	}
 	.close1 {
 		width: 20px;
 		height: 20px;
@@ -270,6 +282,7 @@
 	.password {
 		border: none;
 		outline: none;
+		font-size:28rpx;
 	}
 
 	.cuIcon-weixin {

pages/release/selectAddress.vue

@@ -20,7 +20,7 @@
 				<u-radio-group placement="row" class="select-type" v-model="item.radiovalue">
 					<u-radio :customStyle="radioCustomStyle" v-for="(item1, index) in radiolist1" :key="index"
 						:label="item1.name" :name="item1.name" @change="radioChange($event,item)" labelSize='12px'
-						:iconSize='4'>
+						:iconSize='10'>
 					</u-radio>
 				</u-radio-group>
 				<view class="flex">

unpackage/dist/dev/app-plus/__uniappview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>

unpackage/dist/dev/app-plus/app-config.js

@@ -0,0 +1,154 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// install a JSONP callback for chunk loading
+/******/ 	function webpackJsonpCallback(data) {
+/******/ 		var chunkIds = data[0];
+/******/ 		var moreModules = data[1];
+/******/ 		var executeModules = data[2];
+/******/
+/******/ 		// add "moreModules" to the modules object,
+/******/ 		// then flag all "chunkIds" as loaded and fire callback
+/******/ 		var moduleId, chunkId, i = 0, resolves = [];
+/******/ 		for(;i < chunkIds.length; i++) {
+/******/ 			chunkId = chunkIds[i];
+/******/ 			if(Object.prototype.hasOwnProperty.call(installedChunks, chunkId) && installedChunks[chunkId]) {
+/******/ 				resolves.push(installedChunks[chunkId][0]);
+/******/ 			}
+/******/ 			installedChunks[chunkId] = 0;
+/******/ 		}
+/******/ 		for(moduleId in moreModules) {
+/******/ 			if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {
+/******/ 				modules[moduleId] = moreModules[moduleId];
+/******/ 			}
+/******/ 		}
+/******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
+/******/ 		while(resolves.length) {
+/******/ 			resolves.shift()();
+/******/ 		}
+/******/
+/******/ 		// add entry modules from loaded chunk to deferred list
+/******/ 		deferredModules.push.apply(deferredModules, executeModules || []);
+/******/
+/******/ 		// run deferred modules when all chunks ready
+/******/ 		return checkDeferredModules();
+/******/ 	};
+/******/ 	function checkDeferredModules() {
+/******/ 		var result;
+/******/ 		for(var i = 0; i < deferredModules.length; i++) {
+/******/ 			var deferredModule = deferredModules[i];
+/******/ 			var fulfilled = true;
+/******/ 			for(var j = 1; j < deferredModule.length; j++) {
+/******/ 				var depId = deferredModule[j];
+/******/ 				if(installedChunks[depId] !== 0) fulfilled = false;
+/******/ 			}
+/******/ 			if(fulfilled) {
+/******/ 				deferredModules.splice(i--, 1);
+/******/ 				result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
+/******/ 			}
+/******/ 		}
+/******/
+/******/ 		return result;
+/******/ 	}
+/******/
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// object to store loaded and loading chunks
+/******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
+/******/ 	// Promise = chunk loading, 0 = chunk loaded
+/******/ 	var installedChunks = {
+/******/ 		"app-config": 0
+/******/ 	};
+/******/
+/******/ 	var deferredModules = [];
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "/";
+/******/
+/******/ 	var jsonpArray = this["webpackJsonp"] = this["webpackJsonp"] || [];
+/******/ 	var oldJsonpFunction = jsonpArray.push.bind(jsonpArray);
+/******/ 	jsonpArray.push = webpackJsonpCallback;
+/******/ 	jsonpArray = jsonpArray.slice();
+/******/ 	for(var i = 0; i < jsonpArray.length; i++) webpackJsonpCallback(jsonpArray[i]);
+/******/ 	var parentJsonpFunction = oldJsonpFunction;
+/******/
+/******/
+/******/ 	// run deferred modules from other chunks
+/******/ 	checkDeferredModules();
+/******/ })
+/************************************************************************/
+/******/ ([]);

unpackage/dist/dev/app-plus/hybrid/html/base64.js

@@ -0,0 +1,147 @@
+(function() {
+	var base64EncodeChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	var base64DecodeChars = new Array(
+		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
+		52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
+		-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+		15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+		-1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+		41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1);
+	 Window.base64 = {
+		encode: function encode(str) {
+			var out, i, len;
+			var c1, c2, c3;
+			len = str.length;
+			i = 0;
+			out = "";
+			while (i < len) {
+				c1 = str.charCodeAt(i++) & 0xff;
+				if (i == len) {
+					out += base64EncodeChars.charAt(c1 >> 2);
+					out += base64EncodeChars.charAt((c1 & 0x3) << 4);
+					out += "==";
+					break;
+				}
+				c2 = str.charCodeAt(i++);
+				if (i == len) {
+					out += base64EncodeChars.charAt(c1 >> 2);
+					out += base64EncodeChars.charAt(((c1 & 0x3) << 4) | ((c2 & 0xF0) >> 4));
+					out += base64EncodeChars.charAt((c2 & 0xF) << 2);
+					out += "=";
+					break;
+				}
+				c3 = str.charCodeAt(i++);
+				out += base64EncodeChars.charAt(c1 >> 2);
+				out += base64EncodeChars.charAt(((c1 & 0x3) << 4) | ((c2 & 0xF0) >> 4));
+				out += base64EncodeChars.charAt(((c2 & 0xF) << 2) | ((c3 & 0xC0) >> 6));
+				out += base64EncodeChars.charAt(c3 & 0x3F);
+			}
+			return out;
+		},
+		decode: function decode(str) {
+			var c1, c2, c3, c4;
+			var i, len, out;
+			len = str.length;
+			i = 0;
+			out = "";
+			while (i < len) {
+				/* c1 */
+				do {
+					c1 = base64DecodeChars[str.charCodeAt(i++) & 0xff];
+				} while (i < len && c1 == -1);
+				if (c1 == -1)
+					break;
+				/* c2 */
+				do {
+					c2 = base64DecodeChars[str.charCodeAt(i++) & 0xff];
+				} while (i < len && c2 == -1);
+				if (c2 == -1)
+					break;
+				out += String.fromCharCode((c1 << 2) | ((c2 & 0x30) >> 4));
+				/* c3 */
+				do {
+					c3 = str.charCodeAt(i++) & 0xff;
+					if (c3 == 61)
+						return out;
+					c3 = base64DecodeChars[c3];
+				} while (i < len && c3 == -1);
+				if (c3 == -1)
+					break;
+				out += String.fromCharCode(((c2 & 0XF) << 4) | ((c3 & 0x3C) >> 2));
+				/* c4 */
+				do {
+					c4 = str.charCodeAt(i++) & 0xff;
+					if (c4 == 61)
+						return out;
+					c4 = base64DecodeChars[c4];
+				} while (i < len && c4 == -1);
+				if (c4 == -1)
+					break;
+				out += String.fromCharCode(((c3 & 0x03) << 6) | c4);
+			}
+			return out;
+		},
+		utf16to8: function utf16to8(str) {
+			var out, i, len, c;
+			out = "";
+			len = str.length;
+			for (i = 0; i < len; i++) {
+				c = str.charCodeAt(i);
+				if ((c >= 0x0001) && (c <= 0x007F)) {
+					out += str.charAt(i);
+				} else if (c > 0x07FF) {
+					out += String.fromCharCode(0xE0 | ((c >> 12) & 0x0F));
+					out += String.fromCharCode(0x80 | ((c >> 6) & 0x3F));
+					out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
+				} else {
+					out += String.fromCharCode(0xC0 | ((c >> 6) & 0x1F));
+					out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
+				}
+			}
+			return out;
+		},
+		utf8to16: function utf8to16(str) {
+			var out, i, len, c;
+			var char2, char3;
+			out = "";
+			len = str.length;
+			i = 0;
+			while (i < len) {
+				c = str.charCodeAt(i++);
+				switch (c >> 4) {
+					case 0:
+					case 1:
+					case 2:
+					case 3:
+					case 4:
+					case 5:
+					case 6:
+					case 7:
+						// 0xxxxxxx
+						out += str.charAt(i - 1);
+						break;
+					case 12:
+					case 13:
+						// 110x xxxx 10xx xxxx
+						char2 = str.charCodeAt(i++);
+						out += String.fromCharCode(((c & 0x1F) << 6) | (char2 & 0x3F));
+						break;
+					case 14:
+						// 1110 xxxx 10xx xxxx 10xx xxxx
+						char2 = str.charCodeAt(i++);
+						char3 = str.charCodeAt(i++);
+						out += String.fromCharCode(((c & 0x0F) << 12) |
+							((char2 & 0x3F) << 6) |
+							((char3 & 0x3F) << 0));
+						break;
+				}
+			}
+			return out;
+		}
+	}
+console.log('base64')
+console.log(Window.base64)
+	return Window.base64
+})()

unpackage/dist/dev/app-plus/hybrid/html/crypto.js

@@ -0,0 +1,273 @@
+
+
+(function() {
+Window.Crypto = {};
+	var base64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+
+	// Crypto utilities
+	var util = Window.Crypto.util = {
+
+		// Bit-wise rotate left
+		rotl: function(n, b) {
+			return (n << b) | (n >>> (32 - b));
+		},
+
+		// Bit-wise rotate right
+		rotr: function(n, b) {
+			return (n << (32 - b)) | (n >>> b);
+		},
+
+		// Swap big-endian to little-endian and vice versa
+		endian: function(n) {
+
+			// If number given, swap endian
+			if (n.constructor == Number) {
+				return util.rotl(n, 8) & 0x00FF00FF |
+					util.rotl(n, 24) & 0xFF00FF00;
+			}
+
+			// Else, assume array and swap all items
+			for (var i = 0; i < n.length; i++)
+				n[i] = util.endian(n[i]);
+			return n;
+
+		},
+
+		// Generate an array of any length of random bytes
+		randomBytes: function(n) {
+			for (var bytes = []; n > 0; n--)
+				bytes.push(Math.floor(Math.random() * 256));
+			return bytes;
+		},
+
+		// Convert a string to a byte array
+		stringToBytes: function(str) {
+			var bytes = [];
+			for (var i = 0; i < str.length; i++)
+				bytes.push(str.charCodeAt(i));
+			return bytes;
+		},
+
+		// Convert a byte array to a string
+		bytesToString: function(bytes) {
+			var str = [];
+			for (var i = 0; i < bytes.length; i++)
+				str.push(String.fromCharCode(bytes[i]));
+			return str.join("");
+		},
+
+		// Convert a string to big-endian 32-bit words
+		stringToWords: function(str) {
+			var words = [];
+			for (var c = 0, b = 0; c < str.length; c++, b += 8)
+				words[b >>> 5] |= str.charCodeAt(c) << (24 - b % 32);
+			return words;
+		},
+
+		// Convert a byte array to big-endian 32-bits words
+		bytesToWords: function(bytes) {
+			var words = [];
+			for (var i = 0, b = 0; i < bytes.length; i++, b += 8)
+				words[b >>> 5] |= bytes[i] << (24 - b % 32);
+			return words;
+		},
+
+		// Convert big-endian 32-bit words to a byte array
+		wordsToBytes: function(words) {
+			var bytes = [];
+			for (var b = 0; b < words.length * 32; b += 8)
+				bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF);
+			return bytes;
+		},
+
+		// Convert a byte array to a hex string
+		bytesToHex: function(bytes) {
+			var hex = [];
+			for (var i = 0; i < bytes.length; i++) {
+				hex.push((bytes[i] >>> 4).toString(16));
+				hex.push((bytes[i] & 0xF).toString(16));
+			}
+			return hex.join("");
+		},
+
+		// Convert a hex string to a byte array
+		hexToBytes: function(hex) {
+			var bytes = [];
+			for (var c = 0; c < hex.length; c += 2)
+				bytes.push(parseInt(hex.substr(c, 2), 16));
+			return bytes;
+		},
+
+		// Convert a byte array to a base-64 string
+		bytesToBase64: function(bytes) {
+
+			// Use browser-native function if it exists
+			// if (typeof btoa == "function") return btoa(util.bytesToString(bytes));
+
+			var base64 = [],
+				overflow;
+
+			for (var i = 0; i < bytes.length; i++) {
+				switch (i % 3) {
+					case 0:
+						base64.push(base64map.charAt(bytes[i] >>> 2));
+						overflow = (bytes[i] & 0x3) << 4;
+						break;
+					case 1:
+						base64.push(base64map.charAt(overflow | (bytes[i] >>> 4)));
+						overflow = (bytes[i] & 0xF) << 2;
+						break;
+					case 2:
+						base64.push(base64map.charAt(overflow | (bytes[i] >>> 6)));
+						base64.push(base64map.charAt(bytes[i] & 0x3F));
+						overflow = -1;
+				}
+			}
+
+			// Encode overflow bits, if there are any
+			if (overflow != undefined && overflow != -1)
+				base64.push(base64map.charAt(overflow));
+
+			// Add padding
+			while (base64.length % 4 != 0) base64.push("=");
+
+			return base64.join("");
+
+		},
+
+		// Convert a base-64 string to a byte array
+		base64ToBytes: function(base64) {
+
+			// Use browser-native function if it exists
+			if (typeof atob == "function") return util.stringToBytes(atob(base64));
+
+			// Remove non-base-64 characters
+			base64 = base64.replace(/[^A-Z0-9+\/]/ig, "");
+
+			var bytes = [];
+
+			for (var i = 0; i < base64.length; i++) {
+				switch (i % 4) {
+					case 1:
+						bytes.push((base64map.indexOf(base64.charAt(i - 1)) << 2) |
+							(base64map.indexOf(base64.charAt(i)) >>> 4));
+						break;
+					case 2:
+						bytes.push(((base64map.indexOf(base64.charAt(i - 1)) & 0xF) << 4) |
+							(base64map.indexOf(base64.charAt(i)) >>> 2));
+						break;
+					case 3:
+						bytes.push(((base64map.indexOf(base64.charAt(i - 1)) & 0x3) << 6) |
+							(base64map.indexOf(base64.charAt(i))));
+						break;
+				}
+			}
+
+			return bytes;
+
+		}
+
+	};
+
+	Window.Crypto.HMAC = function(hasher, message, key, options) {
+
+		// Allow arbitrary length keys
+		key = key.length > hasher._blocksize * 4 ?
+			hasher(key, {
+				asBytes: true
+			}) :
+			util.stringToBytes(key);
+
+		// XOR keys with pad constants
+		var okey = key,
+			ikey = key.slice(0);
+		for (var i = 0; i < hasher._blocksize * 4; i++) {
+			okey[i] ^= 0x5C;
+			ikey[i] ^= 0x36;
+		}
+
+		var hmacbytes = hasher(util.bytesToString(okey) +
+			hasher(util.bytesToString(ikey) + message, {
+				asString: true
+			}), {
+				asBytes: true
+			});
+		return options && options.asBytes ? hmacbytes :
+			options && options.asString ? util.bytesToString(hmacbytes) :
+			util.bytesToHex(hmacbytes);
+
+	};
+	// The core
+	var SHA1 = Window.Crypto.SHA1 = function (message, options) {
+		var digestbytes = util.wordsToBytes(SHA1._sha1(message));
+		return options && options.asBytes ? digestbytes :
+		       options && options.asString ? util.bytesToString(digestbytes) :
+		       util.bytesToHex(digestbytes);
+	};
+	SHA1._sha1 = function(message) {
+
+		var m = util.stringToWords(message),
+			l = message.length * 8,
+			w = [],
+			H0 = 1732584193,
+			H1 = -271733879,
+			H2 = -1732584194,
+			H3 = 271733878,
+			H4 = -1009589776;
+
+		// Padding
+		m[l >> 5] |= 0x80 << (24 - l % 32);
+		m[((l + 64 >>> 9) << 4) + 15] = l;
+
+		for (var i = 0; i < m.length; i += 16) {
+
+			var a = H0,
+				b = H1,
+				c = H2,
+				d = H3,
+				e = H4;
+
+			for (var j = 0; j < 80; j++) {
+
+				if (j < 16) w[j] = m[i + j];
+				else {
+					var n = w[j - 3] ^ w[j - 8] ^ w[j - 14] ^ w[j - 16];
+					w[j] = (n << 1) | (n >>> 31);
+				}
+
+				var t = ((H0 << 5) | (H0 >>> 27)) + H4 + (w[j] >>> 0) + (
+					j < 20 ? (H1 & H2 | ~H1 & H3) + 1518500249 :
+					j < 40 ? (H1 ^ H2 ^ H3) + 1859775393 :
+					j < 60 ? (H1 & H2 | H1 & H3 | H2 & H3) - 1894007588 :
+					(H1 ^ H2 ^ H3) - 899497514);
+
+				H4 = H3;
+				H3 = H2;
+				H2 = (H1 << 30) | (H1 >>> 2);
+				H1 = H0;
+				H0 = t;
+
+			}
+
+			H0 += a;
+			H1 += b;
+			H2 += c;
+			H3 += d;
+			H4 += e;
+
+		}
+
+		return [H0, H1, H2, H3, H4];
+
+	};
+
+	// Package private blocksize
+	SHA1._blocksize = 16;
+
+	// Crypto mode namespace
+	Window.Crypto.mode = {};
+	console.log("Window.Crypto")
+	console.log(Window.Crypto)
+	return Window.Crypto;
+})();

unpackage/dist/dev/app-plus/hybrid/html/map.html

@@ -0,0 +1,182 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
+		<link rel="stylesheet" href="https://a.amap.com/jsapi_demos/static/demo-center/css/demo-center.css" />
+		<title>运输轨迹</title>
+		<style>
+			* {
+				margin: 0;
+				padding: 0;
+			}
+
+			html,
+			body,
+			#container {
+				height: 100%;
+				width: 100%;
+			}
+			.content{
+				background-color: white;
+				position: absolute;
+				top: 20px;
+				padding: 6px 10px;
+				border-radius: 6px;
+				width: 90%;
+				margin-left: 5%;
+				display: flex;
+				align-items: center;
+			}
+			.start,.end{
+				display: flex;
+			}
+			.distance {
+				background-color: #00000061;
+				position: absolute;
+				bottom: 20px;
+				right: 20px;
+				color: white;
+				padding: 6px 10px;
+				border-radius: 6px;
+			}
+		</style>
+	</head>
+	<body>
+		<div id="container"></div>
+		<div class='content'>
+			<div class='start'>
+				<div id='sendCity'></div>
+				<div id='sendArea'></div>
+			</div>
+			<div>-----------></div>
+			<div class='end'>
+				<div id='unloadCity'></div>
+				<div id='unloadArea'></div>
+			</div>
+		</div>
+		<div id="distance" class='distance'></div>
+		<script
+			src="https://webapi.amap.com/maps?v=2.0&key=211dd6f989e719022aaf47ddb0659c47&plugin=AMap.Scale,AMap.ToolBar,AMap.Geocoder,AMap.Geolocation,Geolocation,AMap.Driving">
+		</script>
+		<script src="https://webapi.amap.com/loca?v=2.0.0&key=211dd6f989e719022aaf47ddb0659c47"></script>
+		<script>
+		var _t = getQueryString("obj"); 
+				var obj = JSON.parse(decodeURI(_t)) ; 
+				console.log('---------------------')
+				console.log(obj)
+				document.getElementById('sendCity').innerHTML = obj.sendCity
+				document.getElementById('sendArea').innerHTML = obj.sendArea
+				document.getElementById('unloadCity').innerHTML = obj.unloadCity
+				document.getElementById('unloadArea').innerHTML = obj.unloadArea
+				
+				
+				
+				function getQueryString(name) {
+					var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+					var r = window.location.search.substr(1).match(reg);
+					if (r != null) return unescape(r[2]); return null;
+				}
+			let starLnglat = [40.243655, 122.114407]
+			console.log(starLnglat)
+			var map = new AMap.Map('container', {
+				zoom: 12,
+				center: [starLnglat[1], starLnglat[0]],
+				resizeEnable: true
+			});
+			map.clearMap();
+			var startIcon = new AMap.Icon({
+				size: new AMap.Size(25, 25),
+				image: './img/1.png',
+				imageSize: new AMap.Size(25, 25),
+			});
+			/*
+			 * 驾车策略 
+			 * AMap.DrivingPolicy.LEAST_TIME           最快捷模式
+			 * AMap.DrivingPolicy.LEAST_FEE            最经济模式
+			 * AMap.DrivingPolicy.LEAST_DISTANCE       最短距离模式
+			 * AMap.DrivingPolicy.REAL_TRAFFIC         考虑实时路况
+			 */
+			var drivingOption = {
+				policy: AMap.DrivingPolicy
+					.LEAST_TIME, // 其它policy参数请参考 https://lbs.amap.com/api/javascript-api/reference/route-search#m_DrivingPolicy
+				ferry: 1, // 是否可以使用轮渡
+				map: map,
+				hideMarkers: false, // 设置隐藏路径规划的起始点图标
+				autoFitView: true
+			}
+			var dis = getDistance(122.114407, 40.243655, 122.114407, 42.243655)
+			document.getElementById("distance").innerHTML = dis
+			console.log(dis)
+			render(122.114407, 42.243655)
+
+			function getDistance(lat1, lng1, lat2, lng2) {
+				function Rad(d) {
+					return d * Math.PI / 180.0;
+				}
+				if (!lat1 || !lng1) {
+					return '';
+				}
+				// lat1用户的纬度
+				// lng1用户的经度
+				// lat2商家的纬度
+				// lng2商家的经度
+				let radLat1 = Rad(lat1);
+				let radLat2 = Rad(lat2);
+				let a = radLat1 - radLat2;
+				let b = Rad(lng1) - Rad(lng2);
+				let s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) *
+					Math.pow(
+						Math.sin(b / 2), 2)));
+				s = s * 6378.137;
+				s = Math.round(s * 10000) / 10000;
+				s = '距离' + s.toFixed(2) + '公里' //保留两位小数
+				return s
+			}
+
+			function render(endLng, endLat) {
+				// 构造路线导航类
+				var driving = new AMap.Driving(drivingOption)
+				// 根据起终点经纬度规划驾车导航路线
+				driving.search(new AMap.LngLat(starLnglat[1], starLnglat[0]), new AMap.LngLat(endLng, endLat), function(status,
+					result) {
+					if (status === 'complete') {
+						console.log('绘制驾车路线完成')
+					} else {
+						console.log('获取驾车数据失败：' + result)
+					}
+				});
+				// var capitals = [{
+				// 	center: [116.42, 39.93123],
+				// }, {
+				// 	center: [116.41, 39.92132],
+				// }, {
+				// 	center: [116.40, 39.91122],
+				// }];
+				var capitals = [];
+				var facilities = [];
+				for (var i = 0; i < capitals.length; i++) {
+					var marker = new AMap.Marker({
+						position: new AMap.LngLat(capitals[i].center[0], capitals[i].center[1]),
+						offset: new AMap.Pixel(-10, -10),
+						icon: startIcon,
+					});
+					facilities.push(marker);
+				}
+				map.add(facilities);
+			}
+			// map.on('click', clickHandler)
+
+			function clickHandler(e) {
+				map.clearMap();
+				var endLng = e.lnglat.getLng();
+				var endLat = e.lnglat.getLat();
+				render(endLng, endLat)
+			}
+		</script>
+
+		<script>
+		</script>
+	</body>
+</html>

unpackage/dist/dev/app-plus/hybrid/html/play.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta name="viewport"
+			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+		<title>视频认证</title>
+		<style>
+			body {
+				margin: 0;
+				background: #F5F6FA;
+			}
+
+			
+		</style>
+	</head>
+	<body>
+		<div id='app'>
+			<video width="320" height="240" controls id='srcSource'>
+			</video>
+		</div>
+	</body>
+	<script type="text/javascript" src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/jquery.min.js"></script>
+	<script type="text/javascript">
+		var src = getUrlParam("src")
+		function getUrlParam(name) {
+			var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
+			var r = window.location.search.substr(1).match(reg); //匹配目标参数
+			if (r != null) return unescape(r[2]);
+			return null; //返回参数值
+		}
+			console.log("src")
+		console.log(src)
+		$('#srcSource').attr("src",src)
+	</script>
+
+</html>

unpackage/dist/dev/app-plus/hybrid/html/video.html

@@ -0,0 +1,428 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta name="viewport"
+			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+		<title>视频认证</title>
+		<style>
+			body {
+				margin: 0;
+				background: #F5F6FA;
+			}
+
+			.content {
+				background: #F5F6FA;
+				height: 100vh;
+				position: relative;
+			}
+
+			.row {
+				display: flex;
+				justify-content: center;
+				padding-top: 50px;
+
+			}
+
+			.img-video {
+				position: relative;
+				border-radius: 280px;
+				width: 250px;
+				height: 250px;
+				overflow: hidden;
+			}
+
+			.row2 {
+				display: flex;
+				font-size: 20px;
+				justify-content: center;
+				margin-top: 20px;
+			}
+
+			.verify-btn {
+				background: #2772FB;
+				font-size: 20px;
+				padding: 10px 0;
+				width: 70%;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 50px;
+				color: white;
+
+			}
+
+			.btn {
+				position: absolute;
+				bottom: 0;
+				background: white;
+				width: 100%;
+				display: flex;
+				justify-content: center;
+				padding: 40px 0;
+			}
+
+			.img {
+				position: absolute;
+				top: 0;
+				bottom: 0;
+				width: 100%;
+				width: 564px;
+				height: 564px;
+				right: 0;
+				left: 0;
+				margin: auto;
+			}
+
+			.video-content {
+				position: absolute;
+				top: 0;
+				bottom: 0;
+				width: 100%;
+				right: 0;
+				left: 0;
+				margin: auto;
+			}
+
+			.video {
+				width: calc(100%);
+				background: #F5F6FA;
+			}
+
+			.video-btn {
+				width: 100%;
+				display: flex;
+				justify-content: center;
+			}
+			.progressBar {
+				width: 50%;
+				height: 25px;
+				display: block;
+				top: 0;
+				left: 0;
+				bottom: 0;
+				right: 0;
+				margin: auto;
+				padding: 10px 10px 10px 10px;
+				position: absolute;
+				z-index: 2001;
+				background: rgb(102, 102, 102);
+				color: white;
+				border-radius: 5px;
+			}
+			.text{
+				padding: 20px;
+			}
+		</style>
+	</head>
+	<body>
+		<div id='app'>
+			<div class='content'>
+				<!-- <div id="progressBar" class="progressBar">地图数据加载中...</div> -->
+				<div class='row'>
+					<div class='img-video'>
+						<!-- <img src="./img/shipinrenzheng.png" alt="" class='img'> -->
+						<div class="video-content">
+							<!--    人脸检测-->
+							<div class="video-cover"></div>
+							<video :src="url" ref="videoRef" autoplay playsinline x5-video-player-type="h5"
+								class="video"></video>
+						</div>
+					</div>
+				</div>
+				<!-- 	<div class='row2' v-show="!showVideo">
+					请打开摄像头 并阅读提示文字
+				</div> -->
+				<div class='row2'>
+					请将头像放于圆圈内，并阅读以下文字
+				</div>
+				<div class='row2 text'>
+					网络客服过段时间浪费多少级范德萨快逻辑范德萨拉丝机多亏了房价按时付款了金坷垃所肩负的看离开静安寺了发动机as在考虑家双方都会计分录卡死范德萨拉使肌肤抵抗力
+				</div>
+				<div class='btn'>
+					<!-- <div class="verify-btn" @click="getCamera" v-show="!showVideo">打开摄像头</div> -->
+					<div class='video-btn'>
+						<div class="verify-btn" @click="saveVideo" v-if='!isAlreadyRecord'>开始录制</div>
+						<div class="verify-btn" @click="saveVideo" v-if='isAlreadyRecord' data-action="navigateTo">结束录制
+						</div>
+						<!-- <button class="video-close" @click="closeVideo">×</button>
+						<button class="video-save" @click="saveVideo">
+							{{ isAlreadyRecord ? '结束录制(' + count + 's)' : '开始录制' }}</button> -->
+					</div>
+				</div>
+				<!-- <video ref="videob" controls="" name="media" width="100%" height="100"></video> -->
+			</div>
+
+
+		</div>
+	</body>
+	<script type="text/javascript" src="vue.min.js"></script>
+	<script type="text/javascript" src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/jquery.min.js"></script>
+	<script type="text/javascript" src="base64.js"></script>
+	<script type="text/javascript" src="crypto.js"></script>
+	<script type="text/javascript" src="index.js"></script>
+	<script type="text/javascript">
+		document.addEventListener('UniAppJSBridgeReady', function() {
+			uni.webView.getEnv(function(res) {
+				console.log('当前环境：' + JSON.stringify(res));
+			});
+			// 
+			new Vue({
+		 	el: '#app',
+				data: {
+					url: '',
+					// showVideo: true,
+					mediaRecorder: null,
+					MediaStreamTrack: null,
+					isAlreadyRecord: false,
+					count: 8,
+					countTimer: null,
+					recordedBlobs: [],
+					compId: ''
+				},
+				beforeDestroy() {
+					this.MediaStreamTrack && this.MediaStreamTrack.stop()
+					this.countTimer && clearTimeout(this.countTimer)
+				},
+				computed: {},
+
+				mounted() {
+					this.getCamera()
+				},
+				watch: {},
+				methods: {
+					getPolicyBase64() {
+						let date = new Date();
+						date.setHours(date.getHours() + 87600);
+						let srcT = date.toISOString();
+		 			const policyText = {
+							"expiration": srcT, //设置该Policy的失效时间，超过这个失效时间之后，就没有办法通过这个policy上传文件了 
+							"conditions": [
+								["content-length-range", 0, 100 * 1024 * 1024] // 设置上传文件的大小限制,5mb
+							]
+						};
+
+						const policyBase64 = Window.base64.encode(JSON.stringify(policyText));
+						console.log(policyBase64);
+						return policyBase64;
+					},
+					getSignature(policyBase64) {
+						const accesskey = 'FpClTp4OVrRRtHEfi3lBOWUoLxKieW';
+						// console.log('video.js')
+						// console.log(Crypto)
+						const bytes = Window.Crypto.HMAC(Window.Crypto.SHA1, policyBase64, accesskey, {
+							asBytes: true
+						})
+						const signature = Window.Crypto.util.bytesToBase64(bytes);
+						// console.log(signature);
+		 			return signature;
+					},
+					async uploadFile(file) {
+						var formdata = new FormData()
+						const policyBase64 = this.getPolicyBase64();
+						const signature = this.getSignature(policyBase64); //获取签名
+						const urlStr = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/"
+						const fileName = "appData/video" + new Date().getTime() + Math.floor(Math.random() *
+							150) + '.mp4'
+						formdata.append("key", fileName)
+						formdata.append("policy", policyBase64)
+						formdata.append("OSSAccessKeyId", 'LTAI4G9c14PgKvM23WZ9zrpc')
+						formdata.append("signature", signature)
+						formdata.append("success_action_status", '200')
+						formdata.append("file", file)
+						console.log('file.name')
+						$.ajax({
+							type: "POST",
+							data: formdata,
+							contentType: false,
+							processData: false,
+							url: urlStr,
+							success: function(result) {
+		 					console.log(urlStr + fileName)
+								uni.webView.navigateTo({
+									url: '/pages/mine/company/addcompany?videoSrc=' +
+										urlStr + fileName
+								})
+
+							},
+
+							//请求失败，包含具体的错误信息
+							error: function(e) {
+								console.log(e);
+								console.log(e.status);
+								console.log(e.responseText);
+							}
+						});
+					},
+					// 调用摄像头 开始录制
+					getCamera() {
+						// 注意本例需要在HTTPS协议网站中运行，新版本Chrome中getUserMedia接口在http下不再支持。
+						let constraints = {
+		 				audio: true,
+							video: {
+								facingMode: 'user' // 优先调前置摄像头
+							}
+						}
+						console.log('--------------')
+						console.log(navigator)
+						// 老的浏览器可能根本没有实现 mediaDevices，所以我们可以先设置一个空的对象
+						if (navigator.mediaDevices === undefined) {
+							navigator.mediaDevices = {}
+						}
+						// 一些浏览器部分支持 mediaDevices。我们不能直接给对象设置 getUserMedia
+						// 因为这样可能会覆盖已有的属性。这里我们只会在没有getUserMedia属性的时候添加它。
+						if (navigator.mediaDevices.getUserMedia === undefined) {
+							navigator.mediaDevices.getUserMedia = function(constraints) {
+								// 首先，如果有getUserMedia的话，就获得它
+								//   var getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia
+								var getUserMedia = navigator.getUserMedia ||
+		 						navigator.webkitGetUserMedia ||
+									navigator.mozGetUserMedia
+		 					// 一些浏览器根本没实现它 - 那么就返回一个error到promise的reject来保持一个统一的接口
+								if (!getUserMedia) {
+									this.$messageBox.alert('该浏览器不支持getUserMedia，请使用其他浏览器')
+									return Promise.reject(new Error(
+										'getUserMedia is not implemented in this browser'))
+								}
+								// 否则，为老的navigator.getUserMedia方法包裹一个Promise
+								return new Promise(function(resolve, reject) {
+									getUserMedia.call(navigator, constraints, resolve, reject)
+								})
+							}
+						}
+						navigator.mediaDevices.getUserMedia(constraints)
+							.then((stream) => {
+								this.MediaStreamTrack = typeof stream.stop === 'function' ? stream :
+									stream
+									.getTracks()[0]
+								console.log(stream)
+								console.log(this.MediaStreamTrack)
+								// 显示录制框
+								this.showVideo = true
+								this.isAlreadyRecord = false
+								let winURL = window.URL || window.webkitURL
+								if ('srcObject' in this.$refs.videoRef) {
+									this.$refs.videoRef.srcObject = stream
+								} else {
+									this.$refs.videoRef.src = winURL.createObjectURL(stream)
+								}
+								console.log(this.$refs.videoRef)
+								this.$refs.videoRef.onloadedmetadata = e => {
+									// 播放视频
+									this.$refs.videoRef.play()
+								}
+								let options = {
+									videoBitsPerSecond: 2500000
+		 					}
+								this.mediaRecorder = new MediaRecorder(stream, options)
+							})
+							.catch((err) => {
+								console.log(err)
+							console.log('摄像头开启失败，请检查摄像头是否授权或是否可用！')
+							})
+							$("#progressBar").hide();
+					},
+					// 关闭活体检测
+					closeVideo() {
+						this.recordedBlobs = ''
+						this.isAlreadyRecord = false
+						this.MediaStreamTrack && this.MediaStreamTrack.stop()
+						this.countTimer && clearTimeout(this.countTimer)
+						this.$router.go(0)
+					},
+					// 录制倒计时
+					countDown() {
+						let that = this
+						let sendTime = Math.round(+new Date() / 1000)
+		 			return function walk() {
+							that.countTimer = setTimeout(function() {
+								that.countTimer && clearTimeout(that.countTimer)
+								let diff = sendTime + 8 - Math.round(+new Date() / 1000)
+								if (diff > 0) {
+									that.count = diff
+									walk()
+								} else {
+									console.log('倒计时结束')
+									// this.showVideo = false
+									console.log(this.url)
+									console.log(this.MediaStreamTrack)
+								}
+							}, 1000)
+						}
+					},
+					dataURLtoBlob(dataurl) {
+
+						var arr = dataurl.split(","),
+
+							mime = arr[0].match(/:(.*?);/)[1],
+
+							bstr = atob(arr[1]),
+
+							n = bstr.length,
+
+							u8arr = new Uint8Array(n);
+
+						while (n--) {
+
+							u8arr[n] = bstr.charCodeAt(n);
+
+						}
+
+						return this.blobToFile(new Blob([u8arr], {
+							type: mime
+						}), {
+							type: mime
+						});
+
+					},
+					blobToFile(theBlob, type) {
+						theBlob.lastModifiedDate = new Date();
+						return new File([theBlob], `${new Date().getTime()}.mp4`, type);
+
+					},
+					// 保存录制视频
+					saveVideo() {
+						let that = this
+						if (this.isAlreadyRecord) {
+							this.countTimer && clearTimeout(this.countTimer)
+							// this.showVideo = false
+							//当录制的数据可用时
+							this.mediaRecorder.ondataavailable = (e) => {
+								if (e.data && e.data.size > 0) {
+									this.recordedBlobs.push(e.data)
+								}
+							}
+							this.mediaRecorder.stop()
+							setTimeout(() => {
+								console.log("this.recordedBlobs-------------------------")
+		 					var blob = new Blob(this.recordedBlobs, {
+									type: 'video/mp4'
+		 					})
+								this.isAlreadyRecord = false
+								this.MediaStreamTrack && this.MediaStreamTrack.stop()
+								var reader = new FileReader();
+								reader.readAsDataURL(blob)
+								reader.onload = (e) => {
+									// this.$refs.videob.src = reader.result
+									let a = this.dataURLtoBlob(reader.result)
+									console.log(a)
+									this.uploadFile(a)
+								}
+							}, 100)
+						} else {
+							this.count = 8
+							this.isAlreadyRecord = true
+							this.mediaRecorder.start(8000)
+							this.countDown()()
+						}
+					},
+					changeVideo(e) {
+		 			let file = this.$refs.videoFile.files
+						console.log(file)
+					}
+				}
+			})
+		});
+	</script>
+
+</html>

unpackage/dist/dev/app-plus/static/css/common.scss

@@ -0,0 +1,221 @@
+// 全局公共样式
+.content{
+	background:#F7F8FA;
+	// padding:$uni-spacing-row-base;
+	overflow: hidden;
+	position: relative;
+	
+}
+// 常用公共样式
+// 布局相关 start
+.flex{
+	display: flex;
+}
+.align-center{
+	align-items: center;
+}
+.inline-block{
+	display: inline-block;
+}
+.s-row{
+	display: flex;
+	flex-direction: column;
+}
+
+.flex-center{
+	justify-content: center;
+	align-items: center;
+}
+.flex-space-between{
+	justify-content: space-between;
+	align-items: center;
+}
+.flex-space-around{
+	justify-content: space-around;
+	align-items: center;
+}
+.flex-space-evenly{
+	justify-content: space-evenly;
+	align-items: center;
+}
+.flex-end{
+	    justify-content: flex-end;
+}
+.flex-start{
+	    justify-content: flex-start;
+}
+.m-top20{
+	margin-top: 20rpx;
+}
+.paddingr20{
+	padding:20rpx;
+}
+.paddingr35{
+	padding:35rpx;
+}
+.lr-paddingr20{
+	padding: 0 20rpx;
+}
+.fixed{
+	position: fixed;
+}
+.row-between{
+	display: flex;
+	justify-content: space-between;
+}
+.content-other{
+	background: white;
+	padding:10rpx 20rpx;
+	border-radius: 10rpx;
+}
+.width100{
+	width: 100%;
+}
+.mr20{
+	margin-right: 20rpx;
+}
+.ml20{
+	margin-left: 20rpx;
+}
+.msx20{
+	margin:20rpx 0;
+}
+.mt20{
+	margin-top:20rpx;
+}
+.text-align-right{
+	text-align: right;
+}
+// 布局相关 end
+
+// 边线相关start
+.border-bottom{
+	border-bottom: 1px solid #EEEEEE;
+	padding-bottom: 10rpx;
+}
+// 边线相关end
+
+
+// 颜色相关start
+.red{
+	background: red;
+}
+.yellow{
+	background:yellow;
+}
+.btn-color{
+	background: #2772FB!important;
+	color: white!important;
+}
+.h-color{
+	color: #FE6300;
+}
+.number-color{
+	color:#2772FB;
+}
+// 颜色相关end
+// 文字相关start
+.level2-title{
+font-size: 32rpx;
+font-weight: 700;
+color: #000000;
+}
+.fontsize-24{
+	font-size: 24rpx;
+}
+.fontsize-25{
+	font-size: 25rpx;
+}
+.fontsize-26{
+	font-size: 26rpx;
+}
+.fontsize-28{
+	font-size: 28rpx;
+}
+.fontsize-36{
+	font-size: 36rpx!important;
+}
+.fontsize-46{
+	font-size: 46rpx;
+}
+.gray{
+	color: #BBBBBB;
+}
+.fontweight-500{
+	font-weight: 500;
+}
+.point{
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+}
+.row-left-text{
+	font-size:28rpx;
+	// color: #8F8F8F;
+}
+.row-right-text{
+	font-size:28rpx;
+}
+.ytg-color{
+	color: #0CBB6B;
+}
+.shz-color{
+	color:#FE6300;
+}
+.wtg-color{
+	color:#EF4034;
+}
+.ygq-color{
+	color: #878787;
+}
+// 文字相关end
+// 边线相关start
+.noborder{
+	border-bottom: none!important;
+}
+// 边线相关start
+
+// other
+.ssx{
+	width: 40rpx;
+	height: 40rpx;
+	background: linear-gradient(180deg, #C8D7E5 0%, #AFC1D6 100%);
+	font-size: 26rpx;
+	font-family: PingFangSC-Medium, PingFang SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	border-radius: 50%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	margin-right: 10rpx;
+}
+.row-tips{
+font-size: 26rpx;
+font-weight: 400;
+color: #FE7F1A;
+background: #FFEEE1;
+padding: 4rpx 11rpx;
+border-radius: 4px;
+}
+.xj-image{
+	width:46rpx;
+	height: 46rpx;
+}
+/deep/.u-modal__content__text{
+	text-align: center;
+}
+.preview-img{
+	margin-top: 20rpx;
+	width: 212rpx;
+	height: 212rpx;
+	border-radius: 10rpx;
+}
+.uview-upload{
+	margin-top: 20rpx;
+}
+.card-img{
+	width: 100%;
+	height: 440rpx;
+	
+}

unpackage/dist/dev/app-plus/static/css/font.css

@@ -0,0 +1,20 @@
+@font-face {
+	font-family: "PingFang SC";
+	src: url('https://taohaoliang.oss-accelerate.aliyuncs.com/app/tmp/PingFang-Bold.ttf'),
+/* 		url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/PingFang-ExtraLight.ttf'),
+		url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/PingFang-Heavy.ttf'),
+		url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/PingFang-Light.ttf'), */
+		url('https://taohaoliang.oss-accelerate.aliyuncs.com/app/tmp/PingFang-Medium.ttf'),
+		url('https://taohaoliang.oss-accelerate.aliyuncs.com/app/tmp/PingFang-Regular.ttf');
+		font-weight: normal;
+	font-style: normal;
+}
+@font-face {
+	font-family: "DINPro";
+	src:url('https://taohaoliang.oss-accelerate.aliyuncs.com/app/tmp/DINPro-Bold.ttf'),
+		/* url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/DINPro-Light.ttf'), */
+		url('https://taohaoliang.oss-accelerate.aliyuncs.com/app/tmp/DINPro-Medium.ttf');
+		font-weight: normal;
+	font-style: normal;
+}
+