Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bh_face_counter
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄天晨
bh_face_counter
Commits
eda22a72
Commit
eda22a72
authored
Feb 21, 2021
by
lichao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
收银台修改logo提示和监听外卖自提单小票打印
parent
1285c7f2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
63 additions
and
3 deletions
+63
-3
store.js
src/models/store.js
+3
-0
VerticalPage.js
src/pages/VerticalPage.js
+52
-3
store.js
src/services/store.js
+4
-0
config.js
src/utils/config.js
+4
-0
No files found.
src/models/store.js
View file @
eda22a72
...
@@ -146,6 +146,9 @@ export default {
...
@@ -146,6 +146,9 @@ export default {
*
getStore
(
action
,
{
call
})
{
*
getStore
(
action
,
{
call
})
{
return
yield
call
(
api
.
getStore
,
action
);
return
yield
call
(
api
.
getStore
,
action
);
},
},
*
findModuleSetting
(
action
,
{
call
})
{
return
yield
call
(
api
.
findModuleSetting
,
action
);
},
},
},
};
};
...
...
src/pages/VerticalPage.js
View file @
eda22a72
...
@@ -10,7 +10,6 @@ import CounterMixins from './CounterMixins';
...
@@ -10,7 +10,6 @@ import CounterMixins from './CounterMixins';
import
NP
from
'../utils/np'
;
import
NP
from
'../utils/np'
;
import
AutoClick
from
'../utils/AutoClick'
;
import
AutoClick
from
'../utils/AutoClick'
;
import
Touch
from
'../components/Touch'
;
import
Touch
from
'../components/Touch'
;
import
logo
from
'../assets/Vertical/logo.png'
;
import
counterText
from
'../assets/Vertical/counterText.png'
;
import
counterText
from
'../assets/Vertical/counterText.png'
;
import
img24h
from
'../assets/Vertical/24h.png'
;
import
img24h
from
'../assets/Vertical/24h.png'
;
import
phone
from
'../assets/Vertical/phone.png'
;
import
phone
from
'../assets/Vertical/phone.png'
;
...
@@ -20,9 +19,11 @@ import WxFacepay from '../utils/WxFacepay';
...
@@ -20,9 +19,11 @@ import WxFacepay from '../utils/WxFacepay';
import
{
width
,
setSpText
,
scaleSize
,
scaleHeight
}
from
'../utils/screen'
;
import
{
width
,
setSpText
,
scaleSize
,
scaleHeight
}
from
'../utils/screen'
;
import
Speech
from
'../utils/Speech'
;
import
Speech
from
'../utils/Speech'
;
import
delay
from
'../utils/delay'
;
import
delay
from
'../utils/delay'
;
import
Printer
from
'../utils/Printer'
;
import
Smilepay
from
'../utils/Smilepay'
;
import
Smilepay
from
'../utils/Smilepay'
;
import
{
leaveTalkCall
,
onTalkCall
}
from
'../utils/agora'
;
import
{
leaveTalkCall
,
onTalkCall
}
from
'../utils/agora'
;
import
Toast
from
'../components/Toast'
;
import
Toast
from
'../components/Toast'
;
import
{
ossLink
}
from
'../utils/config'
;
let
pageSize
=
8
;
// 分页大小
let
pageSize
=
8
;
// 分页大小
window
.
pageSize
=
pageSize
;
window
.
pageSize
=
pageSize
;
...
@@ -40,6 +41,7 @@ class VerticalPage extends Component {
...
@@ -40,6 +41,7 @@ class VerticalPage extends Component {
hintVisible
:
false
,
hintVisible
:
false
,
setting
:
false
,
setting
:
false
,
logoVisible
:
true
,
logoVisible
:
true
,
logo
:
''
,
};
};
async
componentWillMount
()
{
async
componentWillMount
()
{
...
@@ -64,6 +66,7 @@ class VerticalPage extends Component {
...
@@ -64,6 +66,7 @@ class VerticalPage extends Component {
await
this
.
wxFacepay
();
// 点击开通重新调用
await
this
.
wxFacepay
();
// 点击开通重新调用
this
.
faceBusy
=
false
;
this
.
faceBusy
=
false
;
});
});
await
this
.
refreshLogo
();
}
}
initSetting
=
()
=>
{
initSetting
=
()
=>
{
...
@@ -96,11 +99,52 @@ class VerticalPage extends Component {
...
@@ -96,11 +99,52 @@ class VerticalPage extends Component {
// 语音通话中
// 语音通话中
window
.
socket
.
on
(
'talkLeave'
,
this
.
leaveC
);
window
.
socket
.
on
(
'talkLeave'
,
this
.
leaveC
);
}
}
// logo改变
if
(
!
window
.
socket
.
hasListeners
(
'storeSetting'
))
{
window
.
socket
.
on
(
'storeSetting'
,
async
data
=>
{
// 重新获取logo
await
this
.
refreshLogo
();
});
}
// 外卖自提订单小票打印
if
(
!
window
.
socket
.
hasListeners
(
'orderReceipt'
))
{
window
.
socket
.
on
(
'orderReceipt'
,
async
data
=>
{
await
this
.
print
(
data
.
goods
,
data
.
receipt
);
});
}
}
catch
(
e
)
{
}
catch
(
e
)
{
console
.
log
(
e
);
console
.
log
(
e
);
}
}
};
};
refreshLogo
=
async
()
=>
{
let
group
=
await
AsyncStorage
.
getItem
(
'KEY'
);
let
{
data
}
=
await
this
.
props
.
dispatch
({
type
:
'store/findModuleSetting'
,
group
,
});
if
(
data
.
code
===
1
&&
data
.
data
)
{
await
this
.
setState
({
logo
:
`
${
ossLink
}
/
${
data
.
data
}
`
});
}
};
print
=
async
(
arr
,
receipt
)
=>
{
let
total
=
0
;
let
goods
=
[];
arr
.
map
(
v
=>
{
total
+=
(
v
.
price
>
0
?
v
.
price
:
v
.
prePrice
)
*
v
.
num
;
goods
.
push
(
`
${
v
.
name
}
,
${
v
.
num
}
,
${
v
.
price
>
0
?
v
.
price
:
v
.
prePrice
}
,
${(
v
.
price
>
0
?
v
.
price
:
v
.
prePrice
)
*
v
.
num
}
`
,
);
});
goods
.
push
(
`总计, , ,
${
total
.
toFixed
(
2
)}
`
);
await
Printer
.
printNote
(
goods
,
receipt
);
};
handleTalkCall
=
async
()
=>
{
handleTalkCall
=
async
()
=>
{
try
{
try
{
// 加入语音通话
// 加入语音通话
...
@@ -481,7 +525,7 @@ class VerticalPage extends Component {
...
@@ -481,7 +525,7 @@ class VerticalPage extends Component {
imgArr
,
imgArr
,
adType
,
adType
,
}
=
this
.
props
;
}
=
this
.
props
;
let
{
contact
,
hintVisible
,
logoVisible
}
=
this
.
state
;
let
{
contact
,
hintVisible
,
logoVisible
,
logo
}
=
this
.
state
;
pageSize
=
pageSize
=
goods
&&
goods
.
bags
.
length
>
0
goods
&&
goods
.
bags
.
length
>
0
?
goods
&&
goods
.
bags
.
length
>
3
?
goods
&&
goods
.
bags
.
length
>
3
...
@@ -528,7 +572,12 @@ class VerticalPage extends Component {
...
@@ -528,7 +572,12 @@ class VerticalPage extends Component {
/
>
/
>
<
View
style
=
{
styles
.
header
}
>
<
View
style
=
{
styles
.
header
}
>
<
View
style
=
{
styles
.
left
}
>
<
View
style
=
{
styles
.
left
}
>
{
logoVisible
&&
<
Image
source
=
{
logo
}
/>
}
{
logoVisible
&&
(
logo
?
(
<
Image
style
=
{{
width
:
100
,
height
:
100
}}
source
=
{{
uri
:
logo
}}
/
>
)
:
(
<
Image
source
=
{
require
(
'../assets/Vertical/logo.png'
)}
/
>
))}
<
Image
style
=
{
styles
.
counterText
}
source
=
{
counterText
}
/
>
<
Image
style
=
{
styles
.
counterText
}
source
=
{
counterText
}
/
>
<
Image
source
=
{
img24h
}
/
>
<
Image
source
=
{
img24h
}
/
>
<
/View
>
<
/View
>
...
...
src/services/store.js
View file @
eda22a72
...
@@ -86,3 +86,7 @@ export function getAdvertising(action) {
...
@@ -86,3 +86,7 @@ export function getAdvertising(action) {
export
function
getStore
({
group
})
{
export
function
getStore
({
group
})
{
return
axios
.
get
(
`/store/setting/
${
group
}
`
);
return
axios
.
get
(
`/store/setting/
${
group
}
`
);
}
}
export
function
findModuleSetting
({
group
})
{
return
axios
.
get
(
`/store/module/setting/
${
group
}
`
);
}
src/utils/config.js
View file @
eda22a72
...
@@ -8,6 +8,10 @@ export const qrHost = login;
...
@@ -8,6 +8,10 @@ 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/'
;
export
const
watermark
=
'.jpg?x-oss-process=style/zmgo_thumb_watermark'
;
export
const
watermark
=
'.jpg?x-oss-process=style/zmgo_thumb_watermark'
;
export
const
appName
=
'仲马购人工智能'
;
export
const
appName
=
'仲马购人工智能'
;
export
const
bucket
=
process
.
env
.
NODE_ENV
===
'production'
?
'zhongma'
:
'self-shop-test'
;
export
const
region
=
'oss-cn-shenzhen'
;
export
const
ossLink
=
`https://
${
bucket
}
.
${
region
}
.aliyuncs.com`
;
window
.
defaultCount
=
0
;
window
.
defaultCount
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment