From 5218159cfc0d7ef91da8c40c2c15ba12e1cde872 Mon Sep 17 00:00:00 2001
From: anne-lxm <1076217653@qq.com>
Date: Tue, 31 Jan 2023 20:50:59 +0800
Subject: [PATCH] =?UTF-8?q?uni-id-pages=E5=88=86=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cloud-image/cloud-image.vue |  73 ++++++++
 manifest.json                          | 134 +++++++-------
 pages.json                             | 234 +++++++++++++------------
 pages/ucenter/ucenter.vue              |   2 +-
 4 files changed, 261 insertions(+), 182 deletions(-)
 create mode 100644 components/cloud-image/cloud-image.vue

diff --git a/components/cloud-image/cloud-image.vue b/components/cloud-image/cloud-image.vue
new file mode 100644
index 00000000..d714a3ae
--- /dev/null
+++ b/components/cloud-image/cloud-image.vue
@@ -0,0 +1,73 @@
+<template>
+	<view @click="onClick" :style="{width,height}" style="justify-content: center;">
+		<image v-if="cSrc" :style="{width,height}" :src="cSrc" :mode="mode"></image>
+	</view>
+</template>
+
+<script>
+	/**
+	* cloud-image 
+	* @description 兼容普通资源和unicloud图片资源渲染的组件
+	* @property {String} mode	图片裁剪、缩放的模式。默认为widthFix，支持所有image组件的mode值
+	* @property {String} src	资源完了链接或uniCloud云存储资源的fileid
+	* @property {String} width	图片的宽，默认为：100rpx
+	* @property {String} height	图片的高，默认为：100rpx
+	* @event {Function} click 点击 cloud-image 触发事件
+	*/
+	export default {
+		name: "cloud-image",
+		emits:['click'],
+		props: {
+			mode: {
+				type:String,
+				default () {
+					return 'widthFix'
+				}
+			},
+			src: {
+				// type:String,
+				default () {
+					return ""
+				}
+			},
+			width: {
+				type:String,
+				default () {
+					return '100rpx'
+				}
+			},
+			height: {
+				type:String,
+				default () {
+					return '100rpx'
+				}
+			}
+		},
+		watch: {
+			src:{
+				handler(src) {
+					if (src&&src.substring(0, 8) == "cloud://") {
+						uniCloud.getTempFileURL({
+							fileList: [src]
+						}).then(res=>{
+							this.cSrc = res.fileList[0].tempFileURL
+						})
+					}else{
+						this.cSrc = src
+					}
+				},
+				immediate: true
+			}
+		},
+		methods:{
+			onClick(){
+				this.$emit('click')
+			}
+		},
+		data() {
+			return {
+				cSrc:false
+			};
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index da54b188..ede3b16f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,71 +1,71 @@
 {
-  "name": "",
-  "appid": "",
-  "description": "云端一体应用快速开发基本项目模版",
-  "versionName": "",
-  "versionCode": "100",
-  "transformPx": false,
-  "app-plus": {
-    "usingComponents": true,
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
-    },
-    "modules": {
+    "name" : "uni-starter",
+    "appid" : "",
+    "description" : "云端一体应用快速开发基本项目模版",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            "sdkConfigs" : {
+                "push" : {
+                    "unipush" : null
+                }
+            }
+        }
     },
-    "distribute": {
-      "android": {
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-        ]
-      },
-      "ios": {
-      },
-      "sdkConfigs": {
-        "push": {
-          "unipush": null
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        "optimization" : {
+            "subPackages" : true
         }
-      }
-    }
-  },
-  "quickapp": {
-  },
-  "mp-weixin": {
-    "appid": "",
-    "setting": {
-      "urlCheck": false
     },
-    "usingComponents": true
-  },
-  "mp-alipay": {
-    "usingComponents": true
-  },
-  "mp-baidu": {
-    "usingComponents": true
-  },
-  "mp-toutiao": {
-    "usingComponents": true
-  },
-  "uniStatistics": {
-    "enable": false
-  },
-  "vueVersion": "2"
-}
\ No newline at end of file
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2"
+}
diff --git a/pages.json b/pages.json
index d96d8b20..bb67e32d 100644
--- a/pages.json
+++ b/pages.json
@@ -45,8 +45,29 @@
 				"navigationStyle": "custom"
 			}
 		},
-		// #ifdef APP-PLUS
 		{
+			"path": "pages/uni-agree/uni-agree",
+			"style": {
+				"navigationStyle": "custom",
+				"app-plus": {
+					"popGesture": "none"
+				}
+			}
+		}, {
+			"path": "pages/ucenter/settings/settings",
+			"style": {
+				"navigationBarTitleText": "设置"
+			}
+		},
+		{
+			"path": "pages/ucenter/read-news-log/read-news-log",
+			"style": {
+				"navigationBarTitleText": "阅读记录",
+				"enablePullDownRefresh": true
+			}
+		}
+		// #ifdef APP-PLUS
+		, {
 			"path": "pages/ucenter/about/about",
 			"style": {
 				"navigationBarTitleText": "关于",
@@ -81,123 +102,108 @@
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate",
-			"style": {
-				"navigationBarTitleText": "注销账号"
-			}
-		},
+		}
 		// #endif
