merge

manifest.json

@@ -65,7 +65,9 @@
                     "NSPhotoLibraryUsageDescription" : "上传图片",
                     "NSPhotoLibraryAddUsageDescription" : "下载图片",
                     "NSCameraUsageDescription" : "扫描二维码",
-                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "定位您的店铺地址"
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "定位您的店铺地址",
+                    "NSRemindersUsageDescription" : "及时通知提醒内容",
+                    "NSLocalNetworkUsageDescription" : "使用您的网络获取服务数据"
                 }
             },
             /* SDK配置 */
@@ -174,3 +176,5 @@
     },
     "vueVersion" : "2"
 }
+/* SDK配置 */
+

uni_modules/uni-load-more/components/uni-load-more/i18n/en.json

@@ -1,4 +1,4 @@
-{
+{
 	"uni-load-more.contentdown": "Pull up to show more",
 	"uni-load-more.contentrefresh": "loading...",
 	"uni-load-more.contentnomore": "No more data"

uni_modules/uni-load-more/components/uni-load-more/i18n/index.js

@@ -1,8 +1,8 @@
-import en from './en.json'
-import zhHans from './zh-Hans.json'
-import zhHant from './zh-Hant.json'
-export default {
-	en,
-	'zh-Hans': zhHans,
-	'zh-Hant': zhHant
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
 }

uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json

@@ -1,4 +1,4 @@
-{
+{
 	"uni-load-more.contentdown": "上拉显示更多",
 	"uni-load-more.contentrefresh": "正在加载...",
 	"uni-load-more.contentnomore": "没有更多数据了"

uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json

@@ -1,4 +1,4 @@
-{
+{
 	"uni-load-more.contentdown": "上拉顯示更多",
 	"uni-load-more.contentrefresh": "正在加載...",
 	"uni-load-more.contentnomore": "沒有更多數據了"