theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'qxf' (#394) from qxf into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/394
This commit is contained in:
qxf 2020-11-19 17:08:26 +08:00
commit 74f083d6c1
4 changed files with 54 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/remaining/remaining.vue
View File

@ -33,7 +33,8 @@
<!-- 用户协议弹窗 -->
<view class="welcome_backes" v-if="protocol">
<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> -->
<scroll-view scroll-y class="scroll">
<rich-text class="protocol_content" :nodes="agreement.document_content"></rich-text>

54
manifest.json
View File

@ -3,7 +3,7 @@
"appid" : "__UNI__EBFF00A",
"description" : "",
"versionName" : "1.0.1",
"versionCode" : "100",
"versionCode" : 103,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@ -67,7 +67,13 @@
"abiFilters" : [ "armeabi-v7a", "x86" ]
},
/* ios打包配置 */
"ios" : {},
"ios" : {
"privacyDescription" : {
"NSLocationAlwaysAndWhenInUseUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。",
"NSLocationWhenInUseUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。",
"NSLocationAlwaysUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。"
}
},
/* SDK配置 */
"sdkConfigs" : {
"ad" : {},
@ -119,33 +125,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"
}
}
}

11
pageA/login/login.vue
View File

@ -34,7 +34,8 @@
<!-- 注册 -->
<view class="more_Login">
<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>
<!-- denglu QQ weixin -->
<view class="buttones">
@ -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();

12
pages/zhibo/index.nvue
View File

@ -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;
}
</style>