From e9d33106fe8d29c5d58ac59e13ad5db4bba3ea0a Mon Sep 17 00:00:00 2001 From: linju-json Date: Wed, 28 Apr 2021 18:47:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 5 +- baseapp.config.js | 87 ++++--- common/appInit.js | 157 ++++-------- common/openApp.js | 5 + components/null/null.vue | 35 --- components/refreshBox/refreshBox.nvue | 71 ------ components/uni-agreements/uni-agreements.vue | 2 +- components/uni-network/uni-network.vue | 102 ++++++++ manifest.json | 6 +- pages.json | 30 +-- pages/list/detail.vue | 12 +- pages/list/list.nvue | 226 +++++++---------- pages/ucenter/about/about.vue | 10 +- pages/ucenter/login-page/index/index.vue | 2 +- pages/ucenter/ucenter.vue | 18 +- .../bind-mobile/bind-mobile.vue | 0 .../limeClipper/images/photo.svg | 0 .../limeClipper/images/rotate.svg | 0 .../{edit => userinfo}/limeClipper/index.styl | 0 .../limeClipper/limeClipper.vue | 0 .../{edit => userinfo}/limeClipper/utils.js | 0 pages/ucenter/{edit => userinfo}/main.js | 0 .../uploadCutImageToUnicloud.vue | 0 .../{edit/edit.vue => userinfo/userinfo.vue} | 0 static/getDataState/loading.png | Bin 30470 -> 0 bytes static/getDataState/nodata.png | Bin 45738 -> 34325 bytes static/getDataState/nowifi.png | Bin 98274 -> 0 bytes static/logo.png | Bin 0 -> 4023 bytes static/uni-network/disconnection.png | Bin 0 -> 39925 bytes uni.scss | 2 +- uni_modules/uni-image-menu/readme.md | 20 +- uni_modules/uni-nodata/changelog.md | 0 .../components/uni-nodata/uni-nodata.nvue | 231 ------------------ uni_modules/uni-nodata/package.json | 76 ------ uni_modules/uni-nodata/readme.md | 1 - uni_modules/uni-nodata/static/loading.png | Bin 30470 -> 0 bytes uni_modules/uni-nodata/static/nodata.png | Bin 45738 -> 0 bytes uni_modules/uni-nodata/static/nowifi.png | Bin 98274 -> 0 bytes uni_modules/uni-share/changelog.md | 2 + uni_modules/uni-share/js_sdk/uni-share.js | 4 +- uni_modules/uni-share/package.json | 52 ++-- uni_modules/uni-share/readme.md | 130 +++++----- 42 files changed, 461 insertions(+), 825 deletions(-) delete mode 100644 components/null/null.vue delete mode 100644 components/refreshBox/refreshBox.nvue create mode 100644 components/uni-network/uni-network.vue rename pages/ucenter/{edit => userinfo}/bind-mobile/bind-mobile.vue (100%) rename pages/ucenter/{edit => userinfo}/limeClipper/images/photo.svg (100%) rename pages/ucenter/{edit => userinfo}/limeClipper/images/rotate.svg (100%) rename pages/ucenter/{edit => userinfo}/limeClipper/index.styl (100%) rename pages/ucenter/{edit => userinfo}/limeClipper/limeClipper.vue (100%) rename pages/ucenter/{edit => userinfo}/limeClipper/utils.js (100%) rename pages/ucenter/{edit => userinfo}/main.js (100%) rename pages/ucenter/{edit => userinfo}/uploadCutImageToUnicloud.vue (100%) rename pages/ucenter/{edit/edit.vue => userinfo/userinfo.vue} (100%) delete mode 100644 static/getDataState/loading.png delete mode 100644 static/getDataState/nowifi.png create mode 100644 static/logo.png create mode 100644 static/uni-network/disconnection.png delete mode 100644 uni_modules/uni-nodata/changelog.md delete mode 100644 uni_modules/uni-nodata/components/uni-nodata/uni-nodata.nvue delete mode 100644 uni_modules/uni-nodata/package.json delete mode 100644 uni_modules/uni-nodata/readme.md delete mode 100644 uni_modules/uni-nodata/static/loading.png delete mode 100644 uni_modules/uni-nodata/static/nodata.png delete mode 100644 uni_modules/uni-nodata/static/nowifi.png diff --git a/App.vue b/App.vue index 8ae266c..ccb3669 100644 --- a/App.vue +++ b/App.vue @@ -1,10 +1,11 @@ - - diff --git a/components/refreshBox/refreshBox.nvue b/components/refreshBox/refreshBox.nvue deleted file mode 100644 index 54ce6cc..0000000 --- a/components/refreshBox/refreshBox.nvue +++ /dev/null @@ -1,71 +0,0 @@ - - - - diff --git a/components/uni-agreements/uni-agreements.vue b/components/uni-agreements/uni-agreements.vue index 200f1f5..f3621da 100644 --- a/components/uni-agreements/uni-agreements.vue +++ b/components/uni-agreements/uni-agreements.vue @@ -13,7 +13,7 @@ name:"uni-agreements", computed:{ agreements(){ - return getApp().config.about.agreements + return getApp().globalData.config.about.agreements } }, methods:{ diff --git a/components/uni-network/uni-network.vue b/components/uni-network/uni-network.vue new file mode 100644 index 0000000..d5a7ac0 --- /dev/null +++ b/components/uni-network/uni-network.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/manifest.json b/manifest.json index f0b4b48..eeb96da 100644 --- a/manifest.json +++ b/manifest.json @@ -11,8 +11,8 @@ "prompt" : "template", "template" : { "title" : "服务协议和隐私政策", - "message" : "  请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
  你可阅读《服务协议》《隐私政策》了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。", - "buttonAccept" : "我知道了", + "message" : "  请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
  你可阅读《服务协议》《隐私政策》了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。", + "buttonAccept" : "同意", "buttonRefuse" : "暂不同意" } }, @@ -113,8 +113,8 @@ "es6" : false }, "usingComponents" : true - // "betterScopedSlots" : true }, + // "betterScopedSlots" : true "mp-alipay" : { "usingComponents" : true }, diff --git a/pages.json b/pages.json index 82b2fcd..5f0a1cc 100644 --- a/pages.json +++ b/pages.json @@ -3,23 +3,17 @@ { "path": "pages/list/list", "style": { - // #ifdef APP-NVUE - "enablePullDownRefresh": false, - // #endif - // #ifdef H5 "navigationStyle":"custom", - // #endif + "enablePullDownRefresh": true, "app-plus":{ - // #ifdef APP-PLUS - "titleNView":{ /*排除了H5*/ - "searchInput":{ - "placeholder":"请输入搜索的内容", - "backgroundColor":"#efefef", - "disabled":true, - "borderRadius":"30px" - } - } - // #endif + // "titleNView":{ /*排除了H5*/ + // "searchInput":{ + // "placeholder":"请输入搜索的内容", + // "backgroundColor":"#efefef", + // "disabled":true, + // "borderRadius":"30px" + // } + // } } } }, @@ -73,7 +67,7 @@ "navigationBarTitleText": "文章详情" } }, { - "path": "pages/ucenter/edit/bind-mobile/bind-mobile", + "path": "pages/ucenter/userinfo/bind-mobile/bind-mobile", "style": { "navigationBarTitleText": "绑定手机号码" } @@ -162,12 +156,12 @@ } }, { - "path": "pages/ucenter/edit/edit", + "path": "pages/ucenter/userinfo/userinfo", "style": { "navigationBarTitleText": "个人资料" } }, { - "path": "pages/ucenter/edit/uploadCutImageToUnicloud", + "path": "pages/ucenter/userinfo/uploadCutImageToUnicloud", "style": { "navigationStyle": "custom" } diff --git a/pages/list/detail.vue b/pages/list/detail.vue index b622c24..6eff997 100644 --- a/pages/list/detail.vue +++ b/pages/list/detail.vue @@ -47,7 +47,6 @@ - + diff --git a/pages/list/list.nvue b/pages/list/list.nvue index 8d6f29d..f91190e 100644 --- a/pages/list/list.nvue +++ b/pages/list/list.nvue @@ -1,65 +1,65 @@