Commit cd2078f8 by 姜雷

Merge branch 'develop' into test

parents bf2d5a54 3a7c1ac7
...@@ -3,7 +3,7 @@ import { ComponentClass } from 'react'; ...@@ -3,7 +3,7 @@ import { ComponentClass } from 'react';
import { View, Text, Button } from '@tarojs/components'; import { View, Text, Button } from '@tarojs/components';
import { getPayOrder } from '../../api/Order/pay'; import { getPayOrder } from '../../api/Order/pay';
import { connect } from '@tarojs/redux'; import { connect } from '@tarojs/redux';
import { Device } from '../../types/Device/Device'; import { Device, DeviceRefundMode } from '../../types/Device/Device';
import PrepayConfig from '../../types/Order/Order'; import PrepayConfig from '../../types/Order/Order';
import { Customer } from '../../types/Customer/Customer'; import { Customer } from '../../types/Customer/Customer';
import AES from 'crypto-js/aes'; import AES from 'crypto-js/aes';
...@@ -833,7 +833,9 @@ class Pay extends Component { ...@@ -833,7 +833,9 @@ class Pay extends Component {
</View> </View>
</View> </View>
<View className='Pay-tip'> <View className='Pay-tip'>
温馨提示:如本次预付款未全部使用,系统将在使用结束后半小时内自动退还剩余金额,请留意查收! {device.refundMode === DeviceRefundMode.notRefund
? '温馨提示:设备成功开启后,未使用金额将不会退换!'
: '温馨提示:如本次预付款未全部使用,系统将在使用结束后半小时内自动退还剩余金额,请留意查收!'}
</View> </View>
<View className='Pay-money'> <View className='Pay-money'>
{prepayConfig && {prepayConfig &&
......
import Action from '../../types/Store/Actions'; import Action from '../../types/Store/Actions';
import { Device } from '../../types/Device/Device'; import { Device, DeviceRefundMode } from '../../types/Device/Device';
export type DeviceState = StoreState<Device>; export type DeviceState = StoreState<Device>;
export const INITIAL_STATE = { export const INITIAL_STATE = {
refundMode: DeviceRefundMode.needRefund,
originCode: '', originCode: '',
code: '', code: '',
isCurrentUserUsed: 0, isCurrentUserUsed: 0,
......
export enum DeviceRefundMode {
needRefund = 1,
notRefund = 2,
}
export type Rate = { export type Rate = {
mark: string; mark: string;
name: string; name: string;
}; };
export type Device = { export type Device = {
originCode: string, refundMode: DeviceRefundMode;
originCode: string;
code: string; code: string;
isCurrentUserUsed: number; isCurrentUserUsed: number;
isOnline: number; isOnline: number;
......
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