Skip to content

D
doublescreen-back
Commit 3e1c9855 authored by gaodapeng's avatar gaodapeng
Browse files
Options

fix bugs

parent e33bedc8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 470 additions and 244 deletions
const/actioncmd.js
View file @ 3e1c9855
...@@ -53,8 +53,8 @@ export const ACTION_REFUND_FAILED = "ACTION_REFUND_FAILED"; ...@@ -53,8 +53,8 @@ export const ACTION_REFUND_FAILED = "ACTION_REFUND_FAILED";
export const ACTION_PRINT_LAST_ORDER = "ACTION_PRINT_LAST_ORDER"; export const ACTION_PRINT_LAST_ORDER = "ACTION_PRINT_LAST_ORDER";
const FLOW_IDLE = "idle"; const FLOW_IDLE = "idle";
const FLOW_COLLECTIONS = "collections"; const FLOW_COLLECTIONS = "collections";//收款
const FLOW_REFUND = "refund"; const FLOW_REFUND = "refund";//退款
export { export {
FLOW_IDLE,FLOW_COLLECTIONS,FLOW_REFUND FLOW_IDLE,FLOW_COLLECTIONS,FLOW_REFUND
......
pages/components/landkeybord/landkeybord.js
View file @ 3e1c9855
...@@ -20,17 +20,15 @@ Component({ ...@@ -20,17 +20,15 @@ Component({
//弹窗消失的时候 result清空 //弹窗消失的时候 result清空
if (nextProps.scene == 0) { if (nextProps.scene == 0) {
this.setData({ this.setData({
result: '', result: '',
}); });
} }
this.setData({ this.setData({
scenes: nextProps.scene, scenes: nextProps.scene,
}); });
console.log("scenes:"+this.data.scenes);
}, },
methods: { methods: {
......
pages/index/index.acss
View file @ 3e1c9855
.login-waiting-page{ .login-waiting-page {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
position: absolute position: absolute
} }
.login-waiting-left{ .login-waiting-left {
width: 50%; width: 50%;
height: 100%; height: 100%;
} }
.login-waiting-right{ .login-waiting-right {
width: 50%; width: 50%;
height: 100%; height: 100%;
background-color: white; background-color: white;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center align-items: center
} }
.login-waiting-right-image{ .login-waiting-right-image {
width: 287rpx; width: 287rpx;
height: 204rpx; height: 204rpx;
} }
/* home样式 */ /* home样式 */
...@@ -573,6 +573,7 @@ ...@@ -573,6 +573,7 @@
width: 252rpx; width: 252rpx;
height: 60rpx; height: 60rpx;
} }
/* 确定 兑换成功 */ /* 确定 兑换成功 */
.sure-use-coupon { .sure-use-coupon {
...@@ -598,11 +599,32 @@ ...@@ -598,11 +599,32 @@
border: 2px solid red; border: 2px solid red;
} }
/* 结算页 */ /* 等待操作页 */
.waitOperate {
display: flex;
flex-direction: column;
position: absolute;
width: 100%;
height: 100%;
left: 0rpx;
top: 0rpx;
}
.waitOperateBackButton {
color: #333333;
font-size: 19rpx;
line-height: 60rpx;
height: 60rpx;
width: 110rpx;
text-align: center;
/* border: 2px solid red; */
position: relative;
}
.balanceTopView { .balanceTopView {
position: relative; position: relative;
width: 768rpx; width: 750rpx;
height: 60rpx; height: 60rpx;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
/* border: 2px solid red; */ /* border: 2px solid red; */
...@@ -613,11 +635,11 @@ ...@@ -613,11 +635,11 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
position: relative; position: relative;
width: 768rpx; width: 750rpx;
height: 372rpx; height: 362rpx;
box-sizing: border-box; box-sizing: border-box;
align-items: center; align-items: center;
background: #F3F7F9; background: #FFFFFF;
} }
.leftBody { .leftBody {
...@@ -626,6 +648,7 @@ ...@@ -626,6 +648,7 @@
position: relative; position: relative;
width: 52.8%; width: 52.8%;
height: 100%; height: 100%;
background: rgba(243, 247, 249, 1);
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -714,6 +737,7 @@ ...@@ -714,6 +737,7 @@
} }
/* 兑换券成功文本 */ /* 兑换券成功文本 */
.scan-coupon-text-success { .scan-coupon-text-success {
font-size: 26rpx; font-size: 26rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
...@@ -724,17 +748,18 @@ ...@@ -724,17 +748,18 @@
} }
/* 兑换券失败文本 */ /* 兑换券失败文本 */
.scan-coupon-text-fail { .scan-coupon-text-fail {
font-size: 26rpx; font-size: 26rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color:rgba(255,0,0,1); color: rgba(255, 0, 0, 1);
line-height: 26rpx; line-height: 26rpx;
margin-top: 24rpx; margin-top: 24rpx;
} }
/* 兑换券失败容器*/ /* 兑换券失败容器*/
.failure-operation { .failure-operation {
width: 100%; width: 100%;
height: 62rpx; height: 62rpx;
...@@ -745,129 +770,133 @@ ...@@ -745,129 +770,133 @@
} }
/* 兑换券 关闭 */ /* 兑换券 关闭 */
.close-use-coupon{
width:252rpx; .close-use-coupon {
height:60rpx; width: 252rpx;
margin-right: 18rpx; height: 60rpx;
margin-right: 18rpx;
} }
/* 兑换券 再次兑换 */ /* 兑换券 再次兑换 */
.again-use-coupon{
width:252rpx; .again-use-coupon {
height:60rpx; width: 252rpx;
margin-left: 18rpx; height: 60rpx;
margin-left: 18rpx;
} }
/* 兑换券失败描述 */ /* 兑换券失败描述 */
.scan-coupon-text-fail-desr{
font-size:22rpx; .scan-coupon-text-fail-desr {
font-family:PingFangSC-Regular,PingFang SC; font-size: 22rpx;
font-weight:400; font-family: PingFangSC-Regular, PingFang SC;
color:rgba(91,105,129,1); font-weight: 400;
line-height:22rpx; color: rgba(91, 105, 129, 1);
margin-top: 15rpx line-height: 22rpx;
margin-top: 15rpx
} }
/* 操作结果页面 */ /* 操作结果页面 */
.operateTopView{ .operateTopView {
position: relative; position: relative;
width: 750rpx; width: 750rpx;
height: 60rpx; height: 60rpx;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
/* border: 2px solid red; */ /* border: 2px solid red; */
box-shadow: 0rpx 2rpx 7rpx 0rpx rgba(153, 153, 153, 0.16); box-shadow: 0rpx 2rpx 7rpx 0rpx rgba(153, 153, 153, 0.16);
}
.operateBodyView{
position: relative;
display: flex;
flex-direction: column;
align-items: center;
width: 750rpx;
height: 364rpx;
background: #ffffff;
}
.operateResultIcon{
position: relative;
width: 84rpx;
height: 84rpx;
margin-top: 35rpx;
}
.operateResultText{
font-size:26rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(0,122,255,1);
line-height:26rpx;
margin-top: 23rpx;
}
.operateResultDesc{
font-size:21rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(91,105,129,1);
line-height:21rpx;
margin-top: 19rpx;
}
.operateResultBtnContainer{
width: auto;
height: auto;
display: flex;
flex-direction: row;
margin-top: 54rpx;
}
.operateResultConfirmBtn{
width:246rpx;
height:59rpx;
background:rgba(0,122,255,1);
border-radius:5rpx;
border:1rpx solid rgba(151,151,151,1);
flex-direction: row;
display: flex;
align-items: center;
}
.operateResultConfirmBtnText{
font-size:23rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(255,255,255,1);
line-height:33rpx;
text-align: center;
width: 100%;
height: auto;
}
.operateResultCloseBtn{
width:246rpx;
height:59rpx;
background:rgba(255,255,255,1);
border-radius:5rpx;
border:1rpx solid rgba(0,122,255,1);
flex-direction: row;
display: flex;
margin-right:35rpx;
align-items: center;
}
.operateResultCloseBtnText{
font-size:23rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(0,122,255,1);
line-height:33rpx;
text-align: center;
width: 100%;
height: auto;
} }
.operateBodyView {
position: relative;
display: flex;
flex-direction: column;
align-items: center;
width: 750rpx;
height: 364rpx;
background: #ffffff;
}
.operateResultIcon {
position: relative;
width: 84rpx;
height: 84rpx;
margin-top: 35rpx;
}
.operateResultText {
font-size: 26rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: rgba(0, 122, 255, 1);
line-height: 26rpx;
margin-top: 23rpx;
}
.operateResultDesc {
font-size: 21rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(91, 105, 129, 1);
line-height: 21rpx;
margin-top: 19rpx;
}
.operateResultBtnContainer {
width: auto;
height: auto;
display: flex;
flex-direction: row;
margin-top: 54rpx;
}
.operateResultConfirmBtn {
width: 246rpx;
height: 59rpx;
background: rgba(0, 122, 255, 1);
border-radius: 5rpx;
border: 1rpx solid rgba(151, 151, 151, 1);
flex-direction: row;
display: flex;
align-items: center;
}
.operateResultConfirmBtnText {
font-size: 23rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: rgba(255, 255, 255, 1);
line-height: 33rpx;
text-align: center;
width: 100%;
height: auto;
}
.operateResultCloseBtn {
width: 246rpx;
height: 59rpx;
background: rgba(255, 255, 255, 1);
border-radius: 5rpx;
border: 1rpx solid rgba(0, 122, 255, 1);
flex-direction: row;
display: flex;
margin-right: 35rpx;
align-items: center;
}
.operateResultCloseBtnText {
font-size: 23rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: rgba(0, 122, 255, 1);
line-height: 33rpx;
text-align: center;
width: 100%;
height: auto;
}
/**打印上一单*/ /**打印上一单*/
.printLastOrderPage { .printLastOrderPage {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -932,4 +961,70 @@ ...@@ -932,4 +961,70 @@
font-weight: bold; font-weight: bold;
position: absolute; position: absolute;
top: 89rpx; top: 89rpx;
}
/* 取消等待操作页的操作。名称为recheck*/
.recheckPage {
width: 100%;
height: 100%;
position: absolute;
background: rgba(0, 0, 0, 0.65);
display: flex;
flex-direction: column;
align-items: center;
z-index: 1;
}
.recheckDialog {
width: 516rpx;
height: 292rpx;
background: rgba(255, 255, 255, 1);
border-radius: 5px;
margin-top: 65rpx;
display: flex;
position: relative;
flex-direction: column;
align-items: center;
}
.recheckRemind {
font-size: 21rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: rgba(51, 51, 51, 1);
line-height: 26rpx;
margin-top: 60rpx;
}
.recheckButtonConfirm {
width: 246rpx;
height: 60rpx;
background: rgba(0, 122, 255, 1);
border-radius: 5rpx;
position: relative;
box-sizing: border-box;
margin-top: 32rpx;
}
.recheckButtonCancel {
width: 252rpx;
height: 60rpx;
background: rgba(255, 255, 255, 1);
border-radius: 5rpx;
border: 2rpx solid rgba(0, 122, 255, 1);
position: relative;
box-sizing: border-box;
margin-top: 19rpx;
}
.recheckButtonText {
width: 100%;
height: 60rpx;
margin: 0 auto;
text-align: center;
font-size: 24rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
line-height: 60rpx;
} }
\ No newline at end of file
pages/index/index.axml
View file @ 3e1c9855
...@@ -185,11 +185,11 @@ ...@@ -185,11 +185,11 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 结算页 --> <!-- 等待操作页 -->
<view class="balance" hidden="{{!pageShow['waitoperate']}}"> <view class="waitOperate" hidden="{{!pageShow['waitoperate']}}">
<view class="balanceTopView"> <view class="balanceTopView">
<!--back button--> <!--back button-->
<view catchTap="waitOperateBack" class="backButton"> <view catchTap="waitOperateBack" class="waitOperateBackButton">
<image mode="aspectFit" style="position:absolute;width:11rpx;height:17rpx;left: 18rpx;top:22rpx;" src="/images/icon_back.png"/> <image mode="aspectFit" style="position:absolute;width:11rpx;height:17rpx;left: 18rpx;top:22rpx;" src="/images/icon_back.png"/>
<text>返回</text> <text>返回</text>
</view> </view>
...@@ -197,26 +197,26 @@ ...@@ -197,26 +197,26 @@
<!-- 界面主体 --> <!-- 界面主体 -->
<view class="bodyContainer"> <view class="bodyContainer">
<view class="leftBody"> <view class="leftBody">
<view class="contentLine" style="margin-top:29rpx;"> <view class="contentLine" style="margin-top:29rpx;" hidden="{{flowType!='collections'}}">
<view class="descText">合计金额：</view> <view class="descText">合计金额：</view>
<view class="totalPrice">￥{{totalPrice}}</view> <view class="totalPrice">￥{{totalPrice}}</view>
</view> </view>
<view class="contentLine" style="margin-top: 14.5rpx;"> <view class="contentLine" style="margin-top: 14.5rpx;" hidden="{{flowType!='collections'}}">
<view class="descText">商家优惠：</view> <view class="descText">商家优惠：</view>
<view class="totalCoupon">￥{{totalDisc}}</view> <view class="totalCoupon">￥{{totalDisc}}</view>
</view> </view>
<view style="position: absolute;display: flex;flex-direction: row;align-items: baseline;bottom:22rpx;left:0rpx;padding-left: 29rpx;"> <view style="position: absolute;display: flex;flex-direction: row;align-items: baseline;bottom:22rpx;left:0rpx;padding-left: 29rpx;">
<view class="descText">应收款：</view> <view class="descText">{{waitOperateMoneyRemind}}</view>
<view class="moneySign">￥</view> <view class="moneySign">￥</view>
<view class="payPrice">{{totalPrice}}</view> <view class="payPrice">{{waitOperateAmount}}</view>
<view class="descText">（共{{totalQuantity}}件）</view> <view class="descText" hidden="{{flowType!='collections'}}">（共{{totalQuantity}}件）</view>
</view> </view>
</view> </view>
<view class="rightBody"> <view class="rightBody">
<view class="remindText">等待顾客付款…</view> <view class="remindText">{{waitOperateRemindText}}</view>
<image mode="aspectFit" style="width:166rpx;height:143rpx;margin-top:39rpx;" src="/images/icon_wait_operate.png"/> <image mode="aspectFit" style="width:166rpx;height:143rpx;margin-top:39rpx;" src="/images/icon_wait_operate.png"/>
<view catchTap="waitOperateBack" style="width:252rpx;height:60rpx;background:rgba(255,255,255,1);border-radius:5rpx;border:2rpx solid rgba(0,122,255,1);position:relative;box-sizing: border-box;margin-top:32rpx;"> <view catchTap="waitOperateCancel" style="width:252rpx;height:60rpx;background:rgba(255,255,255,1);border-radius:5rpx;border:2rpx solid rgba(0,122,255,1);position:relative;box-sizing: border-box;margin-top:32rpx;">
<view catchTap="cancelCollect" style="width:100%;height:60rpx;margin:0 auto;text-align:center;font-size:24rpx;font-family:PingFangSC-Medium,PingFang SC;font-weight:500;color:rgba(0,122,255,1);line-height:60rpx;">取消收款</view> <view style="width:100%;height:60rpx;margin:0 auto;text-align:center;font-size:24rpx;font-family:PingFangSC-Medium,PingFang SC;font-weight:500;color:rgba(0,122,255,1);line-height:60rpx;">{{waitOperateCancelText}}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -330,39 +330,45 @@ ...@@ -330,39 +330,45 @@
<!-- 键盘 --> <!-- 键盘 -->
<land-keybord scene="{{scene}}" onKeyBordFinished="onKeyBordFinished" onKeyBordClose="onKeyBordClose"> <land-keybord scene="{{scene}}" onKeyBordFinished="onKeyBordFinished" onKeyBordClose="onKeyBordClose">
</land-keybord> </land-keybord>
<!-- 等待前屏登录 --> <!-- 操作结果页 -->
<view class="login-waiting-page" a:if="{{!isFrontScreenLoginOK}}"> <view hidden="{{!pageShow['operateResult']}}">
<image class="login-waiting-left" mode="aspectFill" src="/images/login_wait_left.png"/> <view class="operateTopView"></view>
<view class="login-waiting-right"> <view class="operateBodyView">
<image class="login-waiting-right-image" mode="aspectFit" src="/images/login_waiting_right.png"/> <block a:if="{{operateSuccess}}">
</view> <image class="operateResultIcon" mode="aspectFit" src="/images/icon_success.png"/>
<!-- 操作结果页 --> <view class="operateResultText">{{operateSuccessRemind}}</view>
<view hidden="{{!pageShow['operateResult']}}"> <view class="operateResultDesc">{{operateSuccessDesc}}</view>
<view class="operateTopView"></view> <view class="operateResultBtnContainer">
<view class="operateBodyView"> <view class="operateResultConfirmBtn">
<block a:if="{{operateSuccess}}"> <view class="operateResultConfirmBtnText" onTap="operateResultClose">确定</view>
<image class="operateResultIcon" mode="aspectFit" src="/images/icon_success.png"/>
<view class="operateResultText">{{operateSuccessRemind}}</view>
<view class="operateResultDesc">{{operateSuccessDesc}}</view>
<view class="operateResultBtnContainer">
<view class="operateResultConfirmBtn">
<view class="operateResultConfirmBtnText">确定</view>
</view>
</view> </view>
</block> </view>
<block a:else> </block>
<image class="operateResultIcon" mode="aspectFit" src="/images/icon_failed.png"/> <block a:else>
<view class="operateResultText">{{operateFailedRemind}}</view> <image class="operateResultIcon" mode="aspectFit" src="/images/icon_failed.png"/>
<view class="operateResultDesc">{{operateFailedDesc}}</view> <view class="operateResultText">{{operateFailedRemind}}</view>
<view class="operateResultBtnContainer"> <view class="operateResultDesc">{{operateFailedDesc}}</view>
<view class="operateResultCloseBtn"> <view class="operateResultBtnContainer">
<view class="operateResultCloseBtnText">关闭</view> <view class="operateResultCloseBtn">
</view> <view class="operateResultCloseBtnText" onTap="operateResultClose">关闭</view>
<view class="operateResultConfirmBtn"> </view>
<view class="operateResultConfirmBtnText">重新退款</view> <view class="operateResultConfirmBtn">
</view> <view class="operateResultConfirmBtnText" onTap="operateResultReOperate">{{operateReDo}}</view>
</view> </view>
</block> </view>
</block>
</view>
</view>
<!-- 重新检查弹窗 -->
<view class="recheckPage" hidden="{{!recheckShow}}">
<view class="recheckDialog">
<view class="recheckRemind">{{recheckRemind}}</view>
<view class="recheckButtonConfirm" onTap="recheckConfirm">
<view class="recheckButtonText" style="color:#ffffff;">确定</view>
</view>
<view class="recheckButtonCancel" onTap="recheckCancel">
<view class="recheckButtonText" style="color:rgba(0,122,255,1);">取消</view>
</view> </view>
</view> </view>
</view> </view>
\ No newline at end of file </view>
\ No newline at end of file
pages/index/index.js
View file @ 3e1c9855
This diff is collapsed.
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