From fb297e8a8c88baefa9e0cdd4f09a0ec5c9782e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com> Date: Wed, 11 Nov 2020 12:00:07 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20nvue=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/zhibo/index.nvue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pages/zhibo/index.nvue b/pages/zhibo/index.nvue index b249386..327fb4c 100644 --- a/pages/zhibo/index.nvue +++ b/pages/zhibo/index.nvue @@ -96,7 +96,9 @@ border-bottom-width: 2rpx; border-style: solid; border-color: #ECECEC; + /* #ifndef APP-PLUS-NVUE */ display: flex; + /* #endif */ flex-direction: row; align-items: center; justify-content: space-between; @@ -124,7 +126,9 @@ border-bottom-width: 2rpx; border-style: solid; border-color: #ECECEC; + /* #ifndef APP-PLUS-NVUE */ display: flex; + /* #endif */ flex-direction: row; align-items: center; } @@ -183,7 +187,9 @@ border-radius: 30rpx; } .userlist{ + /* #ifndef APP-PLUS-NVUE */ display: flex; + /* #endif */ flex-direction: row-reverse; width: 150rpx; height: 60rpx; @@ -205,7 +211,9 @@ text-overflow: ellipsis; } .userinfo { + /* #ifndef APP-PLUS-NVUE */ display: flex; + /* #endif */ flex-direction: column; width: 100rpx; margin-left: 20rpx; @@ -240,7 +248,9 @@ left: 30rpx; width: 308rpx; height: 70rpx; + /* #ifndef APP-PLUS-NVUE */ display: flex; + /* #endif */ align-items: center; border-radius: 35rpx; overflow: hidden; @@ -315,7 +325,9 @@ font-size: 30rpx; color: #fff; flex-direction: column-reverse; + /* #ifndef APP-PLUS-NVUE */ word-wrap:anywhere; + /* #endif */ font-weight: bold; } From ecfc79fbf8b6543bef068f6485937b3b3ad9aa56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com> Date: Thu, 12 Nov 2020 15:11:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/manifest.json b/manifest.json index 5cae804..d6a1e4d 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__EBFF00A", "description" : "", "versionName" : "1.0.1", - "versionCode" : "100", + "versionCode" : 101, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -119,33 +119,33 @@ }, "icons" : { "android" : { - "hdpi" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/安卓png/72x72psd.PNG", - "xhdpi" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/安卓png/96x96psd.PNG", - "xxhdpi" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/安卓png/144x144.PNG", - "xxxhdpi" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/安卓png/192x192.PNG" + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" }, "ios" : { - "appstore" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/appstore 1024X1024.PNG", + "appstore" : "unpackage/res/icons/1024x1024.png", "iphone" : { - "app@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/120x120.PNG", - "app@3x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/180x180.PNG", - "spotlight@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/80x80.PNG", - "spotlight@3x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/120x120.PNG", - "settings@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/58x58psd.PNG", - "settings@3x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/87X87.PNG", - "notification@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/40X40.PNG", - "notification@3x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/60X60.PNG" + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png" }, "ipad" : { - "app" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/80x80.PNG", - "app@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/180x180.PNG", - "notification" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/40X40.PNG", - "notification@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/40X40.PNG", - "proapp@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/180x180.PNG", - "settings" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/40X40.PNG", - "settings@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/58x58psd.PNG", - "spotlight" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/40X40.PNG", - "spotlight@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/80x80.PNG" + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" } } } From 456edb252ebecce37f6fff99839af33b2b3cde2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com> Date: Thu, 12 Nov 2020 15:19:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=B6iOS=E5=B9=B3=E5=8F=B0=E6=9A=82=E6=97=B6=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E8=BF=87=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageA/login/login.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pageA/login/login.vue b/pageA/login/login.vue index d42a3d5..64c0241 100644 --- a/pageA/login/login.vue +++ b/pageA/login/login.vue @@ -34,7 +34,8 @@ {{register}} - 其他方式登录 + + 其他方式登录 @@ -98,11 +99,19 @@ }, ], temp_url: "", // 上个页面路径 pagesArr: ["pages/mine/index"], // 特殊路径 + platform: '', // 手机平台 }; }, onLoad() { // 数据的请求 // this.apiwelcome(); + // 获取手机平台 + uni.getSystemInfo({ + success: (res) => { + console.log(res); + this.platform = res.platform + } + }); }, onShow() { let pages = getCurrentPages(); From 363349afe669d7f1cafe542e0f1e908034762071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com> Date: Thu, 12 Nov 2020 16:18:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=B7=BB=E5=8A=A0iOS?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=89=80=E9=9C=80=E8=A6=81=E7=9A=84=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index d6a1e4d..95b901a 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__EBFF00A", "description" : "", "versionName" : "1.0.1", - "versionCode" : 101, + "versionCode" : 102, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -67,7 +67,11 @@ "abiFilters" : [ "armeabi-v7a", "x86" ] }, /* ios打包配置 */ - "ios" : {}, + "ios" : { + "privacyDescription" : { + "NSLocationAlwaysAndWhenInUseUsageDescription" : "德铭阳光将在推荐商品、填写收货地址等服务中使用您的位置信息。" + } + }, /* SDK配置 */ "sdkConfigs" : { "ad" : {}, From e044812a7c6473ee632c28439d82f1968cdf5c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com> Date: Fri, 13 Nov 2020 10:34:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=B7=BB=E5=8A=A0iOS?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=89=80=E9=9C=80=E8=A6=81=E7=9A=84=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 95b901a..212a260 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__EBFF00A", "description" : "", "versionName" : "1.0.1", - "versionCode" : 102, + "versionCode" : 103, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -69,7 +69,9 @@ /* ios打包配置 */ "ios" : { "privacyDescription" : { - "NSLocationAlwaysAndWhenInUseUsageDescription" : "德铭阳光将在推荐商品、填写收货地址等服务中使用您的位置信息。" + "NSLocationAlwaysAndWhenInUseUsageDescription" : "德铭阳光将在推荐商品、填写收货地址等服务中使用您的位置信息。", + "NSLocationWhenInUseUsageDescription" : "德铭阳光将在推荐商品、填写收货地址等服务中使用您的位置信息。", + "NSLocationAlwaysUsageDescription" : "德铭阳光将在推荐商品、填写收货地址等服务中使用您的位置信息。" } }, /* SDK配置 */ From 7977bd795c4422ccc4a4ba499700fd9ca631c757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com> Date: Thu, 19 Nov 2020 17:05:45 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=88=9D=E6=AC=A1?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=9A=84=E2=80=9C=E7=94=A8=E6=88=B7=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E2=80=9D=E6=94=B9=E4=B8=BA=E2=80=9C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E4=B8=8E=E9=9A=90=E7=A7=81=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/remaining/remaining.vue | 3 ++- manifest.json | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue index 430567d..a448f9f 100644 --- a/components/remaining/remaining.vue +++ b/components/remaining/remaining.vue @@ -33,7 +33,8 @@ - {{ agreement.document_title }} + + 用户协议与隐私 diff --git a/manifest.json b/manifest.json index 212a260..206c921 100644 --- a/manifest.json +++ b/manifest.json @@ -69,9 +69,9 @@ /* ios打包配置 */ "ios" : { "privacyDescription" : { - "NSLocationAlwaysAndWhenInUseUsageDescription" : "德铭阳光将在推荐商品、填写收货地址等服务中使用您的位置信息。", - "NSLocationWhenInUseUsageDescription" : "德铭阳光将在推荐商品、填写收货地址等服务中使用您的位置信息。", - "NSLocationAlwaysUsageDescription" : "德铭阳光将在推荐商品、填写收货地址等服务中使用您的位置信息。" + "NSLocationAlwaysAndWhenInUseUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。", + "NSLocationWhenInUseUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。", + "NSLocationAlwaysUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。" } }, /* SDK配置 */