From cb8d2c4ca5b30844ff9be8793c6f7df6c94138e7 Mon Sep 17 00:00:00 2001
From: linju-json <linju@dcloud.io>
Date: Mon, 26 Jul 2021 21:59:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9vue3...=E5=BE=85=E7=BB=AD?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/appInit.js                             |  5 +-
 components/uni-agreements/uni-agreements.vue  |  3 +-
 .../uni-quick-login/uni-quick-login.vue       |  2 +-
 .../uni-send-sms-code/uni-send-sms-code.vue   |  3 +-
 pages/list/list.nvue                          |  5 --
 pages/ucenter/userinfo/userinfo.vue           |  2 +-
 .../uni-file-picker/uni-file-picker.vue       | 70 ++++++++++++-------
 uni_modules/uni-share/js_sdk/uni-share.js     |  8 +--
 8 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/common/appInit.js b/common/appInit.js
index 47eac345..da0ae8b0 100644
--- a/common/appInit.js
+++ b/common/appInit.js
@@ -322,7 +322,6 @@ export default async function() {
 					url == '/pages/ucenter/login-page/index/index' &&
 					!inLoginPage
 				) {
-					// console.log(9527777,login);
 					//一键登录（univerify）、账号（username）、验证码登录（短信smsCode）
 					if (login[0] == 'username') {
 						e.url = "/pages/ucenter/login-page/pwd-login/pwd-login"
@@ -343,7 +342,7 @@ export default async function() {
 							}
 							return url != item
 						})
-						// console.log(pass)
+						console.log({pass})
 					}
 					if (visitor&&!inLoginPage) {
 						pass = visitor.some((item) => {
@@ -352,7 +351,7 @@ export default async function() {
 							}
 							return url == item
 						})
-						console.log(pass)
+						console.log({pass})
 					}
 
 					if (!pass && (token == '' || tokenExpired)) {
diff --git a/components/uni-agreements/uni-agreements.vue b/components/uni-agreements/uni-agreements.vue
index 86a60ceb..e222237f 100644
--- a/components/uni-agreements/uni-agreements.vue
+++ b/components/uni-agreements/uni-agreements.vue
@@ -44,7 +44,8 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+@import '@/common/all-flex.css';
 .root{
 	flex-direction: row;
 	align-items: center;
diff --git a/components/uni-quick-login/uni-quick-login.vue b/components/uni-quick-login/uni-quick-login.vue
index 9419534a..17409b99 100644
--- a/components/uni-quick-login/uni-quick-login.vue
+++ b/components/uni-quick-login/uni-quick-login.vue
@@ -281,7 +281,7 @@
 									}
 									break;
 								default:
-									console.log(9527, err);
+									console.log(err);
 									break;
 							}
 						}
