gjy %!s(int64=2) %!d(string=hai) anos
pai
achega
9e3710265b

+ 17 - 0
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("点击发布")

+ 16 - 2
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); //追加新数据

+ 38 - 2
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
 			},

+ 5 - 2
pages/mine/cargoowner/cargoowner.vue

@@ -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'>
@@ -62,7 +64,7 @@
 					<view class="row3">
 						<view class="right">
 							<!-- v-if='item.status!="平台审核中"&&item.status!="企业审核中"&&item.status!="企业暂不可用"&&item.status!="企业不存在"&&item.status!="授权已撤销"' -->
-							<image @click='edit(item)'
+							<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;'
@@ -224,6 +226,7 @@
 
 <style lang="scss" scoped>
 	.content {
+		height:100vh;
 		padding-bottom: 320rpx;
 	}
 

+ 34 - 4
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 */
 	}

+ 19 - 0
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]
 			},

+ 19 - 0
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

+ 2 - 1
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({

+ 19 - 0
pages/mine/company/editcompany.vue

@@ -231,6 +231,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: {},
@@ -284,6 +285,7 @@
 			}
 		},
 		onLoad(options) {
+			this.get_camera_permission()
 			this.dataDetails.id = options.id
 			this.validityPeriod = this.$helper.makeValidityPeriod(0, '长期')
 			this.dataDetails.commonId = this.userInfo.id
@@ -300,6 +302,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

+ 19 - 0
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()

+ 19 - 0
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])) {

+ 1 - 0
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 {

+ 20 - 0
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: '加载中'

+ 26 - 4
pages/release/selectAddress.vue

@@ -11,7 +11,7 @@
 					{{item.contacts}}
 				</view>
 				<view class="phone">
-					{{item.contactPhone}}
+					{{item.contactPhone1}}
 				</view>
 			</view>
 			<view class="row flex row2">
@@ -26,13 +26,22 @@
 				</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>
@@ -121,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++) {
@@ -409,6 +424,13 @@
 	.content2-wrap{
 		margin-bottom:200rpx;
 	}
+	.jt-icon {
+		position: relative;
+		top: 4rpx;
+		width: 24rpx;
+		margin: 0 10rpx;
+	
+	}
 	.content2 {
 		border-radius: 20rpx;
 		background: white;

+ 1 - 1
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: '~ 暂无相关数据 ~' // 空提示
 				}

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

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

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

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

+ 1 - 1
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, // 初始化完毕的回调

+ 4 - 0
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,