Commit 0bc2313b authored by gaodapeng's avatar gaodapeng

增加自定义弹窗,UI调整完毕,并调通部分控制逻辑

parent 8d5fddc2
{ {
"pages": [ "pages": [
"pages/home/home",
"pages/paysuccess/paysuccess", "pages/paysuccess/paysuccess",
"pages/balance/balance", "pages/balance/balance",
"pages/scan/scan", "pages/scan/scan",
"pages/home/home",
"pages/login/login", "pages/login/login",
"pages/index/index" "pages/index/index"
], ],
......
page { /* position: absolute 加上 left:0rpx;top:0rpx;即可突破原来限制,显示在父控件的顶部位置 */
display: flex; popUpScanBg{
flex-direction: column; /* 阴影,全屏 */
/* background-color: #ff7f30; */ position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: rgba(0, 0, 0, 0.65) ;
left: 0rpx;
top: 0rpx;
}
.popUpScan{
position: relative;
margin-top: 286rpx;
height: 100%;
width: 100%;
background-color: #ffffff;
border-radius:8rpx 8rpx 0px 0px;
} }
.dialog { .close{
width: 750rpx; position: absolute;
height: 76%; right: 31rpx;
color: white; top: 31rpx;
font-size: 66rpx; width: 28rpx;
background-color: white; height: 28rpx;
/* border: 2px solid red; */
} }
.scanRemindIcon { .scanRemindText{
text-align: center;
font-size:38rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(0,0,0,0.85);
line-height:45rpx;
margin-top: 84rpx;
}
.scanRemindIcon{
position: relative;
margin-top: 63rpx;
width: 659rpx; width: 659rpx;
height: 604rpx; height: 605rpx;
margin-top: 192rpx;
margin-left: 34rpx; margin-left: 34rpx;
} }
.scanRemindText {
font-size: 38rpx; .resultContainer{
color: #D9000000; display: flex;
flex-direction: column;
align-items: center;
top: 0rpx;
left: 0rpx;
width: 100%;
height: 100%;
box-sizing: border-box;
}
.resultIcon{
width: 135rpx;
height: 135rpx;
margin-top: 236rpx;
}
.resultSuccessRemind{
text-align: center;
font-size:41rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(0,122,255,1);
line-height:41rpx;
margin-top: 28rpx;
}
.resultFailedRemind{
text-align: center;
font-size:41rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(255,0,0,1);
line-height:41rpx;
margin-top: 28rpx;
}
.resultText{
font-size:34rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(91,105,129,1);
line-height:34rpx;
text-align: center;
margin-top: 30rpx;
margin-left: 164rpx;
margin-right: 164rpx;
} }
.close{
width: 28rpx;
height: 28rpx;
}
\ No newline at end of file
<popup show="{{showBottom}}" position="bottom" onClose="onPopupClose" > <view class="popUpScanBg" >
<view class="dialog">
<!-- 图片 --> <view class="popUpScan">
<view class="scanRemindIcon"> <image class="close" mode="aspectFit" src="/images/icon_dialog_cancel.png"/>
<image mode="scaleToFill" src="/images/icon_scan_remind"/>
</view> <!-- 初始状态 -->
<!-- x --> <view onTap="scanDialogLoading" style="display:flex;flex-direction:column;" a:if="{{dialogDisplay == show}}">
<view class="close"> <view class="scanRemindText">{{remindText}}</view>
<image mode="scaleToFill" src="/images/icon_dialog_cancel"/> <!-- 图片 -->
</view> <image class="scanRemindIcon" mode="aspectFit" src="/images/icon_scan_remind.png"/>
<view class="scanRemindText">请扫描会员码支付</view> <!-- x -->
<view class="scanRemindError">该付款码无法识别,请重新扫描</view> </view>
<view class=""> </view>
<view style="position:absolute;width:100%;height:100%;display:flex;flex-direction:column;align-items:center;" a:if="{{dialogDisplay == loading}}" >
<image mode="aspectFit" src="/images/icon_dialog_loading.png" style="position:relative;top:307rpx;width:239rpx;height:239rpx;margin:0 auto;"/>
<view style="position:absolute;font-size:38rpx;font-family:PingFangSC-Medium,PingFang SC;font-weight:500;color:rgba(0,0,0,0.85);line-height:45rpx;margin-top:404rpx;align-text:center;">支付中</view>
</view>
<view class="resultContainer" a:if="{{dialogDisplay == resultSuccess}}">
<image class="resultIcon" mode="aspectFit" src="/images/icon_success.png"/>
<view class="resultSuccessRemind">退款成功</view>
<view class="resultText">退款完成!会在1~2个工作日 返还到您的付款账户</view>
</view>
<view class="resultContainer" a:if="{{dialogDisplay == resultFailed}}">
<image class="resultIcon" mode="aspectFit" src="/images/icon_failed.png"/>
<view class="resultFailedRemind">退款失败</view>
<view class="resultText">核销失败!无效的订单码</view>
</view>
</view>
</view> </view>
</popup>
...@@ -5,6 +5,7 @@ page{ ...@@ -5,6 +5,7 @@ page{
width: 100%; width: 100%;
height: 100%; height: 100%;
align-items: center; align-items: center;
box-sizing: border-box;
} }
.goodsRemind{ .goodsRemind{
...@@ -45,4 +46,4 @@ page{ ...@@ -45,4 +46,4 @@ page{
line-height:34rpx; line-height:34rpx;
margin-top: 28rpx; margin-top: 28rpx;
text-align: center; text-align: center;
} }
\ No newline at end of file
...@@ -27,18 +27,6 @@ ...@@ -27,18 +27,6 @@
</view> </view>
</view> </view>
<!-- 测试popup是否好用,能用,适合用。 -->
<popup show="{{qrPayShow}}" position="bottom">
<!-- 图片 -->
<view class="scanRemindIcon">
<image mode="scaleToFill" src="/images/icon_scan_remind"/>
</view>
<!-- x -->
<view class="close">
<image mode="scaleToFill" src="/images/icon_dialog_cancel"/>
</view>
<view class="scanRemindText">请扫描会员码支付</view>
<view class="scanRemindError">该付款码无法识别,请重新扫描</view>
<view class=""> </view>
</popup>
</view> </view>
\ No newline at end of file
...@@ -15,10 +15,9 @@ Page({ ...@@ -15,10 +15,9 @@ Page({
qrPay(){ qrPay(){
//todo 这里增加唤起弹窗的逻辑 //todo 这里增加唤起弹窗的逻辑
this.setData({ this.setData({
qrPayShow:true, qrPayShow:true
}); });
} },
}); });
page{ page{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background: url("/images/bg_home.png")no-repeat fixed top;
background-size: 100% 100%;
width: 100%; width: 100%;
height: 100%; height: 100%;
align-items: center; align-items: center;
...@@ -14,4 +12,4 @@ page{ ...@@ -14,4 +12,4 @@ page{
height: 430rpx; height: 430rpx;
margin: 0 auto; margin: 0 auto;
margin-top: 38rpx; margin-top: 38rpx;
} }
\ No newline at end of file
<view class="page" onTap="homeTap"> <view class="page" >
<view style="position:absolute;width:100%;height:100%;left:0rpx;top:0rpx;background:url(/images/bg_home.png) no-repeat fixed top;background-size:100% 100%;" onTap="homeTap"/>
<scandialog/>
</view> </view>
\ No newline at end of file
Page({ Page({
data: { data: {
dialogDisplay: 0,
show: 1,
loading: 2,
resultSuccess: 3,
resultFailed: 4
}, },
onLoad() { onLoad() {
...@@ -21,10 +24,14 @@ Page({ ...@@ -21,10 +24,14 @@ Page({
// } // }
}, },
homeTap(){ homeTap(){
//FIXME 这里是跳转到新的界面 //FIXME 这里是跳转到新的界面
my.navigateTo({ my.navigateTo({
url: "/pages/balance/balance" url: "/pages/balance/balance"
}); });
} },
}); });
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