Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
max_android_panel
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Zhang Xin
max_android_panel
Commits
0ae81e68
Commit
0ae81e68
authored
Dec 03, 2018
by
Zhang Xin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加问题反馈页面 && fix recovery & replenish css
parent
94831bcc
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
203 additions
and
28 deletions
+203
-28
client/components/CommonComponent/SkuInfoComponent/SkuInfoComponent.jsx
+1
-1
client/components/RecoveryComponent/RecoveryFirstPage/RecoveryFirstPage.jsx
+11
-1
client/components/RecoveryComponent/RecoveryScanPage/RecoveryScanPage.jsx
+16
-6
client/components/RecoveryComponent/RecoverySecondPage/RecoverySecondPage.jsx
+1
-1
client/components/ReplenishComponent/ReplenishScanPage/ReplenishScanPage.jsx
+3
-3
client/config/showPage.js
+5
-2
client/containers/HomePageContainer/HomePageContainer.jsx
+27
-10
client/containers/PageContainer/PageContainer.jsx
+30
-3
client/containers/QuestionContainer/QuestionContainer.jsx
+77
-0
client/containers/QuestionContainer/index.css
+32
-0
client/containers/ReplenishContainer/ReplenishContainer.jsx
+0
-1
No files found.
client/components/CommonComponent/SkuInfoComponent/SkuInfoComponent.jsx
View file @
0ae81e68
...
@@ -54,7 +54,7 @@ export default class SkuInfoComponent extends React.Component{
...
@@ -54,7 +54,7 @@ export default class SkuInfoComponent extends React.Component{
}
}
</
li
>
</
li
>
<
li
className=
{
""
}
>
<
li
className=
{
""
}
>
<
span
className=
{
""
}
>
所在区域:
{
skuInfo
.
shortPosition
||
''
}
<
span
className=
{
""
}
>
所在区域:
{
skuInfo
.
area
||
''
}
{
{
skuInfo
.
areaImage
?
<
span
className=
{
"areaBtn colff775c"
}
onClick=
{
()
=>
this
.
showImg
(
skuInfo
.
areaImage
)
}
>
位置照片
</
span
>
:
null
skuInfo
.
areaImage
?
<
span
className=
{
"areaBtn colff775c"
}
onClick=
{
()
=>
this
.
showImg
(
skuInfo
.
areaImage
)
}
>
位置照片
</
span
>
:
null
}
}
...
...
client/components/RecoveryComponent/RecoveryFirstPage/RecoveryFirstPage.jsx
View file @
0ae81e68
...
@@ -6,6 +6,16 @@ export default class RecoveryFirstPage extends React.Component{
...
@@ -6,6 +6,16 @@ export default class RecoveryFirstPage extends React.Component{
super
(
props
);
super
(
props
);
}
}
showImg
(
imgSrc
){
let
{
showPopup
,
hidePopup
}
=
this
.
props
;
let
showImgDom
=
<
div
onClick=
{
()
=>
hidePopup
()
}
className=
{
"showBigImg"
}
>
<
img
src=
{
imgSrc
||
UTILPATH
.
localImg
.
defaultImg
}
alt=
""
/>
</
div
>;
showPopup
({
popupChild
:
showImgDom
});
}
render
(){
render
(){
let
props
=
this
.
props
;
let
props
=
this
.
props
;
let
{
headerInfo
}
=
props
;
let
{
headerInfo
}
=
props
;
...
@@ -14,7 +24,7 @@ export default class RecoveryFirstPage extends React.Component{
...
@@ -14,7 +24,7 @@ export default class RecoveryFirstPage extends React.Component{
<
div
className=
{
"recoveryFirstPage"
}
>
<
div
className=
{
"recoveryFirstPage"
}
>
<
div
className=
{
"text font40 col333"
}
>
任务目标:请将
{
taskInfo
.
area
||
""
}
区回收箱进行整体更换
</
div
>
<
div
className=
{
"text font40 col333"
}
>
任务目标:请将
{
taskInfo
.
area
||
""
}
区回收箱进行整体更换
</
div
>
<
Button
btnContainer=
{
"recoveryFirstPageBtn font32 backff775c colfff"
}
key=
{
"recoveryFirstPageBtn"
}
text=
{
'已替换完成'
}
option=
{
props
.
handleFinishBoxRecovery
}
/>
<
Button
btnContainer=
{
"recoveryFirstPageBtn font32 backff775c colfff"
}
key=
{
"recoveryFirstPageBtn"
}
text=
{
'已替换完成'
}
option=
{
props
.
handleFinishBoxRecovery
}
/>
<
div
className=
{
"tips font24"
}
>
查看回收箱位置
</
div
>
<
div
className=
{
"tips font24"
}
onClick=
{
()
=>
this
.
showImg
.
bind
(
this
)()
}
>
查看回收箱位置
</
div
>
</
div
>
</
div
>
)
)
}
}
...
...
client/components/RecoveryComponent/RecoveryScanPage/RecoveryScanPage.jsx
View file @
0ae81e68
...
@@ -19,7 +19,7 @@ export default class RecoveryScanPage extends React.Component{
...
@@ -19,7 +19,7 @@ export default class RecoveryScanPage extends React.Component{
this
.
state
=
{
this
.
state
=
{
barcodeText
:
''
,
barcodeText
:
''
,
barcodeErrorText
:
''
,
barcodeErrorText
:
''
,
showInput
:
fals
e
showInput
:
tru
e
}
}
}
}
...
@@ -55,16 +55,29 @@ export default class RecoveryScanPage extends React.Component{
...
@@ -55,16 +55,29 @@ export default class RecoveryScanPage extends React.Component{
handleInputChange
(
e
){
handleInputChange
(
e
){
this
.
setState
({
this
.
setState
({
barcodeText
:
e
.
target
.
value
barcodeText
:
e
.
target
.
value
})
});
if
(
this
.
state
.
barcodeErrorText
){
this
.
setState
({
barcodeErrorText
:
''
})
}
}
}
getBarcodeInput
(){
getBarcodeInput
(){
let
{
headerInfo
}
=
this
.
props
;
let
{
taskList
=
{}}
=
headerInfo
;
return
(
return
(
<
div
className=
{
"recoveryBarcodeInputDom"
}
>
<
div
className=
{
"recoveryBarcodeInputDom"
}
>
<
div
className=
{
"colfff font30 scanText"
}
style=
{
{
marginBottom
:
'0.5rem'
}
}
>
目标回收数量:
<
span
className=
{
"font40 colff775c"
}
>
{
taskList
.
targetNum
||
0
}
</
span
>
已回收数量:
<
span
className=
{
"font40 colff775c"
}
>
{
taskList
.
recoverNum
||
0
}
</
span
></
div
>
<
div
className=
{
"barcodeInputText font30"
}
>
{
this
.
state
.
barcodeErrorText
}
</
div
>
<
div
className=
{
"barcodeInputText font30"
}
>
{
this
.
state
.
barcodeErrorText
}
</
div
>
<
input
value=
{
this
.
state
.
barcodeText
}
className=
{
"barcodeInput font30 col000"
}
type=
"text"
onChange=
{
this
.
handleInputChange
.
bind
(
this
)
}
/>
<
input
value=
{
this
.
state
.
barcodeText
}
autoFocus=
{
true
}
className=
{
"barcodeInput font30 col000"
}
type=
"text"
onChange=
{
this
.
handleInputChange
.
bind
(
this
)
}
/>
<
div
className=
{
"barcodeInputTip font30 colff775c"
}
onClick=
{
()
=>
this
.
changeShowInput
()
}
><
span
className=
{
"colfff"
}
>
or
</
span
>
条形码扫描
</
div
>
<
div
className=
{
"barcodeInputTip font30 colff775c"
}
onClick=
{
()
=>
this
.
changeShowInput
()
}
><
span
className=
{
"colfff"
}
>
or
</
span
>
条形码扫描
</
div
>
<
Button
btnContainer=
{
"barcodeInputBarcode font32 backff775c colfff"
}
key=
{
"barcodeInputBarcode"
}
text=
{
"确定"
}
option=
{
this
.
submitBarcode
}
/>
<
Button
btnContainer=
{
"barcodeInputBarcode font32 backff775c colfff"
}
key=
{
"barcodeInputBarcode"
}
text=
{
"确定"
}
option=
{
this
.
submitBarcode
}
/>
<
div
className=
{
"colfff scanInfo font30"
}
style=
{
{
marginTop
:
'1.5rem'
}
}
>
<
span
style=
{
{
marginRight
:
"0.1rem"
}
}
>
货道信息:
{
taskList
.
position
||
''
}
</
span
>
<
span
style=
{
{
marginRight
:
"0.1rem"
}
}
>
货道编号:
{
taskList
.
positionNum
||
''
}
</
span
>
<
span
>
货物条形码:
{
taskList
.
barcode
||
''
}
</
span
>
</
div
>
</
div
>
</
div
>
)
)
}
}
...
@@ -128,9 +141,6 @@ export default class RecoveryScanPage extends React.Component{
...
@@ -128,9 +141,6 @@ export default class RecoveryScanPage extends React.Component{
if
(
barcodeText
){
if
(
barcodeText
){
barcodeText
=
barcodeText
.
trim
();
barcodeText
=
barcodeText
.
trim
();
if
(
this
.
checkNumber
(
barcodeText
)){
if
(
this
.
checkNumber
(
barcodeText
)){
console
.
log
(
"submitBarcode "
,
barcodeText
);
console
.
log
(
"submitBarcode "
,
taskList
);
console
.
log
(
"submitBarcode "
,
taskList
.
barcode
);
this
.
setState
({
this
.
setState
({
barcodeErrorText
:
''
barcodeErrorText
:
''
});
});
...
...
client/components/RecoveryComponent/RecoverySecondPage/RecoverySecondPage.jsx
View file @
0ae81e68
...
@@ -39,7 +39,7 @@ export default class RecoverySecondPage extends React.Component{
...
@@ -39,7 +39,7 @@ export default class RecoverySecondPage extends React.Component{
wrongSku
(){
wrongSku
(){
//货道商品不符
//货道商品不符
let
{
showPopup
,
hidePopup
}
=
this
.
props
;
let
{
showPopup
,
hidePopup
}
=
this
.
props
;
let
btnDom1
=
<
Button
btnContainer=
{
"recoveryPopInfoWrongSkuBtn1 font32"
}
key=
{
"recoveryContainerShelfWrong1"
}
text=
{
"货品不符"
}
option=
{
this
.
uploadWrongSku
}
/>
let
btnDom1
=
<
Button
btnContainer=
{
"recoveryPopInfoWrongSkuBtn1 font32
bordere5e5e5
"
}
key=
{
"recoveryContainerShelfWrong1"
}
text=
{
"货品不符"
}
option=
{
this
.
uploadWrongSku
}
/>
let
btnDom2
=
<
Button
btnContainer=
{
"recoveryPopInfoWrongSkuBtn2 backff775c colfff font32"
}
key=
{
"recoveryContainerShelfWrong2"
}
text=
{
"关闭窗口"
}
option=
{
hidePopup
}
/>
let
btnDom2
=
<
Button
btnContainer=
{
"recoveryPopInfoWrongSkuBtn2 backff775c colfff font32"
}
key=
{
"recoveryContainerShelfWrong2"
}
text=
{
"关闭窗口"
}
option=
{
hidePopup
}
/>
let
popDom
=
let
popDom
=
<
PopModel
popupTitle=
{
"遇到问题-货品不符"
}
classContainer=
{
"recoveryPopInfo"
}
>
<
PopModel
popupTitle=
{
"遇到问题-货品不符"
}
classContainer=
{
"recoveryPopInfo"
}
>
...
...
client/components/ReplenishComponent/ReplenishScanPage/ReplenishScanPage.jsx
View file @
0ae81e68
...
@@ -25,7 +25,7 @@ export default class ReplenishScanPage extends React.Component{
...
@@ -25,7 +25,7 @@ export default class ReplenishScanPage extends React.Component{
this
.
state
=
{
this
.
state
=
{
barcodeText
:
''
,
barcodeText
:
''
,
barcodeErrorText
:
''
,
barcodeErrorText
:
''
,
showInput
:
fals
e
,
showInput
:
tru
e
,
btnClock
:
false
btnClock
:
false
}
}
}
}
...
@@ -157,7 +157,7 @@ export default class ReplenishScanPage extends React.Component{
...
@@ -157,7 +157,7 @@ export default class ReplenishScanPage extends React.Component{
console
.
log
(
"扫描结束"
);
console
.
log
(
"扫描结束"
);
//货道商品不符
//货道商品不符
let
{
showPopup
,
hidePopup
}
=
this
.
props
;
let
{
showPopup
,
hidePopup
}
=
this
.
props
;
let
btnDom1
=
<
Button
btnContainer=
{
"replenishHandleScanOverBtn1 font32"
}
key=
{
"replenishHandleScanOverBtn1"
}
text=
{
"继续扫描"
}
option=
{
this
.
handleScanContinue
}
/>
let
btnDom1
=
<
Button
btnContainer=
{
"replenishHandleScanOverBtn1 font32
bordere5e5e5
"
}
key=
{
"replenishHandleScanOverBtn1"
}
text=
{
"继续扫描"
}
option=
{
this
.
handleScanContinue
}
/>
let
btnDom2
=
<
Button
btnContainer=
{
"replenishHandleScanOverBtn2 backff775c colfff font32"
}
key=
{
"replenishHandleScanOverBtn2"
}
text=
{
"确认扫描完毕"
}
option=
{
this
.
scanOver
}
/>
let
btnDom2
=
<
Button
btnContainer=
{
"replenishHandleScanOverBtn2 backff775c colfff font32"
}
key=
{
"replenishHandleScanOverBtn2"
}
text=
{
"确认扫描完毕"
}
option=
{
this
.
scanOver
}
/>
let
popDom
=
let
popDom
=
<
PopModel
popupTitle=
{
"补货结束确认"
}
classContainer=
{
"replenishPopInfo"
}
>
<
PopModel
popupTitle=
{
"补货结束确认"
}
classContainer=
{
"replenishPopInfo"
}
>
...
@@ -207,7 +207,7 @@ export default class ReplenishScanPage extends React.Component{
...
@@ -207,7 +207,7 @@ export default class ReplenishScanPage extends React.Component{
return
(
return
(
<
div
className=
{
"replenishScanBarcodeInputDom"
}
>
<
div
className=
{
"replenishScanBarcodeInputDom"
}
>
<
div
className=
{
"barcodeInputText font30"
}
>
{
this
.
state
.
barcodeErrorText
}
</
div
>
<
div
className=
{
"barcodeInputText font30"
}
>
{
this
.
state
.
barcodeErrorText
}
</
div
>
<
input
value=
{
this
.
state
.
barcodeText
}
className=
{
"barcodeInput font30 col000"
}
onFocus=
{
this
.
handleFocus
.
bind
(
this
)
}
type=
"text"
onChange=
{
this
.
handleInputChange
.
bind
(
this
)
}
/>
<
input
value=
{
this
.
state
.
barcodeText
}
autoFocus=
{
true
}
className=
{
"barcodeInput font30 col000"
}
onFocus=
{
this
.
handleFocus
.
bind
(
this
)
}
type=
"text"
onChange=
{
this
.
handleInputChange
.
bind
(
this
)
}
/>
<
div
className=
{
"barcodeInputTip font30 colff775c"
}
onClick=
{
()
=>
this
.
changeShowInput
()
}
><
span
className=
{
"colfff"
}
>
or
</
span
>
条形码扫描
</
div
>
<
div
className=
{
"barcodeInputTip font30 colff775c"
}
onClick=
{
()
=>
this
.
changeShowInput
()
}
><
span
className=
{
"colfff"
}
>
or
</
span
>
条形码扫描
</
div
>
<
Button
btnContainer=
{
"barcodeInputBarcode font32 backff775c colfff"
}
key=
{
"barcodeInputBarcode"
}
text=
{
"确定"
}
option=
{
this
.
submitBarcode
}
/>
<
Button
btnContainer=
{
"barcodeInputBarcode font32 backff775c colfff"
}
key=
{
"barcodeInputBarcode"
}
text=
{
"确定"
}
option=
{
this
.
submitBarcode
}
/>
</
div
>
</
div
>
...
...
client/config/showPage.js
View file @
0ae81e68
...
@@ -13,7 +13,10 @@ const showPage = {
...
@@ -13,7 +13,10 @@ const showPage = {
10
:
'RecoverySkus'
,
//二期回收
10
:
'RecoverySkus'
,
//二期回收
11
:
'Replenishment'
,
//二期补货
11
:
'Replenishment'
,
//二期补货
12
:
'Feedback'
,
//二期问题反馈和关门
12
:
'Feedback'
,
//二期问题反馈和关门
13
:
'HomePage'
//二期首页
13
:
'HomePage'
,
//二期首页
131
:
'HomePage1'
,
//二期首页
14
:
'Question'
,
//二期问题反馈页面
141
:
'Question1'
,
//二期问题反馈页面
};
};
const
taskSchedule
=
{
//任务进度序列号,后台给
const
taskSchedule
=
{
//任务进度序列号,后台给
1
:
showPage
[
5
],
1
:
showPage
[
5
],
...
@@ -38,11 +41,11 @@ const normalMenuList = [
...
@@ -38,11 +41,11 @@ const normalMenuList = [
{
{
text
:
'货品位置查询'
,
text
:
'货品位置查询'
,
type
:
'HPWZ'
,
type
:
'HPWZ'
,
page
:
5
},
},
{
{
text
:
'问题反馈'
,
text
:
'问题反馈'
,
type
:
'WTFK'
,
type
:
'WTFK'
,
page
:
141
},
},
{
{
text
:
'货品信息查询'
,
text
:
'货品信息查询'
,
...
...
client/containers/HomePageContainer/HomePageContainer.jsx
View file @
0ae81e68
...
@@ -2,6 +2,7 @@ import React from 'react';
...
@@ -2,6 +2,7 @@ import React from 'react';
import
HeaderComponent
from
'../../components/CommonComponent/HeaderComponent/HeaderComponent'
import
HeaderComponent
from
'../../components/CommonComponent/HeaderComponent/HeaderComponent'
import
Button
from
'../../components/CommonComponent/ButtonComponent/ButtonComponent'
import
Button
from
'../../components/CommonComponent/ButtonComponent/ButtonComponent'
import
PopModel
from
'../../components/CommonComponent/PopupComponent/PopupChildComponent'
import
PopModel
from
'../../components/CommonComponent/PopupComponent/PopupChildComponent'
import
{
sendMsg
}
from
"../../util/socket"
;
require
(
'./index.css'
);
require
(
'./index.css'
);
export
default
class
HomePageContainer
extends
React
.
Component
{
export
default
class
HomePageContainer
extends
React
.
Component
{
...
@@ -37,7 +38,9 @@ export default class HomePageContainer extends React.Component{
...
@@ -37,7 +38,9 @@ export default class HomePageContainer extends React.Component{
}
}
logout
(){
logout
(){
this
.
props
.
tempLogout
()
this
.
props
.
willCloseDoor
();
let
msg
=
{
type
:
'WILL_CLOSEDOOR'
}
sendMsg
(
JSON
.
stringify
(
msg
))
}
}
showLogoutPopup
(){
showLogoutPopup
(){
...
@@ -77,15 +80,29 @@ export default class HomePageContainer extends React.Component{
...
@@ -77,15 +80,29 @@ export default class HomePageContainer extends React.Component{
headerInfo=
{
headerInfo
}
headerInfo=
{
headerInfo
}
showLogoutPopup=
{
this
.
showLogoutPopup
}
showLogoutPopup=
{
this
.
showLogoutPopup
}
/>
/>
<
div
className=
{
"homeContainer"
}
>
{
<
img
className=
{
"homeIcon"
}
style=
{
imgStyle
}
src=
{
UTILPATH
.
localImg
.
homePage
}
alt=
""
/>
props
.
closeDoor
?
<
div
className=
{
"homeContainer"
}
>
{
<
img
className=
{
"homeIcon"
}
style=
{
imgStyle
}
src=
{
UTILPATH
.
localImg
.
homePage
}
alt=
""
/>
taskInfo
.
area
?
<
div
className=
{
'homeWelcom font30 clo333'
}
style=
{
{
marginTop
:
marginTop50
}
}
>
欢迎来到
<
span
className=
"homeArea font50 colff775c"
style=
{
{
padding
:
`0 ${padding}`
}
}
>
{
taskInfo
.
area
||
''
}
</
span
>
区
</
div
>
{
:
null
taskInfo
.
area
?
<
div
className=
{
'homeWelcom font42 clo333'
}
style=
{
{
marginTop
:
marginTop50
}
}
>
恭喜您,
{
taskInfo
.
area
}
区工作任务完成
</
div
>
}
:
null
<
div
className=
{
"homeText font42"
}
style=
{
{
fontWeight
:
'800'
,
marginTop
:
marginTop20
}
}
>
{
this
.
state
.
text
}
你辛苦了!
</
div
>
}
<
Button
text=
{
'开始工作'
}
btnContainer=
{
'colfff font30'
}
style=
{
buttonStyle
}
option=
{
this
.
start
.
bind
(
this
)
}
/>
<
div
className=
{
"homeText font42"
}
style=
{
{
marginTop
:
marginTop20
}
}
>
请关门,然后继续完成其他工作
</
div
>
</
div
>
<
Button
text=
{
'关门'
}
btnContainer=
{
'colfff font30'
}
style=
{
buttonStyle
}
option=
{
this
.
logout
.
bind
(
this
)
}
/>
</
div
>
:
<
div
className=
{
"homeContainer"
}
>
<
img
className=
{
"homeIcon"
}
style=
{
imgStyle
}
src=
{
UTILPATH
.
localImg
.
homePage
}
alt=
""
/>
{
taskInfo
.
area
?
<
div
className=
{
'homeWelcom font30 clo333'
}
style=
{
{
marginTop
:
marginTop50
}
}
>
欢迎来到
<
span
className=
"homeArea font50 colff775c"
style=
{
{
padding
:
`0 ${padding}`
}
}
>
{
taskInfo
.
area
||
''
}
</
span
>
区
</
div
>
:
null
}
<
div
className=
{
"homeText font42"
}
style=
{
{
fontWeight
:
'800'
,
marginTop
:
marginTop20
}
}
>
{
this
.
state
.
text
}
你辛苦了!
</
div
>
<
Button
text=
{
'开始工作'
}
btnContainer=
{
'colfff font30'
}
style=
{
buttonStyle
}
option=
{
this
.
start
.
bind
(
this
)
}
/>
</
div
>
}
</
div
>
</
div
>
)
)
...
...
client/containers/PageContainer/PageContainer.jsx
View file @
0ae81e68
...
@@ -27,6 +27,7 @@ import TakeStokeContainer from '../TakeStokeContainer/TakeStokeContainer'
...
@@ -27,6 +27,7 @@ import TakeStokeContainer from '../TakeStokeContainer/TakeStokeContainer'
import
BreakageContainer
from
'../BreakageContainer/BreakageConatiner'
import
BreakageContainer
from
'../BreakageContainer/BreakageConatiner'
import
RecoveryPage
from
'../RecoveryContainer/RecoveryContainer'
import
RecoveryPage
from
'../RecoveryContainer/RecoveryContainer'
import
ReplenishContainer
from
'../ReplenishContainer/ReplenishContainer'
import
ReplenishContainer
from
'../ReplenishContainer/ReplenishContainer'
import
QuestionContainer
from
'../QuestionContainer/QuestionContainer'
import
{
getBarCodeProductInfo
,
saveProductInfo
}
from
'../../actions/barcodeCommon'
import
{
getBarCodeProductInfo
,
saveProductInfo
}
from
'../../actions/barcodeCommon'
import
{
getTaskList
}
from
'../../actions/common'
import
{
getTaskList
}
from
'../../actions/common'
import
{
submitBreakageProduct
,
hasNoSku
}
from
'../../actions/breakaegContainer'
import
{
submitBreakageProduct
,
hasNoSku
}
from
'../../actions/breakaegContainer'
...
@@ -259,7 +260,7 @@ class PageContainer extends React.Component {
...
@@ -259,7 +260,7 @@ class PageContainer extends React.Component {
this
.
changePages
(
CONFIG
.
showPage
[
11
]);
this
.
changePages
(
CONFIG
.
showPage
[
11
]);
break
;
break
;
case
'PF'
:
case
'PF'
:
this
.
changePages
(
CONFIG
.
showPage
[
9
]);
this
.
changePages
(
CONFIG
.
showPage
[
14
]);
break
;
break
;
}
}
}
}
...
@@ -575,7 +576,7 @@ class PageContainer extends React.Component {
...
@@ -575,7 +576,7 @@ class PageContainer extends React.Component {
this
.
changePages
(
CONFIG
.
showPage
[
11
]);
this
.
changePages
(
CONFIG
.
showPage
[
11
]);
break
;
break
;
case
'PF'
:
case
'PF'
:
this
.
changePages
(
CONFIG
.
showPage
[
9
]);
this
.
changePages
(
CONFIG
.
showPage
[
14
]);
break
;
break
;
}
}
}
else
{
}
else
{
...
@@ -684,9 +685,18 @@ class PageContainer extends React.Component {
...
@@ -684,9 +685,18 @@ class PageContainer extends React.Component {
changePages=
{
(
data
)
=>
this
.
changePages
(
data
)
}
changePages=
{
(
data
)
=>
this
.
changePages
(
data
)
}
showPopup=
{
(
info
)
=>
this
.
showPopup
(
info
)
}
showPopup=
{
(
info
)
=>
this
.
showPopup
(
info
)
}
hidePopup=
{
()
=>
this
.
hidePopup
()
}
hidePopup=
{
()
=>
this
.
hidePopup
()
}
tempLogout=
{
()
=>
this
.
tempLogout
.
bind
(
this
)()
}
/>
;
/>
;
break;
break;
case showPage[131]:
pages =
<
HomePage
headerInfo=
{
commonInfo
}
getTaskList=
{
()
=>
{
dispatch
(
getTaskList
(
commonInfo
))}
}
changePages=
{
(
data
)
=>
this
.
changePages
(
data
)
}
showPopup=
{
(
info
)
=>
this
.
showPopup
(
info
)
}
hidePopup=
{
()
=>
this
.
hidePopup
()
}
willCloseDoor=
{
()
=>
{
dispatch
(
willCloseDoor
(
commonInfo
))}
}
closeDoor=
{
true
}
/>
;
break;
case showPage[6]:
case showPage[6]:
pages =
<
TakeStokeContainer
headerInfo
=
{
commonInfo
}
pages =
<
TakeStokeContainer
headerInfo
=
{
commonInfo
}
showPopup=
{
(
info
)
=>
this
.
showPopup
(
info
)
}
showPopup=
{
(
info
)
=>
this
.
showPopup
(
info
)
}
...
@@ -744,6 +754,23 @@ class PageContainer extends React.Component {
...
@@ -744,6 +754,23 @@ class PageContainer extends React.Component {
emptyErrorInfo=
{
()
=>
dispatch
(
replenishAction
.
emptyErrorInfo
())
}
emptyErrorInfo=
{
()
=>
dispatch
(
replenishAction
.
emptyErrorInfo
())
}
uploadError=
{
(
exceptionType
)
=>
dispatch
(
uploadError
(
commonInfo
,
exceptionType
))
}
uploadError=
{
(
exceptionType
)
=>
dispatch
(
uploadError
(
commonInfo
,
exceptionType
))
}
finishReplenish=
{
(
source
)
=>
dispatch
(
replenishAction
.
finishReplenish
(
commonInfo
,
source
))
}
finishReplenish=
{
(
source
)
=>
dispatch
(
replenishAction
.
finishReplenish
(
commonInfo
,
source
))
}
/>
;
break;
case showPage[14]:
pages =
<
QuestionContainer
headerInfo=
{
commonInfo
}
changePages=
{
(
data
)
=>
this
.
changePages
(
data
)
}
showPopup=
{
(
info
)
=>
this
.
showPopup
(
info
)
}
hidePopup=
{
()
=>
this
.
hidePopup
()
}
/>
;
break;
case showPage[141]:
pages =
<
QuestionContainer
menuType=
{
'WTFK'
}
headerInfo=
{
commonInfo
}
changePages=
{
(
data
)
=>
this
.
changePages
(
data
)
}
showPopup=
{
(
info
)
=>
this
.
showPopup
(
info
)
}
hidePopup=
{
()
=>
this
.
hidePopup
()
}
/>
/>
/*以下是二期页面 end*/
/*以下是二期页面 end*/
}
}
...
...
client/containers/QuestionContainer/QuestionContainer.jsx
0 → 100644
View file @
0ae81e68
import
React
from
'react'
;
import
Button
from
'../../components/CommonComponent/ButtonComponent/ButtonComponent'
import
HeaderComponent
from
'../../components/CommonComponent/HeaderComponent/HeaderComponent'
import
LeftContainer
from
'../LeftContainer/LeftContainer'
;
import
RightContainer
from
'../RightContainer/RightContainer'
;
import
PropTypes
from
"prop-types"
;
require
(
'./index.css'
);
export
default
class
QuestionContainer
extends
React
.
Component
{
constructor
(
props
){
super
(
props
);
this
.
state
=
{
};
}
componentWillMount
(){
}
componentWillReceiveProps
(
nextProps
){
}
handleNoQuestion
(){
console
.
log
(
"handleNoQuestion "
,
this
.
props
);
console
.
log
(
CONFIG
.
showPage
[
131
])
let
{
menuType
=
''
,
changePages
}
=
this
.
props
;
if
(
menuType
){
this
.
context
.
goBackTask
()
}
else
{
changePages
(
CONFIG
.
showPage
[
131
])
}
}
render
(){
let
props
=
this
.
props
;
console
.
log
(
props
)
let
{
headerInfo
,
menuType
=
""
,
changePages
}
=
props
;
return
(
<
div
style=
{
{
width
:
'100%'
,
height
:
'100%'
}
}
>
<
HeaderComponent
showHeader=
{
CONFIG
.
headerStatus
[
1
]
}
headerInfo=
{
headerInfo
}
showLogoutPopup=
{
this
.
showLogoutPopup
}
/>
<
LeftContainer
leftInfo=
{
props
.
headerInfo
}
menuType=
{
menuType
}
/>
<
RightContainer
>
<
div
className=
{
"chooseTaskContainer"
}
>
<
div
className=
{
"replenishHomePage"
}
>
<
div
className=
{
"text font40 col333"
}
style=
{
{
'marginBottom'
:
UTILPATH
.
getRemByPx
(
40
)}
}
>
请问您是否有问题需要反馈
</
div
>
</
div
>
<
div
className=
{
"chooseTaskButtons"
}
>
<
Button
text=
{
"散落货品上报"
}
option=
{
()
=>
changePages
(
CONFIG
.
showPage
[
51
])
}
btnContainer=
{
"bordere5e5e5 font32"
}
style=
{
{
'marginTop'
:
UTILPATH
.
getRemByPx
(
40
)}
}
/>
<
Button
text=
{
"请求店铺保洁"
}
btnContainer=
{
"bordere5e5e5 font32"
}
style=
{
{
'marginTop'
:
UTILPATH
.
getRemByPx
(
20
)}
}
/>
<
Button
text=
{
"其它问题反馈"
}
btnContainer=
{
"bordere5e5e5 font32"
}
style=
{
{
'marginTop'
:
UTILPATH
.
getRemByPx
(
20
)}
}
/>
<
Button
text=
{
"没有问题"
}
option=
{
()
=>
this
.
handleNoQuestion
.
bind
(
this
)()
}
btnContainer=
{
"bordere5e5e5"
}
style=
{
{
'marginTop'
:
UTILPATH
.
getRemByPx
(
20
)}
}
/>
</
div
>
</
div
>
</
RightContainer
>
</
div
>
)
}
}
QuestionContainer
.
propTypes
=
{
};
QuestionContainer
.
defaultProps
=
{
}
QuestionContainer
.
contextTypes
=
{
goBackTask
:
PropTypes
.
func
};
\ No newline at end of file
client/containers/QuestionContainer/index.css
0 → 100644
View file @
0ae81e68
/*.chooseTaskContainer {
text-align: center;
}
.chooseTaskContainer .chooseTaskText {
line-height: 40px;
margin-top: 145px;
}
.chooseTaskContainer .chooseTaskButtons {
display: inline-block;
align-items: center;
}*/
/*---------px rem 分割线-----------*/
.chooseTaskContainer
{
text-align
:
center
;
}
.chooseTaskContainer
.chooseTaskText
{
line-height
:
0.3333333333333333rem
;
margin-top
:
1.2083333333333333rem
;
}
.chooseTaskContainer
.chooseTaskButtons
{
display
:
inline-block
;
align-items
:
center
;
}
/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtJQUNJLG1CQUFtQjtDQUN0Qjs7QUFFRDtJQUNJLGtCQUFrQjtJQUNsQixrQkFBa0I7Q0FDckI7O0FBRUQ7SUFDSSxzQkFBc0I7SUFDdEIsb0JBQW9CO0NBQ3ZCOztBQUVELGtDQUFrQzs7QUFFbEM7SUFDSSxtQkFBbUI7Q0FDdEI7O0FBRUQ7SUFDSSxtQ0FBbUM7SUFDbkMsa0NBQWtDO0NBQ3JDOztBQUVEO0lBQ0ksc0JBQXNCO0lBQ3RCLG9CQUFvQjtDQUN2QiIsImZpbGUiOiJpbmRleC5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIuY2hvb3NlVGFza0NvbnRhaW5lciB7XHJcbiAgICB0ZXh0LWFsaWduOiBjZW50ZXI7XHJcbn1cclxuXHJcbi5jaG9vc2VUYXNrQ29udGFpbmVyIC5jaG9vc2VUYXNrVGV4dCB7XHJcbiAgICBsaW5lLWhlaWdodDogNDBweDtcclxuICAgIG1hcmdpbi10b3A6IDE0NXB4O1xyXG59XHJcblxyXG4uY2hvb3NlVGFza0NvbnRhaW5lciAuY2hvb3NlVGFza0J1dHRvbnMge1xyXG4gICAgZGlzcGxheTogaW5saW5lLWJsb2NrO1xyXG4gICAgYWxpZ24taXRlbXM6IGNlbnRlcjtcclxufVxyXG5cclxuLyotLS0tLS0tLS1weCByZW0g5YiG5Ymy57q/LS0tLS0tLS0tLS0qL1xyXG5cclxuLmNob29zZVRhc2tDb250YWluZXIge1xyXG4gICAgdGV4dC1hbGlnbjogY2VudGVyO1xyXG59XHJcblxyXG4uY2hvb3NlVGFza0NvbnRhaW5lciAuY2hvb3NlVGFza1RleHQge1xyXG4gICAgbGluZS1oZWlnaHQ6IDAuMzMzMzMzMzMzMzMzMzMzM3JlbTtcclxuICAgIG1hcmdpbi10b3A6IDEuMjA4MzMzMzMzMzMzMzMzM3JlbTtcclxufVxyXG5cclxuLmNob29zZVRhc2tDb250YWluZXIgLmNob29zZVRhc2tCdXR0b25zIHtcclxuICAgIGRpc3BsYXk6IGlubGluZS1ibG9jaztcclxuICAgIGFsaWduLWl0ZW1zOiBjZW50ZXI7XHJcbn1cclxuIl19 */
\ No newline at end of file
client/containers/ReplenishContainer/ReplenishContainer.jsx
View file @
0ae81e68
...
@@ -5,7 +5,6 @@ import RightContainer from '../RightContainer/RightContainer';
...
@@ -5,7 +5,6 @@ import RightContainer from '../RightContainer/RightContainer';
import
ReplenishHomePage
from
'../../components/ReplenishComponent/ReplenishHomePage/ReplenishHomePage'
import
ReplenishHomePage
from
'../../components/ReplenishComponent/ReplenishHomePage/ReplenishHomePage'
import
ReplenishSkuPage
from
'../../components/ReplenishComponent/ReplenishSkuPage/ReplenishSkuPage'
import
ReplenishSkuPage
from
'../../components/ReplenishComponent/ReplenishSkuPage/ReplenishSkuPage'
import
ReplenishScanPage
from
'../../components/ReplenishComponent/ReplenishScanPage/ReplenishScanPage'
import
ReplenishScanPage
from
'../../components/ReplenishComponent/ReplenishScanPage/ReplenishScanPage'
import
Button
from
'../../components/CommonComponent/ButtonComponent/ButtonComponent'
require
(
'./index.css'
);
require
(
'./index.css'
);
...
...
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