diff --git a/components/uni-send-sms-code/uni-send-sms-code.vue b/components/uni-send-sms-code/uni-send-sms-code.vue
index 7df82fa6..ed0028e1 100644
--- a/components/uni-send-sms-code/uni-send-sms-code.vue
+++ b/components/uni-send-sms-code/uni-send-sms-code.vue
@@ -117,7 +117,8 @@
 	}
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+@import '@/common/all-flex.css';
 	.short-code-btn {
 		width: 200rpx;
 		height: 85rpx;
diff --git a/pages/list/list.nvue b/pages/list/list.nvue
index 8e4e35bf..3e18c2ac 100644
--- a/pages/list/list.nvue
+++ b/pages/list/list.nvue
@@ -82,13 +82,8 @@
 			cdbRef = this.$refs.udb
 		},
 		async onShow() {
-			
-			console.log(999,getApp().globalData.searchText);
-			
 			this.keyword = getApp().globalData.searchText
 			getApp().globalData.searchText = ''
-			
-			
 			//这里仅演示如何，在onShow生命周期获取设备位置，并在设备或者应用没有权限时自动引导。设置完毕自动重新获取。
 			//你可以基于他做自己的业务，比如：根据距离由近到远排序列表数据等
 			// uni.showLoading({
diff --git a/pages/ucenter/userinfo/userinfo.vue b/pages/ucenter/userinfo/userinfo.vue
index 78e5dac7..2f1f2fbe 100644
--- a/pages/ucenter/userinfo/userinfo.vue
+++ b/pages/ucenter/userinfo/userinfo.vue
@@ -131,7 +131,7 @@
 				})
 			},
 			setNickname(nickname) {
-				console.log(9527, nickname);
+				console.log(nickname);
 				if (nickname) {
 					usersTable.where('_id==$env.uid').update({
 						nickname
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
index 84d41237..edbbc851 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
@@ -97,6 +97,12 @@ export default {
 			default() {
 				return []
 			}
+		},
+		modelValue: {
+			type: [Array, Object],
+			default() {
+				return []
+			}
 		},
 		disabled: {
 			type: Boolean,
@@ -174,34 +180,26 @@ export default {
 		returnType: {
 			type: String,
 			default: 'array'
+		},
+		sizeType:{
+			type: Array,
+			default(){
+				return ['original','compressed']
+			}
 		}
 	},
 	watch: {
 		value: {
 			handler(newVal) {
-				let newFils = []
-				let newData = [].concat(newVal || [])
-				newData.forEach(v => {
-					const files = this.files.find(i => i.url === v.url)
-					const reg = /cloud:\/\/([\w.]+\/?)\S*/
-					if (!v.path) {
-						v.path = v.url
-					}
-					if (reg.test(v.url)) {
-						this.getTempFileURL(v, v.url)
-					}
-					newFils.push(files ? files : v)
-				})
-				let data  = null
-				if (this.returnType === 'object') {
-					data = this.backObject(newFils)[0]
-				} else {
-					data = this.backObject(newFils)
-				}
-				this.formItem && this.formItem.setValue(data)
-				this.files = newFils
+				this.setValue(newVal)
 			},
 			immediate: true
+		},
+		modelValue:{
+			handler(newVal) {
+				this.setValue(newVal)
+			},
+			immediate: true
 		}
 	},
 	data() {
@@ -261,7 +259,30 @@ export default {
 			}
 		}
 	},
-	methods: {
+	methods: {
+		setValue(newVal){
+			let newFils = []
+			let newData = [].concat(newVal || [])
+			newData.forEach(v => {
+				const files = this.files.find(i => i.url === v.url)
+				const reg = /cloud:\/\/([\w.]+\/?)\S*/
+				if (!v.path) {
+					v.path = v.url
+				}
+				if (reg.test(v.url)) {
+					this.getTempFileURL(v, v.url)
+				}
+				newFils.push(files ? files : v)
+			})
+			let data  = null
+			if (this.returnType === 'object') {
+				data = this.backObject(newFils)[0]
+			} else {
+				data = this.backObject(newFils)
+			}
+			this.formItem && this.formItem.setValue(data)
+			this.files = newFils
+		},
 		/**
 		 * 获取父元素实例
 		 */
@@ -301,7 +322,7 @@ export default {
 		 * 选择文件
 		 */
 		choose() {
-			
+
 			if (this.disabled) return
 			if (this.files.length >= Number(this.limitLength) && this.showType !== 'grid' && this.returnType === 'array') {
 				uni.showToast({
@@ -330,7 +351,8 @@ export default {
 			uniCloud
 				.chooseAndUploadFile({
 					type: this.fileMediatype,
-					compressed: false,
+					compressed: false,
+					sizeType:this.sizeType,
 					// TODO 如果为空，video 有问题
 					extension: this.extname.length > 0 ? this.extname : undefined,
 					count: this.limitLength - this.files.length, //默认9
diff --git a/uni_modules/uni-share/js_sdk/uni-share.js b/uni_modules/uni-share/js_sdk/uni-share.js
index ec141447..2b2b3494 100644
--- a/uni_modules/uni-share/js_sdk/uni-share.js
+++ b/uni_modules/uni-share/js_sdk/uni-share.js
@@ -16,10 +16,10 @@ export default async (param,callback) => {
 			if (typeof(menus[e]['share']) == 'string') {
 				eval(menus[e]['share']+'()')
 			} else {
-				console.log(9527,{
-					...param.content,
-					...menus[e].share,
-				});
+				// console.log(123456,{
+				// 	...param.content,
+				// 	...menus[e].share,
+				// });
 				uni.share({
 					...param.content,
 					...menus[e].share,
-- 
GitLab