From 8607deb4092acb274db4a737a97794f544020f7e Mon Sep 17 00:00:00 2001
From: linju-json <linju@dcloud.io>
Date: Thu, 29 Apr 2021 16:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=85=E6=B5=8B=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=8F=8D=E9=A6=88=E7=9A=84=EF=BC=8C=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E5=85=A8=E5=B1=80=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E8=B5=8B=E5=80=BC=E6=97=B6=E6=9C=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=88=E4=B8=B4=E6=97=B6=E4=BF=AE=E5=A4=8D=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=BB=AD=E4=BC=9A=E4=BB=8E=E6=A1=86=E6=9E=B6?=
 =?UTF-8?q?=E8=A7=92=E5=BA=A6=E5=8D=87=E7=BA=A7=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                |  3 ++-
 App.vue                   |  8 +++++---
 common/appInit.js         | 15 +++++++++------
 manifest.json             |  6 +++---
 package.json              |  4 ++--
 pages/list/list.nvue      | 10 ++++++----
 pages/ucenter/ucenter.vue |  6 +++---
 7 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index cebf3c8..7c42f1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ node_modules
 uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/config.json
 uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
 pages/grid/banner.json
-pages/list/list.json
\ No newline at end of file
+pages/list/list.json
+manifest.json
\ No newline at end of file
diff --git a/App.vue b/App.vue
index e98b470..6b09213 100644
--- a/App.vue
+++ b/App.vue
@@ -1,5 +1,5 @@
 <script>
-	import initApp from '@/common/appInit.js';
+	import initApp from '@/common/appInit.js';
 	import checkIsAgree from '@/uni_modules/uni-agree/utils/uni-agree.js';
 	export default {
 		globalData: {
@@ -8,8 +8,10 @@
 			config:{}
 		},
 		onLaunch: function() {
-			console.log('App Launch')
-			initApp();
+			console.log('App Launch')
+			
+			initApp();
+			
 			// #ifdef APP-PLUS
 			//checkIsAgree(); 暂时先用默认生成的，自定义的等待原生支持后实现。因为启动vue界面时已经，请求了部分权限这并不符合国家的法规
 			// #endif
diff --git a/common/appInit.js b/common/appInit.js
index 0a1de2e..d64219d 100644
--- a/common/appInit.js
+++ b/common/appInit.js
@@ -1,16 +1,19 @@
+import baseappConfig from '@/baseapp.config.js';
 //应用初始化页
-import baseappConfig from '@/baseapp.config.js';
 // #ifdef APP-PLUS
 import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
 import callCheckVersion from '@/uni_modules/uni-upgrade-center-app/utils/call-check-version';
 // #endif
-export default function() {
+export default function() {
+	
+	setTimeout(()=>{
+		// baseappConfig挂载到getApp().
+		const app = getApp({allowDefault: true})
+		app.globalData.config = baseappConfig;
+	},30)
+	
 	// 初始化appVersion（仅app生效）
 	initAppVersion();
-
-	// baseappConfig挂载到getApp().
-	getApp({allowDefault: true}).globalData.config = baseappConfig;
-	
 	/*
 		这里应用拦截器实现了，路由拦截。当应用无访问摄像头/相册权限，引导跳到设置界面
 		1.添加拦截器说明如下：
diff --git a/manifest.json b/manifest.json
index eeb96da..8084732 100644
--- a/manifest.json
+++ b/manifest.json
@@ -110,11 +110,11 @@
         "appid" : "wx07597007230e3702",
         "setting" : {
             "urlCheck" : false,
-            "es6" : false
+            "es6" : true
         },
-        "usingComponents" : true
+        "usingComponents" : true ,
+		"betterScopedSlots" : true
     },
-    // "betterScopedSlots" : true
     "mp-alipay" : {
         "usingComponents" : true
     },
diff --git a/package.json b/package.json
index 3ac4d57..88f6682 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"id": "uniCloud-base-app",
 	"displayName": "baseApp",
 	"version": "1.0.0",
-	"description": "云端一体项目基础功能示例",
+	"description": "集成了商用项目开发常见功能的项目模板",
 	"keywords": [
 		"baseApp",
 		"login",
@@ -20,7 +20,7 @@
 	"dcloudext": {
 		"category": [
 			"uniCloud",
-			"云端一体项目基础功能示例"
+			"集成了商用项目开发常见功能的项目模板"
 		],
 		"sale": {
 			"regular": {
diff --git a/pages/list/list.nvue b/pages/list/list.nvue
index feb597e..88688fc 100644
--- a/pages/list/list.nvue
+++ b/pages/list/list.nvue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<!-- #ifdef APP-PLUS -->
+		<!-- #ifndef H5 -->
 		<uni-nav-bar :border="false"></uni-nav-bar>
 		<!-- #endif -->
 		<!-- 搜索功能 -->
@@ -19,13 +19,13 @@
 				
 				<template v-else>
 					<uni-list-item class="get-data-state" v-if="data.length===0&&pagination.current===1">
-						<template slot="body">
+						<view slot="body">
 							<!-- 数据为空 当前页码为1，且正在加载中;这里为了演示，更加直观的表达内部逻辑。商用项目建议将这部分封装为组件，更好的让业务逻辑与功能分离-->
 							<uni-load-more v-if="loading" status="loading"></uni-load-more>
 							<template v-else>
 								<text class="get-data-state-text">内容为空</text>
 							</template>
-						</template>
+						</view>
 					</uni-list-item>
 					<uni-list-item :to="'./detail?id='+item._id+'&title='+item.title"
 						v-for="(item,index) in data" :key="index">
@@ -84,7 +84,9 @@
 			this.listHight = 'auto'
 			// #endif
 			cdbRef = this.$refs.udb
-			console.log(cdbRef);
+			console.log(cdbRef);
+			console.log(9527,getApp().globalData);
+			
 		},
 		onShow() {
 			this.keyword = getApp().globalData.searchText
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 15e2979..49e7f48 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -8,13 +8,13 @@
 			</view>
 		</view>
 		<uni-grid class="grid" :column="5" :showBorder="false" :square="true">
-			<uni-grid-item class="item" v-for="(item,index) in gridList" @click.native="tapGrid(index)">
+			<uni-grid-item class="item" v-for="(item,index) in gridList" @click.native="tapGrid(index)" :key="index">
 				<uni-icons class="icon" color="#5d5e64" :type="item.icon" size="28"></uni-icons>
 				<text class="text">{{item.text}}</text>
 			</uni-grid-item>
 		</uni-grid>
-		<uni-list class="center-list" v-for="(sublist , index) in ucenterList">
-			<uni-list-item v-for="item in sublist" :title="item.title" link :rightText="item.rightText"
+		<uni-list class="center-list" v-for="(sublist , index) in ucenterList" :key="index">
+			<uni-list-item v-for="(item,i) in sublist" :title="item.title" link :rightText="item.rightText" :key="i"
 				:clickable="true" :to="item.to" @click="ucenterListClick(item)">
 				<view v-if="item.showBadge" class="item-footer" slot="footer">
 					<text class="item-footer-text">{{item.rightText}}</text>
-- 
GitLab