Commit 06e71329 authored by gaodapeng's avatar gaodapeng

增加退出的流程

parent 563a43ae
...@@ -91,7 +91,8 @@ const FLOW_COLLECTIONS = "collections";//收款 ...@@ -91,7 +91,8 @@ const FLOW_COLLECTIONS = "collections";//收款
const FLOW_REFUND = "refund";//退款 const FLOW_REFUND = "refund";//退款
const FLOW_DIRECT_PAYMENT = "direct_payment"//直接收款 const FLOW_DIRECT_PAYMENT = "direct_payment"//直接收款
const FLOW_VERIFY = "verify";//核验 const FLOW_VERIFY = "verify";//核验
const FLOW_QUIT = "quit";
export { export {
FLOW_IDLE, FLOW_COLLECTIONS, FLOW_REFUND, FLOW_DIRECT_PAYMENT, FLOW_VERIFY FLOW_IDLE, FLOW_COLLECTIONS, FLOW_REFUND, FLOW_DIRECT_PAYMENT, FLOW_VERIFY, FLOW_QUIT
} }
...@@ -10,7 +10,7 @@ import { ...@@ -10,7 +10,7 @@ import {
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, FLOW_QUIT } from '../../const/actioncmd'
Page({ Page({
...@@ -106,7 +106,6 @@ Page({ ...@@ -106,7 +106,6 @@ Page({
operateReDo: "重新退款", operateReDo: "重新退款",
/** 重新检查的窗口 */ /** 重新检查的窗口 */
recheckBlock: false,//屏蔽取消操作,防止在实际已经进行了接口请求时还能取消,使得流程混乱
recheckShow: false, recheckShow: false,
recheckRemind: "确定要取消此收款订单吗?", recheckRemind: "确定要取消此收款订单吗?",
...@@ -116,8 +115,6 @@ Page({ ...@@ -116,8 +115,6 @@ Page({
{ url: "/images/img_ad2.png", selected: false }, { url: "/images/img_ad2.png", selected: false },
], ],
/**键盘 */
keyboardErrMsg: "",
}, },
/** /**
...@@ -431,26 +428,9 @@ Page({ ...@@ -431,26 +428,9 @@ Page({
onQuit() { onQuit() {
console.log("onQuit"); console.log("onQuit");
this.setData({ this.setData({
isFrontScreenLoginOK: false, flowType: FLOW_QUIT,
storeName: "--", recheckShow: true,
storeId: "--", recheckRemind: "确定要退出登录吗?",
userName: "--",
})
this.goPage('home')
my.ix.sendBuddyMessage({
target: getApp().globalData.frontScreenAppId,
data: {
action: ACTION_QUIT,
data: null
},
success: (res) => {
console.log("通知前屏退出 成功 ===》" + JSON.stringify(res));
},
fail: (res) => {
console.log("通知前屏退出 失败 ===》" + JSON.stringify(res));
}
}) })
}, },
...@@ -1298,10 +1278,36 @@ Page({ ...@@ -1298,10 +1278,36 @@ Page({
//重检查提示点击确定 //重检查提示点击确定
recheckConfirm() { recheckConfirm() {
this.setData({ if (this.data.flowType == FLOW_QUIT) {
recheckShow: false, this.setData({
}); isFrontScreenLoginOK: false,
this.goHome(); storeName: "--",
storeId: "--",
userName: "--",
recheckShow: false,
})
this.goPage('home')
my.ix.sendBuddyMessage({
target: getApp().globalData.frontScreenAppId,
data: {
action: ACTION_QUIT,
data: null
},
success: (res) => {
console.log("通知前屏退出 成功 ===》" + JSON.stringify(res));
},
fail: (res) => {
console.log("通知前屏退出 失败 ===》" + JSON.stringify(res));
}
})
} else {
this.setData({
recheckShow: false,
});
this.goHome();
}
}, },
recheckCancel() { recheckCancel() {
......
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