Commit 8cfda3f7 authored by gaodapeng's avatar gaodapeng

修复了应用设置的返回点击迟钝的问题

parent 594a2435
......@@ -306,8 +306,9 @@
}
/* 提货成功 */
.pick-goods-success-container{
height: 100%;
.pick-goods-success-container {
height: 100%;
width: 45%;
background: white;
display: flex;
......@@ -828,6 +829,7 @@
}
/* 提货 商品已交付*/
.pick-goods-success {
width: 200rpx;
height: 60rpx;
......@@ -1195,27 +1197,17 @@
box-shadow: 0rpx 2rpx 7rpx 0rpx rgba(153, 153, 153, 0.16);
}
.about-system-back-icon {
width: 9rpx;
height: 18rpx;
}
.about-system-back {
width: 95rpx;
height: 60rpx;
justify-content: center;
align-items: center;
display: flex;
flex-direction: row
}
.about-system-back-text {
flex-direction: row;
position: absolute;
text-align: center;
font-size: 19rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(51, 51, 51, 1);
line-height: 22rpx;
margin-left: 5rpx
line-height: 60rpx;
}
.about-system-title {
......@@ -1285,7 +1277,6 @@
.toastLayout {
text-align: center;
width: 100%;
height: 100%;
position: absolute;
......
......@@ -484,13 +484,13 @@
</view>
</view>
<!-- 关于系统 -->
<view hidden="{{!pageShow['aboutsystem']}}" style="background:#ffffff">
<view hidden="{{!pageShow['aboutsystem']}}" style="background:#FFFFFF;">
<view class="about-system-top">
<view class="about-system-title">关于系统</view>
<view class="about-system-back" catchTap="goHome">
<image class="about-system-back-icon" mode="aspectFit" src="/images/icon_back.png"/>
<text class="about-system-back-text">返回</text>
<image mode="aspectFit" style="width:9rpx;height:18rpx;margin-right:8rpx;" src="/images/icon_back.png"/>
<text>返回</text>
</view>
<view class="about-system-title">关于系统</view>
</view>
<view class="about-system-body">
<view class="about-system-item" style="margin-top:60rpx;">
......@@ -520,13 +520,13 @@
</view>
</view>
<!-- 应用设置 -->
<view hidden="{{!pageShow['appsetting']}}" style="background:#ffffff">
<view hidden="{{!pageShow['appsetting']}}" style="background:#FFFFFF;">
<view class="about-system-top">
<view class="about-system-title">应用设置</view>
<view class="about-system-back" catchTap="goHome">
<image class="about-system-back-icon" mode="aspectFit" src="/images/icon_back.png"/>
<text class="about-system-back-text">返回</text>
<image mode="aspectFit" style="width:9rpx;height:18rpx;margin-right:8rpx;" src="/images/icon_back.png"/>
<text>返回</text>
</view>
<view class="about-system-title">应用设置</view>
</view>
<view class="about-system-body">
<view class="app-setting-item">
......
......@@ -8,7 +8,7 @@ import {
ACTION_REFUND, ACTION_REFUND_SUCCESS, ACTION_REFUND_FAILED,
ACTION_PRINT_LAST_ORDER, ACTION_GET_CUR_AD, ACTION_SEND_SEL_AD,
ACTION_SYSTEM_SETTING, ACTION_BALANCE_BACK_GOODS, ACTION_DAY_CHECK,
ACTION_VERIFY, ACTION_VERIFY_SUCCESS, ACTION_VERIFY_FAILED,ACTION_PICK_UP_GOODS
ACTION_VERIFY, ACTION_VERIFY_SUCCESS, ACTION_VERIFY_FAILED, ACTION_PICK_UP_GOODS
} from '../../const/actioncmd'
import { FLOW_IDLE, FLOW_COLLECTIONS, FLOW_REFUND, FLOW_DIRECT_PAYMENT, FLOW_VERIFY } from '../../const/actioncmd'
......@@ -20,7 +20,7 @@ Page({
isShowToast: false,
toastText: "------",
pageShow: {
"home": true,
"home": false,
"landscan": false,
"waitoperate": false,
"payresult": false,
......@@ -28,10 +28,10 @@ Page({
"printlastorder": false,
"poster": false,
"aboutsystem": false,
"appsetting": false,
"appsetting": true,
},
// 前屏是否完成登录
isFrontScreenLoginOK: false,
isFrontScreenLoginOK: true,
flowType: "", //流程类型:用于区分易混淆的流程,以及共同界面使用时用该标识位作为区分
/**账号信息 */
......@@ -57,7 +57,7 @@ Page({
//提货 0关闭 提货弹窗 1等待扫描提货码 2.提货码录入中 3.提货码录入成功 4.提货码录入失败
pickGoodsState: 0,
pickGoodsMsg: "录入失败!无效的提货码",
pickGoods: [],
pickGoods: [],
//优惠券 0关闭 录入券弹窗 1等待录入 2.录入中 3.录入成功 4.录入失败
discCouponState: 0,
......@@ -161,7 +161,7 @@ Page({
onLoad(query) {
// 页面加载
console.info(`Page onLoad with query: ${JSON.stringify(query)}`);
},
onReady() {
// 页面加载完成
......@@ -395,10 +395,12 @@ Page({
operateReDo: "重新扫描",
});
context.goPage('operateresult');
}else if(res.action == ACTION_PICK_UP_GOODS){
//提货
context.setData({pickGoods:res.data.pickGoods
,pickGoodsState:res.data.pickGoodsState})
} else if (res.action == ACTION_PICK_UP_GOODS) {
//提货
context.setData({
pickGoods: res.data.pickGoods
, pickGoodsState: res.data.pickGoodsState
})
}
}
});
......@@ -425,6 +427,7 @@ Page({
//回到首页
goHome() {
console.log("goHome");
let context = this;
my.ix.sendBuddyMessage({
target: getApp().globalData.frontScreenAppId,
......@@ -586,7 +589,7 @@ Page({
console.log("提货通知前屏 失败 ===》 " + JSON.stringify(fres));
}
})
},
},
/**日结 */
onHomeDayCheckClicked() {
......@@ -705,7 +708,7 @@ Page({
discCouponState: 0,
discCouponMsg: "",
discCouponPrice: 0,
})
var commonRequest = {
......
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