3
0
Fork 0

Compare commits

..

No commits in common. "75388af82028facfe1d4802ae4b5ce3063cf5795" and "11938b224ccb3a998501c46b978aa29813262261" have entirely different histories.

3 changed files with 25 additions and 31 deletions

View File

@ -9,7 +9,7 @@
<view class="banner" v-if="isEmpty(banners) == false"> <view class="banner" v-if="isEmpty(banners) == false">
<view class="uni-margin-wrap"> <view class="uni-margin-wrap">
<swiper <swiper
class="swiper swiper-s" class="swiper"
circular circular
:indicator-dots="indicatorDots" :indicator-dots="indicatorDots"
:autoplay="autoplay" :autoplay="autoplay"
@ -17,7 +17,6 @@
:duration="duration" :duration="duration"
> >
<swiper-item <swiper-item
class="index-swiper-item"
v-for="(item, index) in banners" v-for="(item, index) in banners"
:key="index" :key="index"
@click="bannerTap(item.link)" @click="bannerTap(item.link)"
@ -318,12 +317,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.uni-margin-wrap {
:v-deep .uni-swiper-wrapper {
border-radius: 10px !important;
}
}
.content { .content {
// background: url('~@/static/images/fBgd.jpg') no-repeat; // background: url('~@/static/images/fBgd.jpg') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
@ -446,12 +439,8 @@ header {
} }
} }
.swiper {
border-radius: 10px;
}
.swiper-s { .swiper-s {
// height: 495rpx; height: 495rpx;
border-radius: 10px;
} }
.goods-lists { .goods-lists {
@ -544,10 +533,6 @@ header {
margin-left: 15rpx; margin-left: 15rpx;
} }
} }
.swiper {
border-radius: 10rpx;
overflow: hidden;
}
:v-deep .swiper-s .swiper-items uni-image { :v-deep .swiper-s .swiper-items uni-image {
height: 495rpx; height: 495rpx;
@ -556,9 +541,8 @@ header {
.swiper-items { .swiper-items {
// height: 495rpx; // height: 495rpx;
// width: 340rpx; // width: 340rpx;
border-radius: 30rpx;
image { image {
border-radius: 10rpx;
height: 450rpx; height: 450rpx;
width: 340rpx; width: 340rpx;
} }
@ -573,17 +557,16 @@ header {
font-size: 0; font-size: 0;
image { image {
height: 300rpx; height: 300rpx;
border-radius: 10rpx;
font-size: 0; font-size: 0;
width: 100%; width: 100%;
} }
} }
.banner { .banner {
padding: 10rpx 20rpx 0; // padding: 30rpx 0 0 0;
text-align: center; text-align: center;
// width: 100%; width: 100%;
// margin-bottom: 10rpx; margin-bottom: 20rpx;
} }
.changeLanguages { .changeLanguages {

View File

@ -136,10 +136,10 @@
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
<!-- 提现引导弹窗 --> <!-- 提现引导弹窗 -->
<!-- <WithdrawalGuide <WithdrawalGuide
:show="showWithdrawalGuide" :show="showWithdrawalGuide"
@confirm="onWithdrawalGuideConfirm" @confirm="onWithdrawalGuideConfirm"
/> --> />
</view> </view>
</template> </template>
@ -255,11 +255,10 @@ export default {
message: res.msg, message: res.msg,
type: 'success', type: 'success',
}) })
uni.navigateBack()
// //
// setTimeout(() => { setTimeout(() => {
// this.showWithdrawalGuide = true this.showWithdrawalGuide = true
// }, 300) }, 300)
} }
}) })
}) })

View File

@ -21,7 +21,10 @@
/> />
<!-- 微信环境全屏图片显示 --> <!-- 微信环境全屏图片显示 -->
<view class="wechat-fullscreen-overlay" v-show="generatedImageUrl"> <view
class="wechat-fullscreen-overlay"
v-show="(isWechat || userInfo.sharePosterImage) && generatedImageUrl"
>
<img class="fullscreen-image" :src="generatedImageUrl" @click.stop="" /> <img class="fullscreen-image" :src="generatedImageUrl" @click.stop="" />
</view> </view>
</view> </view>
@ -136,7 +139,16 @@ export default {
}) })
uni.hideLoading() uni.hideLoading()
if (this.isWechat) {
//
this.generatedImageUrl = dataUrl this.generatedImageUrl = dataUrl
} else {
//
if (this.isSpecialScene) {
//
this.generatedImageUrl = dataUrl
}
}
}, },
// //