Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -78,6 +78,445 @@ main > section {
 .bg-blue {
     background-color: #0aa6bd;
 }
+/* 遮罩 */
+.zhezhao {
+    display: none;
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 100%;
+    background: #000;
+    opacity: 0.8;
+    z-index: 5;
+}
+/* 登录弹窗 */
+.box,.box-zc{
+    display:none;
+    width: 378px;
+    height: 382px; 
+    position: fixed;
+    background:white; 
+    top: 55%;
+    left:50%;
+    margin-left: -189px;
+    margin-top: -225px;
+    z-index: 10;
+}
+.box-zc {
+    height: 450px;
+}
+.tc-login {
+    text-align: center;
+    color: black;
+    margin: 24px;
+    /* margin-top: -20px; */
+}
+.tc-logoimg {
+    width: 64px;
+    height: 64px;
+}
+.tc-out {
+    position: absolute;
+    top: 24px;
+    right: 24px;
+}
+.tc-logo {
+    font-family: PingFangSC-Medium;
+    font-size: 18px;
+    color: #007FE6;
+    letter-spacing: 0.34px;
+    text-align: center;
+    /* margin-top: 94px; */
+}
+.tc-title {
+    font-family: PingFangSC-Regular;
+    font-size: 14px;
+    color: #999999;
+    letter-spacing: 0.3px;
+    text-align: center;
+    margin-top: 10px;
+}
+.tc-phone {
+    background: rgba(32,53,128,0.01);
+    border: 1px solid #D8DCE8;
+    border-radius: 3px;
+    /* width: 330px; */
+    height: 40px;
+    margin: 16px auto;
+}
+.tc-phonebox {
+    line-height: 33px;
+    margin-left: 10px;
+    text-align: left;
+}
+.tc-phonecon {
+    border: 0;
+    width: 94%;
+    height: 38px;
+}
+.tc-phonepwd {
+    border: 0;
+    width: 295px;
+    height: 38px;
+}
+.tc-login-pwd {
+    background-image: linear-gradient(-90deg, #007EE5 0%, #05B3FF 100%, #5533FF 100%);
+    border-radius: 3px;
+    border: 0;
+    box-shadow: 0px 12px 12px -12px #007EE5;
+    width: 100%;
+    height: 40px;
+    margin-bottom: 12px;
+    color: white;
+}
+.tc-duanxin {
+    font-family: PingFangSC-Medium;
+    font-size: 12px;
+    color: #0080E6;
+    letter-spacing: 0.26px;
+}
+.tc-over {
+    overflow: hidden;
+}
+.tc-duanxin a {
+    text-decoration:underline;
+}
+.tc-color {
+    font-family: PingFangSC-Regular;
+    font-size: 12px;
+    color: #727272;
+    letter-spacing: 0.26px;
+    text-align: center;
+}
+.tc-weixin {
+    font-family: PingFangSC-Regular;
+    font-size: 12px;
+    color: #999999;
+    letter-spacing: 0.26px;
+}
+/* 短信登录 */
+.tc-yanzhengma {
+    border: 0;
+    height: 38px;
+}
+.tc-shibiema {
+    width: 194px;
+    margin-left: -10px;
+}
+.tc-huoqu {
+    background-image: linear-gradient(-90deg, #007EE5 0%, #05B3FF 100%, #5533FF 100%);
+    border-radius: 3px;
+    border: 0;
+    height: 40px;
+    width: 115px;
+    color: white;
+}
+/* 新注册 */ 
+.tc-yanzhengimg {
+    width: 90px;
+    height: 40px;
+    margin-left: 10px;
+}
+/* 11/12注册页面 ..........................................*/
+.login {
+    margin-top: 12px;
+    color: white;
+}
+.login img {
+    width: 27px;
+    height: 26px;
+}
+.login > span:hover{
+    cursor:pointer;
+    color: #0aa6bd;
+}
+.my-label {
+    float: left;
+    line-height: 40px;
+    color:#414141;
+}
+.my-ipt {
+    width: 100%;
+}
+.zc-box {
+    margin: 50px;
+}
+.xieyi {
+    color: #999;
+    margin-bottom: 12px;
+    float: left;
+}
+.form-buttom {
+    float: right;
+    font-family: PingFangSC-Regular;
+    font-size: 12px;
+    color: #727272;
+    letter-spacing: 0.26px;
+}
+.form-buttom a{
+    color: #5533FF;
+    text-decoration: underline;
+}
+.back {
+    background: #6f6f6f;
+}
+/* 首页内容 ..........................................*/
+.my-text {
+    display: block;
+    position: absolute;
+    top: 156px;
+    left: 245px;
+    z-index: 5;
+}
+.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);
+}
+.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;
+}
+.my-bgtext {
+    font-family: PingFangSC-Regular;
+    letter-spacing: 4.17px;
+    position: absolute;
+    top: 39px;
+    left: 28px;
+}
+.my-right {
+    margin-left: 20px;
+}
+.my-bgtext span {
+    font-size: 30px !important;
+    color: #444444;
+}
+.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;
+    font-family: PingFangSC-Regular;
+    font-size: 30px;
+    color: #FFFFFF;
+    letter-spacing: 4.17px;
+}
+.chrw {
+    width: 486px;
+    height: 508px;
+}
+.sy-img {
+    position: absolute;
+    top: 100px;
+    right: 100px;
+}
+/* 特色 .......................................*/
+.ts-box {
+    overflow: hidden;
+    margin-top: 50px;
+}
+.left {
+    float: left;
+}
+.right {
+    float: right;
+}
+.ts-img {
+    width: 500px;
+}
+.right-text {
+    text-align: right;
+}
+.left-text {
+    text-align: left;
+}
+
+/* 功能 .........................................*/
+.gn-img {
+    width: 100%;
+}
+.gn-hei>div {
+    height: 240px;
+}
+
+/* 帮助 ........................................*/
+.bz-box {
+    width: 80%;
+    margin: 0 auto;
+}
+.bz-sousuo {
+    width: 80%;
+    margin: 0 -5px;
+}
+.bz-content {
+    margin-top: 30px;
+    
+}
+.bz-left {
+    width: 10%;
+}
+.bz-left button {
+    width: 100%;
+    background: white;
+    border: 0;
+    height: 30px;
+}
+.actvin {
+    background: #444 !important;
+    color: white;
+}
+.bz-right {
+    width: 90%;
+    background: white;
+    height: 500px;
+}
+.bz-right-conent div {
+    display: none;
+}
+.bz-right-conent li {
+    margin-bottom: 20px;
+}
+.bz-right-conent {
+    margin: 30px;
+}
+/* 底部 ...................................*/
+/*footer*/
+.footer{
+    width: 100%;
+    background: #383838;
+}
+.footer .container{
+    margin: 0 auto;
+    width: 1200px;
+    height: 445px;
+    overflow: hidden;
+    text-align: center;
+}
+.footer-section .link{
+    overflow: hidden;
+    float: left;
+    margin-right: 100px;
+}
+.footer-section ul{
+    float: left;
+    margin-right: 70px;
+}
+.footer-section ul:last-child {
+    margin-right: 0;
+}
+.footer-section ul>li{
+    list-style: none;
+}
+.footer-section ul>li span {
+    display: inline-block;
+    margin-bottom: 28px;
+    font-size: 16px;
+    color: #fff;
+}
+.footer-section ul>li a{
+    display: inline-block;
+    margin-bottom: 20px;
+    font-size: 12px;
+    color: #fff;
+    cursor: pointer;
+}
+.footer-section ul>li:hover a{
+    text-decoration: underline ;
+    color: #e41f2b;
+}
+.footer-section ul>li:hover a.no-link{
+    text-decoration: none;
+    color: #fff;
+    cursor: default;
+}
+.footer-section .about{
+    float: left;
+    margin-right: 90px;
+    width: 245px;
+    text-align: left;
+}
+.footer-section .about .logo{
+    margin-bottom: 32px;
+}
+.footer-section .about .logo img{
+    width: 156px;
+    height: 44px;
+}
+.footer-section .about .time{
+    margin-bottom: 21px;
+    font-size: 14px;
+    color: #fff;
+}
+.footer-section .qr{
+    width: 220px;
+    overflow: hidden;
+    text-align: right;
+}
+.footer-section .qr .qr-top{
+    overflow: hidden;
+}
+.footer-section .qr .qr-code{
+    float: right;
+    width: 90px;
+    font-size: 14px;
+    color: #fff;
+    text-align: center;
+}
+.footer-section .qr .qr-mall{
+    margin-right: 21px;
+}
+.footer-section .qr .qr-code img{
+    width: 100%;
+    margin-bottom: 18px;
+}
+.footer-section .qr .qr-bottom{
+    margin-top: 22px;
+    line-height: 30px;
+    text-align: right;
+    font-size: 13px;
+    color: #fff;
+}
+.footer .footer-list{
+    margin: 55px auto 22px;
+}
+.footer .friend-link{
+    height: 100px;
+    padding: 28px 0 16px;
+    border-top: 1px solid rgba(255,255,255,.2);
+    border-bottom: 1px solid rgba(255,255,255,.2)
+}
+.footer .friend-link ul{
+    overflow: hidden;
+    list-style: none ;
+}
+.footer .friend-link ul li{
+    float: left;
+}
+.footer .friend-link ul li span{
+    font-size: 14px;
+    color: #8b8b8b;
+}
+.footer .friend-link ul li a{
+    display: inline-block;
+    margin-right: 20px;
+    font-size: 14px;
+    color: #8b8b8b;
+}
 
 /* Sweep To Right */
 .btn-effect {
@@ -176,7 +615,7 @@ main > section {
 }
 .section-title p {
     color: #444;
-    font-style: italic;
+    /* font-style: italic; */
     font-size: 13px;
 }
 .section-title.white p {
@@ -301,7 +740,7 @@ main > section {
 h1.navbar-brand {
     font-size: 20px;
     font-weight: 700;
-    margin: 0;
+    margin-top: -12px;
     text-transform: uppercase;
 }
 
@@ -373,7 +812,7 @@ h1.navbar-brand {
     line-height: 1.5;
 }
 .slider-1 {
-    background-image: url(../img/slider/slider-1.jpg);
+    background-image: url(../img/assets/背景.png);
 }
 .slider-2 {
     background-image: url(../img/slider/slider-2.jpg);

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

@@ -70,7 +70,8 @@
 					<!-- logo -->
 					<h1 class="navbar-brand">
 						<a href="#body">
-							<img src="img/logo.png" alt="">
+							<img src="./img/assets/logo.png" alt="">
+							<span>优企云服</span>
 						</a>
 					</h1>
 					<!-- /logo -->
@@ -79,525 +80,384 @@
 				<!-- main nav -->
                 <nav class="collapse navbar-collapse navbar-right" role="navigation">
                     <ul id="nav" class="nav navbar-nav menu">
-                        <li><a href="#body"><span>Home</span></a></li>
-                        <li><a href="#service"><span>Service</span></a></li>
-                        <li><a href="#portfolio"><span>portfolio</span></a></li>
-                        <li><a href="#testimonials"><span>Testimonial</span></a></li>
-                        <li><a href="#price"><span>price</span></a></li>
-                        <li><a href="#contact"><span>Contact</span></a></li>
+                        <li><a href="#body"><span>首页</span></a></li>
+                        <li><a href="#feature"><span>特色</span></a></li>
+                        <li><a href="#service"><span>功能</span></a></li>
+                        <li><a href="#prototype"><span>帮助中心</span></a></li>
+                        <li><a href="#footer"><span>联系我们</span></a></li>
+						</li>
+						<li class="login">
+							<span class="btn1">
+								<img src="./img/assets/导航-登录.png" alt="">
+								登录 | 
+							</span>
+							<span class="register"><img src="./img/assets/导航-注册.png" alt="">注册</span>
+						</li>
                     </ul>
                 </nav>
 				<!-- /main nav -->
-				
-            </div>
+
         </header>
-        <!--
-        End Fixed Navigation
-        ==================================== -->
+<!--End Fixed Navigation==================================== -->
 		
 		<main class="site-content" role="main">
-		
-        <!--
-        Home Slider
-        ==================================== -->
-		
-		<section id="home-slider">
-            <div id="slider" class="sl-slider-wrapper">
-
-				<div class="sl-slider">
-				
-					<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="slide-caption">
-                            <div class="caption-content">
-                                <h2 class="animated fadeInDown">
-                                	Amazing Business Template For Your Business
-                                </h2>
-                                <p class="animated fadeInDown">Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.</p>
-                                <a href="#" class="btn btn-blue btn-effect">Join US</a>
-                            </div>
-                        </div>
-						
-					</div>
-					
-					<div class="sl-slide" data-orientation="vertical" data-slice1-rotation="10" data-slice2-rotation="-15" data-slice1-scale="1.5" data-slice2-scale="1.5">
-						<div class="mask-overly"></div>
-						<div class="bg-img slider-2"></div>
-						<div class="slide-caption">
-                            <div class="caption-content">
-                                <h2 class="animated fadeInDown">Amazing Business Template For Your Business</h2>
-                                <p class="animated fadeInDown">Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.</p>
-                                <a href="#" class="btn btn-blue btn-effect">Join US</a>
-                            </div>
-                        </div>
-						
-					</div>
-					
-					<div class="sl-slide" data-orientation="horizontal" data-slice1-rotation="3" data-slice2-rotation="3" data-slice1-scale="2" data-slice2-scale="1">
-						<div class="mask-overly"></div>
-						<div class="bg-img slider-3"></div>
-						<div class="slide-caption">
-                            <div class="caption-content">
-                                <h2 class="animated fadeInDown">Amazing Business Template For Your Business</h2>
-                                <p class="animated fadeInDown">
-                                	Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
-                                </p>
-                                <a href="#" class="btn btn-blue btn-effect">Join US</a>
-                            </div>
-                        </div>
-
-					</div>
-
-				</div><!-- /sl-slider -->
-                
-                <nav id="nav-arrows" class="nav-arrows hidden-xs hidden-sm visible-md visible-lg">
-                    <a href="javascript:;" class="sl-prev">
-                        <i class="ion-ios-arrow-back"></i>
-                    </a>
-                    <a href="javascript:;" class="sl-next">
-                        <i class="ion-ios-arrow-forward"></i>
-                    </a>
-                </nav>
-                
-
-				<nav id="nav-dots" class="nav-dots visible-xs visible-sm hidden-md hidden-lg">
-					<span class="nav-dot-current"></span>
-					<span></span>
-					<span></span>
-				</nav>
-
-			</div><!-- /slider-wrapper -->
-		</section>
-		
-        <!--
-        End Home SliderEnd
-        ==================================== -->
-			
-
-			<section id="feature">
-				<div class="container">
-					<div class="row">
-						<div class="section-title text-center">
-							<h2>Best Features</h2>
-							<p >Lorem ipsum dolor sit amet, consectetur adipisicing elit. <br> Accusantium repellendus, ut saepe, consequatur dolor eum!.</p>
+			<!-- 遮罩 -->
+			<div class="zhezhao"></div>
+			<!-- 注册 -->
+			<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>
+					<form action="#" method="post">
+						<div class="tc-phone">
+							<div class="tc-phonebox">
+								<span><img src="./img/assets/手机号.png"></span>
+								<input type="text" class="tc-phonecon" placeholder="请输入您的手机号" name="phone" id="phone">
+							</div>
 						</div>
-						<div class="col-md-4">
-							<h4>The Perfect Spot</h4>
-							<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cum quia praesentium culpa a! Est fuga, blanditiis rem culpa sed unde.</p>
-							<ul class="list-nav">
-								<li><i class="ion-ios-checkmark-empty"></i>Norman Copenhagen focuses on challenging</li>
-								<li><i class="ion-ios-checkmark-empty"></i>The challenge was melting</li>
-								<li><i class="ion-ios-checkmark-empty"></i>We thought air purifier</li>
-								<li><i class="ion-ios-checkmark-empty"></i>Front face is coated with fabric for a familia</li>
-								<li><i class="ion-ios-checkmark-empty"></i>Developing Belyse, I thought the strong characters</li>
-							</ul>
+						<div class="tc-over">
+							<div class="tc-phone left" style="margin: 0 0 16px 0;">
+								<div class="tc-phonebox">
+									<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="right" style="line-height: 40px;"><img src="./img/assets/刷新.png" alt=""></div>
 						</div>
-						<div class="col-md-8">
-							<img  class="img-responsive" src="img/features.jpg" alt="">
+						<div style="width: 100%;">
+							<div class="tc-phone left" style="margin: 0 0 16px 0;">
+								<div class="tc-phonebox">
+										<span><img src="./img/assets/验证码.png"></span>
+										<input type="text" class="tc-yanzhengma" placeholder="请输入验证码" name="" id="">
+								</div>
+							</div>
+							<button class="tc-huoqu right">获取验证码</button>
 						</div>
-					</div>
-				</div>
-			</section>
-
-
-			<section id="prototype">
-				<div class="container">
-					<div class="row">
-						<div class="section-title text-center">
-							<h2>What Do You Wanna Know</h2>
-							<p >Lorem ipsum dolor sit amet, consectetur adipisicing elit. <br> Accusantium repellendus, ut saepe, consequatur dolor eum!.</p>
+						<div class="xieyi">
+							<input class="checked" type="checkbox" checked> 
+							<span>
+								我已阅读并同意
+								<a href="https://sso.ubtob.com/common/agreement">《优软云服务条款》</a>
+							</span>
 						</div>
-						<div class="col-md-8 col-md-offset-2 text-center">
-							<div class="block">
-								<img src="img/prototype.jpg" alt="" class="">
-								<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Voluptate magni, delectus nam qui deserunt perspiciatis, voluptates ratione. Atque voluptate qui dolor veniam voluptatibus, itaque odit, ullam ipsam exercitationem et ex.</p>
-								<a href="#" class="btn btn-blue btn-effect">Learn More</a>
-								
-							</div>
+						<div>
+							<button class="tc-login-pwd form-btn" id="login-pwd">登录</button>
 						</div>
+					</form>
+					<div>
+						<span class="form-buttom">已有账号，去<a href="#" class="go-login">登录</a></span>
 					</div>
 				</div>
-			</section>
-
-			
-			
-			<!-- Service section -->
-			<section id="service">
-				<div class="container">
-					<div class="row">
-					
-						<div class="section-title text-center">
-							<h2>Service</h2>
-							<p >Lorem ipsum dolor sit amet, consectetur adipisicing elit. <br> Accusantium repellendus, ut saepe, consequatur dolor eum!.</p>
-						</div>
-						
-						<div class="col-md-3 col-sm-6 col-xs-12 text-center">
-							<div class="service-item">
-								<div class="service-icon">
-									<i class="ion-laptop"></i>
-								</div>
-								<h3>Fully Responsive</h3>
-								<p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. </p>
+			</div>
+			<!-- 登录窗 -->
+			<div id="box" class="box">
+		<!-- 账号登录 -->
+				<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>
+					<form action="#" method="post">
+						<div class="tc-phone">
+							<div class="tc-phonebox">
+								<span><img src="./img/assets/手机号.png"></span>
+								<input type="text" class="tc-phonecon" placeholder="手机号/优软云账号" name="phone" id="phone">
 							</div>
 						</div>
-					
-						<div class="col-md-3 col-sm-6 col-xs-12 text-center" data-wow-delay="0.3s">
-							<div class="service-item">
-								<div class="service-icon">
-									<i class="ion-ios-checkmark-outline"></i>
-								</div>
-								<h3>Well Documented</h3>
-								<p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. </p>
+						<div class="tc-phone">
+							<div class="tc-phonebox">
+								<span><img src="./img/assets/密码.png"></span>
+								<input type="password" class="tc-phonepwd" placeholder="请输入您的密码" name="pwd" id="pwd">
 							</div>
 						</div>
-					
-						<div class="col-md-3 col-sm-6 col-xs-12 text-center ">
-							<div class="service-item">
-								<div class="service-icon">
-									<i class="ion-ios-compose-outline"></i>
-								</div>
-								<h3>Elegant Design</h3>
-								<p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. </p>
-							</div>
+						<div>
+							<button class="tc-login-pwd" id="login-pwd">登录</button>
 						</div>
-					
-						<div class="col-md-3 col-sm-6 col-xs-12 text-center" data-wow-delay="0.9s">
-							<div class="service-item">
-								<div class="service-icon">
-									<i class="ion-ios-paperplane-outline"></i>
-								</div>
-								<h3>Bootstrap Based</h3>
-								<p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. </p>							
-							</div>
+					</form>
+					<div class="tc-over" id="qiehuan">
+						<span id="message" class="left tc-duanxin"><a href="#">短信登录</a></span>
+						<span class="right">
+							<a href="#" class="fr tc-color" id="register">注册 | </a>
+							<a href="#" class="fr tc-color" id="example">忘记密码？</a>
+						</span>
+					</div>
+					<!-- <div class="clearfix" style="margin-top: 47px;">
+						<div class="fl" style="color:#999999;font-size: 14px;text-align: center">
+							<span>-----------------第三方登录------------------</span>
 						</div>
-
-						<div class="col-md-3 col-sm-6 col-xs-12 text-center">
-							<div class="service-item">
-								<div class="service-icon">
-									<i class="ion-laptop"></i>
-								</div>
-								<h3>Fully Responsive</h3>
-								<p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. </p>
-							</div>
+						<div class="aui-form-content-item1" id="weixin-login">
+							<a href="#">
+								<img src="./img/assets/微信.png">
+								<p class="tc-weixin">微信登录</p>
+							</a>
 						</div>
-					
-						<div class="col-md-3 col-sm-6 col-xs-12 text-center">
-							<div class="service-item">
-								<div class="service-icon">
-									<i class="ion-ios-checkmark-outline"></i>
-								</div>
-								<h3>Well Documented</h3>
-								<p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. </p>
+					</div> -->
+				</div>
+		<!-- 短信登录 -->
+
+				<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>
+					<form action="#" method="post">
+						<div class="tc-phone">
+							<div class="tc-phonebox">
+								<span><img src="./img/assets/手机号.png"></span>
+								<input type="text" class="tc-phonecon" placeholder="请输入您的手机号" name="phone" id="phone">
 							</div>
 						</div>
-					
-						<div class="col-md-3 col-sm-6 col-xs-12 text-center">
-							<div class="service-item">
-								<div class="service-icon">
-									<i class="ion-ios-compose-outline"></i>
+						<div style="width: 100%;">
+							<div class="tc-phone left" style="margin: 0 0 16px 0;">
+								<div class="tc-phonebox">
+										<span><img src="./img/assets/验证码.png"></span>
+										<input type="text" class="tc-yanzhengma" placeholder="请输入验证码" name="" id="">
 								</div>
-								<h3>Elegant Design</h3>
-								<p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. </p>
 							</div>
+							<button class="tc-huoqu right">获取验证码</button>
 						</div>
-					
-						<div class="col-md-3 col-sm-6 col-xs-12 text-center">
-							<div class="service-item">
-								<div class="service-icon">
-									<i class="ion-ios-paperplane-outline"></i>
-								</div>
-								<h3>Bootstrap Based</h3>
-								<p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. </p>							
-							</div>
+						<div>
+							<button class="tc-login-pwd" id="login-pwd">登录</button>
 						</div>
-						
+					</form>
+					<div class="tc-over" id="qiehuan">
+						<span id="user-phone" class="left tc-duanxin"><a href="#">密码登录</a></span>
+						<span class="right">
+							<a href="#" class="fr tc-color dx-zc">注册</a>
+						</span>
 					</div>
+					<!-- <div class="clearfix" style="margin-top: 47px;">
+						<div class="fl" style="color:#999999;font-size: 14px;text-align: center">
+							<span>-----------------第三方登录------------------</span>
+						</div>
+						<div class="aui-form-content-item1" id="weixin-login">
+							<a href="#">
+								<img src="./img/assets/微信.png">
+								<p class="tc-weixin">微信登录</p>
+							</a>
+						</div>
+					</div> -->
 				</div>
-			</section>
-			<!-- end Service section -->
+			</div>
+<!--Home Slider==================================== -->
 
-			<section class="video-bg">
-				<div class="overlay"></div>
-				<div class="container">
-					<div class="row">
-						<div class="col-md-offset-2 col-md-8">
-							<div class="section-title text-center white">
-								<h2>FEATURED PROJECTS</h2>
-								<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
-							</div>
-							<div class="modal-section text-center">
-								<a href="#" data-toggle="modal" data-target="#video-modal" class="video-popup-button">
-									<i class="ion-play"></i>
-								</a>
-								<div class="modal fade" id="video-modal" tabindex="-1" role="dialog">
-									<div class="modal-dialog modal-lg" role="document">
-										<div class="modal-content">
-											<div class="modal-header">
-												<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-											</div>
-											<div class="modal-body">
-												<div class="embed-responsive embed-responsive-16by9">
-													<!--
-												  	<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/u7mhxWKZovc"></iframe>
-													-->
-												</div>
-											</div>
-										</div>
-									</div>
+		<section id="home-slider">
+            <div id="slider" class="sl-slider-wrapper">
+
+				<div class="sl-slider">
+				
+					<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="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>
 							</div>
-							<p>Curabitur nec scelerisque nulla, non pharetra sapien. Praesent ac odio dolor. Pellentesque commodo erat justo, ac facilisis arcu fringilla finibus.</p>
+							<button class='my-tiyan'>立即体验</button> -->
 						</div>
+						<div class="sy-img"><img class="chrw" src="./img/assets/插画人物.png" alt=""></div>
+						<div class="slide-caption">
+                        	<div class="caption-content"></div>
+                    	</div>
 					</div>
 				</div>
-			</section>
+			</div>
+		</section>
+		
+    <!-- End Home SliderEnd==================================== -->
 			
-			<!-- portfolio section -->
-			<section id="portfolio">
+			<!-- 特色 -->
+			<section id="feature">
 				<div class="container">
-					<div class="section-title text-center">
-						<h2>FEATURED PROJECTS</h2>
-						<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
-					</div>
-					<ul class="portfolio-filter text-center">
-						<li><a href="#" data-filter="*" class="active">All</a></li>
-						<li><a href="#" data-filter=".photoshop">Photoshop</a></li>
-						<li><a href="#" data-filter=".responsive">Responsive</a></li>
-						<li><a href="#" data-filter=".wordpress">WordPress</a></li>
-						<li><a href="#" data-filter=".illustrator">Illustrator</a></li>
-					</ul>
-					<div class="row project-wrapper">
-						<div class="col-sm-6 col-md-4 photoshop">
-							<div class="portfolio-item">
-								<img src="img/portfolio/item-1.jpg" class="img-responsive" alt="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat">
-								<figcaption class="mask">
-									<h3>Wall street</h3>
-									<p>Responsive</p>
-								</figcaption>
-								<ul class="external">
-									<li><a class="fancybox" title="Araund The world" data-fancybox-group="works" href="img/portfolio/item.jpg"><i class="ion-ios-search"></i></a></li>
-									<li><a href=""><i class="ion-link"></i></a></li>
-								</ul>
-							</div>
+					<div class="row">
+						<div class="section-title text-center">
+							<h2>特色</h2>
+							<p>云端连接 简单易用</p>
 						</div>
-							
-						<div class="col-sm-6 col-md-4 responsive">
-							<div class="portfolio-item">
-								<img src="img/portfolio/item-2.jpg" class="img-responsive" alt="Lorem Ipsum is simply dummy text of the printing and typesetting ndustry. ">
-								<figcaption class="mask">
-									<h3>Wall street</h3>
-									<p>Responsive</p>
-								</figcaption>
-								<ul class="external">
-									<li><a class="fancybox" title="Wall street" href="img/portfolio/item-2.jpg" data-fancybox-group="works" ><i class="ion-ios-search"></i></a></li>
-									<li><a href=""><i class="ion-link"></i></a></li>
-								</ul>
+						<div class="ts-box">
+							<div class="left col-md-8">
+								<img  class="ts-img" src="img/features.jpg" alt="">
 							</div>
-						</div>
-
-						<div class="col-sm-6 col-md-4 wordpress">
-							<div class="portfolio-item">
-								<img src="img/portfolio/item-3.jpg" class="img-responsive" alt="Lorem Ipsum is simply dummy text of the printing and typesetting ndustry. ">
-								<figcaption class="mask">
-									<h3>Wall street</h3>
-									<p>Responsive</p>
-								</figcaption>
-								<ul class="external">
-									<li><a class="fancybox" title="Behind The world" data-fancybox-group="works" href="img/portfolio/item-3.jpg"><i class="ion-ios-search"></i></a></li>
-									<li><a href=""><i class="ion-link"></i></a></li>
-								</ul>
+							<div class="right right-text col-md-4">
+								<p>迅速找到您想要的</p>
+								<p>寻找供应商资源</p>
+								<p>寻找产品资料 货源</p>
 							</div>
 						</div>
-
-						<div class="col-sm-6 col-md-4 illustrator">
-							<div class="portfolio-item">
-								<img src="img/portfolio/item-4.jpg" class="img-responsive" alt="Lorem Ipsum is simply dummy text of the printing and typesetting ndustry.">
-								<figcaption class="mask">
-									<h3>Wall street</h3>
-									<p>Responsive</p>
-								</figcaption>
-								<ul class="external">
-									<li><a class="fancybox" title="Wall street 4" data-fancybox-group="works" href="img/portfolio/item-4.jpg"><i class="ion-ios-search"></i></a></li>
-									<li><a href=""><i class="ion-link"></i></a></li>
-								</ul>
+						<div class="ts-box">
+							<div class="left left-text col-md-4">
+								<p>直观看到您想看的</p>
+								<p>月度销售额 采购额</p>
+								<p>经营指标实时看</p>
 							</div>
-						</div>
-
-						<div class="col-sm-6 col-md-4 photoshop">
-							<div class="portfolio-item">
-								<img src="img/portfolio/item-5.jpg" class="img-responsive" alt="Lorem Ipsum is simply dummy text of the printing and typesetting ndustry. ">
-								<figcaption class="mask">
-									<h3>Wall street</h3>
-									<p>Responsive</p>
-								</figcaption>
-								<ul class="external">
-									<li><a class="fancybox" title="Wall street 5" data-fancybox-group="works" href="img/portfolio/item-5.jpg"><i class="ion-ios-search"></i></a></li>
-									<li><a href=""><i class="ion-link"></i></a></li>
-								</ul>
+							<div class="right">
+								<img  class="ts-img" src="img/features.jpg" alt="">
 							</div>
 						</div>
-
-						<div class="col-sm-6 col-md-4 illustrator">
-							<div class="portfolio-item">
-								<img src="img/portfolio/item-6.jpg" class="img-responsive" alt="Lorem Ipsum is simply dummy text of the printing and typesetting ndustry. ">
-								<figcaption class="mask">
-									<h3>Wall street</h3>
-									<p>Responsive</p>
-								</figcaption>
-								<ul class="external">
-									<li><a class="fancybox" title="Wall street 6" data-fancybox-group="works" href="img/portfolio/item-6.jpg"><i class="ion-ios-search"></i></a></li>
-									<li><a href=""><i class="ion-link"></i></a></li>
-								</ul>
+						<div class="ts-box">
+							<div class="left col-md-8">
+								<img  class="ts-img" src="img/features.jpg" alt="">
+							</div>
+							<div class="right right-text col-md-4">
+								<p>快速上手 生意简单做</p>
+								<p>移动端的体验</p>
+								<p>简单的业务线 让您三分钟上手</p>
 							</div>
 						</div>
 					</div>
 				</div>
 			</section>
-			<!-- end portfolio section -->
-			
-			<!-- Testimonial section -->
-			<section id="testimonials" class="parallax">
+
+			<!-- Service section 功能-->
+			<section id="service">
 				<div class="container">
-						<div class="row">
-						
-							<div class="section-title text-center white ">
-								<h2>What people say</h2>
+					<div class="row">
+						<div class="section-title text-center">
+							<h2>功能</h2>
+						</div>
+						<div class="gn-hei">
+							<div class="col-md-3 col-sm-6 col-xs-12">
+								<div class="service-item">
+									<div>
+										<img class="gn-img" src="img/features.jpg" alt="">
+									</div>
+									<p>任务分配，高效工作，管好每一件事</p>
+								</div>
+							</div>
+							<div class="col-md-3 col-sm-6 col-xs-12">
+								<div class="service-item">
+									<div>
+										<img class="gn-img" src="img/features.jpg" alt="">
+									</div>
+									<p>一键查询，海量供应商产品信息，节约时间</p>
+								</div>
+							</div>
+							<div class="col-md-3 col-sm-6 col-xs-12">
+								<div class="service-item">
+									<div>
+										<img class="gn-img" src="img/features.jpg" alt="">
+									</div>
+									<p>快速制单，利润实时算</p>
+								</div>
 							</div>
-							
-							<div id="testimonial" class="">
-								<div class="testimonial-item text-center">
-									<img src="img/member-1.jpg" alt="Our Clients">
-									<div class="clearfix">
-										<span>Katty Flower</span>
-										<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
+							<div class="col-md-3 col-sm-6 col-xs-12">
+								<div class="service-item">
+									<div>
+										<img class="gn-img" src="img/features.jpg" alt="">
 									</div>
+									<p>寻源，定价，采购，一条流程</p>
 								</div>
-								<div class="testimonial-item text-center">
-									<img src="img/member-1.jpg" alt="Our Clients">
-									<div class="clearfix">
-										<span>Katty Flower</span>
-										<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
+							</div>
+							<div class="col-md-3 col-sm-6 col-xs-12">
+								<div class="service-item">
+									<div>
+										<img class="gn-img" src="img/features.jpg" alt="">
 									</div>
+									<p>库存盘点，库存账龄，呆滞分析</p>
 								</div>
-								<div class="testimonial-item text-center">
-									<img src="img/member-1.jpg" alt="Our Clients">
-									<div class="clearfix">
-										<span>Katty Flower</span>
-										<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
+							</div>
+							<div class="col-md-3 col-sm-6 col-xs-12">
+								<div class="service-item">
+									<div>
+										<img class="gn-img" src="img/features.jpg" alt="">
 									</div>
+									<p>BOM成本及时看，加工单自动出入库作业</p>
+								</div>
+							</div>
+							<div class="col-md-3 col-sm-6 col-xs-12">
+								<div class="service-item">
+									<div>
+										<img class="gn-img" src="img/features.jpg" alt="">
+									</div>
+									<p>清晰核算，实时查看供应商和客户账款情况</p>
+								</div>
+							</div>
+							<div class="col-md-3 col-sm-6 col-xs-12">
+								<div class="service-item">
+									<div>
+										<img class="gn-img" src="img/features.jpg" alt="">
+									</div>
+									<p>直观数据看板，看库存分析，收款分析，付款分析</p>
 								</div>
 							</div>
-						
 						</div>
+					</div>
 				</div>
 			</section>
-			<!-- end Testimonial section -->
-			
-			<!-- Price section -->
-			<section id="price">
+			<!-- end Service section -->
+
+			<!-- 帮助中心 -->
+			<section id="prototype">
 				<div class="container">
 					<div class="row">
 						<div class="section-title text-center">
-							<h2>Price</h2>
-							<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. <br> Vel aspernatur vitae consectetur error quas consequatur inventore iste quod, possimus qui.</p>
+							<h2>帮助中心</h2>
 						</div>
-						
-						<div class="col-sm-4 wow animated fadeInUp">
-							<div class="price-table text-center">
-								<span>Silver</span>
-								<div class="value">
-									<span>$</span>
-									<span>24,35</span><br>
-									<span>month</span>
-								</div>
-								<ul>
-									<li>24/7 Tech Suport</li>
-									<li>Unlimite Uploads</li>
-									<li>Unlimited Email Accounts</li>
-									<li>Cloud Storage</li>
-									<li><a href="#">sign up</a></li>
-								</ul>
-							</div>
+						<div class="bz-box">
+							<select style="margin-top: -1px;height:30px;width: 10%">
+								<option value ="volvo">操作文档</option>
+								<option value ="saab">常见问题</option>
+							</select>
+							<input class="bz-sousuo" type="text" placeholder="输入标题搜索"/>
+							<button style="width:10%">搜索</button>
 						</div>
-						
-						<div class="col-sm-4 wow animated fadeInUp" data-wow-delay="0.4s">
-							<div class="price-table featured text-center">
-								<span>Gold</span>
-								<div class="value">
-									<span>$</span>
-									<span>50,00</span><br>
-									<span>month</span>
-								</div>
-								<ul>
-									<li>24/7 Tech Suport</li>
-									<li>Unlimite Uploads</li>
-									<li>Unlimited Email Accounts</li>
-									<li>Cloud Storage</li>
-									<li><a href="#">sign up</a></li>
-								</ul>
+						<div class="bz-box bz-content">
+							<div class="left bz-left">
+								<button class="actvin">操作文档</button>
+								<button>常见问题</button>
 							</div>
-						</div>
-						
-						<div class="col-sm-4 wow animated fadeInUp" data-wow-delay="0.8s">
-							<div class="price-table text-center">
-								<span>Diamond</span>
-								<div class="value">
-									<span>$</span>
-									<span>123,12</span><br>
-									<span>month</span>
+							<div class="right bz-right">
+								<div class="bz-right-conent">
+									<div>
+										<ul>
+											<li>XXXXXXXXXXXXXXX操作文档</li>
+											<li>XXXXXXXXXXXXXXX操作文档</li>
+											<li>XXXXXXXXXXXXXXX操作文档</li>
+											<li>XXXXXXXXXXXXXXX操作文档</li>
+											<li>XXXXXXXXXXXXXXX操作文档</li>
+											<li>XXXXXXXXXXXXXXX操作文档</li>
+										</ul>
+									</div>
+									<div>
+										<ul>
+											<li>XXXXXXXXXXXXXXX常见问题</li>
+											<li>XXXXXXXXXXXXXXX常见问题</li>
+											<li>XXXXXXXXXXXXXXX常见问题</li>
+											<li>XXXXXXXXXXXXXXX常见问题</li>
+											<li>XXXXXXXXXXXXXXX常见问题</li>
+											<li>XXXXXXXXXXXXXXX常见问题</li>
+										</ul>
+									</div>
 								</div>
-								<ul>
-									<li>24/7 Tech Suport</li>
-									<li>Unlimite Uploads</li>
-									<li>Unlimited Email Accounts</li>
-									<li>Cloud Storage</li>
-									<li><a href="#">sign up</a></li>
-								</ul>
 							</div>
 						</div>
-		
 					</div>
 				</div>
 			</section>
-			<!-- end Price section -->
 			
-			<!-- Social section -->
-			<section id="social" class="parallax">
-				<div class="overlay">
-					<div class="container">
-						<div class="row">
-						
-							<div class="section-title white text-center white ">
-								<h2>FOLLOW US</h2>
-								<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Doloribus, <br> sapiente. Libero ipsam, dolore quibusdam magni.</p>
-							</div>
-							
-							<ul class="social-button">
-								<li class="wow animated zoomIn"><a href="http://www.fb.com/themefisher"><i class="ion-social-facebook"></i></a></li>
-								<li class="wow animated zoomIn" data-wow-delay="0.3s"><a href="#"><i class="ion-social-twitter"></i></a></li>
-								<li class="wow animated zoomIn" data-wow-delay="0.6s"><a href="#"><i class="ion-social-dribbble"></i></a></li>
-								<li class="wow animated zoomIn" data-wow-delay="0.9s"><a href="#"><i class="ion-social-linkedin"></i></a></li>							
-							</ul>
-							
-						</div>
-					</div>
-				</div>
-			</section>
-			<!-- end Social section -->
 			
 			<!-- Contact section -->
-			<section id="contact" >
+			<!-- <section id="contact" >
 				<div class="container">
 					<div class="row">
-						
 						<div class="section-title text-center">
 							<h2>Contact</h2>
 							<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Doloribus, <br> sapiente. Libero ipsam, dolore quibusdam magni.</p>
 						</div>
-						
-						
 						<div class="col-md-7 contact-form">
 							<form id="contact-form" action="#" method="post">
 								<div class="input-field">
@@ -615,7 +475,6 @@
 						       	<button type="submit" id="submit" class="btn btn-blue btn-effect">Send</button>
 							</form>
 						</div>
-						
 						<div class="col-md-5">
 							<address class="contact-details">
 								<h3>Our Address</h3>						
@@ -624,70 +483,82 @@
 								<p><i class="ion-ios-email-outline"></i>website@yourname.com</p>
 							</address>
 						</div>
-			
 					</div>
 				</div>
-			</section>
+			</section> -->
 			<!-- end Contact section -->
-			<!--
-			<section id="google-map">
-				<div id="map-canvas" class="wow animated fadeInUp"></div>
-			</section>
-			-->
 		</main>
-		
-		<footer id="footer">
+
+	<!-- 底部 ------------------------------------------------>
+		<!--footer begin-->
+		<div class="footer footer-section">
 			<div class="container">
-				<div class="row">
-					<div class="col-md-4">
-						<h4>
-							<a href="">
-								<img src="img/logo.png" alt="">
-							</a>
-						</h4>
-						<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Molestias ullam numquam repudiandae repellat ex autem voluptas vel esse quo excepturi!</p>
-						<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Rem, repellendus.</p>
+				<div class="footer-list">
+					<div class="about">
+						<div class="logo"><img src="./img/logo_w.png" alt=""/></div>
+						<div class="time">客服热线：400-830-1818</div>
+						<div class="time">工作时间：周一至周五08:30~18:00</div>
+						<!--<div class="time">意见反馈：usoftmall.com</div>-->
 					</div>
-					<div class="col-md-4">
-						<h4>Company</h4>
+					<div class="link">
+						<ul>
+							<li><span>帐号中心</span></li>
+							<li><a href="http://uas.ubtob.com/serve#/self/find_account">找回帐号密码</a></li>
+							<li><a href="http://uas.ubtob.com/serve#/self/account_excetion">帐号无法登录</a></li>
+							<li><a href="http://uas.ubtob.com/serve#/self/modify_pwd/4.1">修改密码</a></li>
+						</ul>
+						<ul>
+							<li><span>帮助中心</span></li>
+							<li><a href="#">操作视频</a></li>
+							<li><a href="#">操作文档</a></li>
+							<li><a href="#">常见问题</a></li>
+						</ul>
+						<!-- <ul>
+							<li><span>闯客网</span></li>
+							<li><a href="https://www.uuzcc.com/article/detail/13260.html">需求发布流程</a></li>
+							<li><a href="https://www.uuzcc.com/article/detail/13457.html">认证流程</a></li>
+							<li><a href="https://www.uuzcc.com/article/detail/13456.html">服务商规则</a></li>
+						</ul> -->
 						<ul>
-							<li><a href="#">About Us</a></li>
-							<li><a href="#">Press</a></li>
-							<li><a href="#">Jobs</a></li>
-							<li><a href="#">Terms And Condition</a></li>
+							<li><span>关于我们</span></li>
+							<li><a class="no-link">优软云介绍</a></li>
+							<li><a class="no-link">发展历程</a></li>
+							<li><a href="https://www.usoftchina.com/contact">联系我们</a></li>
 						</ul>
 					</div>
-					<div class="col-md-4">
-						<h4>newsletter signup</h4>
-							<p>You will be among the first to know about hot new software and great deals on stuff to enhance and promote</p>
-						<form action="#" method="post" class="subscribe-form wow animated fadeInUp">
-							<div class="input-field">
-								<input type="email" class="subscribe form-control" placeholder="Enter Your Email...">
-								<button type="submit" class="submit-icon">
-									<i class="ion-ios-email"></i>
-								</button>
+					<div class="qr">
+						<div class="qr-top">
+							<div class="qr-tech qr-code">
+								<img src="./img/qr-tech.png" alt="">
+								科技公众号
 							</div>
-						</form>
+							<div class="qr-mall qr-code">
+								<img src="./img/qr_mall.jpg" alt="">
+								商城公众号
+							</div>
+						</div>
+						<div class="qr-bottom">
+							粤ICP备15112126号
+							<br/>2018 © 深圳市优软科技有限公司
+						</div>
 					</div>
 				</div>
-			</div>
-		</footer>
-		<section id="footer-bottom">
-			<div class="container">
-				<div class="row">
-					<div class="col-md-6">
-						<p>
-							COPYRIGHT © 2016 , BLUE PRO | DIGITAL AGENCY
-						</p>
-					</div>
-					<div class="col-md-6 text-right">
-						<p>
-							Design and Developed By <a href="#">Themefisher</a>
-						</p>
-					</div>
+				<div class="friend-link">
+					<ul style="margin-left: -40px;">
+						<li><span>友情链接：</span></li>
+						<li><a href="http://www.worldshine.net">深圳华商龙</a></li>
+						<li><a href="http://www.yitoa.com">深圳市英唐智能科技</a></li>
+						<li><a href="http://uas.usoftchina.com">深圳市优软科技</a></li>
+						<li><a href="http://www.51cube.com">酷比魔方</a></li>
+						<li><a href="http://www.szsoling.com/home">SOLING索菱</a></li>
+						<li><a href="http://www.huashangweitai.com">深圳市华商维泰显示科技</a></li>
+						<li><a href="http://www.szmadigi.com">迈迪杰科技</a></li>
+						<li><a href="http://www.hi-mantech.com">怡海能达</a></li>
+					</ul>
 				</div>
 			</div>
-		</section>
+		</div>
+		<!--footer end-->
 		
 		<!-- Essential jQuery Plugins
 		================================================== -->
@@ -711,72 +582,150 @@
         <script src="js/jquery.ba-cond.min.js"></script>
 		<!-- onscroll animation -->
         <script src="js/wow.min.js"></script>
-		<!-- Custom Functions -->
+		<!-- Custom Functions jq表单提交插件-->
         <script src="js/jquery.form.min.js"></script>
         <script src="js/jquery.validate.min.js"></script>
         <script src="js/main.js"></script>
         <script>
         	$(function() {
-    			$("#contact-form").validate({
-    				rules: {
-    					name: {
-    						required: true,
-    						minlength: 2
-    					},
-    		            email: {
-    		                required: true,
-    		                email: true
-    		            },
-    					subject: {
-    						required: true,
-    		                minlength: 2
-    					},
-    					message: {
-    						required: true,
-    		                minlength: 2
-    					}
-    				},
-    				messages: {
-    					name: {
-    						required: "come on, you have a name don't you?",
-    						minlength: "your name must consist of at least 2 characters"
-    					},
-    		            email: {
-    		                required: "no email, no support"
-    		            },
-    					subject: {
-    						required: "you have a reason to contact, write it here",
-    		                minlength: "thats all? really?"
-    					},
-    					message: {
-    						required: "um...yea, you have to write something to send this form.",
-    						minlength: "thats all? really?"
-    					}
-    				},
-    				submitHandler: function(form) {
-    					$(form).ajaxSubmit({
-    						type:"POST",
-    						data: $(form).serialize(),
-    						url:"mail.php",
-    						success: function() {
-    							$(".contact-form").fadeTo( "slow", 1, function() {
-    		                        $(".contact-form").resetForm();
-    								$(".success").slideDown("slow");
-    							});
-    						},
-    						error: function() {
-    							$(".contact-form").fadeTo( "slow", 1, function() {
-    								$(".error").slideDown("slow");
-    							});
-    						}
-    					});
-    				},
-    		        errorPlacement: function(error, element) {
-    		            element.after(error);
-    		            error.hide().slideDown();
-    		        }
-    			});
-        	});
+				// $.validator.addMethod("isMobile", function(value, element) {       
+				// 	var length = value.length;   
+				// 	var mobile = /^[1][3,4,5,7,8][0-9]{9}$/;   
+				// 	return this.optional(element) || (length == 11 && mobile.test(value));       
+				// }, "请正确填写您的手机号码");
+    			// $("#contact-form").validate({//自定义验证规则
+    			// 	rules: {
+    			// 		name: {
+				// 			required: true,
+				// 			isMobile:true
+    			// 			// minlength: 8
+				// 		},
+				// 		// realName: "required",
+    		    //         email: {
+    		    //             required: true,
+    		    //             email: true
+    		    //         },
+    			// 		subject: {
+    			// 			required: true,
+    		    //             minlength: 2
+    			// 		},
+    			// 		message: {
+    			// 			required: true,
+    		    //             minlength: 2
+    			// 		}
+    			// 	},
+				// 	messages: {//提示文字
+				// 		name: {
+				// 			required: "姓名不能为空",
+				// 			// telephone: '请填写正确的手机号'
+				// 		},
+    			// 		// name: {
+    			// 		// 	required: "姓名不能为空",
+    			// 		// 	minlength: "至少输入8位字母和数字"
+    			// 		// },
+    		    //         email: {
+    		    //             required: "no email, no support"
+    		    //         },
+    			// 		subject: {
+    			// 			required: "you have a reason to contact, write it here",
+    		    //             minlength: "thats all? really?"
+    			// 		},
+    			// 		message: {
+    			// 			required: "um...yea, you have to write something to send this form.",
+    			// 			minlength: "thats all? really?"
+    			// 		}
+    			// 	},
+    			// 	submitHandler: function(form) {
+    			// 		$(form).ajaxSubmit({//jq表单提交
+    			// 			type:"POST",
+    			// 			data: $(form).serialize(),//获取form中的所有数据
+    			// 			url:"mail.php",
+    			// 			success: function() {
+    			// 				$(".contact-form").fadeTo( "slow", 1, function() {
+    		    //                     $(".contact-form").resetForm();//清空form
+    			// 					$(".success").slideDown("slow");//滑动方式显示隐藏元素
+    			// 				});
+    			// 			},
+    			// 			error: function() {
+    			// 				$(".contact-form").fadeTo( "slow", 1, function() {
+    			// 					$(".error").slideDown("slow");
+    			// 				});
+    			// 			}
+    			// 		});
+    			// 	},
+    		    //     errorPlacement: function(error, element) {
+    		    //         element.after(error);
+    		    //         error.hide().slideDown();
+    		    //     }
+    			// });
+			});
+			// 关闭弹窗X
+			$(".tc-on").click(function(){
+				$('#box-zc').css('display','none');
+				$('#box').css('display','none');
+				$(".zhezhao").css("display","none")
+			})
+			// 登录弹出
+            $(".btn1").click(function(){
+				if($('#box').css('display') =="none") {
+					$('#box').show();
+					$('#box-zc').css('display','none');
+					$(".zhezhao").css("display","block")
+				}else {
+					$('#box').hide();
+					$(".zhezhao").css("display","none")
+				}
+            });
+            /*点击短信登录*/
+            $("#message").click(function(){
+				$("#zhanghao").css("display","none")
+				$("#duanxin").css("display","block")
+			})
+			// 点击账号登录
+            $("#user-phone").click(function(){
+				$("#zhanghao").css("display","block")
+				$("#duanxin").css("display","none")
+
+            })
+
+			// 注册弹出
+			$('.register').click(function(){
+				if($('#box-zc').css('display') =="none") {
+					$('#box-zc').show();
+					$('#box').css('display','none');
+					$(".zhezhao").css("display","block")
+				}else {
+					$('#box-zc').hide();
+					$(".zhezhao").css("display","none")
+				}
+			})
+			$('#register').click(function(){
+				$("#box").css('display','none');
+				$('#box-zc').css('display','block');
+			})
+			$('.dx-zc').click(function(){
+				$("#box").css('display','none');
+				$('#box-zc').css('display','block');
+			})
+			// 返回登录
+			$("#go-login").click(function(){
+				$("#box").css('display','block');
+				$('#box-zc').css('display','none');
+			})
+			$(".go-login").click(function(){
+				$("#box").css('display','block');
+				$('#box-zc').css('display','none');
+			})
+
+
+			$("#callback").click(function(){
+                $("#bbb").css("display","none");
+                $("#aaa").css("display","block");
+            })
+            $("#weixin-login").click(function(){
+                $("#bbb").css("display","block");
+                $("#aaa").css("display","none");
+            })
         </script>
     </body>
 </html>

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

@@ -4,8 +4,75 @@
 
 jQuery(window).load(function(){
 
-	$("#preloader").fadeOut("slow");
-
+    $("#preloader").fadeOut("slow");
+    
+    // ........................
+    // 手机验证
+    isPhone = function (phone) {
+        var myreg = /^[1][3,4,5,7,8][0-9]{9}$/;
+        if (!myreg.test(phone)) {
+            return false;
+        } else {
+            return true;
+        }
+    };
+    // 密码验证
+    isMima = function(mima){
+        let mimareg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,20}$/;
+        if (!mimareg.test(mima)) {
+            return false;
+        } else {
+            return true;
+        }
+    };
+    // $('#pwd').change(function(){
+    //     if (isMima($(this).val())) {
+    //         return
+    //     } else {
+    //         alert("密码格式不对")
+    //     }
+    // })
+    // $("#phone").change(function(){
+    //     if (isPhone($(this).val())) {
+    //         return
+    //     } else {
+    //         alert("手机号码格式不对")
+    //     }
+    // })
+    // 登录点击
+    // $("#login-pwd").click(function(){
+    //     let name = $("#phone").val();
+    //     let pwd = $("#pwd").val();
+    //     console.log('姓名是'+name+'密码是'+pwd)
+    // })
+    //注册点击
+    // $("#zc-login").click(function(){
+    //     let name = $("#zc-phone").val();
+    //     let pwd = $("#zc-password").val();
+    //     let yanzheng  = $("#zc-yanzhengma").val();
+    //     console.log('姓名是'+name+'密码是'+pwd+'验证码是'+yanzheng)
+    // })
+
+    // 注册协议按钮同意可以点击注册
+    $(".checked").click(function(){
+        if ($(".checked").get(0).checked) {
+            $(".form-btn").attr('disabled',false);
+            $(".form-btn").removeClass("back");
+        } else {
+            $(".form-btn").attr('disabled',true);
+            $(".form-btn").addClass("back");
+        }
+    })
+    
+    // 帮助中心
+    $(".bz-right-conent>div").eq(0).show()
+    let abtn = $(".bz-left").children('button').click(function(){
+        console.log($(this).text())
+        var _index = $(this).index();
+        //让内容框的第 _index 个显示出来，其他的被隐藏
+        $(".bz-right-conent>div").eq(_index).show().siblings().hide();
+        $(this).addClass("actvin").siblings().removeClass('actvin')
+    });
 });
 
 /* ========================================================================= */
@@ -132,7 +199,7 @@ $(document).ready(function(){
 	});
 	
     $(window).scroll(function () {
-        if ($(window).scrollTop() > 400) {
+        if ($(window).scrollTop() > 10) {
             $(".navbar-brand a").css("color","#fff");
             $("#navigation").removeClass("animated-header");
         } else {
@@ -296,3 +363,4 @@ var wow = new WOW ({
 	mobile:       false,       // trigger animations on mobile devices (default is true)
 });
 wow.init();
+

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -179,23 +179,6 @@ Ext.define('saas.view.core.form.FormPanel', {
         return items;
     },
 
-    isValid: function() {
-        var me = this;
-        var viewModel = me.getViewModel();
-        var valid = me.getForm().isValid();
-        var detailGrids = me.query('detailGridField');
-
-        for(var i = 0; i < detailGrids.length; i++) {
-            var g = detailGrids[i];
-            if(!g.isValid()) {
-                valid = false;
-                break;
-            }
-        }
-        viewModel.set('base.valid', valid);
-        return valid;
-    },
-
     /**
      * 一些初始化viewModel的方法
      */
@@ -415,6 +398,23 @@ Ext.define('saas.view.core.form.FormPanel', {
     },
 
     //overriders
+    isValid: function() {
+        var me = this;
+        var viewModel = me.getViewModel();
+        var valid = me.getForm().isValid();
+        var detailGrids = me.query('detailGridField');
+
+        for(var i = 0; i < detailGrids.length; i++) {
+            var g = detailGrids[i];
+            if(!g.isValid()) {
+                valid = false;
+                break;
+            }
+        }
+        viewModel.set('base.valid', valid);
+        return valid;
+    },
+
     isDirty: function () {
         var me = this,
         detailGrids = me.query('detailGridField'),
@@ -437,5 +437,21 @@ Ext.define('saas.view.core.form.FormPanel', {
 
     getDirtyData: function() {
         return this.getForm().getDirtyData();
-    }
+    },
+
+    beforeSave: function() {
+        return true;
+    },
+
+    beforeDelete: function() {
+        return true;
+    },
+
+    beforeAudit: function() {
+        return true;
+    },
+
+    beforeUnAudit: function() {
+        return true;
+    },
 });

frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -82,6 +82,11 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var id = viewModel.get(form._idField);
         var code = viewModel.get(form._codeField);
         if(id&&id.value!=0){
+
+            if(!form.beforeDelete()) {
+                return false;
+            }
+
             deleteWarn(form._deleteMsg,function(btn){
                 if(btn == 'yes'){
                     me.BaseUtil.request({
@@ -115,6 +120,10 @@ Ext.define('saas.view.core.form.FormPanelController', {
             return false;
         }
 
+        if(!form.beforeSave()) {
+            return false;
+        }
+
         me.save();
     },
 
@@ -196,6 +205,10 @@ Ext.define('saas.view.core.form.FormPanelController', {
             showToast(form.invalidText);
             return false;
         }
+
+        if(!form.beforeAudit()) {
+            return false;
+        }
         
         //form里面数据
         var formData = form.getFormData();
@@ -263,6 +276,11 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var id = viewModel.get(form._idField);
         var code = viewModel.get(form._codeField);
         if(id&&id.value!=0){
+
+            if(!form.beforeUnAudit()) {
+                return false;
+            }
+
             me.BaseUtil.request({
                 url: form._unAuditUrl+id,
                 method: 'POST',

frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js

@@ -243,7 +243,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "pi_recorddate", 
+        name : "createTime", 
         fieldLabel : "录入日期",
         readOnly:true
     }, {

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -15,17 +15,20 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
+                        //数据接口
                         dataUrl:'/api/document/vendor/list',
-                        // dataUrl:'http://localhost:9480/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
+                        defaultCondition:"ve_statuscode='OPEN'",
+                        //赋值 
                         dbfinds:[{
-                            from:'id',to:'pi_vendid'
+                            from:'id',to:'pi_vendid',ignore:true
                         },{
                             from:'ve_code',to:'pi_vendcode'
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
+                        //联想设置
                         dbtpls:[{
                             field:'ve_code',width:100
                         },{
@@ -42,6 +45,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25
                         }],
+                        //放大镜窗口列表
                         dbColumns:[{
                             "text": "供应商ID",
                             "hidden": true,
@@ -72,10 +76,14 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
+<<<<<<< HEAD
+                            align: 'end'
+=======
                             align:'end', 
                             renderer : function(v) {
                                 return Ext.util.Format.number(v, '0');
                             }
+>>>>>>> origin/dev
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -94,24 +102,26 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pi_custname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
+            'dbfindtrigger[name=pi_custname]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
-                        dataUrl:'/api/document/customer/list',
+                        dataUrl: '/api/document/customer/list',
                         // dataUrl:'http://localhost:9480/customer/list',
-                        dbfinds:[{
-                            from:'id',to:'pi_custid'
-                        },{
-                            from:'cu_code',to:'pi_custcode'
-                        },{
-                            from:'cu_name',to:'pi_custname'
+                        dbfinds: [{
+                            from: 'id',to: 'pi_custid',ignore:true
+                        }, {
+                            from: 'cu_code',to: 'pi_custcode'
+                        }, {
+                            from: 'cu_name',to: 'pi_custname'
                         }],
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
+                        dbtpls: [{
+                            field: 'cu_code',
+                            width: 100
+                        }, {
+                            field: 'cu_name',
+                            width: 100
                         }],
                         defaultCondition:"cu_statuscode='OPEN'",
                         //放大镜窗口字段
@@ -122,7 +132,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%')";
                             }
                         }],
                         dbColumns:[{
@@ -167,10 +177,10 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             xtype: 'numbercolumn',
                             align:'end'
                         }]
-                    }) ;   
+                    });
 
                 }
-            },            
+            },           
             //放大镜赋值关系 以及 tpl模板
             'multidbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
@@ -298,9 +308,9 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         from:'wh_description',to:'pd_whname'
                     }],
                     dbtpls:[{
-                        field:'pd_whcode',width:100
+                        field:'wh_code',width:100
                     },{
-                        field:'pd_whname',width:100
+                        field:'wh_description',width:100
                     }],
                     dbSearchFields:[{
                         emptyText:'输入仓库编号或名称',
@@ -359,9 +369,9 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         from:'wh_description',to:'pd_inwhname'
                     }],
                     dbtpls:[{
-                        field:'pd_whcode',width:100
+                        field:'wh_code',width:100
                     },{
-                        field:'pd_whname',width:100
+                        field:'wh_description',width:100
                     }],
                     dbSearchFields:[{
                         emptyText:'输入仓库编号或名称',

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js

@@ -26,25 +26,38 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         allowBlank: true,
         columnWidth: 0.5
     }, {
-        xtype: 'textfield',
+        xtype: 'hidden',
         name: 'pi_vendcode',
         fieldLabel: '供应商编号',
         allowBlank: true,
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         allowBlank: true,
         columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 'pi_custcode',
+        fieldLabel: '客户编号',
+        allowBlank: true,
+        hidden:true,
+        columnWidth: 0.25
     }, {
         xtype: 'dbfindtrigger',
+        name: 'pi_custname',
+        fieldLabel: '客户名称',
+        allowBlank: true,
+        columnWidth: 0.25
+    }, {
+        xtype: 'hidden',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         showDetail: true
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         showDetail: true
@@ -53,6 +66,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         name: 'pi_statuscode',
         fieldLabel: '审核状态',
         allowBlank: true,
+        editable:false,
         columnWidth: 0.25,
         queryMode: 'local',
         displayField: 'pi_status',
@@ -84,92 +98,99 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 0,
+            hidden:true,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
             dataIndex: 'pi_inoutno',
             width: 200
-        }, {
-            text: '单据状态',
-            dataIndex: 'pi_status',
-            width: 120
-        }, {
+        },{
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 120
-        }, {
+        },{
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200
         },{
-            text: '采购单号',
-            dataIndex: 'pi_pucode',
-            width: 200
+            text: '审核状态',
+            dataIndex: 'pi_status',
+            width: 120
         },{
             text: '供应商名称',
             dataIndex: 'pi_vendname',
             width: 120
         },{
-            text: '含税金额',
-            dataIndex: 'pi_total',
-            xtype:'numbercolumn',
+            text: '客户名称',
+            dataIndex: 'pi_custname',
             width: 120
         },{
-            text: '未税金额',
-            dataIndex: 'pi_nettotal',
-            xtype:'numbercolumn',
-            width: 120,
+            text: '制单人',
+            dataIndex: 'pi_recordman',
+            width: 120
+        },{
+            text: '审核人',
+            dataIndex: 'pi_auditman',
+            width: 120
+        },{
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 200
         }],
         relativeColumn: [{
             text: 'id',
             dataIndex: 'pu_id',
-            width: 0,
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            hidden:true
         }, {
             text: '单据编号',
-            dataIndex: 'pd_inoutno',
+            dataIndex: 'pi_inoutno',
             width: 200
         }, {
-            text: '单据状态',
-            dataIndex: 'pi_status',
-            width: 120
-        }, {
-            text: '单据日期',
-            dataIndex: 'pi_date',
-            xtype:'datecolumn',
+            text: '单据类型',
+            dataIndex: 'pd_piclass',
             width: 200
         },{
-            text: '供应商名称',
-            dataIndex: 'pi_vendname',
+            text: '审核状态',
+            dataIndex: 'pi_status',
             width: 120
         },{
-            text: '采购单号',
-            dataIndex: 'pd_ordercode',
+            text: '客户编号',
+            dataIndex: 'pi_custcode',
             width: 120
         },{
-            text: '采购序号',
-            dataIndex: 'pd_orderdetno',
-            xtype:'numbercolumn',
+            text: '客户名称',
+            dataIndex: 'pi_custname',
             width: 120
         },{
             text: '物料编号',
             dataIndex: 'pd_prodcode',
             width: 120
         },{
-            text: '验收数量',
+            text: '物料名称',
+            dataIndex: 'pr_detail',
+            width: 120
+        },{
+            text: '物料规格',
+            dataIndex: 'pr_spec',
+            width: 120
+        },{
+            text: '单位',
+            dataIndex: 'pr_unit',
+            width: 120
+        },{
+            text: '数量',
             dataIndex: 'pd_inqty',
             xtype:'numbercolumn',
             width: 120
         },{
-            text: '采购单价',
-            dataIndex: 'pd_orderprice',
-            xtype:'numbercolumn',
+            text: '仓库',
+            dataIndex: 'pd_whname',
             width: 120
         },{
-            text: '金额',
-            dataIndex: 'pd_total',
+            text: '单位成本',
+            dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
             width: 120
         },{
@@ -178,10 +199,15 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             xtype:'numbercolumn',
             width: 120
         },{
-            text: '成本单价',
-            dataIndex: 'pd_price',
+            text: '金额',
+            dataIndex: 'pd_total',
             xtype:'numbercolumn',
-            width: 120,
+            width: 120
+        },{
+            text: '相关单号',
+            dataIndex: 'pd_ordercode',
+            xtype:'numbercolumn',
+            width: 120
         }]
     }
 });

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelController.js

@@ -6,16 +6,16 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendname]':{
+            'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
+                            from:'ve_code',to:'pi_vendcode'
                         },{
-                            from:'ve_name',to:'pu_vendname'
+                            from:'ve_name',to:'pi_vendname'
                         }],
                         dbtpls:[{
                             field:'ve_code',width:100
@@ -85,15 +85,19 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
+            'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
+                        conditionCode:'pr_code',
                         dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{
+                            from:'pr_detail',to:'pr_detail',
+                        },{
                             from:'pr_code',to:'pd_prodcode',
-                            from:'pr_unit',to:'pd_unit'
+                        }, {
+                            from:'pr_detail',to:'pr_detail'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100
@@ -102,7 +106,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                         }],
                         defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
+                            emptyText:'输入物料编号或名称',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
@@ -176,11 +180,87 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",
                             "width": 100,
-                        }]
+                        }]   
                     }) ;   
 
                 }
-            }
+            },
+            'dbfindtrigger[name=pi_custname]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
+                        dataUrl: '/api/document/customer/list',
+                        // dataUrl:'http://localhost:9480/customer/list',
+                        dbfinds: [{
+                            from: 'id',to: 'pi_custid',ignore:true
+                        }, {
+                            from: 'cu_code',to: 'pi_custcode'
+                        }, {
+                            from: 'cu_name',to: 'pi_custname'
+                        }],
+                        dbtpls: [{
+                            field: 'cu_code',
+                            width: 100
+                        }, {
+                            field: 'cu_name',
+                            width: 100
+                        }],
+                        defaultCondition:"cu_statuscode='OPEN'",
+                        //放大镜窗口字段
+                        dbSearchFields:[{
+                            emptyText:'输入客户编号或名称',
+                            xtype : "textfield", 
+                            name : "cu_name", 
+                            allowBlank : true, 
+                            columnWidth : 0.25,
+                            getCondition:function(v){
+                                return "(upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%')";
+                            }
+                        }],
+                        dbColumns:[{
+                            "text": "客户ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                        },{
+                            "text": "客户编号",
+                            "dataIndex": "cu_code",
+                            "width": 200,
+                        }, {
+                            "text": "客户名称",
+                            "dataIndex": "cu_name",
+                            "width": 200
+                        },{
+                            "text": "客户类型",
+                            "dataIndex": "cu_name",
+                            "width": 100
+                        },{
+                            "text": "业务员",
+                            "dataIndex": "cu_sellername",
+                            "width": 100
+                        },{
+                            "text": "税率",
+                            "dataIndex": "cu_taxrate",
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align:'end'
+                        },{
+                            "text": "承付天数",
+                            "dataIndex": "cu_promisedays",
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align:'end'
+                        },{
+                            "text": "额度",
+                            "dataIndex": "cu_credit",
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align:'end'
+                        }]
+                    });
+
+                }
+            },                
         });
 
     }

frontend/saas-web/app/view/stock/make/FormPanel.js

@@ -195,7 +195,10 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 width : 100.0,
                 ignore:true,
                 renderer: function (v, m, r) {
-                    return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:'';
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
+                    }
+                    return v;
                 }
             },            
             {

frontend/saas-web/app/view/stock/make/FormPanelController.js

@@ -83,9 +83,9 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                             from:'wh_description',to:'mm_whname'
                         }],
                         dbtpls:[{
-                            field:'pd_whcode',width:100
+                            field:'wh_code',width:100
                         },{
-                            field:'pd_whname',width:100
+                            field:'wh_description',width:100
                         }],
                         dbSearchFields:[{
                             emptyText:'输入仓库编号或名称',

frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -58,6 +58,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         bind: '{pi_statuscode}',
         fieldLabel: '审核状态',
         allowBlank: true,
+        editable:false,
         columnWidth: 0.25,
         queryMode: 'local',
         displayField: 'pi_status',

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -58,6 +58,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         bind: '{pi_statuscode}',
         fieldLabel: '审核状态',
         allowBlank: true,
+        editable:false,
         columnWidth: 0.25,
         queryMode: 'local',
         displayField: 'pi_status',

frontend/saas-web/ext/packages/modern-locale/overrides/zh_CN/field/Date.js

@@ -5,7 +5,11 @@
 Ext.define('Ext.locale.zh_CN.field.Date', {
     override: 'Ext.form.field.Date',
 
-    formatText: '当前日期格式为 {0}.',
-    minDateMessage: '该输入项的日期必须在 {0} 之后',
-    maxDateMessage: '该输入项的日期必须在 {0} 之前'
+    config: {
+        formatText: '当前日期格式为 {0}.',
+        minDateMessage: '该输入项的日期必须在 {0} 之后',
+        maxDateMessage: '该输入项的日期必须在 {0} 之前',
+        minText: "日期必须大于等于 {0}",
+        maxText: "日期必须小于等于 {0}",
+    },
 });

frontend/saas-web/ext/packages/modern-locale/overrides/zh_CN/picker/Date.js

@@ -10,6 +10,11 @@ Ext.define('Ext.locale.zh_CN.picker.Date', {
         monthText: '月',
         dayText: '日',
         yearText: '年',
-        todayText: '今天'
+        todayText: '今天',
+        todayTip: '{0} (今天)',
+        monthYearText: '选择月 (Ctrl + 上/下增减年)',
+        nextText: '下一个月 (Ctrl + 右)',
+        prevText: '上一个月 (Ctrl + 左)',
+        
     }
 });