Skip to content

D
doublescreen-back
Commit d006f2dc authored by jiangjiantao's avatar jiangjiantao
Browse files
Options

merge fixed

parents 69076a08 e195f375
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 479 additions and 224 deletions
app.json
View file @ d006f2dc
{ {
"pages": [ "pages": [
"pages/index/index", "pages/index/index",
"pages/printlastorder/printlastorder",
"pages/poster/poster", "pages/poster/poster",
"pages/home/home", "pages/home/home",
"pages/poster/poster", "pages/poster/poster",
......
const/actioncmd.js
View file @ d006f2dc
...@@ -49,7 +49,8 @@ export const ACTION_REFUND_SUCCESS = "ACTION_REFUND_SUCCESS"; ...@@ -49,7 +49,8 @@ export const ACTION_REFUND_SUCCESS = "ACTION_REFUND_SUCCESS";
//退款失败 //退款失败
export const ACTION_REFUND_FAILED = "ACTION_REFUND_FAILED"; export const ACTION_REFUND_FAILED = "ACTION_REFUND_FAILED";
//打印上一单
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";
......
pages/index/index.acss
View file @ d006f2dc
...@@ -852,3 +852,71 @@ ...@@ -852,3 +852,71 @@
width: 100%; width: 100%;
height: auto; height: auto;
} }
/**打印上一单*/
.printLastOrderPage {
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
position: absolute;
}
.topView {
position: absolute;
top: 0rpx;
width: 100%;
height: 60rpx;
background: #ffffff;
box-shadow: 0rpx 2rpx 7rpx 0rpx rgba(153, 153, 153, 0.16);
/* border: 2px solid red; */
}
.printLastOrderTitleText {
position: absolute;
line-height: 60rpx;
height: 100%;
font-size: 22rpx;
font-weight: bold;
text-align: center;
align-items: center;
width: 100%;
color: #333333;
align-content: center;
/* border: 2px solid red; */
}
.printLastOrderBackButton {
position: absolute;
height: 60rpx;
text-align: center;
align-items: center;
align-content: center;
font-size: 19rpx;
line-height: 60rpx;
/* border: 2px solid red; */
padding-left: 19rpx;
padding-right: 19rpx;
}
.printLastOrderBottomView {
height: 100%;
background: white;
width: 100%;
position: absolute;
/* display: flex;
flex-direction: column; */
/* border: 2px solid red; */
}
.printLastOrderPrintStatusHint {
color: #333333;
font-size: 26rpx;
margin: 0 auto;
width: 100%;
text-align: center;
font-weight: bold;
position: absolute;
top: 89rpx;
}
\ No newline at end of file
pages/index/index.axml
View file @ d006f2dc
This diff is collapsed.
pages/index/index.js
View file @ d006f2dc
...@@ -17,7 +17,7 @@ import { ACTION_REFUND } from '../../const/actioncmd' ...@@ -17,7 +17,7 @@ import { ACTION_REFUND } from '../../const/actioncmd'
import { ACTION_REFUND_SUCCESS } from '../../const/actioncmd' import { ACTION_REFUND_SUCCESS } from '../../const/actioncmd'
import { ACTION_REFUND_FAILED } from '../../const/actioncmd' import { ACTION_REFUND_FAILED } from '../../const/actioncmd'
import { FLOW_IDLE, FLOW_COLLECTIONS, FLOW_REFUND} from '../../const/actioncmd' import { FLOW_IDLE, FLOW_COLLECTIONS, FLOW_REFUND } from '../../const/actioncmd'
Page({ Page({
data: { data: {
//页面控制相关参数 //页面控制相关参数
...@@ -26,11 +26,12 @@ Page({ ...@@ -26,11 +26,12 @@ Page({
"landscan": false, "landscan": false,
"waitoperate": false, "waitoperate": false,
"payresult": false, "payresult": false,
"operateResult":false "operateResult": false,
"printlastorder": false,
}, },
// 前屏是否完成登录 // 前屏是否完成登录
isFrontScreenLoginOK:false, isFrontScreenLoginOK: true,
flowType:"", //流程类型：用于区分易混淆的流程，以及共同界面使用时用该标识位作为区分 flowType: "", //流程类型：用于区分易混淆的流程，以及共同界面使用时用该标识位作为区分
storeName: "--", storeName: "--",
/**支付结果页相关参数 */ /**支付结果页相关参数 */
payFailedReason: "xxxxxxxxxxx", payFailedReason: "xxxxxxxxxxx",
...@@ -41,7 +42,7 @@ Page({ ...@@ -41,7 +42,7 @@ Page({
isPrintSuccess: false, isPrintSuccess: false,
payPriceFen: 0, payPriceFen: 0,
/**商品扫码页相关参数 */ /**商品扫码页相关参数 */
//是否正在用券 //是否正在用券
couponUseing: false, couponUseing: false,
...@@ -61,11 +62,17 @@ Page({ ...@@ -61,11 +62,17 @@ Page({
totalDisc: 0.00, totalDisc: 0.00,
goods: [ goods: [
], ],
operateSuccess:false, operateSuccess: false,
operateSuccessRemind:"退款成功", operateSuccessRemind: "退款成功",
operateSuccessDesc:"退款完成！会在1~2个工作日返还到付款账户", operateSuccessDesc: "退款完成！会在1~2个工作日返还到付款账户",
operateFailedRemind:"退款失败", operateFailedRemind: "退款失败",
operateFailedDesc:"核销失败！无效的订单码", operateFailedDesc: "核销失败！无效的订单码",
//打印上一单页面
printLastOrderPrintStatusHint: "正在打印上一单...",
//是否打印成功
printLastOrderIsPrintSuccess: false,
printLastOrderIsPrinting:true
}, },
/**跳转页面方法 */ /**跳转页面方法 */
...@@ -75,7 +82,8 @@ Page({ ...@@ -75,7 +82,8 @@ Page({
"landscan": false, "landscan": false,
"waitoperate": false, "waitoperate": false,
"payresult": false, "payresult": false,
"operateResult":false, "operateResult": false,
"printlastorder":false
}; };
//遍历pageShow //遍历pageShow
for (var key in pageShowTemp) { for (var key in pageShowTemp) {
...@@ -94,7 +102,7 @@ Page({ ...@@ -94,7 +102,7 @@ Page({
onLoad(query) { onLoad(query) {
// 页面加载 // 页面加载
console.info(`Page onLoad with query: ${JSON.stringify(query)}`); console.info(`Page onLoad with query: ${JSON.stringify(query)}`);
}, },
onReady() { onReady() {
// 页面加载完成 // 页面加载完成
...@@ -155,7 +163,7 @@ Page({ ...@@ -155,7 +163,7 @@ Page({
context.goPage('landscan'); context.goPage('landscan');
} else if (res.action == ACTION_GO_BALANCE) { } else if (res.action == ACTION_GO_BALANCE) {
//跳转 //跳转
context.goPage('waitoperate'); context.goPage('waitoperate');
} else if (res.action == ACTION_ON_PAY_SUCCESS) { } else if (res.action == ACTION_ON_PAY_SUCCESS) {
//分转元 //分转元
...@@ -178,32 +186,32 @@ Page({ ...@@ -178,32 +186,32 @@ Page({
context.setData({ context.setData({
storeName: res.data.storeName storeName: res.data.storeName
}); });
}else if(res.action == ACTION_DIRECT_PAYMENT){ } else if (res.action == ACTION_DIRECT_PAYMENT) {
//直接收款 //直接收款
if(res.data != null){ if (res.data != null) {
context.setData({totalPrice:res.data}) context.setData({ totalPrice: res.data })
} }
context.goPage('waitoperate'); context.goPage('waitoperate');
}else if(res.action == ACTION_CONVERT_COUPON){ } else if (res.action == ACTION_CONVERT_COUPON) {
//兑换券 //兑换券
context.setData({convertCouponState:res.data.state}) context.setData({ convertCouponState: res.data.state })
if(null != res.data.msg){ if (null != res.data.msg) {
context.setData({convertCouponMsg:res.data.msg}) context.setData({ convertCouponMsg: res.data.msg })
} }
}else if(res.action == ACTION_LOGIN_OK){ } else if (res.action == ACTION_LOGIN_OK) {
//前屏登录完成 //前屏登录完成
context.setData({isFrontScreenLoginOK:true}) context.setData({ isFrontScreenLoginOK: true })
} else if(res.action == ACTION_REFUND_SUCCESS){ } else if (res.action == ACTION_REFUND_SUCCESS) {
//跳转到成功页面 //跳转到成功页面
context.goPage('operateResult'); context.goPage('operateResult');
} else if(res.action == ACTION_REFUND_FAILED) { } else if (res.action == ACTION_REFUND_FAILED) {
context.setData({ context.setData({
isPaySuccess: false, isPaySuccess: false,
}); });
context.goPage('operateResult'); context.goPage('operateResult');
} }
} }
}); });
...@@ -255,15 +263,15 @@ Page({ ...@@ -255,15 +263,15 @@ Page({
/**首页相关 */ /**首页相关 */
/**立即收款 */ /**立即收款 */
onHomeCashierImmediatelyClicked() { onHomeCashierImmediatelyClicked() {
this.setData({scene:3}) this.setData({ scene: 3 })
}, },
/** /**
* 兑换 * 兑换
*/ */
onHomeExchangeClicked() { onHomeExchangeClicked() {
this.setData({convertCouponState:1}) this.setData({ convertCouponState: 1 })
this.sendConvertCouponToFront(1) this.sendConvertCouponToFront(1)
}, },
/** /**
...@@ -278,17 +286,18 @@ Page({ ...@@ -278,17 +286,18 @@ Page({
*/ */
onHomeRefundClicked() { onHomeRefundClicked() {
this.setData({ this.setData({
flowType :FLOW_REFUND, flowType: FLOW_REFUND,
scene:4 scene: 4
}) })
console.log("scene:"+this.data.scene) console.log("scene:" + this.data.scene)
}, },
/** /**
* 打印上一单 * 打印上一单
*/ */
onHomePrintLastOrderClicked() { onHomePrintLastOrderClicked() {
//跳转至打印上一单页面
this.goPage('printlastorder');
}, },
/** /**
...@@ -390,7 +399,7 @@ Page({ ...@@ -390,7 +399,7 @@ Page({
}); });
}, },
//发生直接收银事件 //发生直接收银事件
sendPaymentToFront(payment) { sendPaymentToFront(payment) {
var commonRequest = { var commonRequest = {
...@@ -415,7 +424,7 @@ Page({ ...@@ -415,7 +424,7 @@ Page({
}); });
}, },
}); });
}, },
/**landscan页面逻辑方法 */ /**landscan页面逻辑方法 */
//把所有的商品数据发送到后屏 //把所有的商品数据发送到后屏
...@@ -442,17 +451,17 @@ Page({ ...@@ -442,17 +451,17 @@ Page({
//键盘完成 //键盘完成
onKeyBordFinished(result) { onKeyBordFinished(result) {
if(this.data.scene == 3){ if (this.data.scene == 3) {
this.sendPaymentToFront(result) this.sendPaymentToFront(result)
}else if(this.data.scene == 1){ } else if (this.data.scene == 1) {
this.sendGoodsInfoToFront(result) this.sendGoodsInfoToFront(result)
}else if(this.data.scene ==4){ } else if (this.data.scene == 4) {
this.sendRefund(result); this.sendRefund(result);
return; return;
} }
this.onKeyBordClose(); this.onKeyBordClose();
}, },
//把手输条码发生到前屏 //把手输条码发生到前屏
sendGoodsInfoToFront(barcode) { sendGoodsInfoToFront(barcode) {
my.showLoading({}); my.showLoading({});
...@@ -620,31 +629,31 @@ Page({ ...@@ -620,31 +629,31 @@ Page({
//兑换券界面关闭 //兑换券界面关闭
convertCouponClose(e){ convertCouponClose(e) {
this.setData({convertCouponState:0}) this.setData({ convertCouponState: 0 })
this.sendConvertCouponToFront(0) this.sendConvertCouponToFront(0)
}, },
//发生兑换券到前屏 //发生兑换券到前屏
sendConvertCouponToFront(res){ sendConvertCouponToFront(res) {
let context = this; let context = this;
my.ix.sendBuddyMessage({ my.ix.sendBuddyMessage({
target: getApp().globalData.frontScreenAppId, target: getApp().globalData.frontScreenAppId,
data: { data: {
action:ACTION_CONVERT_COUPON, action: ACTION_CONVERT_COUPON,
data:res data: res
}, },
success: (sres) => { success: (sres) => {
console.log("兑换券通知前屏 成功 ===》" + JSON.stringify(sres)); console.log("兑换券通知前屏 成功 ===》" + JSON.stringify(sres));
}, },
fail: (fres) => { fail: (fres) => {
console.log("兑换券通知前屏 失败 ===》 " + JSON.stringify(fres)); console.log("兑换券通知前屏 失败 ===》 " + JSON.stringify(fres));
context.sendConvertCouponToFront(res) context.sendConvertCouponToFront(res)
} }
}) })
}, },
//用券返回 //用券返回
couponBack(e) { couponBack(e) {
...@@ -654,31 +663,44 @@ Page({ ...@@ -654,31 +663,44 @@ Page({
useCoupon(e) { useCoupon(e) {
this.setData({ couponUseing: true }) this.setData({ couponUseing: true })
}, },
//发送退款金额.以分为单位 //发送退款金额.以分为单位
sendRefund(amount){ sendRefund(amount) {
var miyapay = require("/utils/miyapay4.js"); var miyapay = require("/utils/miyapay4.js");
var refundAmount = miyapay.yuan2Fen(amount); var refundAmount = miyapay.yuan2Fen(amount);
console.log("amount"+refundAmount); console.log("amount" + refundAmount);
my.ix.sendBuddyMessage({ my.ix.sendBuddyMessage({
target: getApp().globalData.frontScreenAppId, target: getApp().globalData.frontScreenAppId,
data:{ data: {
action: ACTION_REFUND, action: ACTION_REFUND,
data: refundAmount data: refundAmount
}, },
success:(res)=>{ success: (res) => {
//成功发送则 //成功发送则
console.log("发送退款金额到前屏小程序成功 ===》" + JSON.stringify(res)); console.log("发送退款金额到前屏小程序成功 ===》" + JSON.stringify(res));
}, },
fail:(res)=>{ fail: (res) => {
my.showToast({ my.showToast({
type: 'fail', type: 'fail',
content: '发送退款金额到前屏失败', content: '发送退款金额到前屏失败',
duration: 3000, duration: 3000,
success: () => { success: () => {
}, },
}); });
} }
}) })
} },
/**
* 打印上一单页面
*/
onPrintLastOrderCancelClicked() { },
onPrintLastOrderConfirmClicked() { },
onPrintLastOrderRePrintClicked() { },
onPrintLastOrderBackClicked(){}
}); });
pages/printlastorder/printlastorder.acss 0 → 100644
View file @ d006f2dc
.printLastOrderPage {
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
position: absolute;
}
.topView {
position: absolute;
top: 0rpx;
width: 100%;
height: 60rpx;
background: #ffffff;
box-shadow: 0rpx 2rpx 7rpx 0rpx rgba(153, 153, 153, 0.16);
/* border: 2px solid red; */
}
.printLastOrderTitleText {
position: absolute;
line-height: 60rpx;
height: 100%;
font-size: 22rpx;
font-weight: bold;
text-align: center;
align-items: center;
width: 100%;
color: #333333;
align-content: center;
/* border: 2px solid red; */
}
.printLastOrderBackButton {
position: absolute;
height: 60rpx;
text-align: center;
align-items: center;
align-content: center;
font-size: 19rpx;
line-height: 60rpx;
/* border: 2px solid red; */
padding-left: 19rpx;
padding-right: 19rpx;
}
.printLastOrderBottomView {
height: 100%;
background: white;
width: 100%;
position: absolute;
/* display: flex;
flex-direction: column; */
/* border: 2px solid red; */
}
.printLastOrderPrintStatusHint {
color: #333333;
font-size: 26rpx;
margin: 0 auto;
width: 100%;
text-align: center;
font-weight: bold;
position: absolute;
top: 89rpx;
}
\ No newline at end of file
pages/printlastorder/printlastorder.axml 0 → 100644
View file @ d006f2dc
<view class="printLastOrderPage">
<!--下半部分布局-->
<view class="printLastOrderBottomView">
<text class="printLastOrderPrintStatusHint">{{printLastOrderPrintStatusHint}}</text>
<!--层叠布局-->
<view style="width:277rpx;height:196rpx;margin:0 auto;position:absolute;top:132rpx;left:0rpx;right:0rpx;display:relative;">
<image mode="aspectFit" style="width:277rpx;height:196rpx;margin:0 auto;" src="/images/bg_paper.png"/>
<block a:if="{{!printLastOrderIsPrintSuccess}}">
<view style="position:absolute;margin:0 auto;top:107rpx;left:0rpx;right:0rpx;width:124rpx;height:41rpx;font-size:19rpx;">
<button size="mini" type="ghost" style="border-radius:20rpx;height:41rpx;width:124rpx;border-color:#F96146;" onTap="onPrintLastOrderRePrintClicked">
<text style="font-size:19rpx;color:#F96146;line-height:41rpx;text-align:center;position:absolute;top:0rpx;left:0rpx;right:0rpx;">重新打印</text></button>
</view>
</block>
<block a:else>
<!--打印成功-->
<text style="color:#333333;font-size:19rpx;position:absolute;left:0rpx;right:0rpx;margin:0 auto;width:100%;text-align:center;top:93rpx;">提示顾客带好小票</text>
</block>
</view>
<view style="position:absolute;top:342rpx;margin:0 auto;left:0rpx;right:0rpx;width:252rpx;height:60rpx;text-align:center;">
<block a:if="{{!printLastOrderIsPrintSuccess}}">
<button size="default" type="ghost" style="width:252rpx;height:60rpx;text-align:center;border-color:#007AFF;" onTap="onPrintLastOrderCancelClicked">
<text style="color:#007AFF;position:absolute;line-height:60rpx;left:0rpx;right:0rpx;font-size:24rpx;font-weight:bold;">取消</text></button>
</block>
<block a:else>
<button size="default" type="primary" style="width:252rpx;height:60rpx;text-align:center;border-color:#007AFF;color:#007AFF;" onTap="onPrintLastOrderConfirmClicked">
<text style="color:#ffffff;position:absolute;line-height:60rpx;left:0rpx;right:0rpx;font-size:24rpx;font-weight:bold;">确定</text></button>
</block>
</view>
</view>
<!--topTitle-->
<view class="topView" onTap="onPosterPageBack">
<!--title-->
<view class="printLastOrderTitleText">
<text>打印上一单</text>
</view>
<!--返回键-->
<view class="printLastOrderBackButton">
<image mode="aspectFit" style="width:9rpx;height:18rpx;margin-right:8rpx;" src="/images/icon_back.png"/>
<text>返回</text>
</view>
</view>
</view>
\ No newline at end of file
pages/printlastorder/printlastorder.js 0 → 100644
View file @ d006f2dc
Page({
data: {
printLastOrderPrintStatusHint: "正在打印上一单...",
//是否打印成功
printLastOrderIsPrintSuccess: false
},
onLoad() { },
onPrintLastOrderCancelClicked() { },
onPrintLastOrderConfirmClicked() { },
onPrintLastOrderRePrintClicked() { }
});
pages/printlastorder/printlastorder.json 0 → 100644
View file @ d006f2dc
{
"transparentTitle": "always"
}
\ No newline at end of file
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