diff --git a/common/style/layout.css b/common/style/layout.css index 6801471..b14bd63 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -250,6 +250,113 @@ uni-button:after { background-color: #fef6e4; } +/** 站点 **/ +.state-wrap { + width: 100%; + height: 60rpx; + margin-bottom: 10rpx; + display: flex; + justify-content: flex-start; + align-items: center; +} +.state-item-wrap { + height: 60rpx; + margin-right: 20rpx; + display: flex; + justify-content: space-between; + align-items: center; +} +.state-color { + width: 30rpx; + height: 30rpx; + border-radius: 50%; + margin-right: 10rpx; +} +.state-name { + font-size: 28rpx; + line-height: 60rpx; + color: #333; + font-weight: normal; + text-align: left; +} +.locate_name { + border-bottom: 1px solid #e9b451; + margin-bottom: 10px; + position: relative; +} +.title_locate { + width: 50%; + font-size: 30rpx; + line-height: 80rpx; + color: #333; + font-weight: bold; + text-align: left; + font-style: italic; +} +.is_reverse { + -webkit-transform: rotateZ(90deg); + transform: rotateZ(90deg); +} +.open_icon { + position: absolute; + right: 0; + top: 0; + width: 48rpx; + height: 80rpx; + font-size: 40rpx; + line-height: 80rpx; + color: #ff6a00; + font-weight: normal; + text-align: right; + transition: all 0.3s; + -webkit-transform: rotateZ(-90deg); + transform: rotateZ(-90deg); +} +.open_icon::before { + content: "\e6db"; +} +.site_block { + width: 100%; + height: auto; + overflow: hidden; + transition: height 0.3s; + display: flex; + justify-content: flex-start; + align-items: center; + flex-direction: row; + flex-wrap: wrap; + padding-bottom: 10rpx; +} +.site_item { + width: calc(100% / 3); + height: 110rpx; + padding: 5rpx 5rpx; + overflow: hidden; + display: flex; + justify-content: center; + align-items: center; +} +.site_item_box { + width: 100%; + height: 100%; + padding: 10rpx; + background-color: #dcdfe6; + border-radius: 10rpx; +} +.title_1 { + width: 100%; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + overflow: hidden; + font-size: 28rpx; + line-height: 28rpx; + color: #303133; + font-weight: 500; + text-align: center; +} + /** 提交栏 **/ .filter_bar { position: fixed; diff --git a/pages/login/login.vue b/pages/login/login.vue index b7b69d6..7afda02 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -8,6 +8,9 @@ + + 升级版本 + v{{version}} @@ -41,6 +44,9 @@ //#endif }, methods: { + isUpdate () { + this._pdaUpdate() + }, toLogin() { if (this.addrip === '') { uni.showToast({ @@ -55,16 +61,14 @@ }) }, async _pdaUpdate () { - let res = await pdaUpdate() - if (res.versionName === this.version) { - uni.showToast({ - title: '当前为最新版本', - icon: 'none' - }) - } else { + try { + let res = await pdaUpdate() this.grade = true this.androidUrl = res.url + } catch (e) { + console.log(e) } + }, closeUpdate () { this.grade = false @@ -84,7 +88,6 @@ margin-bottom 10vh .input-wrap width 100% - margin-bottom 10vh .input-label _font(30rpx,70rpx,#333) margin-bottom 2vh @@ -110,4 +113,6 @@ position: absolute bottom: 30rpx _font(30rpx, 60rpx, #999,,center) +.setup-text + _font(28rpx, 28rpx,$red,,right) diff --git a/pages/modules/callmanage.vue b/pages/modules/callmanage.vue index 18e9dd4..de4aafb 100644 --- a/pages/modules/callmanage.vue +++ b/pages/modules/callmanage.vue @@ -153,61 +153,10 @@ padding 0 7rpx .zd_content padding-bottom 196rpx -.open_icon - position absolute - right 0 - top 0 - _wh(48rpx,48rpx) - _font(40rpx,48rpx,$red,,right) - transition all .3s - transform rotateZ(-90deg) - &:before - content: "\e6db"; -.is_reverse - transform rotateZ(90deg) -.site_block - _wh(100%,auto) - overflow hidden - transition height .3s - _fj(flex-start,,,wrap) - padding-bottom 10rpx -.site_item - _wh(calc(100% / 3),110rpx) - padding 5rpx 5rpx - overflow hidden - _fj(center) -.site_item_box - _wh(100%, 100%) - padding 10rpx - background-color rgb(220, 223, 230) - border-radius 10rpx -.title_locate - width 50% - _font(30rpx,40rpx,#333,bold) - font-style italic -.title_1 - _wh(100%, 100%) - _fj(center) - overflow hidden - _font(28rpx,28rpx,#303133,500, center) .p1 _font(30rpx,80rpx,#855d15,700,center) .p2 _font(30rpx,55rpx,#fff,,center) background: linear-gradient(46deg, #ef8900, #eb6600); border-radius: 24rpx; -.state-wrap - _wh(100%, 60rpx) - margin-bottom 10rpx - _fj(flex-start) -.state-item-wrap - height 60rpx - margin-right 20rpx - _fj() -.state-color - _wh(30rpx, 30rpx) - border-radius 50% - margin-right 10rpx -.state-name - _font(28rpx, 60rpx, #333) diff --git a/pages/modules/pointmanage.vue b/pages/modules/pointmanage.vue index 28a6182..fab45ef 100644 --- a/pages/modules/pointmanage.vue +++ b/pages/modules/pointmanage.vue @@ -162,62 +162,6 @@ padding 0 7rpx .zd_content padding-bottom 15rpx -.locate_block - width 100% -.locate_name - position relative - _wh(100%,48rpx) -.open_icon - position absolute - right 0 - top 0 - _wh(48rpx,48rpx) - _font(40rpx,48rpx,$red,,right) - transition all .3s - transform rotateZ(-90deg) - &:before - content: "\e6db"; -.is_reverse - transform rotateZ(90deg) -.site_block - _wh(100%,auto) - overflow hidden - transition height .3s - _fj(flex-start,,,wrap) - padding-bottom 10rpx -.site_item - _wh(calc(100% / 3),110rpx) - padding 5rpx 10rpx - overflow hidden - _fj(center) -.site_item_box - _wh(100%, 100%) - padding 10rpx - background-color rgb(220, 223, 230) - border-radius 10rpx -.title_locate - width 50% - _font(30rpx,40rpx,#333,bold) - font-style italic -.title_1 - _wh(100%, 100%) - _fj(center) - overflow hidden - _font(28rpx,28rpx,#303133,500, center) -.state-wrap - _wh(100%, 60rpx) - margin-bottom 10rpx - _fj(flex-start) -.state-item-wrap - height 60rpx - margin-right 20rpx - _fj() -.state-color - _wh(30rpx, 30rpx) - border-radius 50% - margin-right 10rpx -.state-name - _font(28rpx, 60rpx, #333) .msg_wrapper position fixed top 0