Skip to content

肖康 / H5_2.0

Go to a project
Commit b1243184 by LJM
Options

css

parent 2bc7ce15
Inline Side-by-side
Showing with 205 additions and 208 deletions
App.vue
......@@ -22,5 +22,23 @@ uni-page-head {
body {
background: #f5f5f5;
}
::v-deep uni-modal .uni-modal {
border-radius: 10rpx;
}
::v-deep uni-modal .uni-modal__hd {
color: #323233;
}
::v-deep uni-modal .uni-modal__btn_default {
color: #323233 !important;
}
::v-deep uni-modal .uni-modal__btn_primary {
color: #1969f9 !important;
}
::v-deep uni-modal .uni-modal__btn:after {
border-left: 1px solid #ebedf0;
}
::v-deep uni-modal .uni-modal__ft:after {
border-top: 1px solid #ebedf0;
}
/* #endif */
</style>
assets/css/mine/news.scss
......@@ -198,11 +198,14 @@
}
.ad {
padding: 28rpx 24rpx 30rpx 24rpx;
.box {
margin-bottom: 24rpx;
image {
width: 100%;
height: 302px;
}
}
}
}
.no-data {
......
pages.json
......@@ -229,7 +229,7 @@
}
],
"globalStyle": {
"maxWidth": 750
},
"uniIdRouter": {}
}
\ No newline at end of file
pages/mine/article.vue
......@@ -20,17 +20,19 @@
</view>
<view class="content" v-html="detail.content"></view>
</view>
<view class="hot-article">
<view class="hot-article" v-if="detail.hot_article_list && detail.hot_article_list.length > 0">
<view class="title row verCenter">
<text class="t1">热门文章</text>
<text class="iconfont icon-a-juxing1"></text>
</view>
<view class="list" v-if="detail.hot_article_list && detail.hot_article_list.length > 0">
<view class="list">
<view class="box" v-for="(item, index) in detail.hot_article_list" :key="index">{{ index + 1 }}. {{ item.title }}</view>
</view>
</view>
<view class="ad" v-if="detail.h5_news_detail_ad && detail.h5_news_detail_ad.length > 0"><image v-for="(item, index) in detail.h5_news_detail_ad" :key="index" :src="item.images"></image></view>
<uni-popup ref="share" type="share" safeArea backgroundColor="#fff"><uni-popup-share></uni-popup-share></uni-popup>
<view class="ad" v-if="detail.h5_news_detail_ad && detail.h5_news_detail_ad.length > 0">
<a class="box" :href="item.url" v-for="(item, index) in detail.h5_news_detail_ad" :key="index"><image mode="aspectFill" :src="item.images" lazy-load="true"></image></a>
</view>
<uni-popup ref="share" type="share" safeArea backgroundColor="#fff"><uni-popup-share @select="selectChange"></uni-popup-share></uni-popup>
</view>
</template>
......@@ -58,19 +60,6 @@ export default {
onShow() {
this.getData();
},
filters: {
formatDate(value) {
// 过滤器函数
const date = new Date(value * 1000);
const year = date.getFullYear();
const month = ('0' + (date.getMonth() + 1)).slice(-2);
const day = ('0' + date.getDate()).slice(-2);
const hour = ('0' + date.getHours()).slice(-2);
const minute = ('0' + date.getMinutes()).slice(-2);
const second = ('0' + date.getSeconds()).slice(-2);
return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
}
},
methods: {
handleChangeTitle(e) {
uni.navigateTo({
......@@ -80,6 +69,9 @@ export default {
open() {
this.$refs.share.open('bottom');
},
selectChange(e) {
console.log(e);
},
toUrl(id, type, name) {
if (type == 1) {
uni.navigateTo({
......
uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
<template>
<view class="uni-popup-share">
<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
<view class="uni-share-title">
<text class="uni-share-title-text">{{ shareTitleText }}</text>
</view>
<view class="uni-share-content">
<view class="uni-share-content-box">
<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
<view class="uni-share-content-item" v-for="(item, index) in bottomData" :key="index" @click.stop="select(item, index)">
<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
<text class="uni-share-text">{{item.text}}</text>
<text class="uni-share-text">{{ item.text }}</text>
</view>
</view>
</view>
<view class="uni-share-button-box">
<button class="uni-share-button" @click="close">{{cancelText}}</button>
<view class="uni-share-button" @click="close">{{ cancelText }}</view>
</view>
</view>
</template>
<script>
import popup from '../uni-popup/popup.js'
import {
initVueI18n
} from '@dcloudio/uni-i18n'
import messages from '../uni-popup/i18n/index.js'
const { t } = initVueI18n(messages)
export default {
import popup from '../uni-popup/popup.js';
import { initVueI18n } from '@dcloudio/uni-i18n';
import messages from '../uni-popup/i18n/index.js';
const { t } = initVueI18n(messages);
export default {
name: 'UniPopupShare',
mixins:[popup],
emits:['select'],
mixins: [popup],
emits: ['select'],
props: {
title: {
type: String,
......@@ -39,46 +38,37 @@
},
data() {
return {
bottomData: [{
bottomData: [
{
text: '微信',
icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
icon: 'https://img.ichunt.com/images/ichunt/202305/27/5bbbd6fb77046c311d544937f89284d9.png',
name: 'wx'
},
{
text: '支付宝',
icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
text: '朋友圈',
icon: 'https://img.ichunt.com/images/ichunt/202305/27/a92b05438b5c89daff38c729cb63faba.png',
name: 'wx'
},
{
text: 'QQ',
icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
name: 'qq'
text: '复制链接',
icon: 'https://img.ichunt.com/images/ichunt/202305/27/726bff17f48ad6866f9e6956c19cb1a8.png',
name: 'link'
},
{
text: '新浪',
icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
name: 'sina'
},
// {
// text: '百度',
// icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
// name: 'copy'
// },
// {
// text: '其他',
// icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
// name: 'more'
// }
]
text: '二维码',
icon: 'https://img.ichunt.com/images/ichunt/202305/27/8478b5b31e6bc6f84676369ff18a9556.png',
name: 'code'
}
]
};
},
created() {},
computed: {
cancelText() {
return t("uni-popup.cancel")
return t('uni-popup.cancel');
},
shareTitleText() {
return this.title || t("uni-popup.shareTitle")
return this.title || t('uni-popup.shareTitle');
}
},
methods: {
......@@ -89,27 +79,26 @@
this.$emit('select', {
item,
index
})
this.close()
});
this.close();
},
/**
* 关闭窗口
*/
close() {
if(this.beforeClose) return
this.popup.close()
}
if (this.beforeClose) return;
this.popup.close();
}
}
};
</script>
<style lang="scss" >
.uni-popup-share {
<style lang="scss">
.uni-popup-share {
background-color: #fff;
border-top-left-radius: 11px;
border-top-right-radius: 11px;
}
.uni-share-title {
border-top-left-radius: 10rpx;
border-top-right-radius: 10rpx;
}
.uni-share-title {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
......@@ -117,30 +106,31 @@
align-items: center;
justify-content: center;
height: 40px;
}
.uni-share-title-text {
font-size: 14px;
color: #666;
}
.uni-share-content {
}
.uni-share-title-text {
font-size: 28rpx;
color: #292b33;
font-weight: 600;
}
.uni-share-content {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
justify-content: center;
padding-top: 10px;
}
}
.uni-share-content-box {
.uni-share-content-box {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
flex-wrap: wrap;
width: 360px;
}
}
.uni-share-content-item {
.uni-share-content-item {
width: 90px;
/* #ifndef APP-NVUE */
display: flex;
......@@ -149,39 +139,41 @@
justify-content: center;
padding: 10px 0;
align-items: center;
}
}
.uni-share-content-item:active {
.uni-share-content-item:active {
background-color: #f5f5f5;
}
}
.uni-share-image {
width: 30px;
height: 30px;
}
.uni-share-image {
width: 96rpx;
height: 96rpx;
}
.uni-share-text {
.uni-share-text {
margin-top: 10px;
font-size: 14px;
color: #3B4144;
}
color: #3b4144;
}
.uni-share-button-box {
.uni-share-button-box {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
padding: 10px 15px;
}
border-top: 16rpx solid #f7f8fa;
}
.uni-share-button {
.uni-share-button {
flex: 1;
border-radius: 50px;
color: #666;
color: #484b59;
font-size: 16px;
}
text-align: center;
}
.uni-share-button::after {
.uni-share-button::after {
border-radius: 50px;
}
}
</style>
uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
......@@ -3,5 +3,5 @@
"uni-popup.ok": "确定",
"uni-popup.placeholder": "请输入",
"uni-popup.title": "提示",
"uni-popup.shareTitle": "分享到"
"uni-popup.shareTitle": "立即分享给好友"
}
\ No newline at end of file
uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
......@@ -3,5 +3,5 @@
"uni-popup.ok": "確定",
"uni-popup.placeholder": "請輸入",
"uni-popup.title": "提示",
"uni-popup.shareTitle": "分享到"
"uni-popup.shareTitle": "立即分享给好友"
}
\ No newline at end of file
uni_modules/uni-popup/components/uni-popup/uni-popup.vue
<template>
<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
<view @touchstart="touchstart">
<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
:duration="duration" :show="showTrans" @click="onTap" />
<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
:show="showTrans" @click="onTap">
<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear">
<slot />
</view>
<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear"><slot /></view>
</uni-transition>
</view>
<!-- #ifdef H5 -->
......@@ -17,11 +13,11 @@
</template>
<script>
// #ifdef H5
import keypress from './keypress.js'
// #endif
// #ifdef H5
import keypress from './keypress.js';
// #endif
/**
/**
* PopUp 弹出层
* @description 弹出层组件，为了解决遮罩弹层的问题
* @tutorial https://ext.dcloud.net.cn/plugin?id=329
......@@ -44,7 +40,7 @@
* @event {Function} maskClick 点击遮罩触发
*/
export default {
export default {
name: 'uniPopup',
components: {
// #ifdef H5
......@@ -85,7 +81,7 @@
maskBackgroundColor: {
type: String,
default: 'rgba(0, 0, 0, 0.4)'
},
}
},
watch: {
......@@ -94,15 +90,15 @@
*/
type: {
handler: function(type) {
if (!this.config[type]) return
this[this.config[type]](true)
if (!this.config[type]) return;
this[this.config[type]](true);
},
immediate: true
},
isDesktop: {
handler: function(newVal) {
if (!this.config[newVal]) return
this[this.config[this.type]](true)
if (!this.config[newVal]) return;
this[this.config[this.type]](true);
},
immediate: true
},
......@@ -112,13 +108,13 @@
*/
maskClick: {
handler: function(val) {
this.mkclick = val
this.mkclick = val;
},
immediate: true
},
isMaskClick: {
handler: function(val) {
this.mkclick = val
this.mkclick = val;
},
immediate: true
},
......@@ -126,7 +122,7 @@
showPopup(show) {
// #ifdef H5
// fix by mehaotian 处理 h5 滚动穿透的问题
document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible';
// #endif
}
},
......@@ -164,44 +160,37 @@
maskShow: true,
mkclick: true,
popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
}
};
},
computed: {
isDesktop() {
return this.popupWidth >= 500 && this.popupHeight >= 500
return this.popupWidth >= 500 && this.popupHeight >= 500;
},
bg() {
if (this.backgroundColor === '' || this.backgroundColor === 'none') {
return 'transparent'
return 'transparent';
}
return this.backgroundColor
return this.backgroundColor;
}
},
mounted() {
const fixSize = () => {
const {
windowWidth,
windowHeight,
windowTop,
safeArea,
screenHeight,
safeAreaInsets
} = uni.getSystemInfoSync()
this.popupWidth = windowWidth
this.popupHeight = windowHeight + (windowTop || 0)
const { windowWidth, windowHeight, windowTop, safeArea, screenHeight, safeAreaInsets } = uni.getSystemInfoSync();
this.popupWidth = windowWidth;
this.popupHeight = windowHeight + (windowTop || 0);
// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
if (safeArea && this.safeArea) {
// #ifdef MP-WEIXIN
this.safeAreaInsets = screenHeight - safeArea.bottom
this.safeAreaInsets = screenHeight - safeArea.bottom;
// #endif
// #ifndef MP-WEIXIN
this.safeAreaInsets = safeAreaInsets.bottom
this.safeAreaInsets = safeAreaInsets.bottom;
// #endif
} else {
this.safeAreaInsets = 0
this.safeAreaInsets = 0;
}
}
fixSize()
};
fixSize();
// #ifdef H5
// window.addEventListener('resize', fixSize)
// this.$once('hook:beforeDestroy', () => {
......@@ -212,135 +201,135 @@
// #ifndef VUE3
// TODO vue2
destroyed() {
this.setH5Visible()
this.setH5Visible();
},
// #endif
// #ifdef VUE3
// TODO vue3
unmounted() {
this.setH5Visible()
this.setH5Visible();
},
// #endif
created() {
// this.mkclick = this.isMaskClick || this.maskClick
if (this.isMaskClick === null && this.maskClick === null) {
this.mkclick = true
this.mkclick = true;
} else {
this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick;
}
if (this.animation) {
this.duration = 300
this.duration = 300;
} else {
this.duration = 0
this.duration = 0;
}
// TODO 处理 message 组件生命周期异常的问题
this.messageChild = null
this.messageChild = null;
// TODO 解决头条冒泡的问题
this.clearPropagation = false
this.maskClass.backgroundColor = this.maskBackgroundColor
this.clearPropagation = false;
this.maskClass.backgroundColor = this.maskBackgroundColor;
},
methods: {
setH5Visible() {
// #ifdef H5
// fix by mehaotian 处理 h5 滚动穿透的问题
document.getElementsByTagName('body')[0].style.overflow = 'visible'
document.getElementsByTagName('body')[0].style.overflow = 'visible';
// #endif
},
/**
* 公用方法，不显示遮罩层
*/
closeMask() {
this.maskShow = false
this.maskShow = false;
},
/**
* 公用方法，遮罩层禁止点击
*/
disableMask() {
this.mkclick = false
this.mkclick = false;
},
// TODO nvue 取消冒泡
clear(e) {
// #ifndef APP-NVUE
e.stopPropagation()
e.stopPropagation();
// #endif
this.clearPropagation = true
this.clearPropagation = true;
},
open(direction) {
// fix by mehaotian 处理快速打开关闭的情况
if (this.showPopup) {
return
return;
}
let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share'];
if (!(direction && innerType.indexOf(direction) !== -1)) {
direction = this.type
direction = this.type;
}
if (!this.config[direction]) {
console.error('缺少类型：', direction)
return
console.error('缺少类型：', direction);
return;
}
this[this.config[direction]]()
this[this.config[direction]]();
this.$emit('change', {
show: true,
type: direction
})
});
},
close(type) {
this.showTrans = false
this.showTrans = false;
this.$emit('change', {
show: false,
type: this.type
})
clearTimeout(this.timer)
});
clearTimeout(this.timer);
// // 自定义关闭事件
// this.customOpen && this.customClose()
this.timer = setTimeout(() => {
this.showPopup = false
}, 300)
this.showPopup = false;
}, 300);
},
// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
touchstart() {
this.clearPropagation = false
this.clearPropagation = false;
},
onTap() {
if (this.clearPropagation) {
// fix by mehaotian 兼容 nvue
this.clearPropagation = false
return
this.clearPropagation = false;
return;
}
this.$emit('maskClick')
if (!this.mkclick) return
this.close()
this.$emit('maskClick');
if (!this.mkclick) return;
this.close();
},
/**
* 顶部弹出样式处理
*/
top(type) {
this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
this.ani = ['slide-top']
this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top';
this.ani = ['slide-top'];
this.transClass = {
position: 'fixed',
left: 0,
right: 0,
backgroundColor: this.bg
}
};
// TODO 兼容 type 属性 ，后续会废弃
if (type) return
this.showPopup = true
this.showTrans = true
if (type) return;
this.showPopup = true;
this.showTrans = true;
this.$nextTick(() => {
if (this.messageChild && this.type === 'message') {
this.messageChild.timerClose()
this.messageChild.timerClose();
}
})
});
},
/**
* 底部弹出样式处理
*/
bottom(type) {
this.popupstyle = 'bottom'
this.ani = ['slide-bottom']
this.popupstyle = 'bottom';
this.ani = ['slide-bottom'];
this.transClass = {
position: 'fixed',
left: 0,
......@@ -348,18 +337,18 @@
bottom: 0,
paddingBottom: this.safeAreaInsets + 'px',
backgroundColor: this.bg
}
};
// TODO 兼容 type 属性 ，后续会废弃
if (type) return
this.showPopup = true
this.showTrans = true
if (type) return;
this.showPopup = true;
this.showTrans = true;
},
/**
* 中间弹出样式处理
*/
center(type) {
this.popupstyle = 'center'
this.ani = ['zoom-out', 'fade']
this.popupstyle = 'center';
this.ani = ['zoom-out', 'fade'];
this.transClass = {
position: 'fixed',
/* #ifndef APP-NVUE */
......@@ -372,15 +361,15 @@
top: 0,
justifyContent: 'center',
alignItems: 'center'
}
};
// TODO 兼容 type 属性 ，后续会废弃
if (type) return
this.showPopup = true
this.showTrans = true
if (type) return;
this.showPopup = true;
this.showTrans = true;
},
left(type) {
this.popupstyle = 'left'
this.ani = ['slide-left']
this.popupstyle = 'left';
this.ani = ['slide-left'];
this.transClass = {
position: 'fixed',
left: 0,
......@@ -391,15 +380,15 @@
display: 'flex',
flexDirection: 'column'
/* #endif */
}
};
// TODO 兼容 type 属性 ，后续会废弃
if (type) return
this.showPopup = true
this.showTrans = true
if (type) return;
this.showPopup = true;
this.showTrans = true;
},
right(type) {
this.popupstyle = 'right'
this.ani = ['slide-right']
this.popupstyle = 'right';
this.ani = ['slide-right'];
this.transClass = {
position: 'fixed',
bottom: 0,
......@@ -410,20 +399,20 @@
display: 'flex',
flexDirection: 'column'
/* #endif */
}
};
// TODO 兼容 type 属性 ，后续会废弃
if (type) return
this.showPopup = true
this.showTrans = true
}
if (type) return;
this.showPopup = true;
this.showTrans = true;
}
}
};
</script>
<style lang="scss">
.uni-popup {
.uni-popup {
position: fixed;
/* #ifndef APP-NVUE */
z-index: 99;
z-index: 9999;
/* #endif */
&.top,
......@@ -459,15 +448,15 @@
flex: 1;
}
}
}
}
.fixforpc-z-index {
.fixforpc-z-index {
/* #ifndef APP-NVUE */
z-index: 999;
/* #endif */
}
}
.fixforpc-top {
.fixforpc-top {
top: 0;
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment