首页图标

uas-office-web/wxuasapproval/config-overrides.js

@@ -2,7 +2,7 @@ const {
   override,
   fixBabelImports,
   addLessLoader,
-  addWebpackAlias
+  addWebpackAlias,
 } = require(
   'customize-cra')
 const rewireLess = require('react-app-rewire-less')
@@ -30,8 +30,8 @@ module.exports = override(
   }),
 
   addWebpackAlias({
-    '@': path.join(__dirname, './src'),
-  })
+    '@': path.join(__dirname, 'src'),
+  }),
 )
 // module.exports = function override (config, env) {
 //

uas-office-web/wxuasapproval/src/components/approvalItem/ApprovalItem.jsx

@@ -27,14 +27,14 @@ export default class ApprovalItem extends Component {
   render () {
     const { approval, type } = this.props
     let approvalStatus = '等待我审批'
-    let statusColor = '#3BAE7E'
+    let statusColor = '#33A3F4'
     if (type === 2) {
       approvalStatus = approval.JN_DEALRESULT
       if (!isObjEmpty(approvalStatus)) {
         if (approvalStatus.startWith('不同意') || approvalStatus.startWith('结束流程')
           || approvalStatus.startWith('未通过')) {
           approvalStatus = '未通过'
-          statusColor = 'red'
+          statusColor = '#db3a34'
         } else if (approvalStatus.startWith('变更处理人')) {
           statusColor = '#999999'
           if (!isObjEmpty(approval.JN_OPERATEDDESCRIPTION)) {
@@ -51,10 +51,10 @@ export default class ApprovalItem extends Component {
       approvalStatus = approval.JP_STATUS
       if (!isObjEmpty(approvalStatus)) {
         if (approvalStatus === '待审批') {
-          statusColor = '#3BAE7E'
+          statusColor = '#33A3F4'
           approvalStatus = '等待' + approval.JP_NODEDEALMANNAME + '审批'
         } else if (approvalStatus === '未通过') {
-          statusColor = 'red'
+          statusColor = '#db3a34'
         } else {
           statusColor = '#999999'
         }
@@ -91,8 +91,15 @@ export default class ApprovalItem extends Component {
             <div className='recharge-item-caption'>{approval.JP_STATUS
               ? '单据状态：'
               : approval.JN_DEALRESULT ? '审批结果：' : '状态'}</div>
-            <div className='recharge-item-value'
-                 style={{ color: statusColor }}>{approvalStatus}</div>
+            <div
+              // className='recharge-item-value'
+              style={{
+                background: statusColor,
+                borderRadius: '8px',
+                color: 'white',
+                padding: '1px 6px',
+                fontSize:'12px'
+              }}>{approvalStatus}</div>
           </div>
         </div>
       </div>

uas-office-web/wxuasapproval/src/components/approvalItem/approvalItem.css

@@ -14,6 +14,7 @@
     padding: 2px 2px 2px 10px;
     font-family: PingFangSC-Regular;
     font-size: 13px;
+    align-items: center;
     letter-spacing: 0;
     flex-direction: row;
 }
@@ -50,8 +51,8 @@
 
 .homework-item-title-layout {
     padding: 8px 10px 4px;
-    font-family: PingFangSC-Regular;
-    font-size: 14px;
+    /*font-family: PingFangSC-Regular;*/
+    font-size: 13px;
     color: #000;
     letter-spacing: 0;
     flex: 1;

uas-office-web/wxuasapproval/src/configs/Constants.js

@@ -0,0 +1,21 @@
+import businessTrip from '@/images/approvalNew/businessTrip.png'
+import dailyreport from '@/images/approvalNew/dailyreport.png'
+import monthlyReport from '@/images/approvalNew/monthlyReport.png'
+import outplans from '@/images/approvalNew/outplans.png'
+import overtime from '@/images/approvalNew/overtime.png'
+import reissueCard from '@/images/approvalNew/reissueCard.png'
+import vacation from '@/images/approvalNew/vacation.png'
+import visit from '@/images/approvalNew/visit.png'
+import weeklyreport from '@/images/approvalNew/weeklyreport.png'
+
+export const LocalImgs = {
+  'businessTrip.png': businessTrip,
+  'dailyreport.png': dailyreport,
+  'monthlyReport.png': monthlyReport,
+  'outplans.png': outplans,
+  'overtime.png': overtime,
+  'reissueCard.png': reissueCard,
+  'vacation.png': vacation,
+  'visit.png': visit,
+  'weeklyreport.png': weeklyreport,
+}

uas-office-web/wxuasapproval/src/index.css

@@ -85,3 +85,12 @@ textarea::-webkit-scrollbar {
     display: none;
 }
 
+.am-tab-bar-tab {
+    font-size: 18px;
+}
+
+.am-tab-bar-bar .am-tab-bar-tab-title {
+    font-size: 12px !important;
+    margin: 4px 0 0 0 !important;
+}
+

uas-office-web/wxuasapproval/src/pages/approval/ApprovalHome.jsx

@@ -14,6 +14,7 @@ import RefreshLayout from '../../components/RefreshLayout'
 import { isObjEmpty } from '../../utils/common'
 import { fetchGet } from '../../utils/fetchRequest'
 import { connect } from 'react-redux'
+import { LocalImgs } from '../../configs/Constants'
 import {
   clearHomeState,
   clearNewState,
@@ -35,7 +36,7 @@ let mSendIndex = 0
 
 let mBaseUrl = window.location.origin
   + (process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP')
-// && 'http://29226oq576.qicp.vip/erp'
+// && 'http://erp.yitoa.com:8888/ERP'
 
 // process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP'
 
@@ -868,13 +869,16 @@ class FuncItem extends Component {
   render () {
     const { funcObj } = this.props
 
+    let platform = funcObj.sv_logourl.platform
+    let imgUrl = funcObj.sv_logourl.mobile || LocalImgs[platform] || ''
+
     return (
       isObjEmpty(funcObj) ?
         <div></div> :
         <div className='newMenu-func-root' onClick={this.onFuncClick}>
           <div className='newMenu-func-layout'>
             <img className='newMenu-func-icon'
-                 src={funcObj.sv_logourl ? funcObj.sv_logourl.mobile : ''}/>
+                 src={imgUrl}/>
             <span className='newMenu-func-text'>{funcObj.sv_name}</span>
           </div>
         </div>

uas-office-web/wxuasapproval/src/pages/approval/approval.css

@@ -159,10 +159,13 @@
 }
 
 .newMenu-group-layout {
-    padding: 10px 8px 6px;
+    padding: 6px 6px 2px 6px;
+    margin: 6px;
     display: flex;
     flex-direction: row;
     align-items: center;
+    /*background: white;*/
+    /*border-radius: 8px;*/
 }
 
 .newMenu-group-icon {
@@ -193,8 +196,8 @@
 }
 
 .newMenu-func-icon {
-    width: 36px;
-    height: 36px;
+    width: 30px;
+    height: 30px;
 }
 
 .newMenu-func-text {