-		// #ifdef H5
-		{
-			"path": "uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/register/register-admin",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "注册管理员账号"
-			}
-		},
-		// #endif
-		{
-			"path": "pages/uni-agree/uni-agree",
-			"style": {
-				"navigationStyle": "custom",
-				"app-plus": {
-					"popGesture": "none"
+	],
+	"subPackages": [{
+			"root": "uni_modules/uni-feedback",
+			"pages": [{
+				"path": "pages/opendb-feedback/opendb-feedback",
+				"style": {
+					"navigationBarTitleText": "意见反馈",
+					"enablePullDownRefresh": false
 				}
-			}
-		}, {
-			"path": "pages/ucenter/settings/settings",
-			"style": {
-				"navigationBarTitleText": "设置"
-			}
-		},
-		{
-			"path": "pages/ucenter/read-news-log/read-news-log",
-			"style": {
-				"navigationBarTitleText": "阅读记录",
-				"enablePullDownRefresh": true
-			}
+			}]
 		},
 		{
-			"path": "uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback",
-			"style": {
-				"navigationBarTitleText": "意见反馈",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/userinfo/userinfo",
-			"style": {
-				"navigationBarTitleText": "个人资料"
-			}
-		}, {
-			"path": "uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile",
-			"style": {
-				"navigationBarTitleText": "绑定手机号码"
-			}
-		}, {
-			"path": "uni_modules/uni-id-pages/pages/login/login-withoutpwd",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		}, {
-			"path": "uni_modules/uni-id-pages/pages/login/login-withpwd",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		}, {
-			"path": "uni_modules/uni-id-pages/pages/login/login-smscode",
-			"style": {
-				"navigationBarTitleText": "手机验证码登录"
-			}
-		}, {
-			"path": "uni_modules/uni-id-pages/pages/register/register",
-			"style": {
-				"navigationBarTitleText": "注册"
-			}
-		}, {
-			"path": "uni_modules/uni-id-pages/pages/retrieve/retrieve",
-			"style": {
-				"navigationBarTitleText": "重置密码"
-			}
-		}, {
-			"path": "uni_modules/uni-id-pages/pages/common/webview/webview",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": ""
-			}
-		}, {
-			"path": "uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "修改密码"
-			}
-		}, {
-			"path": "uni_modules/uni-id-pages/pages/register/register-by-email",
-			"style": {
-				"navigationBarTitleText": "邮箱验证码注册"
-			}
-		}, {
-			"path": "uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email",
-			"style": {
-				"navigationBarTitleText": "通过邮箱重置密码"
-			}
-		},
-		{
-			 "path": "uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd",
-			 "style": {
-				  "enablePullDownRefresh": false,
-				  "navigationBarTitleText": "设置密码"
-			 }
-		}
-],
+			"root": "uni_modules/uni-id-pages",
+			"pages": [{
+					"path": "pages/userinfo/userinfo",
+					"style": {
+						"navigationBarTitleText": "个人资料"
+					}
+				},
+				{
+					"path": "pages/login/login-withoutpwd"
+				},
+				{
+					"path": "pages/login/login-withpwd"
+				},
+				{
+					"path": "pages/userinfo/deactivate/deactivate",
+					"style": {
+						"navigationBarTitleText": "注销账号"
+					}
+				},
+				{
+					"path": "pages/userinfo/bind-mobile/bind-mobile",
+					"style": {
+						"navigationBarTitleText": "绑定手机号码"
+					}
+				},
+				{
+					"path": "pages/login/login-smscode",
+					"style": {
+						"navigationBarTitleText": "手机验证码登录"
+					}
+				},
+				{
+					"path": "pages/register/register",
+					"style": {
+						"navigationBarTitleText": "注册"
+					}
+				},
+				{
+					"path": "pages/retrieve/retrieve",
+					"style": {
+						"navigationBarTitleText": "重置密码"
+					}
+				}, {
+					"path": "pages/common/webview/webview",
+					"style": {
+						"enablePullDownRefresh": false,
+						"navigationBarTitleText": ""
+					}
+				}, {
+					"path": "pages/userinfo/change_pwd/change_pwd",
+					"style": {
+						"enablePullDownRefresh": false,
+						"navigationBarTitleText": "修改密码"
+					}
+				}, {
+					"path": "pages/register/register-by-email",
+					"style": {
+						"navigationBarTitleText": "邮箱验证码注册"
+					}
+				}, {
+					"path": "pages/retrieve/retrieve-by-email",
+					"style": {
+						"navigationBarTitleText": "通过邮箱重置密码"
+					}
+				},
+				{
+					"path": "pages/userinfo/set-pwd/set-pwd",
+					"style": {
+						"enablePullDownRefresh": false,
+						"navigationBarTitleText": "设置密码"
+					}
+				}
+				// #ifdef H5
+				,
+				{
+					"path": "pages/userinfo/cropImage/cropImage"
+				},
+				{
+					"path": "pages/register/register-admin",
+					"style": {
+						"enablePullDownRefresh": false,
+						"navigationBarTitleText": "注册管理员账号"
+					}
+				}
+				// #endif
+			]
+		}
+	],
 	"globalStyle": {
 		// #ifdef H5
 		"h5": {
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 631032cd..094fc396 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -378,7 +378,7 @@
 	.defaultAvatarUrl{
 		width: 150rpx;
 		height: 150rpx;
-		background-color: rgb(0, 122, 255);
+		background-color: #007aff;
 		border-radius: 100%;
 		justify-content: center;
 		align-items: center;
-- 
GitLab