diff --git a/App.vue b/App.vue index 8ae266c1fe43c675cafc3bda70bbcfcc99b1e2e4..ccb3669faeed24489c1835eafb6cedffc2cbfae5 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 54ce6cce48d98e2ed8e81958b2c1846b1e482ee9..0000000000000000000000000000000000000000 --- 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 200f1f5f7dd5d22315493b1ad252dc7e7ccf887c..f3621dab6e1454a9d2b2759e2632d0c4c29cd851 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 0000000000000000000000000000000000000000..d5a7ac037d513389d2f2f889698175f90dd166b2 --- /dev/null +++ b/components/uni-network/uni-network.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/manifest.json b/manifest.json index f0b4b4801034684f9fce14f45caa8cbc82648413..eeb96daa01a9c2cd4842d8f1c43b177d05f2dea1 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 82b2fcd3f6dcc900f9b293067c0329724c66a678..5f0a1cc0645cd122d9d2b6120f763311c05d9f66 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 b622c241347b07518307c36639a6ed2e7eaa8a0c..6eff9970f294121dc5ec0277db91cba1ce0f31af 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 8d6f29d8c9646a56d6ceb7e8adc4893df171c280..f91190e664144210032f13b50e61078907ec1624 100644 --- a/pages/list/list.nvue +++ b/pages/list/list.nvue @@ -1,65 +1,65 @@