Skip to content

M
max_android_panel
Commit 119ada55 by Zhang Xin
Options

玩完善整套逻辑，修改页面bug

parent ebd5255b
Showing with 183 additions and 87 deletions
client/actions/getStore.js
...@@ -42,7 +42,7 @@ const getStoreInfo = (storeId)=>{ ...@@ -42,7 +42,7 @@ const getStoreInfo = (storeId)=>{
credentials : 'include', credentials : 'include',
method : 'POST', method : 'POST',
mode : 'cors', mode : 'cors',
headers: myHeaders, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(bodyData) body: JSON.stringify(bodyData)
}).then((response)=>response.json()) }).then((response)=>response.json())
.then(json=>{ .then(json=>{
......
client/actions/userinfo.js
...@@ -26,21 +26,31 @@ const saveUserinfo = (data)=>{ ...@@ -26,21 +26,31 @@ const saveUserinfo = (data)=>{
} }
}; };
var myHeaders = new Headers({
'Access-Control-Allow-Origin': '*',
// 'Content-Type': 'text/plain;charset=UTF-8',
// 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'Content-Type': 'application/json; charset=UTF-8',
});
const getUserinfo = (info)=>{ const getUserinfo = (info)=>{
let employeeId = info.employeeid; console.log("getUserinfo ",info)
let employeeId = info.employeeId;
let bodyData = Object.assign({},{employeeId})
return(dispatch)=>{ return(dispatch)=>{
dispatch(saveHeaderInfo(info)); dispatch(saveHeaderInfo(info));
// fetch(domain + '/web/flush_image.action',{ fetch(domain + 'machine_pad/get_alowed_task.action',{
// credentials : 'include', credentials : 'include',
// method : 'POST', method : 'POST',
// mode : 'cors', mode : 'cors',
// body : {} headers:myHeaders,
// body : JSON.stringify(bodyData)
// }).then((response)=>response.json()) }).then((response)=>response.json())
// .then(json=>{ .then(json=>{
// console.log(json); console.log(json);
// }).catch(e=>{console.error(e)}) }).catch(e=>{console.error(e)})
if(json.meta.success && json.data){ if(json.meta.success && json.data){
dispatch(saveUserinfo(json.data)) dispatch(saveUserinfo(json.data))
} }
......
client/components/CommonComponent/ClockComponent/ClockComponent.jsx
...@@ -13,7 +13,7 @@ export default class ClockComponent extends React.Component{ ...@@ -13,7 +13,7 @@ export default class ClockComponent extends React.Component{
} }
componentWillMount(){ componentWillMount(){
console.log("componentWillMount") console.log("clock componentWillMount")
let {totalTime} = this.props; let {totalTime} = this.props;
if(totalTime && totalTime > 0){ if(totalTime && totalTime > 0){
this.setState({ this.setState({
...@@ -26,11 +26,11 @@ export default class ClockComponent extends React.Component{ ...@@ -26,11 +26,11 @@ export default class ClockComponent extends React.Component{
} }
componentWillReceiveProps(){ componentWillReceiveProps(){
console.log("componentWillReceiveProps") console.log("clock componentWillReceiveProps")
} }
componentWillUnmount(){ componentWillUnmount(){
console.log("componentWillUnmount") console.log("clock componentWillUnmount")
window.clearTimeout(this.state.timer); window.clearTimeout(this.state.timer);
this.setState({ this.setState({
timer : null, timer : null,
......
client/components/CommonComponent/HeaderComponent/index.css
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
border-left: 0 solid transparent; border-left: 0 solid transparent;
border-right: 40px solid #34343e; border-right: 40px solid #34343e;
top: 0; top: 0;
right: 0; right: -1px;
} }
.headerComponent .homeHeader .headerlogo .logoImg{ .headerComponent .homeHeader .headerlogo .logoImg{
position: absolute; position: absolute;
......
client/components/OtherQuestionComponent/index.css
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
display: inline-block; display: inline-block;
position: relative; position: relative;
float: left; float: left;
background: #ffffff;
} }
.editUploadItem .closeBtn{ .editUploadItem .closeBtn{
width: 32px; width: 32px;
......
client/components/ReportDamageListComponent/DamageItemComponent/DamageItem.jsx
...@@ -20,7 +20,7 @@ export default class DamageItem extends React.Component{ ...@@ -20,7 +20,7 @@ export default class DamageItem extends React.Component{
return ( return (
<div className={"damageProductItem"}> <div className={"damageProductItem"}>
<span onClick={()=>{deleteItem(inventoryId)}} className={"closeBtn"}>×</span> <span onClick={()=>{deleteItem(inventoryId)}} className={"closeBtn font50"}>×</span>
<div className={"productBaseInfo clearfix"}> <div className={"productBaseInfo clearfix"}>
<img className={"productImg"} src= {skuBaseInfoVo.skuImagePath} alt=""/> <img className={"productImg"} src= {skuBaseInfoVo.skuImagePath} alt=""/>
<div className={"baseNumber"}> <div className={"baseNumber"}>
...@@ -36,8 +36,8 @@ export default class DamageItem extends React.Component{ ...@@ -36,8 +36,8 @@ export default class DamageItem extends React.Component{
</div> </div>
<div className={"productOtherInfo"}> <div className={"productOtherInfo"}>
<div className={"locationAndStatusInfo"}> <div className={"locationAndStatusInfo"}>
<p className={"location"}>商品位置:<span>{lossPosition}</span></p> <p className={"location font32"}>商品位置:<span>{lossPosition}</span></p>
<p className={"status"}>商品状态:<span>{packingStatus}</span></p> <p className={"status font32"}>商品状态:<span>{packingStatus}</span></p>
</div> </div>
<div className={"damageImgs clearfix"}> <div className={"damageImgs clearfix"}>
<ImgToolComponent noCloseBtn={true} type={"custom"} imgSrc = { require('./img/lol.gif')} ></ImgToolComponent> <ImgToolComponent noCloseBtn={true} type={"custom"} imgSrc = { require('./img/lol.gif')} ></ImgToolComponent>
......
client/components/ReportDamageListComponent/DamageItemComponent/index.css
...@@ -5,46 +5,50 @@ ...@@ -5,46 +5,50 @@
border-radius: 10px; border-radius: 10px;
display: inline-block; display: inline-block;
position: relative; position: relative;
float: left; background: #fff;
} }
.damageProductItem .closeBtn{ .damageProductItem .closeBtn{
width: 32px; width: 56px;
height: 32px; height: 56px;
display: inline-block; display: inline-block;
border-radius: 50%; border-radius: 50%;
background-color: #fe785b; background-color: #fe785b;
font-weight: 500; font-weight: bold;
color: #ffffff; color: #ffffff;
font-size: 26px; /* line-height: 28px; */
line-height: 27px;
text-align: center; text-align: center;
position: absolute; position: absolute;
top: -16px; top: -28px;
right: -16px right: -28px;
} }
.damageProductItem .productBaseInfo{ .damageProductItem .productBaseInfo{
border-bottom: 1px dashed #e5e5e5; border-bottom: 2px dashed #e5e5e5;
padding-bottom: 30px; padding-bottom: 30px;
} }
.damageProductItem .productBaseInfo .productImg{ .damageProductItem .productBaseInfo .productImg{
display: inline-block; display: inline-block;
width: 200px; width: 198px;
height: 200px; height: 198px;
border: 1px solid #e5e5e5; border: 2px solid #e5e5e5;
/*background-color: darkgoldenrod;*/ /*background-color: darkgoldenrod;*/
float: left; float: left;
} }
.damageProductItem .productBaseInfo .baseNumber{ .damageProductItem .productBaseInfo .baseNumber{
float: left; float: left;
width: 200px; margin: 0 30px;
margin-left: 30px; width: 506px;
width: 315px; overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
.damageProductItem .productBaseInfo .baseNumber p{ .damageProductItem .productBaseInfo .baseNumber p{
margin-top: 8px; margin-top: 8px;
font-size: 32px; font-size: 32px;
line-height: 44px; line-height: 44px;
color: #333333; color: #333333;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
} }
.damageProductItem .productBaseInfo .baseNumber .barcode{} .damageProductItem .productBaseInfo .baseNumber .barcode{}
.damageProductItem .productBaseInfo .baseNumber .skuNumnber{} .damageProductItem .productBaseInfo .baseNumber .skuNumnber{}
...@@ -57,10 +61,11 @@ ...@@ -57,10 +61,11 @@
} }
.damageProductItem .productBaseInfo .productCount{ .damageProductItem .productBaseInfo .productCount{
display: inline-block; display: inline-block;
padding-top: 140px; /*padding-top: 140px;*/
float: right; float: left;
margin:0 20px 0 220px; /*margin:0 20px 0 220px;*/
box-sizing: border-box; box-sizing: border-box;
line-height: 198px;
} }
.damageProductItem .productBaseInfo .productCount .multipleIcon{ .damageProductItem .productBaseInfo .productCount .multipleIcon{
font-size: 32px; font-size: 32px;
...@@ -73,8 +78,8 @@ ...@@ -73,8 +78,8 @@
font-size: 40px; font-size: 40px;
} }
.damageProductItem .productOtherInfo{ .damageProductItem .productOtherInfo{
margin-top: 16px; margin-top: 24px;
width: 1080px; width: 100%;
box-sizing: border-box; box-sizing: border-box;
} }
.damageProductItem .productOtherInfo .locationAndStatusInfo{ .damageProductItem .productOtherInfo .locationAndStatusInfo{
...@@ -91,7 +96,7 @@ ...@@ -91,7 +96,7 @@
margin-left: 15px; margin-left: 15px;
} }
.damageProductItem .productOtherInfo .damageImgs{ .damageProductItem .productOtherInfo .damageImgs{
margin-top: 40px; margin-top: 32px;
} }
.damageProductItem .productOtherInfo .damageImgs .imgItem { .damageProductItem .productOtherInfo .damageImgs .imgItem {
width: 90px; width: 90px;
......
client/containers/ChooseTaskContainer/ChooseTaskContainer.jsx
import React from 'react'; import React from 'react';
import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent' import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent'
import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
require('./index.css'); require('./index.css');
export default class ChooseTaskContainer extends React.Component{ export default class ChooseTaskContainer extends React.Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state = { this.state = {
} };
this.closeDoor = this.closeDoor.bind(this);
} }
componentWillMount(){ componentWillMount(){
...@@ -17,22 +19,35 @@ export default class ChooseTaskContainer extends React.Component{ ...@@ -17,22 +19,35 @@ export default class ChooseTaskContainer extends React.Component{
} }
closeDoor(){
console.log("closeDoor")
this.props.showOpenDoorPage()
}
render(){ render(){
let {userInfo,storeInfo} = this.props;
return( return(
<div className={"chooseTaskContainer"}> <div>
<div className={"chooseTaskText font32"}> <HeaderComponent
<p>请选择一个有权限的任务！</p> showHeader={CONFIG.headerStatus[1]}
</div> userinfo={userInfo}
<div className={"chooseTaskButtons"}> storeInfo={storeInfo}
<Button text={"处理已知故障"} style={{'marginTop':'40px'}}/> />
<Button text={"申报新故障"} style={{'marginTop':'20px'}}/> <div className={"chooseTaskContainer"}>
<Button text={"设备检查"} style={{'marginTop':'20px'}}/> <div className={"chooseTaskText font32"}>
<Button text={"设备测试"} style={{'marginTop':'20px'}}/> <p>请选择一个有权限的任务！</p>
<Button text={"确认退出，并离店"} style={{'marginTop':'87px'}}/> </div>
<div className={"chooseTaskButtons"}>
<Button text={"处理已知故障"} style={{'marginTop':'40px'}}/>
<Button text={"申报新故障"} style={{'marginTop':'20px'}}/>
<Button text={"设备检查"} style={{'marginTop':'20px'}}/>
<Button text={"设备测试"} style={{'marginTop':'20px'}}/>
<Button text={"确认退出，并离店"} style={{'marginTop':'87px'}} option={this.closeDoor}/>
</div>
</div> </div>
</div> </div>
) )
} }
} }
......
client/containers/FinishAskContainer/FinishAskContainer.jsx
import React from 'react'; import React from 'react';
import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent' import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent'
import Clock from '../../components/CommonComponent/ClockComponent/ClockComponent' import Clock from '../../components/CommonComponent/ClockComponent/ClockComponent'
import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
require('./index.css'); require('./index.css');
export default class FinishAskContainer extends React.Component{ export default class FinishAskContainer extends React.Component{
...@@ -8,31 +10,52 @@ export default class FinishAskContainer extends React.Component{ ...@@ -8,31 +10,52 @@ export default class FinishAskContainer extends React.Component{
super(props); super(props);
this.state = { this.state = {
} }
this.closeDoor = this.closeDoor.bind(this);
this.selectTask = this.selectTask.bind(this);
} }
componentWillMount(){ componentWillMount(){
this.props.endCountBack()
} }
componentWillReceiveProps(nextProps){ componentWillReceiveProps(nextProps){
} }
selectTask(){
console.log("selectTask")
let {changePages} = this.props;
changePages(CONFIG.showPage[9])
}
closeDoor(){
console.log("closeDoor")
this.props.showOpenDoorPage();
}
render(){ render(){
let {userInfo,storeInfo} = this.props;
return( return(
<div className={"finishAskContainer"}> <div>
<div className={"finishAskText font32"}> <HeaderComponent
<p>感谢您的故障问题处理工作！</p> showHeader={CONFIG.headerStatus[1]}
<p>您是否有其它任务</p> userinfo={userInfo}
</div> storeInfo={storeInfo}
<div className={"finishAskButtons"}> />
<Button text={"有"} style={{'marginTop':'120px'}}/> <div className={"finishAskContainer"}>
<Button text={"没有"} style={{'marginTop':'40px'}}/> <div className={"finishAskText font32"}>
<Clock style={{'marginTop':'40px'}}/> <p>感谢您的故障问题处理工作！</p>
<p>您是否有其它任务</p>
</div>
<div className={"finishAskButtons"}>
<Button text={"有"} style={{'marginTop':'120px'}} option={this.selectTask}/>
<Button text={"没有"} style={{'marginTop':'40px'}} option={this.closeDoor}/>
<Clock style={{'marginTop':'40px'}} totalTime={60}
callback={this.closeDoor}/>
</div>
</div> </div>
</div> </div>
) )
} }
} }
......
client/containers/HomeContainer/HomeContainer.jsx
...@@ -22,7 +22,7 @@ export default class HomeContainer extends React.Component{ ...@@ -22,7 +22,7 @@ export default class HomeContainer extends React.Component{
render(){ render(){
let props = this.props; let props = this.props;
let {userInfo,storeInfo} = props; let {userInfo,storeInfo,judgeDoorStatus} = props;
return( return(
<div> <div>
<HeaderComponent <HeaderComponent
...@@ -39,7 +39,8 @@ export default class HomeContainer extends React.Component{ ...@@ -39,7 +39,8 @@ export default class HomeContainer extends React.Component{
<p>关门倒数，请尽快离开店铺</p> <p>关门倒数，请尽快离开店铺</p>
<p>请在离开前再次确保没有遗留个人物品在设备内</p> <p>请在离开前再次确保没有遗留个人物品在设备内</p>
</div> </div>
<Clock totalTime={60}/> <Clock totalTime={60}
callback={judgeDoorStatus}/>
</div> : null </div> : null
} }
</div> </div>
......
client/containers/PageContainer/PageContainer.jsx
...@@ -44,13 +44,14 @@ class PageContainer extends React.Component { ...@@ -44,13 +44,14 @@ class PageContainer extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
showPage : initPage, showPage : showPage[3],
lastPage : '', lastPage : '',
page : null, page : null,
popupInfo : defaultPopupInfo, popupInfo : defaultPopupInfo,
showClock : false, //关门页面显示倒计时 showClock : false, //关门页面显示倒计时
headerInfo : {}, headerInfo : {},
pageStyle : {} pageStyle : {},
successCloseDoor : false
}; };
this.getPages = this.getPages.bind(this); //获取当前页面 this.getPages = this.getPages.bind(this); //获取当前页面
this.showPopup = this.showPopup.bind(this); //显示弹窗 this.showPopup = this.showPopup.bind(this); //显示弹窗
...@@ -134,6 +135,9 @@ class PageContainer extends React.Component { ...@@ -134,6 +135,9 @@ class PageContainer extends React.Component {
let info = JSON.parse(data.info); let info = JSON.parse(data.info);
console.log("SUCCESS_OPENDOOR " ,info); console.log("SUCCESS_OPENDOOR " ,info);
dispatch(getUserinfo(info)); dispatch(getUserinfo(info));
this.setState({
successCloseDoor : false
});
break; break;
case 'SUCCESS_CLOSEDOOR': case 'SUCCESS_CLOSEDOOR':
//关门成功 //关门成功
...@@ -143,7 +147,8 @@ class PageContainer extends React.Component { ...@@ -143,7 +147,8 @@ class PageContainer extends React.Component {
this.setState({ this.setState({
showPage : showPage[7], showPage : showPage[7],
showClock : false, showClock : false,
popupInfo : defaultPopupInfo popupInfo : defaultPopupInfo,
successCloseDoor : true
}); });
break; break;
} }
...@@ -326,7 +331,12 @@ class PageContainer extends React.Component { ...@@ -326,7 +331,12 @@ class PageContainer extends React.Component {
judgeDoorStatus(){ judgeDoorStatus(){
//成功关门 //成功关门
//关门失败 //关门失败
this.failCloseDoor() // this.emptyUser();
// this.failCloseDoor()
if(!this.state.successCloseDoor){
//关门失败，上传警报
this.failCloseDoor();
}
} }
playAlarmMusic(){ playAlarmMusic(){
...@@ -360,6 +370,13 @@ class PageContainer extends React.Component { ...@@ -360,6 +370,13 @@ class PageContainer extends React.Component {
} }
showOpenDoorPage(){
console.log("showOpenDoorPage")
this.setState({
showPage : initPage,
showClock : true
})
}
getPages(){ getPages(){
...@@ -414,14 +431,24 @@ class PageContainer extends React.Component { ...@@ -414,14 +431,24 @@ class PageContainer extends React.Component {
break; break;
case showPage[7]: case showPage[7]:
pages = <HomeContainer showClock={this.state.showClock} storeInfo={state.storeInfo} pages = <HomeContainer showClock={this.state.showClock} storeInfo={state.storeInfo}
userInfo={state.userInfo}/>; userInfo={state.userInfo}
judgeDoorStatus={this.judgeDoorStatus}
/>;
break; break;
case showPage[8]: case showPage[8]:
pages = <FinishAskContainer />; pages = <FinishAskContainer storeInfo={state.storeInfo}
userInfo={state.userInfo}
endCountBack={this.endCountBack}
changePages={(data)=>this.changePages(data)}
showOpenDoorPage={()=>this.showOpenDoorPage.bind(this)()}
/>;
break; break;
case showPage[9]: case showPage[9]:
pages = <ChooseTaskContainer storeInfo={state.storeInfo} pages = <ChooseTaskContainer storeInfo={state.storeInfo}
userInfo={state.userInfo}/>; userInfo={state.userInfo}
changePages={(data)=>this.changePages(data)}
showOpenDoorPage={()=>this.showOpenDoorPage.bind(this)()}
/>;
break; break;
} }
return pages; return pages;
......
client/containers/ReportDamagesListContainer/ReportDamagesListContainer.jsx
...@@ -45,7 +45,7 @@ export default class ReportDamagesListContainer extends React.Component{ ...@@ -45,7 +45,7 @@ export default class ReportDamagesListContainer extends React.Component{
}); });
} }
let swiperOptions = { let swiperOptions = {
width : 1396, width : 987,
spaceBetween: 30, spaceBetween: 30,
freeMode:true, freeMode:true,
// slidesPerView: 2.6, // slidesPerView: 2.6,
...@@ -61,7 +61,7 @@ export default class ReportDamagesListContainer extends React.Component{ ...@@ -61,7 +61,7 @@ export default class ReportDamagesListContainer extends React.Component{
storeInfo={storeInfo} storeInfo={storeInfo}
/> />
<div className={"damageTitleContainer"}>故障相关报损商品(非货架区)</div> <div className={"damageTitleContainer"}>故障相关报损商品(非货架区)</div>
<div className={"damageProductList clearfix"}> <div className={"damageProductList"}>
<SwiperComponent <SwiperComponent
swiperContainer={swiperContainer} swiperOptions={swiperOptions} swiperCount={swiperCount} swiperContainer={swiperContainer} swiperOptions={swiperOptions} swiperCount={swiperCount}
> >
......
client/containers/ReportDamagesListContainer/index.css
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
line-height: 25px; line-height: 25px;
font-size: 25px; font-size: 25px;
} }
.ReportDamagesListContainer .damageProductList{} .ReportDamagesListContainer .damageProductList{
padding-left: 30px;
}
.ReportDamagesListContainer .damageSwiperContainer{ .ReportDamagesListContainer .damageSwiperContainer{
overflow: visible; overflow: visible;
} }
......
client/containers/TextAreaContainer/TextAreaContainer.jsx
...@@ -26,17 +26,14 @@ export default class TextAreaContainer extends React.Component{ ...@@ -26,17 +26,14 @@ export default class TextAreaContainer extends React.Component{
} }
handleBlur(){ handleBlur(){
console.log("--handleBlur--"); console.log("--handleBlur--");
this.props.setStyle({ this.props.setStyle({})
'position':'absolute',
'top':'0px'
})
} }
handleFocus(){ handleFocus(){
console.log("==handleFocus=="); console.log("==handleFocus==");
this.props.setStyle({ this.props.setStyle({
'position':'absolute', 'position':'absolute',
'top':'120px' 'top':'0px'
}) })
} }
......
client/containers/TroubleContainer/TroubleContainer.jsx
...@@ -218,9 +218,9 @@ export default class TroubleContainer extends React.Component{ ...@@ -218,9 +218,9 @@ export default class TroubleContainer extends React.Component{
} }
setStyle(style){ setStyle(style){
// this.setState({ this.setState({
// style : style style : style
// }) })
} }
getTextAreaDom(){ getTextAreaDom(){
...@@ -252,7 +252,7 @@ export default class TroubleContainer extends React.Component{ ...@@ -252,7 +252,7 @@ export default class TroubleContainer extends React.Component{
render(){ render(){
return ( return (
<div className={"troubleContainers "+(this.state.showStatus === showDom[2] ? 'backfff' : '')}> <div className={"troubleContainers "+(this.state.showStatus === showDom[2] ? 'backfff' : '')} style={this.state.style}>
{ {
this.getDom() this.getDom()
} }
......
client/css/common.css
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
-moz-user-select: none; /* Firefox */ -moz-user-select: none; /* Firefox */
-ms-user-select: none; /* Internet Explorer/Edge */ -ms-user-select: none; /* Internet Explorer/Edge */
user-select: none; /* Non-prefixed version, currently*/ user-select: none; /* Non-prefixed version, currently*/
position: relative;
height: 100%;
} }
div{ div{
touch-action: none; touch-action: none;
......
client/css/font.css
...@@ -135,6 +135,18 @@ body{ ...@@ -135,6 +135,18 @@ body{
[data-dpr="3"] .font44 { [data-dpr="3"] .font44 {
font-size: calc(var(--font3) * font44) !important; font-size: calc(var(--font3) * font44) !important;
} }
.font50 {
font-size: font50 !important;
}
[data-dpr="2"] .font50 {
font-size: calc(var(--font2) * font50) !important;
}
[data-dpr="3"] .font50 {
font-size: calc(var(--font3) * font50) !important;
}
.font58 { .font58 {
font-size: font58 !important; font-size: font58 !important;
} }
......
client/css/reset.css
...@@ -26,7 +26,7 @@ button, input, select, textarea { /* for ie */ ...@@ -26,7 +26,7 @@ button, input, select, textarea { /* for ie */
outline: none; outline: none;
} }
html, body { html, body {
/*height: 100%;*/ height: 100%;
background-color: #f5f5f5; background-color: #f5f5f5;
} }
......
client/env/development.js
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
* Created by ruibing on 16/11/2. * Created by ruibing on 16/11/2.
*/ */
module.exports = { module.exports = {
domain: 'http://test.mjitech.com/web/', domain: 'http://preprod.mjitech.com/web/',
uploadImg : 'https://test.mjitech.com/static/uploadTrouble/' uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble/'
} }
\ No newline at end of file
client/index.html
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>怪兽家便利店</title> <title>华沁工作平台</title>
<meta name='viewport' content='width=device-width, initial-scale=0.67, maximum-scale=0.67, user-scalable=false,target-densitydpi=device-dpi'/> <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=false,target-densitydpi=device-dpi'/>
<meta name="format-detection" content="telephone=no"/> <meta name="format-detection" content="telephone=no"/>
</head> </head>
......
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