Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-huozhuapp

App.vue

@@ -10,6 +10,7 @@
 	} from 'vuex';
 	import Vue from 'vue'
 	import * as config from '@/config'
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import appUpdate from 'common/appUpdate.js'
 	// import app_push from './components/APPPush/app_push.js'
 	export default {
@@ -20,6 +21,22 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onLaunch: function() {
+			// plus.android.requestPermissions(['android.permission.CAMERA'], function(e){  
+			//                 if(e.deniedAlways.length>0){    //权限被永久拒绝  
+			//                     // 弹出提示框解释为何需要权限，引导用户打开设置页面开启  
+			//                     console.log('权限被永久拒绝'+e.deniedAlways.toString());  
+			//                 }  
+			//                 if(e.deniedPresent.length>0){   //权限被临时拒绝  
+			//                     // 弹出提示框解释为何需要权限，可再次调用plus.android.requestPermissions申请权限  
+			//                     console.log('权限被临时拒绝'+e.deniedPresent.toString());  
+			//                 }  
+			//                 if(e.granted.length>0){ //权限被允许  
+			//                     console.log('权限被允许'+e.granted.toString());  
+			//                 }  
+			//             }, function(e){  
+			//                      console.log('Request Permissions error:'+JSON.stringify(e));  
+			//             });  
+
 			let that = this
 			// uni.onTabBarMidButtonTap(() => {
 			// 	console.log("点击发布")

common/helper.js

@@ -92,46 +92,24 @@ const setAudit = (item) => {
 	}
 	console.log(item)
 }
-const contactCustomerService = (phone) => {
-	console.log(phone)
-	if (!phone) {
-		phone = '13304979986'
+const contactCustomerService = (item) => {
+	console.log(item)
+	if (!item) {
+		// item = '400123123'
+		item = '13304979986'
 	}
-	const res = uni.getSystemInfoSync();
-	// ios系统默认有个模态框
-	if(res.platform=='ios'){
-		uni.makePhoneCall({
-		phoneNumber:phone,
-		success(){
-			console.log('拨打成功了');
+	console.log("联系客服")
+	uni.makePhoneCall({
+		phoneNumber: item,
+		success: (res) => {
+			console.log('调用成功!')
 		},
-		fail() {
-			console.log('拨打失败了');
+		// 失败回调
+		fail: (res) => {
+			console.log('调用失败!')
+			contactCustomerService(item)
 		}
-	})
-	}else{
-	//安卓手机手动设置一个showActionSheet
-		uni.showActionSheet({
-			itemList: [phone,'呼叫'],
-			success:function(res){
-				console.log(res);
-			   if(res.tapIndex==1){
-				uni.makePhoneCall({
-				  phoneNumber: phone,
-				success: (res) => {
-					console.log('调用成功!')
-				},
-			  
-				// 失败回调
-				fail: (res) => {
-					console.log('调用失败!')
-					// contactCustomerService(item)
-				}
-				})
-			  }
-			}
-		  })
-	}
+	});
 }
 // 获取市、区简称
 const filterUrban = (s) => {

components/luo-navBar/components/luo-navBar/luo-navBar.vue

@@ -36,8 +36,8 @@
 		computed:{
 			searchText1:{
 				get(){
-				        return this.searchText;
-				      },
+				    return this.searchText;
+				},
 				set(v) { }
 			}
 		},

pages/mine/agentCargoOwner.vue

@@ -70,7 +70,7 @@
 		methods: {
 			previewImage(good) {
 				uni.previewImage({
-					urls: [good.certificateAddressUrl],
+					urls: good.certificateAddressUrlArray,
 					longPressActions: {
 						// itemList: ['发送给朋友', '保存图片', '收藏'],
 						success: function(data) {
@@ -165,7 +165,21 @@
 						pageSize: page.size,
 						currentPage: page.num,
 					}).then(res => {
-
+						var obj={}
+						for (var i = 0; i < res.data.records.length; i++) {
+							// obj[i]=[]
+							// console.log(obj[i])
+							res.data.records[i].certificateAddressUrlArray=[]
+							if(res.data.records[i].certificateAddressUrl){
+								var data=res.data.records[i].certificateAddressUrl.split(',')
+								for (var q = 0; q < data.length; q++) {
+									if(data[q]!=''){
+										res.data.records[i].certificateAddressUrlArray.push(data[q])
+									}
+								}
+								// res.data.records[i].certificateAddressUrlArray=obj[i]
+							}
+						}
 						this.mescroll.endBySize(res.data.records.length, res.data.total);
 						if (page.num == 1) this.goods = []; //如果是第一页需手动制空列表
 						this.goods = this.goods.concat(res.data.records); //追加新数据

pages/mine/cargoowner/addEnerprise.vue

@@ -39,7 +39,7 @@
 					</view>
 				</view>
 				<nk-select-file v-model="show" @confirm="getPath"></nk-select-file> -->
-			<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
+			<u-upload class="uview-upload" :fileList="fileList1" @beforeRead='beforeRead($event)' @afterRead="afterRead($event)" @delete="deletePic"
 				name="1" multiple :maxCount="9"></u-upload>
 			<!-- 		<view style='position:relative;'>
 				<view v-if='!dataDetails.certificateAddressUrl' @click="uploadImg(1)" class="picture picture7">
@@ -78,7 +78,7 @@
 		</u-action-sheet>
 		<view class="content4">
 			<view style='margin:0 0 18px;font-size:16px;color:#999;' class='flex items-center'>
-				<u--image style='margin-right:5px;margin-top: 12rpx;' @click='consent'
+				<u--image style='margin-right:5px;margin-top: 16rpx;' @click='consent'
 					:src="checked?'../../../static/mine/duihao@2x.png':'../../../static/mine/wxz.png'" width="12px"
 					height="12px"></u--image>
 				我已阅读并同意全部细则
@@ -97,6 +97,7 @@
 		mapState
 	} from 'vuex';
 	import upload from '@/components/upload.vue';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
 		components: {},
@@ -126,6 +127,7 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onLoad() {
+			this.get_camera_permission()
 			if (uni.getStorageSync('cargoOwnerId')) {
 				this.dataDetails.cargoOwnerId = uni.getStorageSync('cargoOwnerId')
 			}
@@ -149,6 +151,23 @@
 			}
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			getPath(event) {
 				console.log(event);
 				this.pathArr = event;
@@ -190,6 +209,23 @@
 					fileListLen++
 				}
 			},
+			async beforeRead(event) {
+				console.log(1221212,event)
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+								if(photol == false){
+									uni.showModal({
+									    title: '提示',
+									    content: '您已经关闭相册权限,去设置',
+									    success: function (res) {
+									        if (res.confirm) {
+									            plus.runtime.openURL("app-settings:");
+									        } else if (res.cancel) {
+									            console.log('用户点击取消');
+									        }
+									    }
+									});	
+								}
+			},
 			consent() {
 				this.checked = !this.checked
 			},

pages/mine/cargoowner/cargoowner.vue

@@ -27,11 +27,11 @@
 							:src="personage.authenticationStatus=='已认证'?'../../../static/mine/huozhurenzheng/shenfen2.png':'../../../static/mine/huozhurenzheng/shenfen.png'"
 							width="32px" height="32px"></u--image>
 						<view style='width:100%;'>
-							<view v-if='!datastatus' style='font-size:21px;'>身份信息</view>
+							<view v-if='!personage' style='font-size:21px;'>身份信息</view>
 							<view v-else style='font-size:21px;'>{{personage.name}}</view>
 							<view v-if="personage.authenticationStatus!='已认证'" class='flex flex-space-between'
 								style='width:100%;color:#999999;font-size:14px;'>您的身份信息{{personage.authenticationStatus?personage.authenticationStatus:'未认证'}}状态
-								<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+								<u-icon name="arrow-right" color="#7E7E7E" size="10" v-if="datastatus"></u-icon>
 							</view>
 							<view v-else class='flex flex-space-between' style='width:100%;color:#999999;font-size:14px;'>
 								{{starUserphone}}
@@ -41,7 +41,9 @@
 					</view>
 				</view>
 		<view>
-			<view class="content2-title">所属企业 <text style='color:#999;'>（{{enterprise.length}})</text></view>
+			<view class="content2-title">所属企业 
+			<!-- <text style='color:#999;'>({{enterprise.length}})</text> -->
+			</view>
 			<view v-if='enterprise.length>0'>
 				<view v-for='item in enterprise' class='wrap'>
 					<view class='flex flex-space-between'>
@@ -61,7 +63,8 @@
 					</view>
 					<view class="row3">
 						<view class="right">
-							<image @click='edit(item)' 							v-if='item.status!="平台审核中"&&item.status!="企业审核中"&&item.status!="企业暂不可用"&&item.status!="企业不存在"&&item.status!="授权已撤销"'
+							<!-- v-if='item.status!="平台审核中"&&item.status!="企业审核中"&&item.status!="企业暂不可用"&&item.status!="企业不存在"&&item.status!="授权已撤销"' -->
+							<image v-if='item.status!="企业审核中"&&item.status!="平台审核中"' @click='edit(item)'
 								style='width:17px;height:17px;margin:0 10px;' src="@/static/mine/company/edit.png">
 							</image>
 							<image @click='del(item)' style='width:17px;height:17px;margin:0 10px;'
@@ -81,7 +84,6 @@
 				<view @click='goDetailPage("/pages/mine/cargoowner/editpersonalinformation")' class='newlyIncreased' v-if="!datastatus">去认证</view>
 			</view>
 		</view>
-		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -125,12 +127,6 @@
 			toEditPage(){
 				if(this.personage&&this.personage.authenticationStatus=='已认证'){
 					uni.$u.route("/pages/mine/cargoowner/editpersonalinformation",this.personage);
-				}else if(this.personage&&this.personage.authenticationStatus == "审核中"){
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "身份审核中，请耐心等待！",
-					})
-					return 
 				}else{
 					uni.$u.route("/pages/mine/cargoowner/editpersonalinformation",this.personage);
 				}
@@ -230,7 +226,8 @@
 
 <style lang="scss" scoped>
 	.content {
-		padding-bottom: 460rpx;
+		height:100vh;
+		padding-bottom: 320rpx;
 	}
 
 	.identity {

pages/mine/cargoowner/editEnerprise.vue

@@ -12,7 +12,7 @@
 			<view style='padding:10px 0 10px;' class="flex flex-space-between items-center 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.legalPersonName">
+					<u--input disabledColor='#fff' disabled placeholder="自动获取" inputAlign='left' border="none" v-model="dataDetails.legalPersonName1">
 					</u--input>
 				</view>
 			</view>
@@ -50,9 +50,9 @@
 			</view>
 			</view> -->
 			<view class="flex row noborder">
-				<view class="left-text">授权截止日期</view>
+				<view stlye='width:100px;' class="left-text">授权截止日期</view>
 				<view style='font-size:16px;width:50%;' class='flex flex-space-between'  @click="selectdate">
-					<view :style="{'color':dataDetails.authorizationDeadline ? '#000':'#C6CBD5'}">{{dataDetails.authorizationDeadline?dataDetails.authorizationDeadline:'选择期限截止日期'}}</view>
+					<view style='padding-left:20px;' :style="{'color':dataDetails.authorizationDeadline ? '#000':'#C6CBD5'}">{{dataDetails.authorizationDeadline?dataDetails.authorizationDeadline:'选择期限截止日期'}}</view>
 					<view><u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon></view>
 				</view>
 			</view>
@@ -66,7 +66,7 @@
 		</u-action-sheet>
 		<view class="content4">
 			<view style='margin:0 0 18px;font-size:12px;color:#999;' class='flex items-center'>
-				<u--image style='margin-right:5px;' @click='consent'
+				<u--image style='margin-right:5px;margin-top: 16rpx;' @click='consent'
 					:src="checked?'../../../static/mine/duihao@2x.png':'../../../static/mine/wxz.png'"
 					width="12px" height="12px"></u--image>
 					我已阅读并同意全部细则
@@ -84,6 +84,7 @@
 		mapState
 	} from 'vuex';
 	import upload from '@/components/upload.vue';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
 		components: {
@@ -109,6 +110,7 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onLoad(options){
+			this.get_camera_permission()
 			if(uni.getStorageSync('cargoOwnerId')){
 				this.dataDetails.cargoOwnerId=uni.getStorageSync('cargoOwnerId')
 			}
@@ -116,6 +118,15 @@
 			// this.getList()
 			
 			this.dataDetails = options
+			if(this.dataDetails.legalPersonName.length==2){
+				this.dataDetails.legalPersonName1=this.dataDetails.legalPersonName.toString().replace(/^([^\x00-\xff])([^\x00-\xff]{0,})([^\x00-\xff])/g , '$1*')
+			}else if(this.dataDetails.legalPersonName.length==3){
+				this.dataDetails.legalPersonName1=this.dataDetails.legalPersonName.toString().replace(/^([^\x00-\xff])([^\x00-\xff]{0,})([^\x00-\xff])/g , '$1*$3')
+			}else if(this.dataDetails.legalPersonName.length==4){
+				this.dataDetails.legalPersonName1=this.dataDetails.legalPersonName.toString().replace(/^([^\x00-\xff])([^\x00-\xff]{0,2})([^\x00-\xff])/g , '$1**$3')
+			}
+			
+			console.log(this.dataDetails)
 			if(options.certificateAddressUrl){
 				var arr = options.certificateAddressUrl.split(',')
 				this.urlList = options.certificateAddressUrl.split(',')
@@ -133,6 +144,23 @@
 		
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			uploadFilePromise(file,url) {
 				uploadImage('image',url, 'appData/',
 					result => {
@@ -276,8 +304,10 @@
 <style lang='scss' scoped>
 	page{
 		background: #F5F6FA;
+		
 	}
 	.content{
+		height:100vh;
 		/* background: white; */
 		/* padding:20rpx */
 	}

pages/mine/cargoowner/editpersonalinformation.vue

@@ -121,6 +121,7 @@
 		mapState
 	} from 'vuex';
 	import upload from '@/components/upload.vue';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	var _this;
 	export default {
@@ -161,6 +162,7 @@
 			};
 		},
 		onLoad(options) {
+			this.get_camera_permission()
 			var _this = this;
 			this.dataDetails = options
 			this.validityPeriod = this.$helper.makeValidityPeriod(0, '长期')
@@ -171,6 +173,23 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			nameinput() {
 				this.dataDetails.call = this.dataDetails.name[0]
 			},

pages/mine/cargoowner/selectcompany.vue

@@ -90,9 +90,7 @@
 						
 						uni.hideLoading()
 						if (res.data) {
-							console.log(111111)
 							if(res.data.name==item.legalPersonName){
-								console.log(22222)
 								uni.showToast({
 									title: '您已经具备该公司货主身份',
 									icon: 'none',
@@ -123,7 +121,6 @@
 							}else{
 								uni.setStorageSync('currectcompany', item)
 								that.goDetailPage('pages/mine/cargoowner/addEnerprise')
-								console.log(4444)
 							}
 						}
 					})

pages/mine/company/addcompany.vue

@@ -227,6 +227,7 @@
 		mapState
 	} from 'vuex';
 	import upload from '@/components/upload.vue';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
 		components: {},
@@ -282,6 +283,7 @@
 
 		},
 		onLoad(options) {
+			this.get_camera_permission()
 			this.validityPeriod = this.$helper.makeValidityPeriod(0, '长期')
 			console.log(this)
 			this.dataDetails.commonId = this.userInfo.id
@@ -301,6 +303,23 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			selectData(num) {
 				this.dataType = num
 				this.isShowcardValidity = true

pages/mine/company/companyvideo.nvue

@@ -182,7 +182,8 @@
 						} else if (res.status == "end") {
 							console.log("结束录像")
 							uni.showLoading({
-								title: '压缩中...'
+								title: '压缩中...',
+								mask:true
 							});
 							var that = this;
 							uni.compressVideo({

pages/mine/company/editcompany.vue

@@ -232,6 +232,7 @@
 		mapState
 	} from 'vuex';
 	import upload from '@/components/upload.vue';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
 		components: {},
@@ -285,6 +286,7 @@
 			}
 		},
 		onLoad(options) {
+			this.get_camera_permission()
 			this.dataDetails.id = options.id
 			this.validityPeriod = this.$helper.makeValidityPeriod(0, '长期')
 			this.dataDetails.commonId = this.userInfo.id
@@ -301,6 +303,23 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			selectData(num) {
 				this.dataType = num
 				this.isShowcardValidity = true

pages/mine/manageBankCards/addBankCard.vue

@@ -79,6 +79,7 @@
 
 <script>
 	import upload from '@/components/upload.vue';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	var _this;
 	import {
@@ -112,6 +113,7 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onLoad() {
+			this.get_camera_permission()
 			_this = this;
 			// this.dataDetails.driverId = this.userInfo.driverId
 			_this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', { //查身份证号
@@ -122,6 +124,23 @@
 			})
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			delCard() {
 				_this.dataDetails.payeeAddressUrl = ''
 				_this.$forceUpdate()

pages/mine/manageBankCards/editBankCard.vue

@@ -59,6 +59,7 @@
 
 <script>
 	import upload from '@/components/upload.vue';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	var _this;
 	export default {
@@ -75,9 +76,27 @@
 			};
 		},
 		onLoad() {
+			this.get_camera_permission()
 			_this = this;
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			manualInput() {
 				if (this.isShowManualInput) {
 					if (uni.$u.test.isEmpty(this.bankType[this.index])) {

pages/mine/set.vue

@@ -41,13 +41,13 @@
 				</view>
 				<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 			</view>
-			<u-line color="#EEEEEE" class="line"></u-line>
+			<!-- <u-line color="#EEEEEE" class="line"></u-line>
 			<view class='flex flex-space-between wrap-item' @click='clearStorage'>
 				<view>
 					<text>清除缓存</text>
 				</view>
 				<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
-			</view>
+			</view> -->
 		</view>
 		<view class='exitloginwrap'>
 			<button @click='logoutAlert()' class='exitlogin'>退出登录</button>

pages/news/index.vue

@@ -104,7 +104,6 @@
 				if (res3.data||res3.data==0) {
 					let name = 'myTip';
 					let value = res3.data
-					console.log(value,111111)
 					if (value == 0) {
 						uni.removeTabBarBadge({
 							index: 2
@@ -172,7 +171,6 @@
 					});
 			},
 			read(val) {
-				uni.$u.route("/pages/news/newsSee?_obj="+JSON.stringify(val))
 				if(val.newsType == "投诉结果" || val.newsType == "举报结果"){
 					uni.$u.route("/pages/news/feedbackResults?id=" + val.bussId + "&type=" + val.newsType)
 				}

pages/order/addEvaluation.vue

@@ -85,31 +85,31 @@
 						name: "司机信用",
 						count: "5",
 						value1: '0',
-						level: '非常好'
+						level: ''
 					},
 					{
 						name: "运输效率",
 						count: "5",
 						value1: '0',
-						level: '非常好'
+						level: ''
 					},
 					{
 						name: "运输安全",
 						count: "5",
 						value1: '0',
-						level: '非常好'
+						level: ''
 					},
 					{
-						name: "运输安全",
+						name: "服务质量",
 						count: "5",
 						value1: '0',
-						level: '非常好'
+						level: ''
 					},
 					{
 						name: "满意度",
 						count: "5",
 						value1: '0',
-						level: '非常满意'
+						level: ''
 					}
 				],
 				button: [{
@@ -123,44 +123,13 @@
 			}
 		},
 		onNavigationBarButtonTap() {
+			// console.log(12121,uni.$u,this)
 			// debugger
-			let _data = {
-				evaluatoredId: this.objData.commonId,
-				evaluatorId: this.objData.cargoCommonId,
-				ownerName: this.checkboxValue1 ? this.objData.cargoOwner : '',
-				driverName: this.objData.driverName,
-				ownerPortrait: this.checkboxValue1 ? this.userInfo.avatarUrl : '',
-				orderId: this.objData.id,
-				orderNumber: this.objData.orderNo,
-				driverCredit: this.rate[0].value1,
-				tranEfficiency: this.rate[1].value1,
-				tranSafety: this.rate[2].value1,
-				serviceQuality: this.rate[3].value1,
-				satisfaction: this.rate[4].value1,
-				ownerContent: this.value3,
-				ownerUrl: this.imageList.toString(),
-				ownerAnonymous: this.checkboxValue1.length != 0 ? 1 : 0
-
-			}
-			that.$request.baseRequest('post', '/evaluateInfo/api/addEvaluateInfo', _data).then(res => {
-				if (res.code == 200) {
-					this.$refs.uToast.show({
-						type: 'success',
-						message: "评价成功",
-						complete() {
-							uni.navigateBack({
-								delta:1
-							})
-						}
-					})
-				} else {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "评价失败",
-					})
-				}
-			})
+			uni.$u.throttle(this.submit, 500)
+			// uni.$u.debounce(this.submit, 500)
+			
 		},
+		
 		onLoad(options) {
 			that = this
 			this.objData = JSON.parse(options.val)
@@ -168,6 +137,45 @@
 			that.imageList = []
 		},
 		methods: {
+			submit(){
+				// console.log(11111111)
+				let _data = {
+					evaluatoredId: this.objData.commonId,
+					evaluatorId: this.objData.cargoCommonId,
+					ownerName: this.checkboxValue1 ? this.objData.cargoOwner : '',
+					driverName: this.objData.driverName,
+					ownerPortrait: this.checkboxValue1 ? this.userInfo.avatarUrl : '',
+					orderId: this.objData.id,
+					orderNumber: this.objData.orderNo,
+					driverCredit: this.rate[0].value1,
+					tranEfficiency: this.rate[1].value1,
+					tranSafety: this.rate[2].value1,
+					serviceQuality: this.rate[3].value1,
+					satisfaction: this.rate[4].value1,
+					ownerContent: this.value3,
+					ownerUrl: this.imageList.toString(),
+					ownerAnonymous: this.checkboxValue1.length != 0 ? 1 : 0
+				
+				}
+				that.$request.baseRequest('post', '/evaluateInfo/api/addEvaluateInfo', _data).then(res => {
+					if (res.code == 200) {
+						this.$refs.uToast.show({
+							type: 'success',
+							message: "评价成功",
+							complete() {
+								uni.navigateBack({
+									delta:1
+								})
+							}
+						})
+					} else {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "评价失败",
+						})
+					}
+				})
+			},
 			clickStar(index) {
 				console.log(index)
 				this.selectStar = index

pages/order/driverDetail.vue

@@ -270,6 +270,7 @@
 								that.total = res.data.total
 								for (let i = 0; i < that.list.length; i++) {
 									if (that.list[i].ownerUrl) {
+										// that.list[i].imgList=[]
 										that.list[i].imgList = that.list[i].ownerUrl.split(',')
 									}
 						

pages/order/fk.vue

@@ -24,6 +24,7 @@
 		mapState
 	} from 'vuex';
 	import uploadImage from '@/components/ossutil/uploadFile.js';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	export default {
 		data() {
 			return {

pages/order/index.vue

@@ -50,7 +50,7 @@
 			</u-transition>
 			<view class="modal-black" v-show="showMenu" @click="closeMenu"></view>
 		</view>
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" class="mescroll">
+		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" @down="downCallback" @up="upCallback" class="mescroll">
 	<view class="evaluatePage flex flex-space-between" v-show="tabIndex == 10"  @click="evaluationRecord">
 		<view class="left flex flex-space-between">
 			<u-icon size="20" name="edit-pen"></u-icon>
@@ -227,6 +227,15 @@
 					margin:'0 20rpx 0 0',
 					"border-radius": '30rpx'
 				},
+				upOption: {
+					page: {
+												size: 10 // 每页数据的数量,默认10
+											},
+											noMoreSize: 0, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+					empty: {
+						tip: '暂无相关数据'
+					}
+				},
 				searchKeyWord: '',
 				useSearchList: [],
 				mescroll: null,

pages/order/jb.vue

@@ -23,7 +23,9 @@
 	import {
 		mapState
 	} from 'vuex';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uploadImage from '@/components/ossutil/uploadFile.js';
+	
 	export default {
 		data() {
 			return {
@@ -37,11 +39,29 @@
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		onLoad(options) {
+			this.get_camera_permission()
 			this.dataDetails = JSON.parse(options.val)
 			console.log(this.dataDetails)
 			this.imgList = []
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			submit() {
 				uni.showLoading({
 					title: '加载中'

pages/order/orderDetails.vue

@@ -179,7 +179,7 @@
 				<view class="row-left-text gray">装车照片</view>
 				<view class="flex">
 					<u--image :showLoading="true" :src="item" width="40px" height="40px"
-						v-for="(item,index) in zcImgList" :key='index' @click='ylImg(item)'></u--image>
+						v-for="(item,index) in zcImgList" :key='index' @click='ylImg(zcImgList)'></u--image>
 				</view>
 			</view>
 			<view class='row-between'>
@@ -196,7 +196,7 @@
 				<view class="row-left-text gray">卸车照片</view>
 				<view class="flex">
 					<u--image :showLoading="true" :src="item" width="40px" height="40px"
-						v-for="(item,index) in xcImgList" :key='index' @click='ylImg(item)'></u--image>
+						v-for="(item,index) in xcImgList" :key='index' @click='ylImg(xcImgList)'></u--image>
 				</view>
 			</view>
 		</view>
@@ -366,7 +366,7 @@
 		methods: {
 			ylImg(src) {
 				uni.previewImage({
-					urls: [src],
+					urls: src,
 					longPressActions: {
 						itemList: ['发送给朋友', '保存图片', '收藏'],
 						success: function(data) {

pages/public/register.vue

@@ -7,22 +7,28 @@
 				class="flex">
 				<view class="NumberMedium" style='width:15%;border-right:1px solid #E8E9ED;'>+86</view>
 				<view style='width:85%;'>
-					<input border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
-						placeholder="请输入手机号码" type="number" class="Regular" />
+					<!-- <u-input border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
+						placeholder="请输入手机号码" type="number" class="Regular" /> -->
+					<input placeholder-style="color:#AFB3BF" border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
+							placeholder="请输入手机号码" type="number" class="Regular" />
 				</view>
 				<!-- <image v-if='phone!=""' @click='phone=""' class='close' src='../../static/img/login/guanbi@2x.png'></image> -->
 			</view>
 			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
 				<view style='width:70%;position:relative;'>
-					<u-input border="none" v-model='verifyCode' class="Regular" placeholder="请输入验证码" type="number" maxlength="6"/>
-					<!-- <image v-if='verifyCode' @click='verifyCode=""' class='close1' src='../../static/img/login/guanbi@2x.png'></image> -->
+				<!-- 	<u-input border="none" v-model='verifyCode' class="Regular" placeholder="请输入验证码" type="number" maxlength="6" />
+					 -->
+					<input placeholder-style="color:#AFB3BF" border="none" maxlength="6" v-model='verifyCode'  style='padding-left:10px;'
+							placeholder="请输入验证码" type="number" class="Regular" /><!-- <image v-if='verifyCode' @click='verifyCode=""' class='close1' src='../../static/img/login/guanbi@2x.png'></image> -->
 				</view>
-				<button class='getcode Regular' :class='codestatus?"activeCode":""' @click='getcode'
-					>{{sendText}}</button>
+				<button  :class='codestatus?"activeCode":""' @click='getcode'
+					class='getcode Regular'>{{sendText}}</button>
 			</view>
 			<view style='border-bottom:1px solid #E8E9ED;padding:10px;position:relative;'>
-				<u-input border="none" maxlength='16' class='Regular input-style' style='height:30px;'
-					v-model='password' placeholder="请输入密码，6-16位字符" :type="type" />
+				<!-- <u-input border="none" maxlength='16' class='Regular input-style' style='height:30px;'
+					v-model='password' placeholder="请输入密码，6-16位字符" :type="type" /> -->
+				<input placeholder-style="color:#AFB3BF" border="none" maxlength="16" v-model='password' style='padding-left:10px;'
+							placeholder="请输入密码，6-16位字符" :type="type" class="Regular input-style" />
 				<!-- 				<input maxlength='16' class='password Regular input-style' style='height:30px;' v-model='password' placeholder="请输入密码，6-16位字符" :type="type"> -->
 				<!-- <image v-if='password!=""' @click='password=""' class='close2' src='../../static/img/login/guanbi@2x.png'></image> -->
 				<!-- <view @click='switchover' style='position:absolute;right:0;top:38%;z-index:10;cursor:pointer;' class="iconfont " :class='type=="password"?"icon-yanjing-biyan":"icon-yanjing-zhengyan"'></view> -->
@@ -33,7 +39,7 @@
 				style='color:#6A6A6A;margin-top:10px;font-size:30rpx;display:flex;justify-content:center;align-items: center;'>
 				<u--image @click='consent'
 					:src="consentStatus==true?'../../static/images/mine/duihao@2x.png':'../../static/images/mine/wxz.png'"
-					width="17px" height="17px" style="margin:0 10rpx"></u--image>
+					width="17px" height="17px"></u--image>
 				已阅读并同意
 				<navigator
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"

pages/release/editRelease.vue

@@ -25,7 +25,7 @@
 					<view class="top" @click="selectAddress(0)">
 						<view class="send">寄</view>
 						<view class="title">
-							{{dataObj.sendArea?(dataObj.sendPrivate + dataObj.sendCity+dataObj.sendArea):'选择发货地区'}}
+							{{dataObj.sendArea?(dataObj.sendPrivate?dataObj.sendPrivate:'' + dataObj.sendCity+dataObj.sendArea):'选择发货地区'}}
 						</view>
 					</view>
 					<view class="bottom">
@@ -41,7 +41,7 @@
 					<view class="top" @click="selectAddress(1)">
 						<view class="collect">收</view>
 						<view class="title">
-							{{dataObj.unloadArea?(dataObj.unloadPrivate + dataObj.unloadCity+dataObj.unloadArea):'选择收货地区'}}
+							{{dataObj.unloadArea?(dataObj.unloadPrivate?dataObj.unloadPrivate:'' + dataObj.unloadCity+dataObj.unloadArea):'选择收货地区'}}
 						</view>
 					</view>
 					<view class="bottom">
@@ -302,10 +302,31 @@
 			}
 		},
 		onShow() {
-			// this.getSFList()
+			this.getSFList()
+			let _faddress = uni.getStorageSync('storage_faddress');
+			let _saddress = uni.getStorageSync('storage_saddress');
+			if (_faddress) {
+				this.dataObj.sendCity = _faddress.city
+				this.dataObj.sendArea = _faddress.area
+				this.dataObj.sendPrivate = _faddress.province
+				this.dataObj.sendDetailedAddress = _faddress.detailedAddress
+				this.dataObj.sendLongitude = _faddress.longitude
+				this.dataObj.sendLatitude = _faddress.latitude
+				this.dataObj.senderPhone = _faddress.contactPhone
+				this.dataObj.sender = _faddress.contacts
+			}
+			if (_saddress) {
+				this.dataObj.unloadDetailedAddress = _saddress.detailedAddress
+				this.dataObj.unloadCity = _saddress.city
+				this.dataObj.unloadArea = _saddress.area
+				this.dataObj.unloadPrivate = _saddress.province
+				this.dataObj.unsendLongitude = _saddress.longitude
+				this.dataObj.unsendLatitude = _saddress.latitude
+				this.dataObj.receiver = _saddress.contacts
+				this.dataObj.receiverPhone = _saddress.contactPhone
+			}
 		},
 		onLoad(options) {
-
 			_this = this;
 			_this = this;
 			this.dataObj = options
@@ -358,17 +379,24 @@
 						let _self = res.data.companyInfoList
 						//代理货主
 						let _dlhz = res.data.cargoOwnerCompInfoList
-						for (let i = 0; i < _self.length; i++) {
-							if (_self[i].status == '已认证') {
-								this.qyList.push(_self[i])
+						if(_self){
+							for (let i = 0; i < _self.length; i++) {
+								if (_self[i].status == '已认证') {
+									this.qyList.push(_self[i])
+								}
 							}
 						}
-
-						for (let i = 0; i < _dlhz.length; i++) {
-							if (_dlhz[i].status == '已认证') {
-								this.qyList.push(_dlhz[i])
+						if(_dlhz){
+							for (let i = 0; i < _dlhz.length; i++) {
+								if (_dlhz[i].status == '已认证') {
+									this.qyList.push(_dlhz[i])
+								}
 							}
 						}
+						let obj = uni.getStorageSync("firstAuthentication")
+						if(obj && obj.authenticationStatus == '已认证'){
+							this.columns[0].push("个人货主")
+						}
 						for (let i = 0; i < this.qyList.length; i++) {
 							this.columns[0].push(this.qyList[i].company ? this.qyList[i].company : this.qyList[i]
 								.companyName)
@@ -702,6 +730,7 @@
 				});
 				uni.$u.route('/pages/release/selectAddress', {
 					type: type,
+					status:1
 				});
 			},
 			checkboxChange(n) {

pages/release/release.vue

@@ -711,7 +711,15 @@
 				this.dataObj.carModel = _list.toString()
 				this.dataObj.commonId = this.userInfo.id
 				this.$request.baseRequest('post', '/publishTaskInfo/api/addTask', this.dataObj).then(res => {
-
+						uni.removeStorage({
+							key: 'storage_saddress'
+						});
+						uni.removeStorage({
+							key: 'storage_faddress'
+						});
+						uni.removeStorage({
+							key: 'releaseCargoOwner'
+						});
 						this.$refs.uToast.show({
 							type: 'success',
 							message: "发布成功",

pages/release/selectAddress.vue

@@ -4,13 +4,14 @@
 			<u-search placeholder="可按地址、联系人和电话查找" v-model="searchKeyWord" :showAction='false' @search="getList()">
 			</u-search>
 		</view>
-		<view class="content2" v-for="(item,index) in dataList" :key='index' @click="configAddress(item)">
+		<view class="content2-wrap">
+			<view class="content2" v-for="(item,index) in dataList" :key='index' @click="configAddress(item)">
 			<view class="row flex row1">
 				<view class="name">
 					{{item.contacts}}
 				</view>
 				<view class="phone">
-					{{item.contactPhone}}
+					{{item.contactPhone1}}
 				</view>
 			</view>
 			<view class="row flex row2">
@@ -25,17 +26,28 @@
 				</u-radio-group>
 				<view class="flex">
 					<view class="mr20 icon-img" @click.stop="toTop(item)">
-						<u-icon name="arrow-upward" color="#999999" size="18"></u-icon>置顶
+						<!-- <u-icon name="arrow-upward" color="#999999" size="18"></u-icon> -->
+						<image class="jt-icon" src="@/static/images/release/zhiding.png" mode='widthFix'>
+						</image>
+						置顶
 					</view>
 					<view class="mr20 icon-img" @click.stop="edit(item)">
-						<u-icon name="edit-pen-fill" color="#999999" size="18"></u-icon>编辑
+						<!-- <u-icon name="edit-pen-fill" color="#999999" size="18"></u-icon> -->
+						<image class="jt-icon" src="@/static/images/release/bianji.png" mode='widthFix'>
+						</image>
+						编辑
 					</view>
 					<view class="mr20 icon-img" @click.stop="del(item)">
-						<u-icon name="trash-fill" color="#999999" size="18"></u-icon>删除
+						<!-- <u-icon name="trash-fill" color="#999999" size="18"></u-icon> -->
+						<image class="jt-icon" src="@/static/images/release/shanchu.png" mode='widthFix'>
+						</image>
+						删除
 					</view>
 				</view>
 			</view>
 		</view>
+		</view>
+		
 		<view class="bottom-btn">
 			<view class="btn-left" @click="selectAddress(0)">选择临时地址</view>
 			<view class="btn-right" @click="selectAddress(1)">新增地址</view>
@@ -118,6 +130,12 @@
 						currentPage: 1
 					}).then(res => {
 						if (res.code == 200) {
+							if(res.data.records.length){
+								for (var i = 0; i < res.data.records.length; i++) {
+									res.data.records[i].contactPhone1=res.data.records[i].contactPhone.replace(/(\d{3})(\d{4})(\d{4})/, "$1****$3")
+								}
+							}
+							console.log(res.data.records)
 							this.dataList = res.data.records
 							this.$forceUpdate()
 							for (let i = 0; i < this.dataList.length; i++) {
@@ -233,6 +251,7 @@
 			selectAddress(type) {
 				// 0临时地址 1 新增地址
 				if (type == 0) {
+					console.log(111111111)
 					let that = this
 					uni.getLocation({
 						type: 'wgs84',
@@ -258,6 +277,7 @@
 									that.configAddress(that.temporaryAddress)
 								},
 								fail: function() {
+									console.log(2222222)
 								// 	uni.getSetting({
 								// 		success: function(res) {
 								// 			var statu = res.authSetting;
@@ -403,11 +423,20 @@
 		background: white;
 		padding: 20rpx;
 	}
-
+	.content2-wrap{
+		margin-bottom:200rpx;
+	}
+	.jt-icon {
+		position: relative;
+		top: 4rpx;
+		width: 24rpx;
+		margin: 0 10rpx;
+	
+	}
 	.content2 {
 		border-radius: 20rpx;
 		background: white;
-		margin: 20rpx;
+		margin: 20rpx ;
 		padding: 20rpx;
 
 		.row {
@@ -436,8 +465,10 @@
 
 	.bottom-btn {
 		position: fixed;
-		bottom: 50rpx;
+		bottom: 0rpx;
+		padding:50rpx 0;
 		width: 100%;
+		background-color: #fff;
 		display: flex;
 		justify-content: space-around;
 

uni_modules/mescroll-uni/components/mescroll-diy/beibei/mescroll-uni-option.js

@@ -27,7 +27,7 @@ const GlobalOption = {
 		zh: {
 			up: {
 				textLoading: '加载中 ...', // 加载中的提示文本
-				textNoMore: '-- 没有更多了~ --', // 没有更多数据的提示文本
+				textNoMore: ' 没有更多了~ ', // 没有更多数据的提示文本
 				empty: {
 					tip: '~ 暂无相关数据 ~' // 空提示
 				}

uni_modules/mescroll-uni/components/mescroll-diy/xinlang/mescroll-uni-option.js

@@ -35,7 +35,7 @@ const GlobalOption = {
 			},
 			up: {
 				textLoading: '加载中 ...', // 加载中的提示文本
-				textNoMore: '-- 没有更多了~ --', // 没有更多数据的提示文本
+				textNoMore: ' 没有更多了~ ', // 没有更多数据的提示文本
 				empty: {
 					tip: '~ 空空如也 ~' // 空提示
 				}

uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni-option.js

@@ -35,7 +35,7 @@ const GlobalOption = {
 			},
 			up: {
 				textLoading: '加载中 ...', // 加载中的提示文本
-				textNoMore: '-- 没有更多了~ --', // 没有更多数据的提示文本
+				textNoMore: ' 没有更多了~ ', // 没有更多数据的提示文本
 				empty: {
 					tip: '~ 空空如也 ~' // 空提示
 				}

uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.js

@@ -95,7 +95,7 @@ MeScroll.prototype.extendUpScroll = function(optUp) {
 		noMoreSize: 5, // 如果列表已无数据,可设置列表的总数量要大于等于5条才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看
 		offset: 150, // 距底部多远时,触发upCallback,仅mescroll-uni生效 ( mescroll-body配置的是pages.json的 onReachBottomDistance )
 		textLoading: '加载中 ...', // 加载中的提示文本
-		textNoMore: '-- 没有更多了~ --', // 没有更多数据的提示文本
+		textNoMore: ' 没有更多了~ ', // 没有更多数据的提示文本
 		bgColor: "transparent", // 背景颜色 (建议在pages.json中再设置一下backgroundColorBottom)
 		textColor: "gray", // 文本颜色 (当bgColor配置了颜色,而textColor未配置时,则textColor会默认为白色)
 		inited: null, // 初始化完毕的回调

uni_modules/uni-rate/changelog.md

@@ -1,23 +0,0 @@
-## 1.3.0（2021-11-19）
-- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
-- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-rate](https://uniapp.dcloud.io/component/uniui/uni-rate)
-## 1.2.2（2021-09-10）
-- 优化 默认值修改为 0 颗星
-## 1.2.1（2021-07-30）
-- 优化 vue3下事件警告的问题
-## 1.2.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 1.1.2（2021-05-12）
-- 新增 组件示例地址
-## 1.1.1（2021-04-21）
-- 修复 布局变化后 uni-rate  星星计算不准确的 bug
-- 优化 添加依赖 uni-icons, 导入 uni-rate 自动下载依赖
-## 1.1.0（2021-04-16）
-- 修复 uni-rate 属性 margin 值为 string 组件失效的 bug
-
-## 1.0.9（2021-02-05）
-- 优化 组件引用关系，通过uni_modules引用组件
-
-## 1.0.8（2021-02-05）
-- 调整为uni_modules目录规范
-- 支持 pc 端

uni_modules/uni-rate/package.json

@@ -1,88 +0,0 @@
-{
-  "id": "uni-rate",
-  "displayName": "uni-rate 评分",
-  "version": "1.3.0",
-  "description": "Rate 评分组件，可自定义评分星星图标的大小、间隔、评分数。",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "评分"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [
-			"uni-scss",
-			"uni-icons"
-		],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        },
-        "Vue": {
-            "vue2": "y",
-            "vue3": "y"
-        }
-      }
-    }
-  }
-}

uni_modules/uni-rate/readme.md

@@ -1,12 +0,0 @@
-
-
-## Rate 评分
-> **组件名：uni-rate**
-> 代码块： `uRate`
-> 关联组件：`uni-icons`
-
-
-评分组件，多用于购买商品后，对商品进行评价等场景
-
-### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-rate)
-#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uview-ui/components/u-upload/u-upload.vue

@@ -124,6 +124,7 @@
 	import {
 		chooseFile
 	} from './utils';
+
 	import mixin from './mixin.js';
 	import props from './props.js';
 
@@ -197,7 +198,10 @@
 				this.lists = lists
 				this.isInCount = lists.length < maxCount
 			},
+			
 			chooseFile() {
+				this.beforeRead1()
+				console.log(1212)
 				const {
 					maxCount,
 					multiple,