Skip to content

S
shop_mobile_uni
Commit daac47f7 authored by 王建威's avatar 王建威
Browse files
Options

bug fix

parent aa2b3e27
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 17 deletions
components/BottomBar/BottomBar.vue
View file @ daac47f7
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
background: #fff; background: #fff;
z-index: 100; z-index: 100;
height: 88rpx; height: 88rpx;
padding-bottom: env(safe-area-inset-bottom);
view { view {
width: 25%; width: 25%;
text-align: center; text-align: center;
......
components/uni-popup/uni-popup.vue
View file @ daac47f7
<template> <template>
<view v-if="showPopup" class="uni-popup" @touchmove.stop.prevent="clear"> <view v-if="showPopup">
<view v-if="!scroll" class="uni-popup" @touchmove.stop.prevent="clear">
<uni-transition :mode-class="['fade']" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" /> <uni-transition :mode-class="['fade']" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
<uni-transition :mode-class="ani" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap"> <uni-transition :mode-class="ani" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
<view class="uni-popup__wrapper-box" @click.stop="clear"> <view class="uni-popup__wrapper-box" @click.stop="clear">
...@@ -7,6 +8,15 @@ ...@@ -7,6 +8,15 @@
</view> </view>
</uni-transition> </uni-transition>
</view> </view>
<view v-else class="uni-popup">
<uni-transition :mode-class="['fade']" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
<uni-transition :mode-class="ani" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
<view class="uni-popup__wrapper-box" @click.stop="clear">
<slot />
</view>
</uni-transition>
</view>
</view>
</template> </template>
<script> <script>
...@@ -45,6 +55,10 @@ ...@@ -45,6 +55,10 @@
maskClick: { maskClick: {
type: Boolean, type: Boolean,
default: true default: true
},
scroll: {
type: Boolean,
default: false
} }
}, },
data() { data() {
......
index.html
View file @ daac47f7
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
<meta name="description" content="宠物行业一站式B2B采购平台"> <meta name="description" content="宠物行业一站式B2B采购平台">
<meta name="keywords" content="谛宝多多 谛宝多多商城 谛宝 宝多多 有宝 小谛"> <meta name="keywords" content="谛宝多多 谛宝多多商城 谛宝 宝多多 有宝 小谛">
<link rel="shortcut icon" href="https://dbc-static.oss-cn-beijing.aliyuncs.com/wx/logo.jpg" type="image/x-icon"> <link rel="shortcut icon" href="https://dbc-static.oss-cn-beijing.aliyuncs.com/wx/logo.jpg" type="image/x-icon">
......
manifest.json
View file @ daac47f7
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
"mode": "history", "mode": "history",
"base": "/uni" "base": "/uni"
}, },
"publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/prod/1.0.29/", "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/test/1.0.29/",
"optimization": { "optimization": {
"treeShaking": { "treeShaking": {
"enable": true "enable": true
......
pages/theRights/theRights.vue
View file @ daac47f7
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<view class="open_btn" v-if="status === -1 && Number(is_auth) === -1" @click="reupload">立即开通</view> <view class="open_btn" v-if="status === -1 && Number(is_auth) === -1" @click="reupload">立即开通</view>
<view class="open_btn" v-else @click="go_open">立即开通</view> <view class="open_btn" v-else @click="go_open">立即开通</view>
</view> </view>
<uni-popup ref="popup"> <uni-popup ref="popup" :scroll="true">
<protocal /> <protocal />
</uni-popup> </uni-popup>
</view> </view>
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
justify-content: center; justify-content: center;
margin-top: 52rpx; margin-top: 52rpx;
.advantage_item { .advantage_item {
width: 160rpx; width: 170rpx;
margin-bottom: 24rpx; margin-bottom: 24rpx;
.icon { .icon {
width: 92rpx; width: 92rpx;
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
} }
} }
.advantage_item:nth-of-type(3n-1) { .advantage_item:nth-of-type(3n-1) {
margin: 0 52rpx; margin: 0 42rpx;
} }
} }
.advantage_btn { .advantage_btn {
......
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 to comment