uas手机版

首页红点接口对接
应用菜单接口对接

uas-office-web/uas-mobile/src/components/common/func/FuncItem.jsx

@@ -24,7 +24,7 @@ export default class FuncItem extends Component {
     let { funcObj } = this.props
     if (!isObjEmpty(funcObj.countUrl)) {
       fetchGet(funcObj.countUrl).then(response => {
-        funcObj.sup = response.data || 11
+        funcObj.sup = response.data
         this.props.onFuncDataChange && this.props.onFuncDataChange(funcObj)
         if (funcObj.funcType === FUNC_TYPE_DOC) {
           GlobalEvent.emit(EVENT_DOC_FUNC_COUNT, this, funcObj)

uas-office-web/uas-mobile/src/components/common/func/common-func.less

@@ -65,7 +65,7 @@
     font-size: 12px;
     color: #fff;
     background-color: #ff5b05;
-    transform: translateX(-40%);
+    transform: translateX(-45%);
     transform-origin: -10% center;
     z-index: 10;
     font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "\5FAE\8F6F\96C5\9ED1", SimSun, sans-serif;

uas-office-web/uas-mobile/src/components/common/mainHeader/MainHeader.jsx

@@ -10,7 +10,6 @@ import { API } from '../../../configs/api.config'
 import { connect } from 'react-redux'
 import { refreshMainState } from '../../../redux/actions/mainState'
 import { freshHomeState } from '../../../redux/actions/homeState'
-import { GlobalEvent } from '../../../utils/common/eventbus/eventbus'
 
 class MainHeader extends Component {
 

uas-office-web/uas-mobile/src/configs/api.config.js

@@ -5,13 +5,15 @@
 
 export const _host = window.location.origin
   && 'http://usoft.f3322.net:10007/uas'
-  && 'http://10.1.7.104:8080/ERP'//吴炳
   && 'http://10.1.7.44:8081/erp'//吴雨骁
+  && 'http://10.1.7.104:8080/ERP'//吴炳
 
 export const _baseURL = _host + (process.env.REACT_APP_ROUTER_BASE_NAME || '')
 
 export const API = {
   /*******************************通用*************************************/
+  //登录ERP
+  COMMON_LOGIN: _baseURL + '/common/login.action',
   //应用红点数
   APPCOMMON_COUNT: _baseURL + '/mobile/appcommon/count/',
   /*******************************应用*************************************/

uas-office-web/uas-mobile/src/pages/private/homePage/HomePage.jsx

@@ -15,6 +15,8 @@ import { clearListState } from '../../../redux/actions/listState'
 import { GlobalEvent } from '../../../utils/common/eventbus/eventbus'
 import { EVENT_DOC_FUNC_COUNT } from '../../../utils/common/eventbus/events.types'
 import { requestServices } from '../../../utils/private/services.request'
+import { fetchGet } from '../../../utils/common/fetchRequest'
+import { API } from '../../../configs/api.config'
 
 /**
  * Created by RaoMeng on 2020/11/9

uas-office-web/uas-mobile/src/utils/common/fetchRequest.js

@@ -1,5 +1,10 @@
 import { getStrValue, isObjNull } from './common.util'
 
+/**
+ * Created by RaoMeng on 2020/10/20
+ * Desc: fetch网络请求封装
+ */
+
 /**
  * 参数为FormData
  * @param url

uas-office-web/uas-mobile/src/utils/common/form.util.js

@@ -13,15 +13,13 @@ import BillModel, {
 } from '../../model/common/BillModel'
 import FormTitle from '../../components/common/formNew/FormTitle'
 import BillGroupModel from '../../model/common/BillGroupModel'
+import { _baseURL } from '../../configs/api.config'
 
 /**
  * Created by RaoMeng on 2020/11/6
  * Desc: 通用表单生成组件工具类
  */
 
-let mBaseUrl = window.location.origin
-  + (process.env.REACT_APP_ROUTER_BASE_NAME || '')
-
 /**
  * 通过json数据获取表单组件列表
  * @param billGroupModelList
@@ -54,7 +52,7 @@ export function getFormItems (billGroupModelList) {
                   formItems.push(
                     <FormInput billModel={billModel} groupIndex={g}
                                childIndex={i}
-                               baseUrl={mBaseUrl}
+                               baseUrl={_baseURL}
                                onTextChange={onTextChange.bind(this,
                                  billGroupModelList)}
                                onInputClick={onInputClick.bind(this,
@@ -66,7 +64,7 @@ export function getFormItems (billGroupModelList) {
                   //附件
                   /*formItems.push(
                     <FormEnclosure billModel={billModel} groupIndex={g}
-                                   baseUrl={mBaseUrl}
+                                   baseUrl={_baseURL}
                                    childIndex={i}/>,
                   )*/
                   break