liang
/
samehome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

解决划动穿透问题,修改markets页面

master
[liang] 3 years ago
parent
f73e4cf650
commit
c3f94d1085
10 changed files with 169 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      components/tabBar/tabBar.vue
  2. 2
      pages/charity/details.vue
  3. 2
      pages/home/index.vue
  4. 1
      pages/markets/index.vue
  5. 146
      pages/markets/trade.vue
  6. 4
      pages/me/transfer.vue
  7. 2
      pages/recharge/recharge.vue
  8. 2
      pages/withdrawal/addAddress.vue
  9. 2
      pages/withdrawal/withdrawal.vue
  10. BIN
      static/maskets/menu.png

23
components/tabBar/tabBar.vue
View File

@ -37,7 +37,8 @@
<view class="tabbar_item" @click="goToPage(4)">
<view class="uni-tabbar_bd">
<view class="uni-tabbar_icon">
<image :src="`/static/tabBar/${selectActive == 4 ? 'ic_subscription_pr' : 'ic_subscription_de'}.png`"
<image
:src="`/static/tabBar/${selectActive == 4 ? 'ic_subscription_pr' : 'ic_subscription_de'}.png`"
mode="aspectFit" class="img1"></image>
</view>
<view class="uni-tabbar_label" :class="['text', selectActive == 4 ? 'active' : '']">
@ -64,9 +65,6 @@
const COMPONENT_NAME = 'tabBar'
export default {
name: COMPONENT_NAME,
props: {
selectActive: {
type: Number,
@ -74,6 +72,12 @@ export default {
return 1
}
},
isTarde: {
type: Boolean,
default() {
return false
}
},
},
data() {
return {
@ -87,7 +91,6 @@ export default {
mounted() {
},
methods: {
goToPage(num) {
let url = '/pages/home/index';
switch (+num) {
@ -110,6 +113,16 @@ export default {
default:
break;
}
if (this.isTarde) { // 如果是在交易页面,则返回上一级即可
// #ifdef H5
history.back()
// #endif
// #ifdef APP-PLUS
uni.navigateBack()
// #endif
return;
}
uni.reLaunch({
url,
})

2
pages/charity/details.vue
View File

@ -95,7 +95,7 @@
<view class="content">
<view class="close" @click="USDTPopupShow = false"></view>
<scroll-view scroll-y="true" style="height: 580rpx;" scroll-with-animation="true"
@touchmove.stop>
@touchmove.stop.prevent="">
<radio-group class="radioGroup" @change="radioChange" v-model="radioValue">
<label class="checkBox" v-for="(item, index) in 40" :key="index">
<view class="icon">

2
pages/home/index.vue
View File

@ -75,7 +75,7 @@ Blame
margin: 'auto 102rpx auto 118rpx',
}">
<view class="content">
<scroll-view scroll-y="true" style="height: 288rpx;" scroll-with-animation="true" @touchmove.stop>
<scroll-view scroll-y="true" style="height: 288rpx;" scroll-with-animation="true" @touchmove.stop.prevent="">
{{ i18n.homeMessage }}
</scroll-view>
<u-button class="button" color="#00E8A2" @click="popupShow = false">OK</u-button>

1
pages/markets/index.vue
View File

@ -118,7 +118,6 @@ export default {
line-height: 64rpx;
font-size: 28rpx;
color: #A1A0A8;
text-align: center;
}
.priceChange {

146
pages/markets/trade.vue
View File

@ -1,7 +1,9 @@
<template>
<view class="main">
<!-- nav -->
<navigation>{{ 'BTC/USDT' }}<view slot="right" class="right" @click="goto('kLine')"></view>
<navigation :showBack="false">
<view class="leftMenuBtn" @click="popupShow = true">{{ 'BTC/USDT' }}</view>
<view slot="right" class="right" @click="goto('kLine')"></view>
</navigation>
<view class="content">
<view class="transactionSide">
@ -11,9 +13,34 @@
<positionList v-on:depthChange="depthChange"></positionList>
</view>
</view>
<view class="gap">
<view class="orderList">
<entrustOrderList></entrustOrderList>
</view>
<u-popup class="popup" :show="popupShow" mode="left" @close="popupShow = false" @open="popupShow = true"
bgColor="#15141F">
<view class="popupContent">
<!-- nav -->
<view class="head">
<text class="item">{{ i18n.TrandingPair }}</text>
<text class="center">{{ i18n.LatestPrice }}</text>
<text class="item">{{ i18n.RiseAndfall }}</text>
</view>
<!-- 列表 -->
<view class="coinList">
<scroll-view scroll-y="true" style="height: 86vh;" scroll-with-animation="true" @touchmove.stop.prevent="">
<view class="coin" v-for="(item, index) in 20" :key="index" @click="goto(item)">
<view class="name">BTC/USDT</view>
<view class="price">{{ 5145 * index * index * index }}</view>
<view class="priceChange" :class="{ 'down': index % 2 === 0 }">500.30%</view>
</view>
</scroll-view>
</view>
</view>
</u-popup>
<!-- tabBar -->
<tab-bar :selectActive="2" :isTarde="true"></tab-bar>
</view>
</template>
@ -22,7 +49,7 @@ export default {
name: "trade",
data() {
return {
popupShow: false,
};
},
computed: {
@ -31,7 +58,6 @@ export default {
},
},
onLoad() {
},
onShow() { },
methods: {
@ -58,6 +84,21 @@ export default {
<style lang="scss" scoped>
.main {
padding-bottom: 198rpx; // 避免底部TabBar盖住内容
.leftMenuBtn {
width: 48rpx;
height: 48rpx;
position: absolute;
left: 32rpx;
font-size: 24rpx;
background-image: url(../../static/maskets/menu.png);
background-repeat: no-repeat;
background-size: 48rpx;
padding-left: 54rpx;
font-size: 34rpx;
font-weight: normal;
}
.right {
width: 48rpx;
@ -93,6 +134,103 @@ export default {
}
.orderList {}
.popup {
.popupContent {
width: 586rpx;
font-size: 24rpx;
.head {
margin-top: 108rpx;
color: #818197;
margin-left: 16rpx;
display: flex;
.center {
width: 190rpx;
padding-left: 30rpx;
font-size: 24rpx;
}
.item {
font-size: 24rpx;
}
}
.coinList {
margin: 0rpx 32rpx 0;
overflow: hidden;
.coin {
overflow: hidden;
position: relative;
height: 64rpx;
padding: 12rpx 0;
font-size: 24rpx;
.name {
display: inline-block;
width: 180rpx;
height: 100%;
line-height: 64rpx;
font-size: 24rpx;
}
.price {
display: inline-block;
width: 180rpx;
height: 100%;
line-height: 64rpx;
font-size: 24rpx;
// text-align: center;
}
.priceChange {
position: absolute;
right: 0;
display: inline-block;
width: 164rpx;
height: 64rpx;
border-radius: 20rpx;
line-height: 64rpx;
background-color: $mainColor;
font-size: 24rpx;
text-align: right;
padding-right: 16rpx;
box-sizing: border-box;
&::before {
display: block;
position: absolute;
content: '';
background-image: url(../../static/maskets/ic_arrow_up.png);
background-repeat: no-repeat;
background-size: contain;
width: 28rpx;
height: 28rpx;
top: 18rpx;
left: 16rpx;
}
&.down {
background-color: $assistRed;
&::before {
background-image: url(../../static/maskets/ic_arrow_down.png);
}
}
}
}
}
}
}

4
pages/me/transfer.vue
View File

@ -51,7 +51,7 @@
@open="USDTPopupShow = true" bgColor="#211F32">
<view class="content">
<view class="close" @click="USDTPopupShow = false"></view>
<scroll-view scroll-y="true" style="height: 432rpx;" scroll-with-animation="true" @touchmove.stop>
<scroll-view scroll-y="true" style="height: 432rpx;" scroll-with-animation="true" @touchmove.stop.prevent="">
<radio-group class="radioGroup" @change="USDTRadioChange" v-model="USDTRadioValue">
<label class="checkBox" v-for="(item, index) in 10" :key="index">
<view class="icon">
@ -78,7 +78,7 @@
@close="accountPopupShow = false" @open="accountPopupShow = true" bgColor="#211F32">
<view class="content">
<view class="close" @click="accountPopupShow = false"></view>
<scroll-view scroll-y="true" style="height: 200rpx;" scroll-with-animation="true" @touchmove.stop>
<scroll-view scroll-y="true" style="height: 200rpx;" scroll-with-animation="true" @touchmove.stop.prevent="">
<radio-group class="radioGroup" @change="accountRadioChange" v-model="accountRadioValue">
<label class="checkBox" v-for="(item, index) in 3" :key="index">
<view class="name">Option account</view>

2
pages/recharge/recharge.vue
View File

@ -46,7 +46,7 @@
@open="USDTPopupShow = true" bgColor="#211F32">
<view class="content">
<view class="close" @click="USDTPopupShow = false"></view>
<scroll-view scroll-y="true" style="height: 432rpx;" scroll-with-animation="true" @touchmove.stop>
<scroll-view scroll-y="true" style="height: 432rpx;" scroll-with-animation="true" @touchmove.stop.prevent="">
<radio-group class="radioGroup" @change="USDTRadioChange" v-model="USDTRadioValue">
<label class="checkBox" v-for="(item, index) in 10" :key="index">
<view class="icon">

2
pages/withdrawal/addAddress.vue
View File

@ -35,7 +35,7 @@
@open="USDTPopupShow = true" bgColor="#211F32">
<view class="content">
<view class="close" @click="USDTPopupShow = false"></view>
<scroll-view scroll-y="true" style="height: 432rpx;" scroll-with-animation="true" @touchmove.stop>
<scroll-view scroll-y="true" style="height: 432rpx;" scroll-with-animation="true" @touchmove.stop.prevent="">
<radio-group class="radioGroup" @change="USDTRadioChange" v-model="USDTRadioValue">
<label class="checkBox" v-for="(item, index) in 10" :key="index">
<view class="icon">

2
pages/withdrawal/withdrawal.vue
View File

@ -70,7 +70,7 @@
@open="USDTPopupShow = true" bgColor="#211F32">
<view class="content">
<view class="close" @click="USDTPopupShow = false"></view>
<scroll-view scroll-y="true" style="height: 432rpx;" scroll-with-animation="true" @touchmove.stop>
<scroll-view scroll-y="true" style="height: 432rpx;" scroll-with-animation="true" @touchmove.stop.prevent="">
<radio-group class="radioGroup" @change="USDTRadioChange" v-model="USDTRadioValue">
<label class="checkBox" v-for="(item, index) in 10" :key="index">
<view class="icon">

BIN
static/maskets/menu.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 209 B

Write Preview
Loading…
Cancel
Save