Commit d729545c by 钟昊

没有经过测试的订单详情弹窗

parent 1285c7f2
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -34,6 +34,7 @@ axios.interceptors.request.use(config => { ...@@ -34,6 +34,7 @@ axios.interceptors.request.use(config => {
if (window.auth) { if (window.auth) {
// 门店Token // 门店Token
config.headers.common.Authorization = `Bearer ${window.auth.token}`; config.headers.common.Authorization = `Bearer ${window.auth.token}`;
// console.log("Token", `Bearer ${window.auth.token}`)
} }
return config; return config;
}); });
......
...@@ -96,5 +96,8 @@ export default { ...@@ -96,5 +96,8 @@ export default {
*balancePay(action, {call}) { *balancePay(action, {call}) {
return yield call(api.balancePay, action); return yield call(api.balancePay, action);
}, },
*getOrderCounter(action, {call}) {
return yield call(api.getOrderCounter, action);
},
}, },
}; };
...@@ -8,6 +8,7 @@ import PhoneModal from '../components/PhoneModal'; ...@@ -8,6 +8,7 @@ import PhoneModal from '../components/PhoneModal';
import VerifyCodeModal from '../components/VerifyCodeModal'; import VerifyCodeModal from '../components/VerifyCodeModal';
import QRCode from 'react-native-qrcode-svg'; import QRCode from 'react-native-qrcode-svg';
import OrderDetailsModal from '../components/OrderDetailsModal'; import OrderDetailsModal from '../components/OrderDetailsModal';
import OrderDetailMini from '../components/OrderDetailMini';
import TipsModal from '../components/TipsModal'; import TipsModal from '../components/TipsModal';
import LoadingModal from '../components/LoadingModal'; import LoadingModal from '../components/LoadingModal';
import delay from '../utils/delay'; import delay from '../utils/delay';
...@@ -30,6 +31,7 @@ class FacePage extends Component { ...@@ -30,6 +31,7 @@ class FacePage extends Component {
phoneModal: false, // 显示输入电话号码弹窗 phoneModal: false, // 显示输入电话号码弹窗
verifyCodeModal: false, // 显示输入验证码弹窗 verifyCodeModal: false, // 显示输入验证码弹窗
orderDetailsModal: false, // 显示订单详情弹窗 orderDetailsModal: false, // 显示订单详情弹窗
orderDetailMini: false,
goodsArr: [], goodsArr: [],
talkCall: 2, // 0请求通话,1通话中,2,已挂断通话,待机状态 talkCall: 2, // 0请求通话,1通话中,2,已挂断通话,待机状态
contact: '', contact: '',
...@@ -39,6 +41,7 @@ class FacePage extends Component { ...@@ -39,6 +41,7 @@ class FacePage extends Component {
tip: '', tip: '',
tipsModal: false, tipsModal: false,
faceType: 'wxpay', faceType: 'wxpay',
// 屏保模式
sleep: true, sleep: true,
loadingModal: false, loadingModal: false,
qrCode: '', qrCode: '',
...@@ -49,6 +52,7 @@ class FacePage extends Component { ...@@ -49,6 +52,7 @@ class FacePage extends Component {
}; };
phone = ''; // 监听用户输入手机 phone = ''; // 监听用户输入手机
// 设备类型
// sense = true; // 测试即拿刷脸设备 // sense = true; // 测试即拿刷脸设备
async componentWillMount() { async componentWillMount() {
...@@ -150,6 +154,31 @@ class FacePage extends Component { ...@@ -150,6 +154,31 @@ class FacePage extends Component {
orderDetailsModal: false, orderDetailsModal: false,
}); });
}; };
/**
* @param {String} timeoutt 超时时间
*/
orderDetailMiniPop = timeoutt => {
this.setState({
orderDetailMini: true,
});
// 没有清空计时器的操作,可能造成内存溢出
setTimeout(() => {
this.setState({
orderDetailMini: false,
});
}, timeoutt);
};
/**
* 拉取数据,同步至state
*/
getOrderDetailMiniCounter = async () => {
const {data} = await this.props.dispatch({
type: 'goods/getOrderCounter',
});
this.setState({
goodsArr: data,
});
};
listen = async () => { listen = async () => {
try { try {
...@@ -195,7 +224,9 @@ class FacePage extends Component { ...@@ -195,7 +224,9 @@ class FacePage extends Component {
else if (this.action === 'leave') { else if (this.action === 'leave') {
// 出门身份识别提示 // 出门身份识别提示
Speech.speak('正在进行安全检查'); Speech.speak('正在进行安全检查');
this.loading(true, 30000); this.getOrderDetailMiniCounter();
this.orderDetailMiniPop(30000);
// this.loading(true, 30000);
} }
} }
}; };
...@@ -282,6 +313,11 @@ class FacePage extends Component { ...@@ -282,6 +313,11 @@ class FacePage extends Component {
code: ret.code, code: ret.code,
}); });
if (ret) { if (ret) {
if (ret.code === 1 && ret.action === 'leave') {
this.setState({
orderDetailMini: false,
});
}
if (ret.code < 0 || ret.code === 401) { if (ret.code < 0 || ret.code === 401) {
// 未授权,提示用户扫码验证 // 未授权,提示用户扫码验证
let tipText = ret.msg; let tipText = ret.msg;
...@@ -652,6 +688,7 @@ class FacePage extends Component { ...@@ -652,6 +688,7 @@ class FacePage extends Component {
verifyCodeModal, verifyCodeModal,
phoneModal, phoneModal,
orderDetailsModal, orderDetailsModal,
orderDetailMini,
goodsArr, goodsArr,
talkCall, talkCall,
storeName, storeName,
...@@ -717,6 +754,14 @@ class FacePage extends Component { ...@@ -717,6 +754,14 @@ class FacePage extends Component {
current={current} current={current}
faceType={faceType} faceType={faceType}
/> />
<OrderDetailMini
visible={orderDetailMini}
transparent
onRequestClose={this.handleOrderClose}
goodsArr={goodsArr}
dispatch={dispatch}
faceType={faceType}
/>
<TipsModal <TipsModal
visible={tipsModal} visible={tipsModal}
transparent transparent
......
...@@ -74,3 +74,7 @@ export function payscoreinfo() { ...@@ -74,3 +74,7 @@ export function payscoreinfo() {
export function balancePay(action) { export function balancePay(action) {
return axios.post('/store/goods/balancePay', qs.stringify(action)); return axios.post('/store/goods/balancePay', qs.stringify(action));
} }
export function getOrderCounter() {
return axios.get('/store/goods/counter');
}
\ No newline at end of file
...@@ -2,7 +2,7 @@ const app = ''; // eg: .25h/.eg ...@@ -2,7 +2,7 @@ const app = ''; // eg: .25h/.eg
export const isProd = process.env.NODE_ENV === 'production'; export const isProd = process.env.NODE_ENV === 'production';
export const host = isProd export const host = isProd
? `https://api${app}.vs-u.com` ? `https://api${app}.vs-u.com`
: 'http://192.168.88.166:7001'; : 'http://192.168.88.88:7001';
export const login = `https://m${app}.vs-u.com`; export const login = `https://m${app}.vs-u.com`;
export const qrHost = login; export const qrHost = login;
export const imgUrl = 'http://barcod.oss-cn-shenzhen.aliyuncs.com/images/'; export const imgUrl = 'http://barcod.oss-cn-shenzhen.aliyuncs.com/images/';
......
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