合并冲突

main
lilu 2 years ago
commit 4252ef397c

@ -45,5 +45,5 @@
// @import "@/uni_modules/uview-ui/index.scss";
// @import "common/css/demo.scss";
@import "common/css/iconfont.css";
@import "common/css/common.less";
// @import "common/css/common.less";
</style>

@ -1,9 +1,332 @@
// @uni-color-normal: #2c96fb;
// @uni-color-yellow: #ffc827;
// @uni-color-origin: #ff8213;
// @uni-color-red: #ff4e20;
// @uni-color-blue: #12c8fd;
// @uni-color-green: #42bfac;
Page{
font-family: "PingFang-SC-Regular";
height: 100%;
font-size: 24rpx;
-webkit-text-size-adjust: none;
}
body{
height: 100%;
}
view{
box-sizing: border-box;
}
.bg-container{
background: rgba(243,244,245,1);
display: flex;
height: 100%;
flex-direction: column;
box-sizing: border-box;
line-height: 1;
}
.container{
height: 100%;
}
.greenBg{
background-color: green;
}
//全局
.pad-rl{
padding: 0 28rpx;
}
.flex-ro{
display: flex;
flex-direction: row;
align-items: center;
}
.flex-cu{
display: flex;
flex-direction: column;
align-items: center;
}
.justify-side{
justify-content: space-between;
}
.justify-center{
justify-content: center;
}
.justify-start{
justify-content: flex-start
}
.justify-end{
justify-content: flex-end;
}
.align-start{
align-items: flex-start
}
.warp{
flex-wrap:wrap;
}
.txt-center{
text-align: center;
}
.mg-center{
margin: 0 auto;
}
//通用字体size
.f-10{
font-size:20rpx;
}
.f-12{
font-size:24rpx;
}
.f-13{
font-size: 26rpx;
}
.f-14{
font-size: 28rpx;
}
.f-15{
font-size: 30rpx;
}
.f-16{
font-size: 32rpx;
}
.f-17{
font-size: 34rpx;
}
.f-18{
font-size: 36rpx;
}
.f-19{
font-size: 38rpx;
}
.f-20{
font-size: 40rpx;
}
.font-w{
font-weight: bold;
}
.pa-l-5{
padding-left: 10rpx;
}
.pa-l-10{
padding-left: 20rpx;
}
.pa-l-15{
padding-left: 30rpx;
}
.pa-l-20{
padding-left: 40rpx;
}
.pa-r-5{
padding-right: 10rpx;
}
.pa-r-10{
padding-right: 20rpx;
}
.pa-r-15{
padding-right: 30rpx;
}
.pa-r-20{
padding-right: 40rpx;
}
.pa-d-10{
padding-bottom: 20rpx;
}
.pa-d-20{
padding-bottom: 40rpx;
}
.pa-d-5{
padding-bottom: 10rpx;
}
.pa-t-10{
padding-top: 20rpx;
}
.pa-t-15{
padding-top: 30rpx;
}
.pa-t-20{
padding-top: 40rpx;
}
.pa-t-5{
padding-top: 10rpx;
}
.mg-l-5{
margin-left: 10rpx;
}
.mg-l-10{
margin-left: 20rpx;
}
.mg-r-5{
margin-right: 10rpx;
}
.mg-r-10{
margin-right: 20rpx;
}
.mg-r-15{
margin-right: 30rpx;
}
.mg-r-20{
margin-right: 40rpx;
}
.mg-d-10{
margin-bottom: 20rpx !important;
}
.mg-d-15{
margin-bottom: 30rpx !important;
}
.mg-d-20{
margin-bottom: 40rpx !important;
}
.mg-d-5{
margin-bottom: 10rpx;
}
.mg-t-10{
margin-top: 20rpx;
}
.mg-t-15{
margin-top: 30rpx;
}
.mg-t-20{
margin-top: 20rpx;
}
.mg-t-5{
margin-top: 10rpx;
}
.col-w{
color: #fff;
}
.col-h{
color: #2f2f2f;
}
.col-low{
color: #3f3f3f;
}
.col-low-down{
color: #898989;
}
.col-ye{
color: #f58f13;
}
.col-red{
color: #E25153!important;
}
.col-redNew{
color: #db4e3c!important;
}
.bg-w{
background-color: #fff;
}
.bg-h{
background-color: #2f2f2f;
}
.bg-low{
background-color: #3f3f3f;
}
.bg-low-down{
background-color: #898989;
}
.bg-low-btn{
background-color: #d4d4d4;
}
.bg-ye{
background-color: #f58f13;
}
.bg-red{
background-color: #fa2807!important;
}
.bg-green{
background-color: #00c45d;
}
.bg-normal{
background-color: rgba(243,244,245,1)!important;
}
.grad {
background-image: linear-gradient(rgb(253,118,6),rgb(252,29,12));
}
.newGrad{
background-image: linear-gradient(to right, #ff933e , #ea5757)!important;
}
.saveNewGrad{
background-image: linear-gradient(to right, rgb(252,85,40) , rgb(243,50,71))!important;
}
.newGradStop{
background-image: linear-gradient(to right, #ffc67f , #ef6a72);
}
.blueGrad{
background-image: linear-gradient(to right, #7C98F7 , #4055EF);
}
.centers{
position: absolute; top: 50%; left: 50%; transform: translate(-50%,-50%);
}
.fn-c-3{
color:#333;
}
.fn-c-6{
color:#333;
}
.fn-c-9{
color:#333;
}
/deep/.uni-scroll-view ::-webkit-scrollbar {
/* 隐藏滚动条,但依旧具备可以滚动的功能 */
display: none;
width: 0;
height: 0;
color: transparent;
background: transparent;
}
/deep/::-webkit-scrollbar {
display: none;
width: 0;
height: 0;
color: transparent;
background: transparent;
}

@ -0,0 +1,67 @@
// 页面白名单
const whiteList = [
'/',
'/pages/homePages/home/home?current=2',
'/pages/homePages/home/home?current=4',
'/pages/homePages/login/login',
]
function hasPermission (url) {
// 在白名单中或有token直接跳转
if(whiteList.indexOf(url) !== -1 || getApp().globalData.isLogin) {
return true
}
return false
}
uni.addInterceptor('navigateTo', {
// 页面跳转前进行拦截, invoke根据返回值进行判断是否继续执行跳转
invoke (e) {
if(!hasPermission(e.url) && !getApp().globalData.isLogin){
console.log('需要登录')
uni.navigateTo({
url: '/pages/homePages/login/login'
})
return false
}
console.log('正确跳转')
return true
},
success (e) {
console.log('success', e)
},
fail (e) {
console.log('fail', e)
},
complete (e) {
console.log('complete', e)
},
})
uni.addInterceptor('switchTab', {
// tabbar页面跳转前进行拦截
invoke (e) {
debugger
if(!hasPermission(e.url)){
uni.navigateTo({
url: '/pages/homePage/home/home?current=2'
})
return false
}
return true
},
success (e) {
console.log('success', e)
},
fail (e) {
console.log('fail', e)
},
complete (e) {
console.log('complete', e)
},
})

@ -46,29 +46,31 @@
borderStyle: 'white',
backgroundColor: '#fff',
position: 'bottom',
list: [{
"type": 'normal',
"pagePath": "/pages/homePage/manifest/manifest",
"icon": 'icon-yunshu1',
"iconClick": 'icon-yunshugongsi',
"text": "舱单",
"bgColor": '#e8effc',
"fontColor": '#333333',
"title": '舱单',
},
list: [
// {
// "type": 'normal',
// "pagePath": "/pages/homePage/manifest/manifest",
// "icon": 'icon-yunshu1',
// "iconClick": 'icon-yunshugongsi',
// "text": "",
// "bgColor": '#e8effc',
// "fontColor": '#333333',
// "title": '',
// },
// {
// "type": 'normal',
// "pagePath": "/pages/homePage/moveTrace/moveTrace",
// // "pagePath": "/pages/chatList/chatList",
// "icon": "icon-yunshu1",
// "iconClick": 'icon-yunshugongsi',
// "text": "",
// "bgColor": '#e8effc',
// "fontColor": '#333333',
// "title": '',
// },
{
// "type": 'center',
"type": 'normal',
"pagePath": "/pages/homePage/moveTrace/moveTrace",
// "pagePath": "/pages/chatList/chatList",
"icon": "icon-yunshu1",
"iconClick": 'icon-yunshugongsi',
"text": "运踪",
"bgColor": '#e8effc',
"fontColor": '#333333',
"title": '运踪',
},
{
"type": 'center',
"pagePath": "/pages/home/home",
"icon": "icon-xinzeng",
"iconClick": 'icon-xinzeng',
@ -78,23 +80,22 @@
"fontColor": '#ffffff',
"title": '欢迎来到大简云',
},
{
"type": 'normal',
"pagePath": "/pages/homePage/vgm/vgm",
"icon": "icon-yunshu1",
"iconClick": 'icon-yunshugongsi',
"text": "VGM",
"bgColor": '#e8effc',
"fontColor": '#333333',
"title": 'VGM',
},
// {
// "type": 'normal',
// "pagePath": "/pages/homePage/vgm/vgm",
// "icon": "icon-yunshu1",
// "iconClick": 'icon-yunshugongsi',
// "text": "VGM",
// "bgColor": '#e8effc',
// "fontColor": '#333333',
// "title": 'VGM',
// },
{
"type": 'normal',
"pagePath": "/pages/mine/mine",
"icon": "icon-yunshu1",
"iconClick": 'icon-yunshugongsi',
"text": "我的",
// "bgColor": '#f99',
"bgColor": '#e9f0fd',
"fontColor": '#333333',
"title": '个人中心',
@ -216,7 +217,8 @@
display: flex;
flex-direction: column;
justify-content: center;
/* 这里是添加样式 */
margin: 0 auto;
}
.tarbar-list-li-icon {

@ -7,6 +7,8 @@ import store from './store'
import validate from '@/common/js/utils/ys-validate.js'
import util from '@/common/js/utils/utils.js'
// import '@/common/js/utils/navigateTo.js'
Vue.prototype.$store = store
Vue.prototype.$validate = validate
@ -19,7 +21,7 @@ App.mpType = 'app'
const app = new Vue({
...App
})
app.$mount()
app.$mount();
// #endif
// #ifdef VUE3
@ -31,3 +33,5 @@ export function createApp() {
}
}
// #endif

@ -17,6 +17,24 @@
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},{
"path": "pages/homePage/manifest/manifest",
"style": {
"navigationBarTitleText": "舱单申报",
"enablePullDownRefresh": false
}
},{
"path": "pages/homePage/moveTrace/moveTrace",
"style": {
"navigationBarTitleText": "运踪",
"enablePullDownRefresh": false
}
},{
"path": "pages/homePage/vgm/vgm",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}],
"subPackages": [{
"root": "pages/manifest",
@ -29,7 +47,7 @@
{
"path": "newManifest/newManifest",
"style": {
"navigationBarTitleText": "单申报"
"navigationBarTitleText": "单申报"
}
}, {
"path": "cabinQuery/cabinQuery",
@ -37,7 +55,12 @@
"navigationBarTitleText": "线上舱位查询",
"enablePullDownRefresh": false
}
}, {
"path": "cabinHistory/cabinHistory",
"style": {
"navigationBarTitleText": "线上舱位查询结果",
"enablePullDownRefresh": false
}
}
]
}],

@ -1,19 +1,18 @@
<template>
<view class="container">
<swiper class="main" :autoplay="false" :current="currentPage" :duration="duration" easing-function="linear"
@change="changeSwiper">
<swiper-item>
<swiper class="main" :autoplay="false" :current="currentPage" :duration="duration" easing-function="linear" @change="changeSwiper">
<!-- <swiper-item>
<manifest></manifest>
</swiper-item>
<swiper-item>
<moveTrace></moveTrace>
</swiper-item>
</swiper-item> -->
<swiper-item>
<index @changeTab="getChangeTab"></index>
</swiper-item>
<swiper-item>
<!-- <swiper-item>
<vgm></vgm>
</swiper-item>
</swiper-item> -->
<swiper-item>
<mine></mine>
</swiper-item>
@ -26,9 +25,9 @@
import tabBar from "@/components/tabBar/tabBar.vue"
import index from "@/pages/homePage/index/index.vue"
import mine from "@/pages/homePage/mine/mine.vue"
import manifest from "@/pages/homePage/manifest/manifest.vue" //
import moveTrace from "@/pages/homePage/moveTrace/moveTrace.vue" //
import vgm from "@/pages/homePage/vgm/vgm.vue"
// import manifest from "@/pages/homePage/manifest/manifest.vue" //
// import moveTrace from "@/pages/homePage/moveTrace/moveTrace.vue" //
// import vgm from "@/pages/homePage/vgm/vgm.vue"
import {
getUserInfo
@ -43,15 +42,14 @@
tabBar,
index,
mine,
manifest,
moveTrace,
vgm
// manifest,
// moveTrace,
// vgm
},
data() {
return {
currentPage: 2,
duration: 200,
backButtonPress: 0,
currentPage: 1,
duration: 200
}
},
computed: {
@ -59,7 +57,8 @@
'userInfo'
]),
},
onLoad() {
onLoad(op) {
this.currentPage = op.current ? op.current : 0;
if (!uni.getStorageSync('userToken')) {
getApp().globalData.isLogin = false;
console.log('== 当前登录状态 ==', getApp().globalData.isLogin)
@ -72,6 +71,17 @@
'setUserInfo'
]),
changePage(index) {
// if(index == 1 && !getApp().globalData.isLogin){
// this.$util.Tips({
// title: "/",
// success: () => {
// uni.navigateTo({
// url: '/pages/homePage/login/login'
// })
// }
// });
// return false
// }
this.currentPage = index;
},
getUserInfo() {
@ -88,30 +98,7 @@
changeSwiper(e){
this.currentPage = e.detail.current;
}
},
// onHide(){
// if (this.currentPage == 2) {
// this.backButtonPress++; //
// if (this.backButtonPress > 1) {
// // plus.runtime.quit();
// // return false; //
// } else {
// // plus.nativeUI.toast('退');
// // return true; //
// return false
// }
// setTimeout(function() {
// this.backButtonPress = 0;
// }, 1000);
// } else {
// this.currentPage = 2;
// uni.switchTab({
// url: '/pages/homePage/home/home',
// })
// // return true; //
// return false
// }
// },
}
}
</script>
@ -122,7 +109,6 @@
flex-direction: column;
overflow: hidden;
box-sizing: border-box;
.main {
flex: 1;
}

@ -27,9 +27,9 @@
<!-- <view class="content-main"></view> -->
<view class="image-box">
<image class="tab-2" src="../../../static/image/buy-3.png" @click="changePage('/pages/manifest/cabinQuery/cabinQuery')"></image>
<image class="tab-2" src="../../../static/image/move-trace-3.png"></image>
<image class="tab-2" src="../../../static/image/vgm-3.png"></image>
<image class="tab-2" src="../../../static/image/manifest-3.png" @click="changeTab(0)"></image>
<image class="tab-2" src="../../../static/image/move-trace-3.png" @click="changePage('/pages/homePage/moveTrace/moveTrace')"></image>
<image class="tab-2" src="../../../static/image/vgm-3.png" @click="changePage('/pages/homePage/vgm/vgm')"></image>
<image class="tab-2" src="../../../static/image/manifest-3.png" @click="changePage('/pages/homePage/manifest/manifest')"></image>
</view>
</view>
@ -48,6 +48,14 @@
},
methods: {
changePage(url){
if(url == '/pages/homePage/vgm/vgm'){
uni.showToast({
title: '敬请期待',
duration: 2000,
icon: 'none'
});
return false
}
if(!getApp().globalData.isLogin){
this.$util.Tips({
title: "请您登录/注册",

@ -3,7 +3,7 @@
height: 100vh;
display: flex;
flex-direction: column;
padding-bottom: 167rpx;
// padding-bottom: 167rpx;
box-sizing: border-box;
.swipe-action-box{
flex: 1;

@ -230,7 +230,7 @@
mounted() {
setTimeout(() => {
this.loadingShow = false;
}, 1500)
}, 800)
},
methods: {
trigger(e) {

@ -81,9 +81,19 @@
},
methods: {
goLogin(){
// uni.navigateTo({
// url:'/pages/homePage/login/login'
// })
uni.navigateTo({
url:'/pages/homePage/login/login'
})
url: '/pages/homePage/login/login',
success(res) {
console.log('成功啦',res);
},
fail(err) {
console.log('失败啦',err);
}
});
},
signOut(){
this.$util.showModal('退出','确定退出登录?',()=>{

@ -1,6 +1,6 @@
<template>
<AddMoveTrace v-if="ViewType" @close='ChangeViewType' />
<view class="Main" v-else>
<scroll-view scroll-y="true" class="Main" v-else @scrolltolower="scrolltolower">
<view class="HeaderSearch">
<uni-icons class='HeaderIcon' type="search"></uni-icons>
<input class="HeaderInput" placeholder="输入历史提单号或备注快速搜索" />
@ -15,43 +15,47 @@
</view>
</view>
<view class="UnitSecond">
<text class="UnitSecondText">提单号:<text class="UnitSecondTextSpan">{{form.MBLNO}}</text></text>
<text class="UnitSecondText">+订阅目的港数</text>
<text class="UnitSecondText">提单号:<text class="UnitSecondTextSpan">{{item.MBLNO}}</text></text>
<text class="UnitSecondText" @click="dialogToggle(item)">+</text>
</view>
<view class="UnitThird">
<view class="UnitThirdView">
<i class="iconfont icon-yunshu "></i>
<text class="UnitThirdViewText"></text>
<i class="iconfont icon-yunshu" :class="item.StaTiXiang=='N'||!item.StaTiXiang?'Ntype':'YType'"></i>
<text class="UnitThirdViewText"></text>
</view>
<text class="UnitThirdText">······</text>
<view class="UnitThirdView">
<i class="iconfont icon-yunshu "></i>
<i class="iconfont icon-yunshu"
:class="item.StaFanChange=='N'||!item.StaFanChange?'Ntype':'YType'"></i>
<text class="UnitThirdViewText">返场</text>
</view>
<text class="UnitThirdText">······</text>
<view class="UnitThirdView">
<i class="iconfont icon-yunshu "></i>
<i class="iconfont icon-yunshu" :class="item.StaCangDan=='N'||!item.StaCangDan?'Ntype':'YType'"></i>
<text class="UnitThirdViewText">舱单生效</text>
</view>
<text class="UnitThirdText">······</text>
<view class="UnitThirdView">
<i class="iconfont icon-yunshu "></i>
<i class="iconfont icon-yunshu" :class="item.StaTiDan=='N'||!item.StaTiDan?'Ntype':'YType'"></i>
<text class="UnitThirdViewText">报关</text>
</view>
<text class="UnitThirdText">······</text>
<view class="UnitThirdView">
<i class="iconfont icon-yunshu "></i>
<i class="iconfont icon-yunshu"
:class="item.StaZhuangZai=='N'||!item.StaZhuangZai?'Ntype':'YType'"></i>
<text class="UnitThirdViewText">装载放行</text>
</view>
<text class="UnitThirdText">······</text>
<view class="UnitThirdView">
<i class="iconfont icon-yunshu "></i>
<i class="iconfont icon-yunshu"
:class="item.StaMaTouFangXing=='N'||!item.StaMaTouFangXing?'Ntype':'YType'"></i>
<text class="UnitThirdViewText">码放</text>
</view>
</view>
<view class="UnitFourth">
<text class="UnitFourthText">船舶:<text class='UnitFourthTextSpan'>ZIM NORFOLK 1E</text></text>
<text class="UnitFourthText">ETD:<text class='UnitFourthTextSpan'> 6-6 10:04</text></text>
<text class="UnitFourthText">船舶:<text class='UnitFourthTextSpan'>{{item.VESSEL}}</text></text>
<text class="UnitFourthText UnitFourthTextTime">ETD:<text
class='UnitFourthTextSpan'>{{FormatTiem(item.ETD)}}</text></text>
</view>
<view class="UnitFifth">
<view class="UnitFifthView">
@ -61,17 +65,24 @@
<text class="UnitFifthViewText">实际离岗</text>
</view>
<view class="UnitFifthView">
<text class="UnitFifthViewText">6/4 17:00</text>
<text class="UnitFifthViewText">6/4 17:00</text>
<text class="UnitFifthViewText">6/4 17:00</text>
<text class="UnitFifthViewText">6/4 17:00</text>
<text class="UnitFifthViewText">{{FormatTiem(item.ETA)}}</text>
<text class="UnitFifthViewText">{{FormatTiem(item.ATA)}}</text>
<text class="UnitFifthViewText">{{FormatTiem(item.ETD)}}</text>
<text class="UnitFifthViewText">{{FormatTiem(item.ATD)}}</text>
</view>
</view>
</view>
<view class="AddBox" @click="ClickAdd">
+新增运踪
</view>
<view>
<uni-popup ref="alertDialog">
<uni-popup-dialog :type="msgType" cancelText="关闭" confirmText="同意" title="通知"
:content="`是否‘订阅提单号${mblno}目的港数据’`" @confirm="dialogConfirm" @close="dialogClose">
</uni-popup-dialog>
</uni-popup>
</view>
</scroll-view>
</template>
@ -79,6 +90,9 @@
import {
ListData
} from '../../../common/js/api/homePage/moveTrace.js'
import {
FormatTiem
} from './time.js'
import AddMoveTrace from './AddMoveTrace.vue'
export default {
components: {
@ -86,22 +100,43 @@
},
data() {
return {
FormatTiem,
ViewType: false,
form:[]
form: [],
GetData: {
"offset": 0,
"limit": 10,
},
mblno: ''
}
},
// mounted() {
// ListData().then(res => {
// console.log(123132);
// // console.log(res.DataList);
// // this.form=res.DataList
// })
// },
mounted() {
ListData().then(res => {
})
this.FnGetData()
},
methods: {
dialogClose() {
this.$refs.alertDialog.close()
},
dialogConfirm() {
this.$refs.alertDialog.close()
},
dialogToggle(item) {
this.mblno = item.MBLNO
this.$refs.alertDialog.open()
},
FnGetData() {
ListData(this.GetData).then(res => {
this.form = [...this.form, ...res.DataList]
}).catch(err => {
this.form = [...this.form, ...err.DataList]
})
console.log(this.form, this.form.length);
},
scrolltolower() {
++this.GetData.offset
this.FnGetData()
},
ChangeViewType() {
this.ViewType = false
},
@ -115,9 +150,11 @@
<style lang="scss" scoped>
.Main {
background: #f2f2f2;
height: 100%;
padding: 1rem;
margin-bottom: 1rem;
height: calc(100% - 175rpx);
padding: 1rem 1rem;
padding-bottom: 0;
box-sizing: border-box;
overflow: auto;
.HeaderSearch {
padding: .5rem;
@ -139,6 +176,7 @@
margin-top: 1rem;
background: #FFF;
padding-bottom: .2rem;
width: 100%;
.UnitFirst {
@ -176,6 +214,7 @@
border-bottom: 1rpx solid #e6e6e6;
>.UnitSecondText {
font-size: .8rem;
&:first-child {
color: #9d9d9d;
@ -194,6 +233,8 @@
.UnitThird {
display: flex;
padding: 1rem .5rem;
width: 100%;
box-sizing:border-box;
.UnitThirdView {
width: 2.5rem;
@ -208,6 +249,10 @@
background: #53a8ff;
border-radius: 50%;
color: #fff;
&.Ntype {
background: #c9c9c9;
}
}
.UnitThirdViewText {
@ -233,12 +278,26 @@
border-bottom: 1rpx solid #e6e6e6;
.UnitFourthText {
min-width: 60%;
color: #9d9d9d;
&.UnitFourthTextTime {
min-width: 40%;
.UnitFourthTextSpan {
width: auto;
}
}
.UnitFourthTextSpan {
line-height: .8rem;
color: #000;
font-weight: 700;
width: 10rem;
display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
@ -271,7 +330,7 @@
.AddBox {
position: fixed;
left: 50%;
bottom: 12%;
bottom: 165rpx;
transform: translate(-50%, 0);
width: 30%;
height: 2.2rem;

@ -0,0 +1,24 @@
const add0 = (m) => {
return m < 10 ? '0' + m : m
}
const FormatTiem = (A) => {
let timestamp = `
`
if (A) {
timestamp = A.split('(')[1].split(')')[0]
var time = new Date(timestamp/1000);
var y = time.getFullYear();
var m = time.getMonth() + 1;
var d = time.getDate();
var h = time.getHours();
var mm = time.getMinutes();
var s = time.getSeconds();
// console.log(y + '-' + add0(m) + '-' + add0(d) + ' ' + add0(h) + ':' + add0(mm) + ':' + add0(s));
return add0(m) + '-' + add0(d) + ' ' + add0(h) + ':' + add0(mm)
}
return timestamp
}
// export default {FormatTiem}
export {
FormatTiem
}

@ -0,0 +1,398 @@
<template>
<view class="cabin-history">
<view class="history-tit">
<view class="setOut">
<text class="tip">出发地</text>
<text class="top">{{fromData.portDeparture}}</text>
</view>
<view class="icon iconfont icon-daoda"></view>
<view class="arrive">
<text class="tip">目的地</text>
<text class="top">{{fromData.portArrival}}</text>
</view>
<!-- iconfont 需要替换 -->
<view class="iconfont icon-shijian screen" @click="reset"></view>
</view>
<template v-for="(item,index) in webCode">
<view class="history-list" v-if="item.status != 'noData'" :key="index">
<view class="tit">
<view class="left">
<image :src="item.image" mode=""></image>
<text>{{item.code}}</text>
</view>
<view class="right">箱型{{fromData.boxType}}</view>
</view>
<template v-if="item.status == 'over'">
<view class="single-main" v-for="(ship, sindex) in item.list">
<view class="left">
<view class="line"></view>
<view class="times">
<view class="etd">
<text class="tip">ETD</text>
<text class="time">{{ship.departure_date.substring(5,16)}}</text>
</view>
<!-- iconfont 需要替换 -->
<view class="iconfont icon-daoda icon"></view>
<view class="eta">
<text class="tip">ETA</text>
<text class="time">{{ship.arrival_date.substring(5,16)}}</text>
</view>
</view>
<view class="ship-name">
<text>船名{{ ship.vessel }}</text>
</view>
<view class="ship-name">
<text>航次 {{ ship.voyage }}</text>
<text class="num">航程 {{ ship.transit_time }}</text>
</view>
</view>
<view class="right">
<view class="amount">
<view class="of tip">O/F</view>
<view class="of">{{ship.ocean_freight}} {{ship.ocean_currency}}</view>
<view class="all tip">ALL IN </view>
<view class="all">{{ship.total_freight}} {{ship.total_currency}}</view>
</view>
</view>
</view>
</template>
<template v-else-if="item.status == 'loading'">
<view class="loading-box">
<uni-load-more status="loading"></uni-load-more>
</view>
</template>
<template v-else-if="item.status == 'noData'">
<view class="no-data">
<text class="iconfont icon-yunshugongsi"></text>
<text class="text">暂无数据</text>
</view>
</template>
</view>
</template>
</view>
</template>
<script>
import {
realQuery,
} from '@/common/js/api/manifest/cabinQuery.js'
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue'
export default {
components:{
uniLoadMore,
},
// props:{
// fromData:{
// type: Object,
// required: true,
// }
// },
watch:{
fromData: {
handler(newValue, oldValue) {
this.getHistory();
},
deep: true,
immediate: true
}
},
data() {
return {
historyList: [],
fromData: {},
webCode:{
'MSK':{
name: '马士基',
code: 'MSK',
image: '../../../static/image/logo/msk.png',
list: [],
status: 'loading',
},
'MCC': {
name: 'MCC',
code: 'MCC',
image: '../../../static/image/logo/MCC.png',
list: [],
status: 'loading',
},
'CMA': {
name: '法国达飞',
code: 'CMA',
image: '../../../static/image/logo/cma.png',
list: [],
status: 'loading',
},
'COSCO': {
name: '法国达飞',
code: 'CMA',
image: '../../../static/image/logo/cma.png',
list: [],
status: 'loading',
},
'OOCL':{
name: 'OOCL',
code: 'OOCL',
image: '../../../static/image/logo/oocl.png',
list: [],
status: 'loading',
}
},
}
},
onLoad(op){
this.fromData = JSON.parse(op.data);
},
methods: {
reset(){
uni.navigateBack()
},
getHistory(){
let data = {
web_code: '',
pol_code: this.fromData.portDepartureCode,
pol_platform_name: this.fromData.portDeparture,
pod_code: this.fromData.portArrivalCode,
pod_platform_name: this.fromData.portArrival,
box_code: this.fromData.boxType,
box_num: 1,
start_time: this.fromData.startTime,
end_time: this.fromData.endTime,
// from_mode:'CY',
// to_mode:'CY',
// product_name: '',
}
Object.keys(this.webCode).map((item,index)=>{
let _data = data;
_data.web_code = this.webCode[item].code;
this.webCode[item].status = 'loading';
this.realQuery(_data, item)
})
},
realQuery(data, type){
realQuery(data).then(res =>{
if(res.code == 200){
this.webCode[type].list = res.data;
this.webCode[type].status = 'over';
}else{
this.webCode[type].status = 'noData';
}
}).catch(err =>{
this.webCode[type].status = 'noData';
})
}
}
}
</script>
<style lang="less">
.cabin-history{
padding-top: 20rpx;
height:100vh;
overflow-y: auto;
background: #f4f4f4;
.history-tit{
width:100%;
padding:0 50rpx;
background:#fff;
display: flex;
// height: 100rpx;
box-sizing: border-box;
.setOut,.arrive{
width: 250rpx;
// height: 100rpx;
text-align: center;
padding: 10rpx 0;
.top{
line-height: 50rpx;
color: #333;
font-weight: 600;
display: block;
}
.tip{
line-height: 40rpx;
color: #999;
font-weight: 500;
font-size: 24rpx;
display: block;
}
}
.icon{
font-size: 50rpx;
color: #2c96fb;
width: 100rpx;
line-height: 150rpx;
height: 150rpx;
display: inline-block;
text-align: center;
}
.screen{
width: 100rpx;
line-height: 100rpx;
text-align: center;
font-size: 32rpx;
color: #999;
}
}
.history-list{
margin-top: 30rpx;
background: #fff;
.tit{
// height: 80rpx;
// line-height: 80rpx;
border-bottom: 2rpx solid #eee;
padding: 20rpx 20rpx 20rpx 10rpx;
display: flex;
.left{
vertical-align: top;
height: 50rpx;
flex: 1;
image{
height: 50rpx;
width: 115rpx;
vertical-align: top;
display: inline-block;
}
text{
font-size: 28rpx;
color: #666;
font-weight: 600;
line-height: 50rpx;
display: inline-block;
vertical-align: top;
}
}
.right{
font-size: 28rpx;
color: #999;
line-height: 50rpx;
}
}
.single-main{
// height: 200rpx;
display: flex;
padding-bottom: 30rpx;
border-bottom: 3rpx solid #eee;
.left{
flex: 1;
position: relative;
.line{
content:'';
position: absolute;
top: 24rpx;
right: 2rpx;
width: 2rpx;
height: 130rpx;
height: calc(100% - 24rpx);
background:#eee;
}
.times{
width:100%;
display: flex;
// margin-bottom: 10rpx;
margin-top: 10rpx;
.etd,.eta{
flex: 1;
text-align: center;
padding-top: 10rpx;
.tip{
display: block;
font-size: 28rpx;
color: #999;
font-weight: 500;
line-height: 40rpx;
}
.time{
display: block;
font-size: 32rpx;
color: #666;
font-weight: 600;
line-height: 60rpx;
}
}
.icon{
height: 100rpx;
line-height: 100rpx;
width: 80rpx;
text-align: center;
}
}
.ship-name{
font-size: 24rpx;
line-height: 40rpx;
padding-left: 40rpx;
color: #666;
.name{
color: #666;
font-weight: 600;
}
.num{
color: #999;
font-weight: 500;
float: right;
text-align: right;
padding-right: 18rpx;
}
}
}
.right{
width: 190rpx;
padding-left: 20rpx;
padding-top: 20rpx;
position: relative;
// height:100%;
.top{
font-size: 28rpx;
color: #666;
line-height: 60rpx;
}
.amount{
position: absolute;
font-size: 24rpx;
color: #ff8213;
line-height: 40rpx;
bottom: 0;
left: 20rpx;
font-weight: 600;
width: 180rpx;
text-align: left;
.tip{
color: #999;
}
}
}
}
.loading-box{
width: 100%;
height: 200rpx;
background: #fff;
padding-top: 63rpx;
box-sizing: border-box;
}
.no-data{
width: 100%;
height: 200rpx;
background: #fff;
box-sizing: border-box;
font-size: 40rpx;
text-align: center;
.iconfont{
font-size: 90rpx;
line-height: 200rpx;
margin-right: 40rpx;
color: #999;
display: inline-block;
vertical-align: top
}
.text{
font-size: 32rpx;
color: #999;
line-height: 200rpx;
display: inline-block;
vertical-align: top
}
}
}
}
</style>

@ -0,0 +1,42 @@
<template>
<view class="cabin-query-box">
<query v-if="show == 'query'" @fromData="getFromData"></query>
<history v-else :fromData="fromData" @reset="resetFun"></history>
</view>
</template>
<script>
import query from '@/pages/manifest/cabinQuery/components/query.vue'
import history from '@/pages/manifest/cabinQuery/components/history.vue'
export default {
components: {
query,
history,
},
data() {
return {
show: 'query',
fromData: {},
}
},
watch: {
},
methods: {
getFromData(data){
this.fromData = data;
this.show = 'history';
},
resetFun(){
this.show = 'query'
}
}
}
</script>
<style lang="less">
.cabin-query-box{
height:100vh;
}
</style>

@ -1,42 +1,588 @@
<template>
<view class="cabin-query-box">
<query v-if="show == 'query'" @fromData="getFromData"></query>
<history v-else :fromData="fromData" @reset="resetFun"></history>
<view class="cabin-query">
<view class="query-box">
<view class="choice-btn">
<view class="left"><text class="iconfont icon-yunshu"></text><text class="tip">起运港</text></view>
<view class="right" @click="openInputSerch('portDeparture')">
<text class="gk" v-if="fromData.portDeparture">{{fromData.portDeparture }}</text>
<text class="gk" v-else></text>
<text class="icon iconfont icon-daoda"></text>
</view>
</view>
<view class="choice-btn">
<view class="left"><text class="iconfont icon-yunshu"></text><text class="tip">目的港</text></view>
<view class="right" @click="openInputSerch('portArrival')">
<text class="gk" v-if="fromData.portArrival">{{fromData.portArrival }}</text>
<text class="gk" v-else></text>
<text class="icon iconfont icon-daoda"></text>
</view>
</view>
<view class="choice-btn" @click="openInputSerch('boxType')">
<view class="left"><text class="iconfont icon-a-jizhuangxiang1"></text><text class="tip">箱型</text></view>
<view class="right">
<text class="gk" v-if="fromData.boxType">{{fromData.boxType }}</text>
<text class="gk" v-else></text>
<text class="icon iconfont icon-daoda"></text>
</view>
</view>
<view class="choice-btn">
<view class="left"><text class="iconfont icon-shijian"></text><text class="tip">开始时间</text></view>
<view class="right">
<uni-datetime-picker type="date" :clear-icon="false" v-model="fromData.startTime"
@maskClick="startTimeClick" :start="Date.now()" />
</view>
</view>
<view class="choice-btn">
<view class="left"><text class="iconfont icon-shijian"></text><text class="tip">结束时间</text></view>
<view class="right">
<uni-datetime-picker type="date" :clear-icon="false" v-model="fromData.endTime"
@maskClick="endTimeClick" :start="Date.now()" />
</view>
</view>
<view class="button-box">
<button class="enter" @click="goQuery"></button>
<button class="reset" v-show="hasFromData" @click="resetFrom"></button>
</view>
</view>
<!-- <view class="query-history">
<view class="history-tit">
<text class="left">历史记录</text>
</view>
<view class="history-list">
<view class="history-view">
<view class="setOut">
<text class="tip">出发地</text>
<text class="top">{{fromData.portDeparture}}</text>
</view>
<view class="icon iconfont icon-daoda"></view>
<view class="arrive">
<text class="tip">目的地</text>
<text class="top">{{fromData.portArrival}}</text>
</view>
<text class="icon-tab left"></text>
<text class="icon-tab right"></text>
<text class="icon-tab top-left"></text>
<text class="icon-tab top-right"></text>
</view>
<view class="history-view">
<view class="setOut">
<text class="tip">出发地</text>
<text class="top">{{fromData.portDeparture}}</text>
</view>
<view class="icon iconfont icon-daoda"></view>
<view class="arrive">
<text class="tip">目的地</text>
<text class="top">{{fromData.portArrival}}</text>
</view>
<text class="icon-tab left"></text>
<text class="icon-tab right"></text>
</view>
<view class="history-view">
<view class="setOut">
<text class="tip">出发地</text>
<text class="top">{{fromData.portDeparture}}</text>
</view>
<view class="icon iconfont icon-daoda"></view>
<view class="arrive">
<text class="tip">目的地</text>
<text class="top">{{fromData.portArrival}}</text>
</view>
<text class="icon-tab left"></text>
<text class="icon-tab right"></text>
</view>
</view>
</view>
-->
<inputSearch
ref="inputView"
v-if="inputSearchShow"
:inputData="inputSearchData"
@change="getInputChange"
@submit="getInputRes"
@cancel="cancelInput"
/>
</view>
</template>
<script>
import query from '@/pages/manifest/cabinQuery/components/query.vue'
import history from '@/pages/manifest/cabinQuery/components/history.vue'
import uniDatetimePicker from '@/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue'
import inputSearch from '@/components/inputSearch/inputSearch.vue'
import {
realGk,
realBox,
} from '@/common/js/api/manifest/cabinQuery.js'
export default {
components: {
query,
history,
uniDatetimePicker,
inputSearch
},
data() {
return {
show: 'query',
fromData: {},
fromData: {
portDeparture: 'QINGDAO',
portDepartureCode: 'CNTAO',
portArrival: '',
portArrivalCode: '',
boxType: '',
// portArrival: 'GDANSK, POLAND',
// portArrivalCode: 'PLGDN',
// boxType: '22G1',
startTime: '',
endTime: '',
},
hasFromData: true,
inputSearchShow: false,
inputSearchData:{
placeholder: '',
dataList: [],
showName: '',
type: '',
history: null,
},
inputSearchRes: {},
}
},
watch: {
fromData: {
handler(newValue, oldValue) {
let hasData = false
for (let key in newValue) {
if (newValue[key] != '') {
hasData = true;
}
}
this.hasFromData = hasData;
},
deep: true,
immediate: true
}
},
methods: {
getFromData(data){
this.fromData = data;
this.show = 'history';
departureClick(e) {
console.log(e);
this.fromData.portDeparture = e.text;
},
arrivalClick(e) {
console.log(e);
this.fromData.portArrival = e.text;
},
startTimeClick(e) {
console.log('startTimeClick事件:', e);
},
endTimeClick(e) {
console.log('endTimeClick事件:', e);
},
goQuery() {
let res = '';
Object.keys(this.fromData).map((val, index) => {
if (this.fromData[val] == '' && val!='endTime') {
res = val
console.log(val, this.fromData[val] == '')
}
})
switch (res) {
// case 'endTime':
// this.$util.Tips({
// title: ''
// });
// return false;
// break;
case 'startTime':
this.$util.Tips({
title: '请填写开始时间'
});
return false;
break;
case 'boxType':
this.$util.Tips({
title: '请填写箱型'
});
return false;
break;
case 'portArrival':
this.$util.Tips({
title: '请填写目的港'
});
return false;
break;
case 'portDeparture':
this.$util.Tips({
title: '请填写起运港'
});
return false;
break;
}
uni.navigateTo({
url: '/pages/manifest/cabinHistory/cabinHistory?data='+JSON.stringify(this.fromData)
})
},
resetFrom() {
this.fromData = {
portDeparture: '',
portDepartureCode: '',
portArrival: '',
portArrivalCode: '',
boxType: '',
startTime: '',
endTime: '',
}
},
openInputSerch(type){
this.inputSearchShow = true;
if(type == 'portDeparture'){
let data = {
placeholder: '请输入起运港',
dataList: [],
showName: 'EnName',
type: 'portDeparture',
history: this.fromData.portDeparture ? {
EnName: this.fromData.portDeparture,
code: this.fromData.portDepartureCode,
} : null,
}
this.$set(this, 'inputSearchData' , data)
}else if(type == 'portArrival'){
let data = {
placeholder: '请输入目的港',
dataList: [],
showName: 'EnName',
type: 'portArrival',
history: this.fromData.portArrival ? {
EnName: this.fromData.portArrival,
code: this.fromData.portArrivalCode,
} : null,
}
this.$set(this, 'inputSearchData' , data)
}else if(type == 'boxType'){
let data = {
placeholder: '请输入箱型',
dataList: [],
showName: 'Code',
type: 'boxType',
history: this.fromData.boxType ? {
Code: this.fromData.boxType
} : null,
}
this.$set(this, 'inputSearchData' , data)
}
},
resetFun(){
this.show = 'query'
getInputChange(key){
if(this.inputSearchData.type == 'portDeparture' || this.inputSearchData.type == 'portArrival'){
realGk({
name: key,
port_type: this.inputSearchData.type == 'portDeparture' ? 'pol' : 'pod'
}).then(res =>{
if(res.code == 200){
this.$set(this.inputSearchData, 'dataList', []);
this.$set(this.inputSearchData, 'dataList', res.data);
this.$refs.inputView.$data.inLoading = false;
this.$forceUpdate()
}else{
this.$set(this.inputSearchData, 'dataList', []);
this.$refs.inputView.$data.inLoading = false;
}
}).catch(err =>{
console.log('报错信息==', err)
this.$set(this.inputSearchData, 'dataList', []);
this.$refs.inputView.$data.inLoading = false;
})
}else{
realBox({
name: key,
}).then(res =>{
if(res.code == 200){
this.$set(this.inputSearchData, 'dataList', res.data);
this.$refs.inputView.$data.inLoading = false;
this.$forceUpdate()
}else{
this.$set(this.inputSearchData, 'dataList', []);
this.$refs.inputView.$data.inLoading = false;
}
}).catch(err =>{
console.log('报错信息==', err)
this.$set(this.inputSearchData, 'dataList', []);
this.$refs.inputView.$data.inLoading = false;
})
}
},
getInputRes(data){
console.log(data);
if(this.inputSearchData.type == 'portDeparture'){
this.fromData.portDeparture = data.EnName;
this.fromData.portDepartureCode = data.code;
}else if(this.inputSearchData.type == 'portArrival'){
this.fromData.portArrival = data.EnName;
this.fromData.portArrivalCode = data.code;
}else if(this.inputSearchData.type == 'boxType'){
this.fromData.boxType = data.Code;
}
this.inputSearchShow = false;
this.inputSearchData = {
placeholder: '',
history: data,
dataList: [],
showName: '',
type: '',
}
},
cancelInput(){
this.inputSearchShow = false;
this.inputSearchData = {
placeholder: '',
history: null,
dataList: [],
showName: '',
type: '',
}
}
}
}
</script>
<style lang="less">
.cabin-query-box{
.cabin-query {
background: #f4f4f4;
height: 100vh;
padding: 20rpx;
.query-box {
background: #fff;
padding: 0 30rpx 30rpx 30rpx;
box-sizing: border-box;
border-radius: 16rpx;
box-shadow: 0 0 18rpx #eee;
.choice-btn {
height: 100rpx;
display: flex;
border-bottom: 1rpx solid #eee;
.left {
width: 220rpx;
font-size: 28rpx;
font-weight: 600;
color: #666;
height: 100rpx;
line-height: 100rpx;
.iconfont {
font-size: 44rpx;
margin-right: 12rpx;
margin-top: 2rpx;
color: #86c7ff;
// color: #999;
font-weight: 500;
display: inline-block;
vertical-align: top;
}
.tip{
display: inline-block;
vertical-align: top;
}
.icon-shijian {
font-size: 36rpx;
}
}
.right {
flex: 1;
padding-top: 15rpx;
font-size: 28rpx;
color: #666;
line-height: 80rpx;
display: flex;
overflow: hidden;
.gk{
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.icon{
// float: right;
font-size: 28rpx;
color: #000;
margin-right: 20rpx;
width: 50rpx;
text-align: right;
}
.box-type {
height: 75rpx;
text-align: left;
line-height: 75rpx;
display: block;
padding-left: 20rpx;
}
}
}
.button-box {
margin-top: 40rpx;
height: 100rpx;
display: flex;
padding: 0 40rpx;
button {
height: 80rpx;
line-height: 80rpx;
}
.enter {
flex: 1;
background: #ff8213;
color: #fff;
border-radius: 80rpx;
border: none;
font-size: 30rpx;
}
.reset {
width: 200rpx;
text-align: center;
color: #ff8213;
margin-left: 20rpx;
background: #fff;
border: 2rpx solid #ff8213;
padding: 0 30rpx;
border-radius: 80rpx;
font-size: 28rpx;
.iconfont {
margin-right: 8rpx;
}
}
}
}
.query-history{
padding-top: 40rpx;
.history-tit{
height: 80rpx;
line-height: 80rpx;
padding: 0 20rpx;
color: #333;
font-size: 28rpx;
font-weight: 600;
// background:#fff;
}
.history-list{
box-shadow: 0 0 10rpx #ccc;
}
.history-view{
width:100%;
padding:10rpx 50rpx;
background:#fff;
display: flex;
// height: 100rpx;
box-sizing: border-box;
border-radius: 10rpx;
// box-shadow: 0 0 10rpx #eee;
position: relative;
border-bottom: 1px dashed #eee;
&:nth-last-of-type(1){
border-bottom: none;
}
.setOut,.arrive{
// width: 250rpx;
flex: 1;
padding: 0 20rpx;
// height: 100rpx;
text-align: center;
padding: 10rpx 0;
.top{
line-height: 50rpx;
color: #333;
font-weight: 600;
display: block;
}
.tip{
line-height: 40rpx;
color: #999;
font-weight: 500;
font-size: 24rpx;
display: block;
}
}
.icon{
font-size: 50rpx;
color: #2c96fb;
width: 100rpx;
line-height: 150rpx;
height: 150rpx;
display: inline-block;
text-align: center;
}
.screen{
width: 100rpx;
line-height: 100rpx;
text-align: center;
font-size: 32rpx;
color: #999;
}
.icon-tab{
width: 40rpx;
height: 40rpx;
background: #f4f4f4;
position: absolute;
border-radius: 50%;
position: absolute;
bottom: -20rpx;
z-index: 999;
// box-shadow: inset 0px 0px 10px 1px #f4f4f4;
&.left{
left:-20rpx;
}
&.right{
right:-20rpx;
}
}
.top-left{
width: 40rpx;
height: 40rpx;
background: #f4f4f4;
position: absolute;
border-radius: 50%;
position: absolute;
top: -20rpx;
z-index: 999;
left:-20rpx;
}
.top-right{
width: 40rpx;
height: 40rpx;
background: #f4f4f4;
position: absolute;
border-radius: 50%;
position: absolute;
top: -20rpx;
z-index: 999;
right:-20rpx;
}
}
}
}
</style>

@ -56,7 +56,7 @@
mounted() {
setTimeout(() => {
this.loadingShow = false;
}, 3000)
}, 800)
},
methods: {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 138 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 29 KiB

@ -244,7 +244,7 @@
.uni-fab--leftBottom {
left: 15px;
bottom: 110px;
bottom: 40px;
/* #ifdef H5 */
left: calc(15px + var(--window-left));
bottom: calc(30px + var(--window-bottom));
@ -264,7 +264,7 @@
.uni-fab--rightBottom {
right: 15px;
bottom: 110px;
bottom: 40px;
/* #ifdef H5 */
right: calc(15px + var(--window-right));
bottom: calc(30px + var(--window-bottom));
@ -299,7 +299,7 @@
.uni-fab__circle--leftBottom {
left: 15px;
bottom: 110px;
bottom: 40px;
/* #ifdef H5 */
left: calc(15px + var(--window-left));
bottom: calc(30px + var(--window-bottom));
@ -317,7 +317,7 @@
.uni-fab__circle--rightBottom {
right: 15px;
bottom: 110px;
bottom: 40px;
/* #ifdef H5 */
right: calc(15px + var(--window-right));
bottom: calc(30px + var(--window-bottom));

@ -0,0 +1,60 @@
## 1.7.92022-04-02
- 修复 弹出层内部无法滚动的bug
## 1.7.82022-03-28
- 修复 小程序中高度错误的bug
## 1.7.72022-03-17
- 修复 快速调用open出现问题的Bug
## 1.7.62022-02-14
- 修复 safeArea 属性不能设置为false的bug
## 1.7.52022-01-19
- 修复 isMaskClick 失效的bug
## 1.7.42022-01-19
- 新增 cancelText \ confirmText 属性 ,可自定义文本
- 新增 maskBackgroundColor 属性 ,可以修改蒙版颜色
- 优化 maskClick属性 更新为 isMaskClick ,解决微信小程序警告的问题
## 1.7.32022-01-13
- 修复 设置 safeArea 属性不生效的bug
## 1.7.22021-11-26
- 优化 组件示例
## 1.7.12021-11-26
- 修复 vuedoc 文字错误
## 1.7.02021-11-19
- 优化 组件UI并提供设计资源详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
## 1.6.22021-08-24
- 新增 支持国际化
## 1.6.12021-07-30
- 优化 vue3下事件警告的问题
## 1.6.02021-07-13
- 组件兼容 vue3如何创建vue3项目详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
## 1.5.02021-06-23
- 新增 mask-click 遮罩层点击事件
## 1.4.52021-06-22
- 修复 nvue 平台中间弹出后点击内容再点击遮罩无法关闭的Bug
## 1.4.42021-06-18
- 修复 H5平台中间弹出后点击内容再点击遮罩无法关闭的Bug
## 1.4.32021-06-08
- 修复 错误的 watch 字段
- 修复 safeArea 属性不生效的问题
- 修复 点击内容再点击遮罩无法关闭的Bug
## 1.4.22021-05-12
- 新增 组件示例地址
## 1.4.12021-04-29
- 修复 组件内放置 input 、textarea 组件,无法聚焦的问题
## 1.4.0 2021-04-29
- 新增 type 属性的 left\right 值,支持左右弹出
- 新增 open(String:type) 方法参数 ,可以省略 type 属性 ,直接传入类型打开指定弹窗
- 新增 backgroundColor 属性,可定义主窗口背景色,默认不显示背景色
- 新增 safeArea 属性,是否适配底部安全区
- 修复 App\h5\微信小程序底部安全区占位不对的Bug
- 修复 App 端弹出等待的Bug
- 优化 提升低配设备性能,优化动画卡顿问题
- 优化 更简单的组件自定义方式
## 1.2.92021-02-05
- 优化 组件引用关系通过uni_modules引用组件
## 1.2.82021-02-05
- 调整为uni_modules目录规范
## 1.2.72021-02-05
- 调整为uni_modules目录规范
- 新增 支持 PC 端
- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端

@ -0,0 +1,45 @@
// #ifdef H5
export default {
name: 'Keypress',
props: {
disable: {
type: Boolean,
default: false
}
},
mounted () {
const keyNames = {
esc: ['Esc', 'Escape'],
tab: 'Tab',
enter: 'Enter',
space: [' ', 'Spacebar'],
up: ['Up', 'ArrowUp'],
left: ['Left', 'ArrowLeft'],
right: ['Right', 'ArrowRight'],
down: ['Down', 'ArrowDown'],
delete: ['Backspace', 'Delete', 'Del']
}
const listener = ($event) => {
if (this.disable) {
return
}
const keyName = Object.keys(keyNames).find(key => {
const keyName = $event.key
const value = keyNames[key]
return value === keyName || (Array.isArray(value) && value.includes(keyName))
})
if (keyName) {
// 避免和其他按键事件冲突
setTimeout(() => {
this.$emit(keyName, {})
}, 0)
}
}
document.addEventListener('keyup', listener)
this.$once('hook:beforeDestroy', () => {
document.removeEventListener('keyup', listener)
})
},
render: () => {}
}
// #endif

@ -0,0 +1,271 @@
<template>
<view class="uni-popup-dialog">
<view class="uni-dialog-title">
<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
</view>
<view v-if="mode === 'base'" class="uni-dialog-content">
<slot>
<text class="uni-dialog-content-text">{{content}}</text>
</slot>
</view>
<view v-else class="uni-dialog-content">
<slot>
<input class="uni-dialog-input" v-model="val" type="text" :placeholder="placeholderText" :focus="focus" >
</slot>
</view>
<view class="uni-dialog-button-group">
<view class="uni-dialog-button" @click="closeDialog">
<text class="uni-dialog-button-text">{{closeText}}</text>
</view>
<view class="uni-dialog-button uni-border-left" @click="onOk">
<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
</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)
/**
* PopUp 弹出层-对话框样式
* @description 弹出层-对话框样式
* @tutorial https://ext.dcloud.net.cn/plugin?id=329
* @property {String} value input 模式下的默认值
* @property {String} placeholder input 模式下输入提示
* @property {String} type = [success|warning|info|error] 主题样式
* @value success 成功
* @value warning 提示
* @value info 消息
* @value error 错误
* @property {String} mode = [base|input] 模式
* @value base 基础对话框
* @value input 可输入对话框
* @property {String} content 对话框内容
* @property {Boolean} beforeClose 是否拦截取消事件
* @event {Function} confirm 点击确认按钮触发
* @event {Function} close 点击取消按钮触发
*/
export default {
name: "uniPopupDialog",
mixins: [popup],
emits:['confirm','close'],
props: {
value: {
type: [String, Number],
default: ''
},
placeholder: {
type: [String, Number],
default: ''
},
type: {
type: String,
default: 'error'
},
mode: {
type: String,
default: 'base'
},
title: {
type: String,
default: ''
},
content: {
type: String,
default: ''
},
beforeClose: {
type: Boolean,
default: false
},
cancelText:{
type: String,
default: ''
},
confirmText:{
type: String,
default: ''
}
},
data() {
return {
dialogType: 'error',
focus: false,
val: ""
}
},
computed: {
okText() {
return this.confirmText || t("uni-popup.ok")
},
closeText() {
return this.cancelText || t("uni-popup.cancel")
},
placeholderText() {
return this.placeholder || t("uni-popup.placeholder")
},
titleText() {
return this.title || t("uni-popup.title")
}
},
watch: {
type(val) {
this.dialogType = val
},
mode(val) {
if (val === 'input') {
this.dialogType = 'info'
}
},
value(val) {
this.val = val
}
},
created() {
//
this.popup.disableMask()
// this.popup.closeMask()
if (this.mode === 'input') {
this.dialogType = 'info'
this.val = this.value
} else {
this.dialogType = this.type
}
},
mounted() {
this.focus = true
},
methods: {
/**
* 点击确认按钮
*/
onOk() {
if (this.mode === 'input'){
this.$emit('confirm', this.val)
}else{
this.$emit('confirm')
}
if(this.beforeClose) return
this.popup.close()
},
/**
* 点击取消按钮
*/
closeDialog() {
this.$emit('close')
if(this.beforeClose) return
this.popup.close()
},
close(){
this.popup.close()
}
}
}
</script>
<style lang="scss" >
.uni-popup-dialog {
width: 300px;
border-radius: 11px;
background-color: #fff;
}
.uni-dialog-title {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
justify-content: center;
padding-top: 25px;
}
.uni-dialog-title-text {
font-size: 16px;
font-weight: 500;
}
.uni-dialog-content {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
justify-content: center;
align-items: center;
padding: 20px;
}
.uni-dialog-content-text {
font-size: 14px;
color: #6C6C6C;
}
.uni-dialog-button-group {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
border-top-color: #f5f5f5;
border-top-style: solid;
border-top-width: 1px;
}
.uni-dialog-button {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex: 1;
flex-direction: row;
justify-content: center;
align-items: center;
height: 45px;
}
.uni-border-left {
border-left-color: #f0f0f0;
border-left-style: solid;
border-left-width: 1px;
}
.uni-dialog-button-text {
font-size: 16px;
color: #333;
}
.uni-button-color {
color: #007aff;
}
.uni-dialog-input {
flex: 1;
font-size: 14px;
border: 1px #eee solid;
height: 40px;
padding: 0 10px;
border-radius: 5px;
color: #555;
}
.uni-popup__success {
color: #4cd964;
}
.uni-popup__warn {
color: #f0ad4e;
}
.uni-popup__error {
color: #dd524d;
}
.uni-popup__info {
color: #909399;
}
</style>

@ -0,0 +1,143 @@
<template>
<view class="uni-popup-message">
<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
<slot>
<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
</slot>
</view>
</view>
</template>
<script>
import popup from '../uni-popup/popup.js'
/**
* PopUp 弹出层-消息提示
* @description 弹出层-消息提示
* @tutorial https://ext.dcloud.net.cn/plugin?id=329
* @property {String} type = [success|warning|info|error] 主题样式
* @value success 成功
* @value warning 提示
* @value info 消息
* @value error 错误
* @property {String} message 消息提示文字
* @property {String} duration 显示时间设置为 0 则不会自动关闭
*/
export default {
name: 'uniPopupMessage',
mixins:[popup],
props: {
/**
* 主题 success/warning/info/error 默认 success
*/
type: {
type: String,
default: 'success'
},
/**
* 消息文字
*/
message: {
type: String,
default: ''
},
/**
* 显示时间设置为 0 则不会自动关闭
*/
duration: {
type: Number,
default: 3000
},
maskShow:{
type:Boolean,
default:false
}
},
data() {
return {}
},
created() {
this.popup.maskShow = this.maskShow
this.popup.messageChild = this
},
methods: {
timerClose(){
if(this.duration === 0) return
clearTimeout(this.timer)
this.timer = setTimeout(()=>{
this.popup.close()
},this.duration)
}
}
}
</script>
<style lang="scss" >
.uni-popup-message {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
justify-content: center;
}
.uni-popup-message__box {
background-color: #e1f3d8;
padding: 10px 15px;
border-color: #eee;
border-style: solid;
border-width: 1px;
flex: 1;
}
@media screen and (min-width: 500px) {
.fixforpc-width {
margin-top: 20px;
border-radius: 4px;
flex: none;
min-width: 380px;
/* #ifndef APP-NVUE */
max-width: 50%;
/* #endif */
/* #ifdef APP-NVUE */
max-width: 500px;
/* #endif */
}
}
.uni-popup-message-text {
font-size: 14px;
padding: 0;
}
.uni-popup__success {
background-color: #e1f3d8;
}
.uni-popup__success-text {
color: #67C23A;
}
.uni-popup__warn {
background-color: #faecd8;
}
.uni-popup__warn-text {
color: #E6A23C;
}
.uni-popup__error {
background-color: #fde2e2;
}
.uni-popup__error-text {
color: #F56C6C;
}
.uni-popup__info {
background-color: #F2F6FC;
}
.uni-popup__info-text {
color: #909399;
}
</style>

@ -0,0 +1,187 @@
<template>
<view class="uni-popup-share">
<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)">
<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
<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>
</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 {
name: 'UniPopupShare',
mixins:[popup],
emits:['select'],
props: {
title: {
type: String,
default: ''
},
beforeClose: {
type: Boolean,
default: false
}
},
data() {
return {
bottomData: [{
text: '微信',
icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
name: 'wx'
},
{
text: '支付宝',
icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.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://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'
// }
]
}
},
created() {},
computed: {
cancelText() {
return t("uni-popup.cancel")
},
shareTitleText() {
return this.title || t("uni-popup.shareTitle")
}
},
methods: {
/**
* 选择内容
*/
select(item, index) {
this.$emit('select', {
item,
index
})
this.close()
},
/**
* 关闭窗口
*/
close() {
if(this.beforeClose) return
this.popup.close()
}
}
}
</script>
<style lang="scss" >
.uni-popup-share {
background-color: #fff;
border-top-left-radius: 11px;
border-top-right-radius: 11px;
}
.uni-share-title {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
align-items: center;
justify-content: center;
height: 40px;
}
.uni-share-title-text {
font-size: 14px;
color: #666;
}
.uni-share-content {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
justify-content: center;
padding-top: 10px;
}
.uni-share-content-box {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
flex-wrap: wrap;
width: 360px;
}
.uni-share-content-item {
width: 90px;
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: column;
justify-content: center;
padding: 10px 0;
align-items: center;
}
.uni-share-content-item:active {
background-color: #f5f5f5;
}
.uni-share-image {
width: 30px;
height: 30px;
}
.uni-share-text {
margin-top: 10px;
font-size: 14px;
color: #3B4144;
}
.uni-share-button-box {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
padding: 10px 15px;
}
.uni-share-button {
flex: 1;
border-radius: 50px;
color: #666;
font-size: 16px;
}
.uni-share-button::after {
border-radius: 50px;
}
</style>

@ -0,0 +1,7 @@
{
"uni-popup.cancel": "cancel",
"uni-popup.ok": "ok",
"uni-popup.placeholder": "pleace enter",
"uni-popup.title": "Hint",
"uni-popup.shareTitle": "Share to"
}

@ -0,0 +1,8 @@
import en from './en.json'
import zhHans from './zh-Hans.json'
import zhHant from './zh-Hant.json'
export default {
en,
'zh-Hans': zhHans,
'zh-Hant': zhHant
}

@ -0,0 +1,7 @@
{
"uni-popup.cancel": "取消",
"uni-popup.ok": "确定",
"uni-popup.placeholder": "请输入",
"uni-popup.title": "提示",
"uni-popup.shareTitle": "分享到"
}

@ -0,0 +1,7 @@
{
"uni-popup.cancel": "取消",
"uni-popup.ok": "確定",
"uni-popup.placeholder": "請輸入",
"uni-popup.title": "提示",
"uni-popup.shareTitle": "分享到"
}

@ -0,0 +1,45 @@
// #ifdef H5
export default {
name: 'Keypress',
props: {
disable: {
type: Boolean,
default: false
}
},
mounted () {
const keyNames = {
esc: ['Esc', 'Escape'],
tab: 'Tab',
enter: 'Enter',
space: [' ', 'Spacebar'],
up: ['Up', 'ArrowUp'],
left: ['Left', 'ArrowLeft'],
right: ['Right', 'ArrowRight'],
down: ['Down', 'ArrowDown'],
delete: ['Backspace', 'Delete', 'Del']
}
const listener = ($event) => {
if (this.disable) {
return
}
const keyName = Object.keys(keyNames).find(key => {
const keyName = $event.key
const value = keyNames[key]
return value === keyName || (Array.isArray(value) && value.includes(keyName))
})
if (keyName) {
// 避免和其他按键事件冲突
setTimeout(() => {
this.$emit(keyName, {})
}, 0)
}
}
document.addEventListener('keyup', listener)
// this.$once('hook:beforeDestroy', () => {
// document.removeEventListener('keyup', listener)
// })
},
render: () => {}
}
// #endif

@ -0,0 +1,26 @@
export default {
data() {
return {
}
},
created(){
this.popup = this.getParent()
},
methods:{
/**
* 获取父元素实例
*/
getParent(name = 'uniPopup') {
let parent = this.$parent;
let parentName = parent.$options.name;
while (parentName !== name) {
parent = parent.$parent;
if (!parent) return false
parentName = parent.$options.name;
}
return parent;
},
}
}

@ -0,0 +1,474 @@
<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>
</view>
<!-- #ifdef H5 -->
<keypress v-if="maskShow" @esc="onTap" />
<!-- #endif -->
</view>
</template>
<script>
// #ifdef H5
import keypress from './keypress.js'
// #endif
/**
* PopUp 弹出层
* @description 弹出层组件为了解决遮罩弹层的问题
* @tutorial https://ext.dcloud.net.cn/plugin?id=329
* @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
* @value top 顶部弹出
* @value center 中间弹出
* @value bottom 底部弹出
* @value left 左侧弹出
* @value right 右侧弹出
* @value message 消息提示
* @value dialog 对话框
* @value share 底部分享示例
* @property {Boolean} animation = [true|false] 是否开启动画
* @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
* @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
* @property {String} backgroundColor 主窗口背景色
* @property {String} maskBackgroundColor 蒙版颜色
* @property {Boolean} safeArea 是否适配底部安全区
* @event {Function} change 打开关闭弹窗触发e={show: false}
* @event {Function} maskClick 点击遮罩触发
*/
export default {
name: 'uniPopup',
components: {
// #ifdef H5
keypress
// #endif
},
emits: ['change', 'maskClick'],
props: {
//
animation: {
type: Boolean,
default: true
},
// top: bottomcenter
// message: ; dialog :
type: {
type: String,
default: 'center'
},
// maskClick
isMaskClick: {
type: Boolean,
default: null
},
// TODO 2 使 isMaskClick
maskClick: {
type: Boolean,
default: null
},
backgroundColor: {
type: String,
default: 'none'
},
safeArea: {
type: Boolean,
default: true
},
maskBackgroundColor: {
type: String,
default: 'rgba(0, 0, 0, 0.4)'
},
},
watch: {
/**
* 监听type类型
*/
type: {
handler: function(type) {
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)
},
immediate: true
},
/**
* 监听遮罩是否可点击
* @param {Object} val
*/
maskClick: {
handler: function(val) {
this.mkclick = val
},
immediate: true
},
isMaskClick: {
handler: function(val) {
this.mkclick = val
},
immediate: true
},
// H5
showPopup(show) {
// #ifdef H5
// fix by mehaotian h5 穿
document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
// #endif
}
},
data() {
return {
duration: 300,
ani: [],
showPopup: false,
showTrans: false,
popupWidth: 0,
popupHeight: 0,
config: {
top: 'top',
bottom: 'bottom',
center: 'center',
left: 'left',
right: 'right',
message: 'top',
dialog: 'center',
share: 'bottom'
},
maskClass: {
position: 'fixed',
bottom: 0,
top: 0,
left: 0,
right: 0,
backgroundColor: 'rgba(0, 0, 0, 0.4)'
},
transClass: {
position: 'fixed',
left: 0,
right: 0
},
maskShow: true,
mkclick: true,
popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
}
},
computed: {
isDesktop() {
return this.popupWidth >= 500 && this.popupHeight >= 500
},
bg() {
if (this.backgroundColor === '' || this.backgroundColor === 'none') {
return 'transparent'
}
return this.backgroundColor
}
},
mounted() {
const fixSize = () => {
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
// #endif
// #ifndef MP-WEIXIN
this.safeAreaInsets = safeAreaInsets.bottom
// #endif
} else {
this.safeAreaInsets = 0
}
}
fixSize()
// #ifdef H5
// window.addEventListener('resize', fixSize)
// this.$once('hook:beforeDestroy', () => {
// window.removeEventListener('resize', fixSize)
// })
// #endif
},
// #ifndef VUE3
// TODO vue2
destroyed() {
this.setH5Visible()
},
// #endif
// #ifdef VUE3
// TODO vue3
unmounted() {
this.setH5Visible()
},
// #endif
created() {
// this.mkclick = this.isMaskClick || this.maskClick
if (this.isMaskClick === null && this.maskClick === null) {
this.mkclick = true
} else {
this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
}
if (this.animation) {
this.duration = 300
} else {
this.duration = 0
}
// TODO message
this.messageChild = null
// TODO
this.clearPropagation = false
this.maskClass.backgroundColor = this.maskBackgroundColor
},
methods: {
setH5Visible() {
// #ifdef H5
// fix by mehaotian h5 穿
document.getElementsByTagName('body')[0].style.overflow = 'visible'
// #endif
},
/**
* 公用方法不显示遮罩层
*/
closeMask() {
this.maskShow = false
},
/**
* 公用方法遮罩层禁止点击
*/
disableMask() {
this.mkclick = false
},
// TODO nvue
clear(e) {
// #ifndef APP-NVUE
e.stopPropagation()
// #endif
this.clearPropagation = true
},
open(direction) {
// fix by mehaotian
if (this.showPopup) {
clearTimeout(this.timer)
this.showPopup = false
}
let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
if (!(direction && innerType.indexOf(direction) !== -1)) {
direction = this.type
}
if (!this.config[direction]) {
console.error('缺少类型:', direction)
return
}
this[this.config[direction]]()
this.$emit('change', {
show: true,
type: direction
})
},
close(type) {
this.showTrans = false
this.$emit('change', {
show: false,
type: this.type
})
clearTimeout(this.timer)
// //
// this.customOpen && this.customClose()
this.timer = setTimeout(() => {
this.showPopup = false
}, 300)
},
// TODO
touchstart() {
this.clearPropagation = false
},
onTap() {
if (this.clearPropagation) {
// fix by mehaotian nvue
this.clearPropagation = false
return
}
this.$emit('maskClick')
if (!this.mkclick) return
this.close()
},
/**
* 顶部弹出样式处理
*/
top(type) {
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
this.$nextTick(() => {
if (this.messageChild && this.type === 'message') {
this.messageChild.timerClose()
}
})
},
/**
* 底部弹出样式处理
*/
bottom(type) {
this.popupstyle = 'bottom'
this.ani = ['slide-bottom']
this.transClass = {
position: 'fixed',
left: 0,
right: 0,
bottom: 0,
paddingBottom: this.safeAreaInsets + 'px',
backgroundColor: this.bg
}
// TODO type
if (type) return
this.showPopup = true
this.showTrans = true
},
/**
* 中间弹出样式处理
*/
center(type) {
this.popupstyle = 'center'
this.ani = ['zoom-out', 'fade']
this.transClass = {
position: 'fixed',
/* #ifndef APP-NVUE */
display: 'flex',
flexDirection: 'column',
/* #endif */
bottom: 0,
left: 0,
right: 0,
top: 0,
justifyContent: 'center',
alignItems: 'center'
}
// TODO type
if (type) return
this.showPopup = true
this.showTrans = true
},
left(type) {
this.popupstyle = 'left'
this.ani = ['slide-left']
this.transClass = {
position: 'fixed',
left: 0,
bottom: 0,
top: 0,
backgroundColor: this.bg,
/* #ifndef APP-NVUE */
display: 'flex',
flexDirection: 'column'
/* #endif */
}
// TODO type
if (type) return
this.showPopup = true
this.showTrans = true
},
right(type) {
this.popupstyle = 'right'
this.ani = ['slide-right']
this.transClass = {
position: 'fixed',
bottom: 0,
right: 0,
top: 0,
backgroundColor: this.bg,
/* #ifndef APP-NVUE */
display: 'flex',
flexDirection: 'column'
/* #endif */
}
// TODO type
if (type) return
this.showPopup = true
this.showTrans = true
}
}
}
</script>
<style lang="scss">
.uni-popup {
position: fixed;
/* #ifndef APP-NVUE */
z-index: 99;
/* #endif */
&.top,
&.left,
&.right {
/* #ifdef H5 */
top: var(--window-top);
/* #endif */
/* #ifndef H5 */
top: 0;
/* #endif */
}
.uni-popup__wrapper {
/* #ifndef APP-NVUE */
display: block;
/* #endif */
position: relative;
/* iphonex 等安全区设置,底部安全区适配 */
/* #ifndef APP-NVUE */
// padding-bottom: constant(safe-area-inset-bottom);
// padding-bottom: env(safe-area-inset-bottom);
/* #endif */
&.left,
&.right {
/* #ifdef H5 */
padding-top: var(--window-top);
/* #endif */
/* #ifndef H5 */
padding-top: 0;
/* #endif */
flex: 1;
}
}
}
.fixforpc-z-index {
/* #ifndef APP-NVUE */
z-index: 999;
/* #endif */
}
.fixforpc-top {
top: 0;
}
</style>

@ -0,0 +1,90 @@
{
"id": "uni-popup",
"displayName": "uni-popup 弹出层",
"version": "1.7.9",
"description": " Popup 组件,提供常用的弹层",
"keywords": [
"uni-ui",
"弹出层",
"弹窗",
"popup",
"弹框"
],
"repository": "https://github.com/dcloudio/uni-ui",
"engines": {
"HBuilderX": ""
},
"directories": {
"example": "../../temps/example_temps"
},
"dcloudext": {
"category": [
"前端组件",
"通用组件"
],
"sale": {
"regular": {
"price": "0.00"
},
"sourcecode": {
"price": "0.00"
}
},
"contact": {
"qq": ""
},
"declaration": {
"ads": "无",
"data": "无",
"permissions": "无"
},
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
},
"uni_modules": {
"dependencies": [
"uni-scss",
"uni-transition"
],
"encrypt": [],
"platforms": {
"cloud": {
"tcb": "y",
"aliyun": "y"
},
"client": {
"App": {
"app-vue": "y",
"app-nvue": "y"
},
"H5-mobile": {
"Safari": "y",
"Android Browser": "y",
"微信浏览器(Android)": "y",
"QQ浏览器(Android)": "y"
},
"H5-pc": {
"Chrome": "y",
"IE": "y",
"Edge": "y",
"Firefox": "y",
"Safari": "y"
},
"小程序": {
"微信": "y",
"阿里": "y",
"百度": "y",
"字节跳动": "y",
"QQ": "y"
},
"快应用": {
"华为": "u",
"联盟": "u"
},
"Vue": {
"vue2": "y",
"vue3": "y"
}
}
}
}
}

@ -0,0 +1,17 @@
## Popup 弹出层
> **组件名uni-popup**
> 代码块: `uPopup`
> 关联组件:`uni-transition`
弹出层组件,在应用中弹出一个消息提示窗口、提示框等
### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
#### 如使用过程中有任何问题或者您对uni-ui有一些好的建议欢迎加入 uni-ui 交流群871950839

@ -0,0 +1,20 @@
## 1.3.12021-11-23
- 修复 init 方法初始化问题
## 1.3.02021-11-19
- 优化 组件UI并提供设计资源详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
## 1.2.12021-09-27
- 修复 init 方法不生效的 Bug
## 1.2.02021-07-30
- 组件兼容 vue3如何创建 vue3 项目,详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
## 1.1.12021-05-12
- 新增 示例地址
- 修复 示例项目缺少组件的 Bug
## 1.1.02021-04-22
- 新增 通过方法自定义动画
- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
- 优化 动画触发逻辑,使动画更流畅
- 优化 支持单独的动画类型
- 优化 文档示例
## 1.0.22021-02-05
- 调整为 uni_modules 目录规范

@ -0,0 +1,128 @@
// const defaultOption = {
// duration: 300,
// timingFunction: 'linear',
// delay: 0,
// transformOrigin: '50% 50% 0'
// }
// #ifdef APP-NVUE
const nvueAnimation = uni.requireNativePlugin('animation')
// #endif
class MPAnimation {
constructor(options, _this) {
this.options = options
this.animation = uni.createAnimation(options)
this.currentStepAnimates = {}
this.next = 0
this.$ = _this
}
_nvuePushAnimates(type, args) {
let aniObj = this.currentStepAnimates[this.next]
let styles = {}
if (!aniObj) {
styles = {
styles: {},
config: {}
}
} else {
styles = aniObj
}
if (animateTypes1.includes(type)) {
if (!styles.styles.transform) {
styles.styles.transform = ''
}
let unit = ''
if(type === 'rotate'){
unit = 'deg'
}
styles.styles.transform += `${type}(${args+unit}) `
} else {
styles.styles[type] = `${args}`
}
this.currentStepAnimates[this.next] = styles
}
_animateRun(styles = {}, config = {}) {
let ref = this.$.$refs['ani'].ref
if (!ref) return
return new Promise((resolve, reject) => {
nvueAnimation.transition(ref, {
styles,
...config
}, res => {
resolve()
})
})
}
_nvueNextAnimate(animates, step = 0, fn) {
let obj = animates[step]
if (obj) {
let {
styles,
config
} = obj
this._animateRun(styles, config).then(() => {
step += 1
this._nvueNextAnimate(animates, step, fn)
})
} else {
this.currentStepAnimates = {}
typeof fn === 'function' && fn()
this.isEnd = true
}
}
step(config = {}) {
// #ifndef APP-NVUE
this.animation.step(config)
// #endif
// #ifdef APP-NVUE
this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
this.next++
// #endif
return this
}
run(fn) {
// #ifndef APP-NVUE
this.$.animationData = this.animation.export()
this.$.timer = setTimeout(() => {
typeof fn === 'function' && fn()
}, this.$.durationTime)
// #endif
// #ifdef APP-NVUE
this.isEnd = false
let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref
if(!ref) return
this._nvueNextAnimate(this.currentStepAnimates, 0, fn)
this.next = 0
// #endif
}
}
const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
'translateZ'
]
const animateTypes2 = ['opacity', 'backgroundColor']
const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']
animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
MPAnimation.prototype[type] = function(...args) {
// #ifndef APP-NVUE
this.animation[type](...args)
// #endif
// #ifdef APP-NVUE
this._nvuePushAnimates(type, args)
// #endif
return this
}
})
export function createAnimation(option, _this) {
if(!_this) return
clearTimeout(_this.timer)
return new MPAnimation(option, _this)
}

@ -0,0 +1,277 @@
<template>
<view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
</template>
<script>
import { createAnimation } from './createAnimation'
/**
* Transition 过渡动画
* @description 简单过渡动画组件
* @tutorial https://ext.dcloud.net.cn/plugin?id=985
* @property {Boolean} show = [false|true] 控制组件显示或隐藏
* @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
* @value fade 渐隐渐出过渡
* @value slide-top 由上至下过渡
* @value slide-right 由右至左过渡
* @value slide-bottom 由下至上过渡
* @value slide-left 由左至右过渡
* @value zoom-in 由小到大过渡
* @value zoom-out 由大到小过渡
* @property {Number} duration 过渡动画持续时间
* @property {Object} styles 组件样式 css 样式注意带-连接符的属性需要使用小驼峰写法如`backgroundColor:red`
*/
export default {
name: 'uniTransition',
emits:['click','change'],
props: {
show: {
type: Boolean,
default: false
},
modeClass: {
type: [Array, String],
default() {
return 'fade'
}
},
duration: {
type: Number,
default: 300
},
styles: {
type: Object,
default() {
return {}
}
},
customClass:{
type: String,
default: ''
}
},
data() {
return {
isShow: false,
transform: '',
opacity: 1,
animationData: {},
durationTime: 300,
config: {}
}
},
watch: {
show: {
handler(newVal) {
if (newVal) {
this.open()
} else {
// close,
if (this.isShow) {
this.close()
}
}
},
immediate: true
}
},
computed: {
//
stylesObject() {
let styles = {
...this.styles,
'transition-duration': this.duration / 1000 + 's'
}
let transform = ''
for (let i in styles) {
let line = this.toLine(i)
transform += line + ':' + styles[i] + ';'
}
return transform
},
//
transformStyles() {
return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
}
},
created() {
//
this.config = {
duration: this.duration,
timingFunction: 'ease',
transformOrigin: '50% 50%',
delay: 0
}
this.durationTime = this.duration
},
methods: {
/**
* ref 触发 初始化动画
*/
init(obj = {}) {
if (obj.duration) {
this.durationTime = obj.duration
}
this.animation = createAnimation(Object.assign(this.config, obj),this)
},
/**
* 点击组件触发回调
*/
onClick() {
this.$emit('click', {
detail: this.isShow
})
},
/**
* ref 触发 动画分组
* @param {Object} obj
*/
step(obj, config = {}) {
if (!this.animation) return
for (let i in obj) {
try {
if(typeof obj[i] === 'object'){
this.animation[i](...obj[i])
}else{
this.animation[i](obj[i])
}
} catch (e) {
console.error(`方法 ${i} 不存在`)
}
}
this.animation.step(config)
return this
},
/**
* ref 触发 执行动画
*/
run(fn) {
if (!this.animation) return
this.animation.run(fn)
},
//
open() {
clearTimeout(this.timer)
this.transform = ''
this.isShow = true
let { opacity, transform } = this.styleInit(false)
if (typeof opacity !== 'undefined') {
this.opacity = opacity
}
this.transform = transform
// nextTick wx
this.$nextTick(() => {
// TODO
this.timer = setTimeout(() => {
this.animation = createAnimation(this.config, this)
this.tranfromInit(false).step()
this.animation.run()
this.$emit('change', {
detail: this.isShow
})
}, 20)
})
},
//
close(type) {
if (!this.animation) return
this.tranfromInit(true)
.step()
.run(() => {
this.isShow = false
this.animationData = null
this.animation = null
let { opacity, transform } = this.styleInit(false)
this.opacity = opacity || 1
this.transform = transform
this.$emit('change', {
detail: this.isShow
})
})
},
//
styleInit(type) {
let styles = {
transform: ''
}
let buildStyle = (type, mode) => {
if (mode === 'fade') {
styles.opacity = this.animationType(type)[mode]
} else {
styles.transform += this.animationType(type)[mode] + ' '
}
}
if (typeof this.modeClass === 'string') {
buildStyle(type, this.modeClass)
} else {
this.modeClass.forEach(mode => {
buildStyle(type, mode)
})
}
return styles
},
//
tranfromInit(type) {
let buildTranfrom = (type, mode) => {
let aniNum = null
if (mode === 'fade') {
aniNum = type ? 0 : 1
} else {
aniNum = type ? '-100%' : '0'
if (mode === 'zoom-in') {
aniNum = type ? 0.8 : 1
}
if (mode === 'zoom-out') {
aniNum = type ? 1.2 : 1
}
if (mode === 'slide-right') {
aniNum = type ? '100%' : '0'
}
if (mode === 'slide-bottom') {
aniNum = type ? '100%' : '0'
}
}
this.animation[this.animationMode()[mode]](aniNum)
}
if (typeof this.modeClass === 'string') {
buildTranfrom(type, this.modeClass)
} else {
this.modeClass.forEach(mode => {
buildTranfrom(type, mode)
})
}
return this.animation
},
animationType(type) {
return {
fade: type ? 1 : 0,
'slide-top': `translateY(${type ? '0' : '-100%'})`,
'slide-right': `translateX(${type ? '0' : '100%'})`,
'slide-bottom': `translateY(${type ? '0' : '100%'})`,
'slide-left': `translateX(${type ? '0' : '-100%'})`,
'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
}
},
//
animationMode() {
return {
fade: 'opacity',
'slide-top': 'translateY',
'slide-right': 'translateX',
'slide-bottom': 'translateY',
'slide-left': 'translateX',
'zoom-in': 'scale',
'zoom-out': 'scale'
}
},
// 线
toLine(name) {
return name.replace(/([A-Z])/g, '-$1').toLowerCase()
}
}
}
</script>
<style></style>

@ -0,0 +1,87 @@
{
"id": "uni-transition",
"displayName": "uni-transition 过渡动画",
"version": "1.3.1",
"description": "元素的简单过渡动画",
"keywords": [
"uni-ui",
"uniui",
"动画",
"过渡",
"过渡动画"
],
"repository": "https://github.com/dcloudio/uni-ui",
"engines": {
"HBuilderX": ""
},
"directories": {
"example": "../../temps/example_temps"
},
"dcloudext": {
"category": [
"前端组件",
"通用组件"
],
"sale": {
"regular": {
"price": "0.00"
},
"sourcecode": {
"price": "0.00"
}
},
"contact": {
"qq": ""
},
"declaration": {
"ads": "无",
"data": "无",
"permissions": "无"
},
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
},
"uni_modules": {
"dependencies": ["uni-scss"],
"encrypt": [],
"platforms": {
"cloud": {
"tcb": "y",
"aliyun": "y"
},
"client": {
"App": {
"app-vue": "y",
"app-nvue": "y"
},
"H5-mobile": {
"Safari": "y",
"Android Browser": "y",
"微信浏览器(Android)": "y",
"QQ浏览器(Android)": "y"
},
"H5-pc": {
"Chrome": "y",
"IE": "y",
"Edge": "y",
"Firefox": "y",
"Safari": "y"
},
"小程序": {
"微信": "y",
"阿里": "y",
"百度": "y",
"字节跳动": "y",
"QQ": "y"
},
"快应用": {
"华为": "u",
"联盟": "u"
},
"Vue": {
"vue2": "y",
"vue3": "y"
}
}
}
}
}

@ -0,0 +1,11 @@
## Transition 过渡动画
> **组件名uni-transition**
> 代码块: `uTransition`
元素过渡动画
### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition)
#### 如使用过程中有任何问题或者您对uni-ui有一些好的建议欢迎加入 uni-ui 交流群871950839
Loading…
Cancel
Save