Commit 8cfda3f7 authored by gaodapeng's avatar gaodapeng

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

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