Merge remote-tracking branch 'origin/dev' into dev

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Bankinformation.java

@@ -43,6 +43,10 @@ public class Bankinformation extends CommonBaseEntity implements Serializable {
 
     private String bk_remark;
 
+    private Double bk_income;
+
+    private Double bk_spending;
+
     public String getBk_bankcode() {
         return bk_bankcode;
     }
@@ -186,4 +190,20 @@ public class Bankinformation extends CommonBaseEntity implements Serializable {
     public void setBk_remark(String bk_remark) {
         this.bk_remark = bk_remark;
     }
+
+    public Double getBk_income() {
+        return bk_income;
+    }
+
+    public void setBk_income(Double bk_income) {
+        this.bk_income = bk_income;
+    }
+
+    public Double getBk_spending() {
+        return bk_spending;
+    }
+
+    public void setBk_spending(Double bk_spending) {
+        this.bk_spending = bk_spending;
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -192,14 +192,20 @@ public class PaybalanceServiceImpl implements PaybalanceService {
             //更新账户资料金额
             Bankinformation bankinformation = new Bankinformation();
             Bankinformation nowBankInformation = paybalanceMapper.selectBankInformationByPrimaryKey(det.getPd_bankid());
-            bankinformation.setBk_thisamount((nowBankInformation.getBk_thisamount() == null ? new Double(0) : nowBankInformation.getBk_thisamount())
-                    + (det.getPd_amount() == null ? 0.0 : det.getPd_amount()));
+            Double amount = det.getPd_amount() == null ? new Double(0) : det.getPd_amount();
+            Double preamount = nowBankInformation.getBk_beginamount() ==null ? new Double(0):nowBankInformation.getBk_beginamount();//期初金额
+            Double incoming = nowBankInformation.getBk_income() ==null ? new Double(0):nowBankInformation.getBk_income();
+            Double spending = nowBankInformation.getBk_spending() ==null ? new Double(0):nowBankInformation.getBk_spending();
+            bankinformation.setBk_spending(spending+amount);
+            bankinformation.setBk_thisamount(preamount+incoming-(spending+amount));
+            bankinformation.setId(Long.valueOf(String.valueOf(det.getPd_bankid())));
             paybalanceMapper.updateBankByPrimaryKeySelective(bankinformation);
+
         }
         //更新主表pb_pbdamount=从表二金额合计
         Double amountTotal2 = new Double(0);
         for (Paybalancedetail detail : paybalancedetail){
-            amountTotal2 = amountTotal2 + detail.getPbd_amount();
+            amountTotal2 = amountTotal2 + detail.getPbd_nowbalance();
         }
         updatePay.setId(pay.getMain().getId());
         updatePay.setPb_pdamount(amountTotal);
@@ -218,20 +224,25 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         Double payamount = vendorData.getVe_payamount()==null?new Double(0):vendorData.getVe_payamount();
 
         Vendor vendor = new Vendor();
+        Double recbalancePreamount = paybalance.getPb_preamount();
         vendor.setId(Long.valueOf(String.valueOf(paybalance.getPb_vendid())));
-        vendor.setVe_preamount(preamount+amountTotal);
+        vendor.setVe_preamount(preamount+recbalancePreamount);
         vendor.setVe_payamount(payamount-amountTotal2);
-        vendor.setVe_leftamount(beginapamount-beginprepayamount+payamount-amountTotal2-preamount-amountTotal);
+        vendor.setVe_leftamount(beginapamount-beginprepayamount+payamount-amountTotal2-preamount-recbalancePreamount);
         paybalanceMapper.updateVendorByPrimaryKeySelective(vendor);
 
         for (Paybalancedetail detail: paybalancedetail) {
-            Subledger newsubledger = new Subledger();
+            Subledger subledger1 = new Subledger();
             Subledger nowSubledger = subledgerMapper.selectByPrimaryKey(detail.getPbd_slid());
-            newsubledger.setId(Long.valueOf(String.valueOf(detail.getPbd_slid())));
-            newsubledger.setSl_yamount(detail.getPbd_nowbalance()+nowSubledger.getSl_yamount());//已核销
-            newsubledger.setSl_namount(nowSubledger.getSl_namount()-detail.getPbd_nowbalance());//未核销
-            subledgerMapper.updateByPrimaryKeySelective(newsubledger);
+            subledger1.setId(Long.valueOf(String.valueOf(detail.getPbd_slid())));
+            Double yamount = nowSubledger.getSl_yamount()==null?new Double(0):nowSubledger.getSl_yamount();
+            Double namount = nowSubledger.getSl_namount()==null?new Double(0):nowSubledger.getSl_namount();
+            Double nowBalance = detail.getPbd_nowbalance()==null?new Double(0):detail.getPbd_nowbalance();
+            subledger1.setSl_yamount(yamount+nowBalance);//已核销
+            subledger1.setSl_namount(namount-nowBalance);//未核销
+            subledgerMapper.updateByPrimaryKeySelective(subledger1);
         }
+
     }
 
     @Override
@@ -260,10 +271,16 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         //更新账户资料金额
         List<Paybalancedet> paybalancedet = paybalancedetMapper.selectByPrimaryKey(id);
         for (Paybalancedet det:paybalancedet) {
+            //更新账户资料金额
             Bankinformation bankinformation = new Bankinformation();
             Bankinformation nowBankInformation = paybalanceMapper.selectBankInformationByPrimaryKey(det.getPd_bankid());
-            bankinformation.setBk_thisamount((nowBankInformation.getBk_thisamount() == null ? new Double(0) : nowBankInformation.getBk_thisamount())
-                    - (det.getPd_amount() == null ? new Double(0) : det.getPd_amount()));
+            Double amount = det.getPd_amount() == null ? new Double(0) : det.getPd_amount();
+            Double bkpreamount = nowBankInformation.getBk_beginamount() ==null ? new Double(0):nowBankInformation.getBk_beginamount();//期初金额
+            Double bkincoming = nowBankInformation.getBk_income() ==null ? new Double(0):nowBankInformation.getBk_income();
+            Double bkspending = nowBankInformation.getBk_spending() ==null ? new Double(0):nowBankInformation.getBk_spending();
+            bankinformation.setBk_spending(bkspending-amount);
+            bankinformation.setBk_thisamount(bkpreamount+bkincoming-(bkspending-amount));
+            bankinformation.setId(Long.valueOf(String.valueOf(det.getPd_bankid())));
             paybalanceMapper.updateBankByPrimaryKeySelective(bankinformation);
         }
 
@@ -272,8 +289,11 @@ public class PaybalanceServiceImpl implements PaybalanceService {
             Subledger subledger1 = new Subledger();
             Subledger nowSubledger = subledgerMapper.selectByPrimaryKey(detail.getPbd_slid());
             subledger1.setId(Long.valueOf(String.valueOf(detail.getPbd_slid())));
-            subledger1.setSl_yamount(nowSubledger.getSl_yamount()-detail.getPbd_nowbalance());//已核销
-            subledger1.setSl_namount(nowSubledger.getSl_namount()+detail.getPbd_nowbalance());//未核销
+            Double yamount = nowSubledger.getSl_yamount()==null?new Double(0):nowSubledger.getSl_yamount();
+            Double namount = nowSubledger.getSl_namount()==null?new Double(0):nowSubledger.getSl_namount();
+            Double nowBalance = detail.getPbd_nowbalance()==null?new Double(0):detail.getPbd_nowbalance();
+            subledger1.setSl_yamount(yamount-nowBalance);//已核销
+            subledger1.setSl_namount(namount+nowBalance);//未核销
             subledgerMapper.updateByPrimaryKeySelective(subledger1);
         }
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -218,7 +218,13 @@ public class RecbalanceServiceImpl implements RecbalanceService {
             //更新账户资料金额
             Bankinformation bankinformation = new Bankinformation();
             Bankinformation nowBankInformation = recbalanceMapper.selectBankInformationByPrimaryKey(det.getRd_bankid());
-            bankinformation.setBk_thisamount(nowBankInformation.getBk_thisamount()+det.getRd_amount());
+            Double amount = det.getRd_amount() == null ? new Double(0) : det.getRd_amount();
+            Double preamount = nowBankInformation.getBk_beginamount() ==null ? new Double(0):nowBankInformation.getBk_beginamount();//期初金额
+            Double incoming = nowBankInformation.getBk_income() ==null ? new Double(0):nowBankInformation.getBk_income();
+            Double spending = nowBankInformation.getBk_spending() ==null ? new Double(0):nowBankInformation.getBk_spending();
+            bankinformation.setBk_income(incoming+amount);
+            bankinformation.setBk_thisamount(preamount+(incoming+amount)-spending);
+            bankinformation.setId(Long.valueOf(String.valueOf(det.getRd_bankid())));
             recbalanceMapper.updateBankByPrimaryKeySelective(bankinformation);
         }
         //更新主表pb_pbdamount=从表二金额合计
@@ -243,11 +249,12 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         Double recamount = customerData.getCu_recamount()==null?new Double(0):customerData.getCu_recamount();
 
         Customer customer = new Customer();
+        Double paybalancePreamount = recbalance.getRb_preamount();
         customer.setId(Long.valueOf(String.valueOf(recbalance.getRb_custid())));
         customer.setId(Long.valueOf(String.valueOf(recbalance.getRb_custid())));
-        customer.setCu_preamount(preamount+amountTotal);
+        customer.setCu_preamount(preamount+paybalancePreamount);
         customer.setCu_recamount(recamount-amountTotal2);
-        customer.setCu_leftamount(beginapamount-beginprepayamount+recamount-amountTotal2-preamount-amountTotal);
+        customer.setCu_leftamount(beginapamount-beginprepayamount+recamount-amountTotal2-preamount-paybalancePreamount);
         recbalanceMapper.updateCustomerByPrimaryKeySelective(customer);
 
         //更新本次核销金额
@@ -255,8 +262,11 @@ public class RecbalanceServiceImpl implements RecbalanceService {
             Subledger subledger1 = new Subledger();
             Subledger nowSubledger = subledgerMapper.selectByPrimaryKey(detail.getRbd_slid());
             subledger1.setId(Long.valueOf(String.valueOf(detail.getRbd_slid())));
-            subledger1.setSl_yamount(detail.getRbd_nowbalance() + nowSubledger.getSl_yamount());//已核销
-            subledger1.setSl_namount(nowSubledger.getSl_namount() - detail.getRbd_nowbalance());//未核销
+            Double yamount = nowSubledger.getSl_yamount()==null?new Double(0):nowSubledger.getSl_yamount();
+            Double namount = nowSubledger.getSl_namount()==null?new Double(0):nowSubledger.getSl_namount();
+            Double nowBalance = detail.getRbd_nowbalance()==null?new Double(0):detail.getRbd_nowbalance();
+            subledger1.setSl_yamount(yamount+nowBalance);//已核销
+            subledger1.setSl_namount(namount-nowBalance);//未核销
             subledgerMapper.updateByPrimaryKeySelective(subledger1);
         }
     }
@@ -287,9 +297,16 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         //更新账户资料金额
         List<Recbalancedet> recbalancedet = recbalancedetMapper.selectByPrimaryKey(Math.toIntExact(id));
         for (Recbalancedet det:recbalancedet) {
+            //更新账户资料金额
             Bankinformation bankinformation = new Bankinformation();
             Bankinformation nowBankInformation = recbalanceMapper.selectBankInformationByPrimaryKey(det.getRd_bankid());
-            bankinformation.setBk_thisamount(nowBankInformation.getBk_thisamount()-det.getRd_amount());
+            Double amount = det.getRd_amount() == null ? new Double(0) : det.getRd_amount();
+            Double bkpreamount = nowBankInformation.getBk_beginamount() ==null ? new Double(0):nowBankInformation.getBk_beginamount();//期初金额
+            Double bkincoming = nowBankInformation.getBk_income() ==null ? new Double(0):nowBankInformation.getBk_income();
+            Double bkspending = nowBankInformation.getBk_spending() ==null ? new Double(0):nowBankInformation.getBk_spending();
+            bankinformation.setBk_income(bkincoming-amount);
+            bankinformation.setBk_thisamount(bkpreamount+(bkincoming-amount)-bkspending);
+            bankinformation.setId(Long.valueOf(String.valueOf(det.getRd_bankid())));
             recbalanceMapper.updateBankByPrimaryKeySelective(bankinformation);
         }
 
@@ -310,9 +327,11 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         for(Recbalancedetail detail: recbalancedetail) {
             Subledger subledger1 = new Subledger();
             Subledger nowSubledger = subledgerMapper.selectByPrimaryKey(detail.getRbd_slid());
-            subledger1.setId(Long.valueOf(String.valueOf(detail.getRbd_slid())));
-            subledger1.setSl_yamount(nowSubledger.getSl_yamount()-detail.getRbd_nowbalance());//已核销
-            subledger1.setSl_namount(nowSubledger.getSl_namount()+detail.getRbd_nowbalance());//未核销
+            subledger1.setId(Long.valueOf(String.valueOf(detail.getRbd_slid())));Double yamount = nowSubledger.getSl_yamount()==null?new Double(0):nowSubledger.getSl_yamount();
+            Double namount = nowSubledger.getSl_namount()==null?new Double(0):nowSubledger.getSl_namount();
+            Double nowBalance = detail.getRbd_nowbalance()==null?new Double(0):detail.getRbd_nowbalance();
+            subledger1.setSl_yamount(yamount-nowBalance);//已核销
+            subledger1.setSl_namount(namount+nowBalance);//未核销
             subledgerMapper.updateByPrimaryKeySelective(subledger1);
         }
     }

applications/money/money-server/src/main/resources/mapper/PaybalanceMapper.xml

@@ -458,7 +458,7 @@
   <sql id="Bank_Column_List" >
     bk_id, bk_bankcode, bk_bankname, bk_date, bk_type, bk_beginamount, bk_thisamount,
     bk_status, bk_statuscode, bk_recorderid, bk_recorder, bk_recorddate, bk_ym, companyid,
-    updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark
+    updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark,bk_spending,bk_income
   </sql>
   <sql id="Blob_Column_List" >
     bk_remark
@@ -497,6 +497,8 @@
     <result column="bk_text4" property="bk_text4" jdbcType="VARCHAR" />
     <result column="bk_text5" property="bk_text5" jdbcType="VARCHAR" />
     <result column="bk_remark" property="bk_remark" jdbcType="VARCHAR" />
+    <result column="bk_spending" property="bk_spending" jdbcType="DOUBLE" />
+    <result column="bk_income" property="bk_income" jdbcType="DOUBLE" />
   </resultMap>
   <update id="updateBankByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Bankinformation" >
     update bankinformation
@@ -564,6 +566,12 @@
       <if test="bk_remark != null" >
         bk_remark = #{bk_remark,jdbcType=LONGVARCHAR},
       </if>
+      <if test="bk_spending != null" >
+        bk_spending = #{bk_spending,jdbcType=DOUBLE},
+      </if>
+      <if test="bk_income != null" >
+        bk_income = #{bk_income,jdbcType=DOUBLE},
+      </if>
     </set>
     where bk_id = #{id,jdbcType=INTEGER}
   </update>

applications/money/money-server/src/main/resources/mapper/RecbalanceMapper.xml

@@ -591,7 +591,7 @@
   <sql id="Bank_Column_List" >
     bk_id, bk_bankcode, bk_bankname, bk_date, bk_type, bk_beginamount, bk_thisamount,
     bk_status, bk_statuscode, bk_recorderid, bk_recorder, bk_recorddate, bk_ym, companyid,
-    updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark
+    updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark,bk_spending,bk_income
   </sql>
   <sql id="Blob_Column_List" >
     bk_remark
@@ -630,6 +630,8 @@
     <result column="bk_text4" property="bk_text4" jdbcType="VARCHAR" />
     <result column="bk_text5" property="bk_text5" jdbcType="VARCHAR" />
     <result column="bk_remark" property="bk_remark" jdbcType="VARCHAR" />
+    <result column="bk_spending" property="bk_spending" jdbcType="DOUBLE" />
+    <result column="bk_income" property="bk_income" jdbcType="DOUBLE" />
   </resultMap>
   <update id="updateBankByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Bankinformation" >
     update bankinformation
@@ -697,6 +699,12 @@
       <if test="bk_remark != null" >
         bk_remark = #{bk_remark,jdbcType=LONGVARCHAR},
       </if>
+      <if test="bk_spending != null" >
+        bk_spending = #{bk_spending,jdbcType=DOUBLE},
+      </if>
+      <if test="bk_income != null" >
+        bk_income = #{bk_income,jdbcType=DOUBLE},
+      </if>
     </set>
     where bk_id = #{id,jdbcType=INTEGER}
   </update>

