Commit 9a599823 by zhangzhen

细节优化

parent b01256ba
...@@ -58,20 +58,19 @@ ...@@ -58,20 +58,19 @@
<view class="content-box"> <view class="content-box">
<view class="content"> <view class="content">
<view class="title-box"> <view class="title-box">
<text class="text-black text-bold text-xl">提示</text> <text class="text-black text-bold text-xl">核销成功</text>
<view class="close-box" @tap="onClose"> <view class="close-box" @tap="onClose">
<text class="cuIcon-close text-gray text-bold text-xl"></text> <text class="cuIcon-close text-gray text-bold text-xl"></text>
</view> </view>
</view> </view>
<view class="tip"> <view class="tip">
<view class="text-1"> <view class="flex-row">
<text class="text-bold text-lg text-black">核销成功</text> <text class="text-gray">优惠券名称:</text>
<text class="text-title text-bold">{{couponInfo.couponName}}</text>
</view> </view>
<view class="flex-col"> <view class="flex-row">
<text >优惠券名称:{{couponInfo.deal_title}}</text> <text class="text-gray">到期时间:</text>
</view> <text class="text-title text-bold">{{couponInfo.receiptEndDate|dateFormat}}</text>
<view class="flex-col">
<text >到期时间:{{couponInfo.receiptEndDate|dateFormat}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -110,7 +109,10 @@ ...@@ -110,7 +109,10 @@
} }
], ],
storeId:'', storeId:'',
couponInfo:'', couponInfo:{
couponName:"【新店特惠】8点-13点任意包4小时畅玩",
receiptEndDate:"2024-04-01"
},
eventChannel:null, eventChannel:null,
orderPage:false, orderPage:false,
popStoreList:[], popStoreList:[],
...@@ -123,6 +125,7 @@ ...@@ -123,6 +125,7 @@
} }
}, },
onLoad() { onLoad() {
// this.$refs.popup.open();
this.eventChannel = this.getOpenerEventChannel(); this.eventChannel = this.getOpenerEventChannel();
this.eventChannel.on('acceptDataFromOpenerPage', (data) => { this.eventChannel.on('acceptDataFromOpenerPage', (data) => {
console.log(data,99999) console.log(data,99999)
...@@ -208,7 +211,6 @@ ...@@ -208,7 +211,6 @@
}).then(res=>{ }).then(res=>{
uni.hideLoading() uni.hideLoading()
if(res.data.code === 200){ if(res.data.code === 200){
uni.showToast({ uni.showToast({
icon:"success", icon:"success",
title:"核验成功", title:"核验成功",
...@@ -218,12 +220,16 @@ ...@@ -218,12 +220,16 @@
that.eventChannel.emit('acceptData', {data: true}); that.eventChannel.emit('acceptData', {data: true});
uni.navigateBack() uni.navigateBack()
}else{ }else{
getCouponByCode({ uni.setStorageSync("storeId",that.storeId)
code: that.qrCode uni.switchTab({
}).then(result =>{ url:"/pages/index/index"
that.couponInfo = res.data.data;
that.$refs.popup.open();
}) })
// getCouponByCode({
// code: that.qrCode
// }).then(result =>{
// that.couponInfo = res.data.data;
// that.$refs.popup.open();
// })
} }
},1000) },1000)
} }
...@@ -340,10 +346,11 @@ ...@@ -340,10 +346,11 @@
.content-box{ .content-box{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 70vw; width: 80vw;
height: 40vh; height: 50vh;
.content{ .content{
display: flex; display: flex;
// flex: 1;
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
padding: 10upx 0 50upx; padding: 10upx 0 50upx;
...@@ -380,14 +387,21 @@ ...@@ -380,14 +387,21 @@
align-items: center; align-items: center;
margin: 30upx 0; margin: 30upx 0;
} }
.flex-col{ .flex-row{
align-items: center;
width: 90%; width: 90%;
margin: 10upx auto; margin: 10upx auto;
text{ .text-gray{
font-size: 32upx; width: 180upx;
color: #666666; text-align: justify;
text-align-last: justify;
} }
.text-title{
display: flex;
flex: 1;
align-items: center;
}
} }
} }
} }
......
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