Merge pull request 'qxf' (#394) from qxf into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/394
This commit is contained in:
commit
74f083d6c1
@ -33,7 +33,8 @@
|
|||||||
<!-- 用户协议弹窗 -->
|
<!-- 用户协议弹窗 -->
|
||||||
<view class="welcome_backes" v-if="protocol">
|
<view class="welcome_backes" v-if="protocol">
|
||||||
<view class="content">
|
<view class="content">
|
||||||
<view class="title">{{ agreement.document_title }}</view>
|
<!-- <view class="title">{{ agreement.document_title }}</view> -->
|
||||||
|
<view class="title">用户协议与隐私</view>
|
||||||
<!-- <text class="protocol_content"></text> -->
|
<!-- <text class="protocol_content"></text> -->
|
||||||
<scroll-view scroll-y class="scroll">
|
<scroll-view scroll-y class="scroll">
|
||||||
<rich-text class="protocol_content" :nodes="agreement.document_content"></rich-text>
|
<rich-text class="protocol_content" :nodes="agreement.document_content"></rich-text>
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
"appid" : "__UNI__EBFF00A",
|
"appid" : "__UNI__EBFF00A",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.0.1",
|
"versionName" : "1.0.1",
|
||||||
"versionCode" : "100",
|
"versionCode" : 103,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
@ -67,7 +67,13 @@
|
|||||||
"abiFilters" : [ "armeabi-v7a", "x86" ]
|
"abiFilters" : [ "armeabi-v7a", "x86" ]
|
||||||
},
|
},
|
||||||
/* ios打包配置 */
|
/* ios打包配置 */
|
||||||
"ios" : {},
|
"ios" : {
|
||||||
|
"privacyDescription" : {
|
||||||
|
"NSLocationAlwaysAndWhenInUseUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。",
|
||||||
|
"NSLocationWhenInUseUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。",
|
||||||
|
"NSLocationAlwaysUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。"
|
||||||
|
}
|
||||||
|
},
|
||||||
/* SDK配置 */
|
/* SDK配置 */
|
||||||
"sdkConfigs" : {
|
"sdkConfigs" : {
|
||||||
"ad" : {},
|
"ad" : {},
|
||||||
@ -119,33 +125,33 @@
|
|||||||
},
|
},
|
||||||
"icons" : {
|
"icons" : {
|
||||||
"android" : {
|
"android" : {
|
||||||
"hdpi" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/安卓png/72x72psd.PNG",
|
"hdpi" : "unpackage/res/icons/72x72.png",
|
||||||
"xhdpi" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/安卓png/96x96psd.PNG",
|
"xhdpi" : "unpackage/res/icons/96x96.png",
|
||||||
"xxhdpi" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/安卓png/144x144.PNG",
|
"xxhdpi" : "unpackage/res/icons/144x144.png",
|
||||||
"xxxhdpi" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/安卓png/192x192.PNG"
|
"xxxhdpi" : "unpackage/res/icons/192x192.png"
|
||||||
},
|
},
|
||||||
"ios" : {
|
"ios" : {
|
||||||
"appstore" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/appstore 1024X1024.PNG",
|
"appstore" : "unpackage/res/icons/1024x1024.png",
|
||||||
"iphone" : {
|
"iphone" : {
|
||||||
"app@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/120x120.PNG",
|
"app@2x" : "unpackage/res/icons/120x120.png",
|
||||||
"app@3x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/180x180.PNG",
|
"app@3x" : "unpackage/res/icons/180x180.png",
|
||||||
"spotlight@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/80x80.PNG",
|
"spotlight@2x" : "unpackage/res/icons/80x80.png",
|
||||||
"spotlight@3x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/120x120.PNG",
|
"spotlight@3x" : "unpackage/res/icons/120x120.png",
|
||||||
"settings@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/58x58psd.PNG",
|
"settings@2x" : "unpackage/res/icons/58x58.png",
|
||||||
"settings@3x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/87X87.PNG",
|
"settings@3x" : "unpackage/res/icons/87x87.png",
|
||||||
"notification@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/40X40.PNG",
|
"notification@2x" : "unpackage/res/icons/40x40.png",
|
||||||
"notification@3x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/60X60.PNG"
|
"notification@3x" : "unpackage/res/icons/60x60.png"
|
||||||
},
|
},
|
||||||
"ipad" : {
|
"ipad" : {
|
||||||
"app" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/80x80.PNG",
|
"app" : "unpackage/res/icons/76x76.png",
|
||||||
"app@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/180x180.PNG",
|
"app@2x" : "unpackage/res/icons/152x152.png",
|
||||||
"notification" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/40X40.PNG",
|
"notification" : "unpackage/res/icons/20x20.png",
|
||||||
"notification@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/40X40.PNG",
|
"notification@2x" : "unpackage/res/icons/40x40.png",
|
||||||
"proapp@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/180x180.PNG",
|
"proapp@2x" : "unpackage/res/icons/167x167.png",
|
||||||
"settings" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/40X40.PNG",
|
"settings" : "unpackage/res/icons/29x29.png",
|
||||||
"settings@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/58x58psd.PNG",
|
"settings@2x" : "unpackage/res/icons/58x58.png",
|
||||||
"spotlight" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/40X40.PNG",
|
"spotlight" : "unpackage/res/icons/40x40.png",
|
||||||
"spotlight@2x" : "/Users/xf/Documents/01德铭打包资料/01-打包/打包资料/苹果png/80x80.PNG"
|
"spotlight@2x" : "unpackage/res/icons/80x80.png"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -34,7 +34,8 @@
|
|||||||
<!-- 注册 -->
|
<!-- 注册 -->
|
||||||
<view class="more_Login">
|
<view class="more_Login">
|
||||||
<text @click="registerUrl()">{{register}}</text>
|
<text @click="registerUrl()">{{register}}</text>
|
||||||
<text class="other" @click="mask_u">其他方式登录</text>
|
<!-- TODO 苹果因审核原因暂时隐藏第三方登录 -->
|
||||||
|
<text v-if="platform != 'ios'" class="other" @click="mask_u">其他方式登录</text>
|
||||||
</view>
|
</view>
|
||||||
<!-- denglu QQ weixin -->
|
<!-- denglu QQ weixin -->
|
||||||
<view class="buttones">
|
<view class="buttones">
|
||||||
@ -98,11 +99,19 @@
|
|||||||
}, ],
|
}, ],
|
||||||
temp_url: "", // 上个页面路径
|
temp_url: "", // 上个页面路径
|
||||||
pagesArr: ["pages/mine/index"], // 特殊路径
|
pagesArr: ["pages/mine/index"], // 特殊路径
|
||||||
|
platform: '', // 手机平台
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
// 数据的请求
|
// 数据的请求
|
||||||
// this.apiwelcome();
|
// this.apiwelcome();
|
||||||
|
// 获取手机平台
|
||||||
|
uni.getSystemInfo({
|
||||||
|
success: (res) => {
|
||||||
|
console.log(res);
|
||||||
|
this.platform = res.platform
|
||||||
|
}
|
||||||
|
});
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
let pages = getCurrentPages();
|
let pages = getCurrentPages();
|
||||||
|
@ -96,7 +96,9 @@
|
|||||||
border-bottom-width: 2rpx;
|
border-bottom-width: 2rpx;
|
||||||
border-style: solid;
|
border-style: solid;
|
||||||
border-color: #ECECEC;
|
border-color: #ECECEC;
|
||||||
|
/* #ifndef APP-PLUS-NVUE */
|
||||||
display: flex;
|
display: flex;
|
||||||
|
/* #endif */
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
@ -124,7 +126,9 @@
|
|||||||
border-bottom-width: 2rpx;
|
border-bottom-width: 2rpx;
|
||||||
border-style: solid;
|
border-style: solid;
|
||||||
border-color: #ECECEC;
|
border-color: #ECECEC;
|
||||||
|
/* #ifndef APP-PLUS-NVUE */
|
||||||
display: flex;
|
display: flex;
|
||||||
|
/* #endif */
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
@ -183,7 +187,9 @@
|
|||||||
border-radius: 30rpx;
|
border-radius: 30rpx;
|
||||||
}
|
}
|
||||||
.userlist{
|
.userlist{
|
||||||
|
/* #ifndef APP-PLUS-NVUE */
|
||||||
display: flex;
|
display: flex;
|
||||||
|
/* #endif */
|
||||||
flex-direction: row-reverse;
|
flex-direction: row-reverse;
|
||||||
width: 150rpx;
|
width: 150rpx;
|
||||||
height: 60rpx;
|
height: 60rpx;
|
||||||
@ -205,7 +211,9 @@
|
|||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
.userinfo {
|
.userinfo {
|
||||||
|
/* #ifndef APP-PLUS-NVUE */
|
||||||
display: flex;
|
display: flex;
|
||||||
|
/* #endif */
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
width: 100rpx;
|
width: 100rpx;
|
||||||
margin-left: 20rpx;
|
margin-left: 20rpx;
|
||||||
@ -240,7 +248,9 @@
|
|||||||
left: 30rpx;
|
left: 30rpx;
|
||||||
width: 308rpx;
|
width: 308rpx;
|
||||||
height: 70rpx;
|
height: 70rpx;
|
||||||
|
/* #ifndef APP-PLUS-NVUE */
|
||||||
display: flex;
|
display: flex;
|
||||||
|
/* #endif */
|
||||||
align-items: center;
|
align-items: center;
|
||||||
border-radius: 35rpx;
|
border-radius: 35rpx;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
@ -315,7 +325,9 @@
|
|||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
flex-direction: column-reverse;
|
flex-direction: column-reverse;
|
||||||
|
/* #ifndef APP-PLUS-NVUE */
|
||||||
word-wrap:anywhere;
|
word-wrap:anywhere;
|
||||||
|
/* #endif */
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
Loading…
Reference in New Issue
Block a user