Skip to content

U
uni-pdtravel
Commit 28644991 authored by renjie's avatar renjie
Browse files
Options

修改卡片提示与使用规则

parent 605bb145
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 34 deletions
pages/album/albumIndex.vue
View file @ 28644991
...@@ -69,26 +69,41 @@ ...@@ -69,26 +69,41 @@
<image class="coupon" src="@/static/img/my/coupon.png" mode="aspectFit" @click="showUseRule = true"></image> <image class="coupon" src="@/static/img/my/coupon.png" mode="aspectFit" @click="showUseRule = true"></image>
<!-- <u-mask :show="showtip || showUseRule"> <u-mask :show="showtip || showUseRule">
<view class="mask"> <view class="mask">
<view class="img-box"> <view class="img-box">
<image src="./static/album/postcardTip.png" mode="aspectFit" v-if="showtip"></image> <image class="bg" src="@/static/img/my/backgroundIcon01.png" mode="aspectFit"></image>
<image src="@/static/img/my/backgroundIcon01.png" mode="aspectFit"></image> <view class="post-card" v-if="showtip">
<view class="congra">恭喜您！</view>
<view class="get-price-tip">
获得摄影抵用券
<text class="price">20</text>
元
</view>
<image class="my-card" src="./static/album/myCard.png" mode="aspectFit"></image>
<view class="use-rule" @click="useRuleClick">
使用规则
<u-icon name="arrow-right"></u-icon>
</view>
<view class="address">（使用地址：长江索道南站观景台旁）</view>
</view>
<view class="rules" v-if="showUseRule"> <view class="rules" v-if="showUseRule">
<view class="title">使用规则</view> <view class="title">使用规则</view>
<view class="block" v-for="item in rules" :key="item.ruleName"> <view class="block" v-for="item in rules" :key="item.ruleName">
<view class="name">{{item.ruleName}}</view> <text class="name">{{item.ruleName}}</text>
<view class="content"> <view class="content">
<view class="small-font" v-for="rule in item.contents" :key="rule.value">{{rule.value}}</view> <view class="small-font" v-for="rule in item.contents" :key="rule.value">
<text class="dot">·</text>
{{rule.value}}
</view>
</view> </view>
</view> </view>
</view> </view>
<u-icon class="close" name="close-circle" @click="closeMask"></u-icon> <u-icon class="close" name="close-circle" @click="closeMask"></u-icon>
<view class="use-rule" @click="useRuleClick" v-if="showtip"></view>
</view> </view>
<u-button type="primary" shape="circle" @click="showtip = false" v-if="showtip">知道了</u-button> <u-button type="primary" shape="circle" @click="showtip = false" v-if="showtip">知道了</u-button>
</view> </view>
</u-mask> --> </u-mask>
</view> </view>
</template> </template>
...@@ -189,7 +204,6 @@ export default { ...@@ -189,7 +204,6 @@ export default {
this.$request('wechatUser/pdFace/checkScanFace',{openid}).then(res => { this.$request('wechatUser/pdFace/checkScanFace',{openid}).then(res => {
if (res.code === '00') { if (res.code === '00') {
console.log(res.data)
if(res.data.isScanFace === 0) {//未扫脸 if(res.data.isScanFace === 0) {//未扫脸
uni.navigateTo({ uni.navigateTo({
url: './getPortrait' url: './getPortrait'
...@@ -205,6 +219,11 @@ export default { ...@@ -205,6 +219,11 @@ export default {
icon: 'none' icon: 'none'
}) })
} }
}).catch(err => {
uni.showToast({
title: err,
icon: 'none'
})
}) })
}, },
jumptoVlog() {//---跳转到vlog页面 jumptoVlog() {//---跳转到vlog页面
...@@ -328,6 +347,7 @@ export default { ...@@ -328,6 +347,7 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
transform: scale(1);
} }
.coupon { .coupon {
position: fixed; position: fixed;
...@@ -446,42 +466,111 @@ export default { ...@@ -446,42 +466,111 @@ export default {
} }
} }
.mask { .mask {
width: 504rpx;
height: 720rpx;
.img-box { .img-box {
position: relative; position: relative;
margin-bottom: 32rpx; margin-bottom: 32rpx;
width: 100%;
height: 100%;
.close { .close {
position: absolute; position: absolute;
top: -54rpx; top: -64rpx;
right: 24rpx; right: 24rpx;
color: #fff; color: #fff;
font-size: 40rpx;
&::after { &::after {
position: absolute; position: absolute;
content: ''; content: '';
top: 24rpx; top: 34rpx;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
width: 0; width: 0;
height: 32rpx; height: 32rpx;
border-left: 1px dashed #fff; border-left: 1px dotted #fff;
} }
} }
.use-rule { .bg {
position: absolute; position: absolute;
left: 50%; left: 0;
bottom: 40px; top: 0;
transform: translateX(-50%); width: 100%;
width: 66px; height: 100%;
height: 16px; z-index: -1;
}
.my-card {
width: 85%;
height: 340rpx;
} }
} }
.rules, .post-card,
image { .rules {
width: 504rpx; display: flex;
height: 720rpx; flex-direction: column;
align-items: center;
padding: 66rpx 0 24rpx 0;
height: 100%;
}
.post-card {
justify-content: space-between;
font-size: 36rpx;
.congra {
font-weight: 700;
}
.price {
font-size: 64rpx;
font-weight: 700;
color: #EE520E;
margin: 0 16rpx;
}
.use-rule {
font-size: 24rpx;
color: #333;
}
.address {
font-size: 24rpx;
font-weight: 700;
}
}
.rules {
padding: 50rpx 32rpx 24rpx;
.title {
font-size: 36rpx;
font-weight: 700;
margin-bottom: 48rpx;
}
.block {
font-size: 32rpx;
align-self: flex-start;
.name {
display: inline-block;
padding: 4rpx 16rpx;
margin-bottom: 28rpx;
border-radius: 4rpx;
font-size: 24rpx;
background-color: #000;
color: #fff;
}
.small-font {
display: flex;
font-size: 20rpx;
}
.small-font:not(:last-child) {
margin-bottom: 16rpx;
}
.dot {
margin-right: 10rpx;
}
}
.block:not(:last-child) {
margin-bottom: 32rpx;
}
} }
/deep/.u-btn { /deep/.u-btn {
width: 304rpx; width: 304rpx;
} }
} }
.rules { .rules {
} }
......
pages/album/chooseFavorite.vue
View file @ 28644991
...@@ -45,9 +45,6 @@ export default { ...@@ -45,9 +45,6 @@ export default {
} }
}, },
methods: { methods: {
checkboxChange(e) {
console.log(e)
},
saveClick() {//---提交 saveClick() {//---提交
const templateIds = this.imgArr.map(item => { const templateIds = this.imgArr.map(item => {
if(item.value) return item.templateId if(item.value) return item.templateId
...@@ -89,10 +86,6 @@ export default { ...@@ -89,10 +86,6 @@ export default {
this.$set(item, 'value', !item.value) this.$set(item, 'value', !item.value)
this.$set(item, 'show', false) this.$set(item, 'show', false)
this.$set(item, 'show', true) this.$set(item, 'show', true)
console.log(item.value, item.show)
// item.show = false
// item.show = true
// item.value = !item.value
}, },
recordDeviceInfo() {//---记录设备信息 recordDeviceInfo() {//---记录设备信息
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight // 状态栏高度 this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight // 状态栏高度
......
pages/album/getPortrait.vue
View file @ 28644991
...@@ -27,12 +27,12 @@ ...@@ -27,12 +27,12 @@
<text class="tip">获取照片需先在拍摄点摄影</text> <text class="tip">获取照片需先在拍摄点摄影</text>
<u-mask :show="maskShow" @click="maskShow = false"> <u-mask :show="maskShow" @click="maskShow = false">
<view class="mask"> <view class="mask">
<text class="countdown">{{maskCount}}s</text> <text class="countdown" v-if="maskCount">{{maskCount}}s</text>
<view class="tip"> <view class="tip">
<view>未找到您的照片</view> <view>未找到您的照片</view>
<view class="small">请在拍摄点拍摄后重试</view> <view class="small">请在拍摄点拍摄后重试</view>
</view> </view>
<u-button type="info" size="mini" shape="circle" @click="maskShow = false">返回</u-button> <u-button type="info" size="mini" shape="circle" @click="returnClick">返回</u-button>
</view> </view>
</u-mask> </u-mask>
</view> </view>
...@@ -60,6 +60,13 @@ export default { ...@@ -60,6 +60,13 @@ export default {
} }
}, },
methods: { methods: {
returnClick() {
if(this.maskCount >= 0) return
this.maskShow = false
uni.navigateBack({
delta: 1
})
},
recordDeviceInfo() {//---记录设备信息 recordDeviceInfo() {//---记录设备信息
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight // 状态栏高度 this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight // 状态栏高度
this.capsule = uni.getMenuButtonBoundingClientRect() // 胶囊大小、位置数据 this.capsule = uni.getMenuButtonBoundingClientRect() // 胶囊大小、位置数据
...@@ -174,12 +181,12 @@ export default { ...@@ -174,12 +181,12 @@ export default {
var loop = setInterval(() => { var loop = setInterval(() => {
this.maskCount -= 1 this.maskCount -= 1
if(this.maskCount <= -1) { if(this.maskCount <= -1) {
this.maskShow = false // this.maskShow = false
this.src = '' this.src = ''
clearInterval(loop) clearInterval(loop)
uni.navigateBack({ // uni.navigateBack({
delta: 1 // delta: 1
}) // })
uni.setScreenBrightness({ uni.setScreenBrightness({
value: this.defaultBrightness, //屏幕亮度值，范围 0~1，0 最暗，1 最亮 value: this.defaultBrightness, //屏幕亮度值，范围 0~1，0 最暗，1 最亮
}) })
......
pages/album/static/album/pillow.png
View replaced file @ 605bb145 View file @ 28644991
pages/album/static/album/pillow.png

269 KB | W: | H:

pages/album/static/album/pillow.png

62.8 KB | W: | H:

pages/album/static/album/pillow.png
pages/album/static/album/pillow.png
pages/album/static/album/pillow.png
pages/album/static/album/pillow.png
  • 2-up
  • Swipe
  • Onion skin
pages/album/static/album/postcard.png
View replaced file @ 605bb145 View file @ 28644991
pages/album/static/album/postcard.png

241 KB | W: | H:

pages/album/static/album/postcard.png

58.1 KB | W: | H:

pages/album/static/album/postcard.png
pages/album/static/album/postcard.png
pages/album/static/album/postcard.png
pages/album/static/album/postcard.png
  • 2-up
  • Swipe
  • Onion skin
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