frontend/saas-portal-web/src/css/main.css

@@ -91,6 +91,7 @@ main > section {
     z-index: 5;
 }
 /* 登录弹窗 */
+
 .box,.box-zc{
     display:none;
     width: 378px;
@@ -113,13 +114,14 @@ main > section {
     /* margin-top: -20px; */
 }
 .tc-logoimg {
-    width: 64px;
-    height: 64px;
+    width: 50px;
+    height: 50px;
 }
 .tc-out {
     position: absolute;
     top: 24px;
     right: 24px;
+    cursor:pointer;
 }
 .tc-logo {
     font-family: PingFangSC-Medium;
@@ -127,7 +129,7 @@ main > section {
     color: #007FE6;
     letter-spacing: 0.34px;
     text-align: center;
-    /* margin-top: 94px; */
+    margin-top: 38px;
 }
 .tc-title {
     font-family: PingFangSC-Regular;
@@ -136,6 +138,21 @@ main > section {
     letter-spacing: 0.3px;
     text-align: center;
     margin-top: 10px;
+    line-height: 30px;
+}
+.tc-hrleft {
+    width: 60px;
+    display: inline-block;
+    margin-top: 0;
+    margin-bottom: 5px;
+    margin-right: 5px;
+}
+.tc-hrright {
+    width: 50px;
+    display: inline-block;
+    margin-top: 0;
+    margin-bottom: 5px;
+    margin-left: 5px;
 }
 .tc-phone {
     background: rgba(32,53,128,0.01);
@@ -164,7 +181,7 @@ main > section {
     background-image: linear-gradient(-90deg, #007EE5 0%, #05B3FF 100%, #5533FF 100%);
     border-radius: 3px;
     border: 0;
-    box-shadow: 0px 12px 12px -12px #007EE5;
+    box-shadow: 0px 16px 22px -12px #05B3FF;
     width: 100%;
     height: 40px;
     margin-bottom: 12px;
@@ -201,7 +218,7 @@ main > section {
     height: 38px;
 }
 .tc-shibiema {
-    width: 194px;
+    width: 204px;
     margin-left: -10px;
 }
 .tc-huoqu {
@@ -217,6 +234,7 @@ main > section {
     width: 90px;
     height: 40px;
     margin-left: 10px;
+    border: #0080E6 1px solid;
 }
 /* 11/12注册页面 ..........................................*/
 .login {
@@ -263,58 +281,40 @@ main > section {
 }
 /* 首页内容 ..........................................*/
 .my-text {
-    display: block;
     position: absolute;
-    top: 156px;
-    left: 245px;
-    z-index: 5;
+    top: 200px;
+    left: 136px;
+    /* z-index: 5; */
+    width: 468px;
+    height: 300px;
 }
-.my-min {
-    font-family: PingFangSC-Medium;
-    font-size: 30px;
-    color: #0080FF;
-    letter-spacing: 4.17px;
-    text-shadow: 0 2px 4px rgba(255,255,255,0.50);
+.sy-dianzi {
+    width: 100%;
+    height: 50px;
 }
-.my-mix {
-    font-family: PingFangSC-Medium;
-    font-size: 36px;
-    color: #0080FF;
-    letter-spacing: 4.17px;
-}
-.my-bgbulue {
-    width: 389px;
-    height: 168px;
-    opacity: 0.41;
-    background: #4E9BFF;
-    position: relative;
-    top: -27px;
-    left: -15px;
+.sy-mb {
+    margin-bottom: 25px;
 }
-.my-bgtext {
-    font-family: PingFangSC-Regular;
-    letter-spacing: 4.17px;
-    position: absolute;
-    top: 39px;
-    left: 28px;
+.sy-mb img{
+    width: 100px;
+    height: 36px;
 }
-.my-right {
-    margin-left: 20px;
+.sy-mbimg2 {
+    width: 150px !important;
 }
-.my-bgtext span {
-    font-size: 30px !important;
-    color: #444444;
+.sy-mb>img:nth-child(2) {
+    margin-left: 15px;
 }
 .my-tiyan {
-    background-image: linear-gradient(90deg, #94E3FF 0%, #49A1FE 31%, #3D97FD 100%, #9DD0FF 100%);
-    box-shadow: 1px 2px 2px 0 rgba(79,92,125,0.50);
-    border-radius: 12px;
-    width: 210px;
-    height: 77px;
+    background: #5172DD;
+    box-shadow: 0 0 19px 0 rgba(137,143,164,0.63);
+    border-radius: 4px;
+    width: 100px;
+    height: 36px;
     font-family: PingFangSC-Regular;
-    font-size: 30px;
+    font-size: 16px;
     color: #FFFFFF;
-    letter-spacing: 4.17px;
+    border: 0;
 }
 .chrw {
     width: 486px;
@@ -323,7 +323,7 @@ main > section {
 .sy-img {
     position: absolute;
     top: 100px;
-    right: 100px;
+    right: 130px;
 }
 /* 特色 .......................................*/
 .ts-box {
@@ -798,13 +798,13 @@ h1.navbar-brand {
     padding: 0;
 }
 .mask-overly {
-    background: rgba(0, 0, 0, 0.2) none repeat scroll 0 0;
+    /* background: rgba(0, 0, 0, 0.2) none repeat scroll 0 0; */
     bottom: 0;
     left: 0;
     position: absolute;
     right: 0;
     top: 0;
-    z-index: 9;
+    /* z-index: 9; */
 
 }
 #slider #nav-arrows > a {

frontend/saas-portal-web/src/index.html

@@ -71,7 +71,7 @@
 					<h1 class="navbar-brand">
 						<a href="#body">
 							<img src="./img/assets/logo.png" alt="">
-							<span>优企云服</span>
+							<span>企云服</span>
 						</a>
 					</h1>
 					<!-- /logo -->
@@ -107,9 +107,9 @@
 			<div id="box-zc" class="box-zc">
 				<div class="tc-login" id="zhuce">
 					<div class="tc-out"><img class="tc-on" src="./img/assets/叉号.png" alt=""></div>
-					<div><img class="tc-logoimg" src="./img/assets/logo-蓝.png" alt=""></div>
-					<div class="tc-logo">优企云服</div>
-					<div class="tc-title">注册</div>
+					<!-- <div><img class="tc-logoimg" src="./img/assets/logo-蓝.png" alt=""></div> -->
+					<div class="tc-logo"><img class="tc-logoimg" src="./img/assets/logo-蓝@3x.png" alt="">企云服</div>
+					<div class="tc-title"><hr class="tc-hrleft"/>注册<hr class="tc-hrright"/></div>
 					<form action="#" method="post">
 						<div class="tc-phone">
 							<div class="tc-phonebox">
@@ -123,7 +123,7 @@
 									<input type="text" class="tc-yanzhengma tc-shibiema" name="" id="">
 								</div>
 							</div>
-							<div class="left"><img class="tc-yanzhengimg" src="./img/assets/Group.png" alt=""></div>
+							<div class="left"><img class="tc-yanzhengimg" src="./img/assets/timg (1).jpg" alt=""></div>
 							<div class="right" style="line-height: 40px;"><img src="./img/assets/刷新.png" alt=""></div>
 						</div>
 						<div style="width: 100%;">
@@ -136,7 +136,7 @@
 							<button class="tc-huoqu right">获取验证码</button>
 						</div>
 						<div class="xieyi">
-							<input class="checked" type="checkbox" checked> 
+							<input class="checked" type="checkbox" checked name="xieyi"/> 
 							<span>
 								我已阅读并同意
 								<a href="https://sso.ubtob.com/common/agreement">《优软云服务条款》</a>
@@ -157,8 +157,8 @@
 				<div class="tc-login" id="zhanghao">
 					<div class="tc-out"><img class="tc-on" src="./img/assets/叉号.png" alt=""></div>
 					<!-- <div></div> -->
-					<div class="tc-logo"><img class="tc-logoimg" src="./img/assets/logo-蓝.png" alt="">企云服</div>
-					<div class="tc-title">账号登陆</div>
+					<div class="tc-logo"><img class="tc-logoimg" src="./img/assets/logo-蓝@3x.png" alt="">企云服</div>
+					<div class="tc-title"><hr class="tc-hrleft"/>账号登录<hr class="tc-hrright"/></div>
 					<form action="#" method="post">
 						<div class="tc-phone">
 							<div class="tc-phonebox">
@@ -199,9 +199,9 @@
 
 				<div class="tc-login" id="duanxin" style="display:none">
 					<div class="tc-out"><img class="tc-on" src="./img/assets/叉号.png" alt=""></div>
-					<div><img class="tc-logoimg" src="./img/assets/logo-蓝.png" alt=""></div>
-					<div class="tc-logo">优企云服</div>
-					<div class="tc-title">短信登陆</div>
+					<!-- <div><img class="tc-logoimg" src="./img/assets/logo-蓝.png" alt=""></div> -->
+					<div class="tc-logo"><img class="tc-logoimg" src="./img/assets/logo-蓝@3x.png" alt="">企云服</div>
+					<div class="tc-title"><hr class="tc-hrleft"/>短信登录<hr class="tc-hrright"/></div>
 					<form action="#" method="post">
 						<div class="tc-phone">
 							<div class="tc-phonebox">
@@ -250,24 +250,25 @@
 				
 					<div class="sl-slide" data-orientation="horizontal" data-slice1-rotation="-25" data-slice2-rotation="-25" data-slice1-scale="2" data-slice2-scale="2">
 						<div class="mask-overly"></div>
-						<div class="bg-img slider-1"></div>
+						<div class="bg-img slider-1">
+							<!-- <img src="./img/assets/背景.png" alt=""> -->
+						</div>
 						<!-- 首页内容 -->
 						<div class="my-text">
-							<!-- <h4 class="my-min">简单易用 轻松上手</h4>
-							<h3 class="my-mix">电子行业云端企业管理解决方案</h3>
-							<div class="my-bgbulue">
-								<div class="my-bgtext">
-									<p style="margin-bottom: 20px">
-										<span>寻源管理</span>
-										<span class="my-right">进销存管理</span>
-									</p>
-									<p>
-										<span>任务管理</span>
-										<span class="my-right">资金管理</span>
-									</p>
-								</div>
+							<img class="sy-dianzi sy-mb" src="./img/assets/电子行业字段.png" alt="">
+							<div class="sy-mb">
+								<img src="./img/assets/寻.png" alt="">
+								<img class='sy-mbimg2' src="./img/assets/进.png" alt="">
+							</div>
+							<div class="sy-mb">
+								<img src="./img/assets/任.png" alt="">
+								<img src="./img/assets/资.png" alt="">
+							</div>
+							<div class="sy-mb">
+								<img src="./img/assets/Group.png" alt="">
+								<img src="./img/assets/轻.png" alt="">
 							</div>
-							<button class='my-tiyan'>立即体验</button> -->
+							<button class='my-tiyan'>立即体验</button> 
 						</div>
 						<div class="sy-img"><img class="chrw" src="./img/assets/插画人物.png" alt=""></div>
 						<div class="slide-caption">

frontend/saas-web/app.json

@@ -291,9 +291,10 @@
         "cache": {
             "enable": true
         },
-        "compressor": {
+        /**"compressor": {
             "type": "yui"
-        },
+        },*/
+        "compressor":null,
         "server": {
             "basePath": "http://192.168.0.181:8560",
             "urlPattern": "^\/api\/"

frontend/saas-web/app/view/core/chart/ChartBase.js

@@ -1,6 +1,10 @@
 Ext.define('saas.view.core.chart.ChartBase', {
     extend: 'Ext.panel.Panel',
 
+    requires: [
+        'Ext.chart.*'
+    ],
+
     height: 300,
 
     layout: 'fit',