Browse Source

机构入驻表单验证调整

huangct 8 years ago
parent
commit
7058960135

+ 27 - 8
donate-console/src/main/webapp/resources/js/index/app.js

@@ -716,8 +716,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
     /**
      * 机构认证第一步
      */
-    app.controller('CertificationStep1Ctrl', ['$scope', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization',
-        function ($scope, $http, $rootScope, $timeout, $location, toaster, Organization) {
+    app.controller('CertificationStep1Ctrl', ['$scope', 'BaseService', '$http', '$rootScope', '$timeout', '$location', '$filter', 'toaster', 'Organization',
+        function ($scope, BaseService, $http, $rootScope, $timeout, $location, $filter, toaster, Organization) {
             // 主要领域
             // $scope.areas = ['疾病援助', '扶贫/救灾', '教育/助学' , '环境/动物保护', '其他'];
 
@@ -756,11 +756,15 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                 item[openParam] = !item[openParam];
             };
 
+            $scope.currentDay = function () {
+                return $filter('date')(new Date(), 'yyyy-MM-dd');
+            };
 
             //提交
             $scope.saveStep1 = function (org, orgType, invalid) {
                 if (invalid == true) {
                     $scope.submited = true;
+                    BaseService.scrollBackToTop();
                     return;
                 }
                 if (orgCopy == org) {
@@ -810,8 +814,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
     /**
      * 机构认证第二步
      */
-    app.controller('CertificationStep2Ctrl', ['$scope', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization',
-        function ($scope, $http, $rootScope, $timeout, $location, toaster, Organization) {
+    app.controller('CertificationStep2Ctrl', ['$scope', 'BaseService', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization',
+        function ($scope, BaseService, $http, $rootScope, $timeout, $location, toaster, Organization) {
 
             var orgCopy;
             // 获取当前账户注册机构情况
@@ -823,7 +827,13 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
             });
 
             //提交
-            $scope.saveStep2 = function (org, orgType) {
+            $scope.saveStep2 = function (org, orgType, invalid) {
+                if (invalid == true) {
+                    $scope.submited = true;
+                    BaseService.scrollBackToTop();
+                    return;
+                }
+
                 if (orgCopy == org) {
                     if (orgType == 1) {
                         $location.path('publicOfferingCertificationStep3');
@@ -864,8 +874,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
     /**
      * 机构认证第三步
      */
-    app.controller('CertificationStep3Ctrl', ['$scope', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization',
-        function ($scope, $http, $rootScope, $timeout, $location, toaster, Organization) {
+    app.controller('CertificationStep3Ctrl', ['$scope', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization', 'BaseService',
+        function ($scope, $http, $rootScope, $timeout, $location, toaster, Organization, BaseService) {
             var orgCopy;
             // 获取当前账户注册机构情况
             Organization.getByUuid({uuid : 222222}, {}, function(data) {//10041558
@@ -882,6 +892,9 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
             }, function() {
                 toaster.pop('error', '注册情况加载失败');
             });
+            if (angular.isUndefined($scope.org)) {
+                $scope.org = {};
+            }
 
             // 获取银行信息
             $scope.getBankName = function (bankCard) {
@@ -1037,7 +1050,13 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
             };
 
             //提交
-            $scope.saveStep3 = function (org, isDraft, orgType) {
+            $scope.saveStep3 = function (org, isDraft, orgType, invalid) {
+                if (invalid == true) {
+                    $scope.submited = true;
+                    BaseService.scrollBackToTop();
+                    return;
+                }
+
                 if (orgCopy == org) {
                     if (orgType == 1) {
                         $location.path('publicOfferingCertificationStep4');

+ 32 - 25
donate-console/src/main/webapp/resources/view/user/charityCertification1.html

@@ -507,18 +507,20 @@
                                 <div class="message">
                                     <span>机构基本信息</span>
                                 </div>
-                                <form action="">
                                     <div class="form-group clearfix">
                                         <label for="" class="fl control-label">优软账号</label>
                                         <input required type="text" name="orgUuid" class="fl form-control" ng-maxlength="15" placeholder="请输入企业UU号" ng-model="org.uuid">
 
-                                        <span class="error" ng-show="charityCertification1.orgUuid.$touched && charityCertification1.orgUuid.$error.required">*优软账号不能为空</span>
+                                        <span class="error" ng-show="submited && charityCertification1.orgUuid.$error.required">*优软账号不能为空</span>
+                                        <span class="error" ng-show="submited && charityCertification1.orgUuid.$error.maxlength">*请填写正确的账号</span>
 
                                     </div>
                                     <div class="form-group clearfix">
                                         <label for="" class="fl control-label">机构全称</label>
-                                        <input required type="text" class="fl form-control" placeholder="请输入机构全称" ng-model="org.name">
+                                        <input required type="text" name="orgName" class="fl form-control" placeholder="请输入机构全称" ng-model="org.name">
                                         <span class="control-help fl">(请填写机构全称,例如:优软公益慈善基金会)</span>
+
+                                        <span class="error" ng-show="submited && charityCertification1.orgName.$error.required">*机构全称不能为空</span>
                                     </div>
                                     <div class="form-group clearfix">
                                         <label for="" class="fl control-label">机构电话</label>
@@ -526,8 +528,9 @@
                                         若电话号码与手机号码同时验证:(^(\d{3,4}-)?\d{7,8})$|(13[0-9]{9})-->
                                         <input required type="text" class="fl form-control" name="orgTelPhone" ng-pattern="/^0\d{2,3}-?\d{7,8}$/" ng-model="org.telphone">
                                         <span class="control-help fl">(请填写机构常用联系电话,例如:0755-26994808)</span>
-                                        <span class="error" ng-show="charityCertification1.orgTelPhone.$touched && charityCertification1.orgTelPhone.$error.required">*机构电话不能为空</span>
-                                        <span class="error" ng-show="ccharityCertification1.orgTelPhone.$touched && charityCertification1.orgTelPhone.$error.pattern">*机构电话不合法</span>
+
+                                        <span class="error" ng-show="submited && charityCertification1.orgTelPhone.$error.required">*机构电话不能为空</span>
+                                        <span class="error" ng-show="submited && charityCertification1.orgTelPhone.$error.pattern">*电话号码有误</span>
                                     </div>
                                     <div class="form-group clearfix">
                                         <label for="" class="fl control-label">常驻地址</label>
@@ -547,16 +550,14 @@
                                             <input required type="text" placeholder="详细地址" class="form-control" name="orgAddress" ng-model="org.address">
                                         </div>
 
-                                        <span class="error" ng-show="charityCertification1.orgProvince.$touched && charityCertification1.orgProvince.$error.required">*请选择省份</span>
-                                        <span class="error" ng-show="charityCertification1.orgCity.$touched && charityCertification1.orgCity.$error.required">*请选择市区</span>
-                                        <span class="error" ng-show="charityCertification1.orgAddress.$touched && charityCertification1.orgAddress.$error.required">*地区不能为空</span>
+                                        <span class="error" ng-show="submited && charityCertification1.orgProvince.$error.required">*请选择省份</span>
+                                        <span class="error" ng-show="submited && !charityCertification1.orgProvince.$error.required && charityCertification1.orgCity.$error.required">*请选择市区</span>
+                                        <span class="error" ng-show="submited && !charityCertification1.orgCity.$error.required && charityCertification1.orgAddress.$error.required">*地区不能为空</span>
 
                                     </div>
-                                </form>
                                 <div class="message">
                                     <span>机构现状</span>
                                 </div>
-                                <form action="">
                                     <div class="form-group clearfix">
                                         <label for="" class="fl control-label">机构登记性质</label>
                                         <select required name="orgRegType" class="fl" ng-model="org.regType">
@@ -564,7 +565,7 @@
                                             <option value="公益机构">公益机构</option>
                                         </select>
 
-                                        <span class="error" ng-show="charityCertification1.orgRegType.$touched && charityCertification1.orgRegType.$error.required">*请选择机构登记性质</span>
+                                        <span class="error" ng-show="submited && org.regType == null">*请选择机构登记性质</span>
                                     </div>
                                     <div class="form-group clearfix">
                                         <label for="" class="fl control-label">主要领域</label>
@@ -579,7 +580,7 @@
                                     </div>
                                     <div class="form-group clearfix">
                                         <label for="" class="fl control-label">年募捐额</label>
-                                        <select required name="" id="" class="fl" ng-model="org.yearDonationAmount">
+                                        <select required name="orgYearDonationAmount" id="" class="fl" ng-model="org.yearDonationAmount">
                                             <option value="">请选择</option>
                                             <option value="100w-1000w">100w-1000w</option>
                                             <option value="1000w-10000w">1000w-10000w</option>
@@ -587,7 +588,7 @@
                                         </select>
                                         <span class="fl control-help">(请选择机构上一年的全年募款金额)</span>
 
-                                        <span class="error" ng-show="charityCertification1.orgRegType.$touched && charityCertification1.orgRegType.$error.required">*请选择机构登记性质</span>
+                                        <span class="error" ng-show="submited && org.yearDonationAmount == null">*请选择机构年募捐额</span>
                                     </div>
                                     <div class="form-group clearfix">
                                         <label for="" class="fl control-label">机构规模</label>
@@ -600,7 +601,7 @@
                                                 <option value="超过500">超过500</option>
                                             </select>
 
-                                            <span class="error" ng-show="charityCertification1.orgFullTimePopulation.$touched && charityCertification1.orgFullTimePopulation.$error.required">*请选择机构规模</span>
+                                            <span class="error" ng-show="submited && org.fullTimePopulation == null">*请选择机构规模</span>
                                         </div>
                                         <div class="select-group fl">
                                             <span>兼职人数</span>
@@ -611,7 +612,7 @@
                                                 <option value="超过50">超过50</option>
                                             </select>
 
-                                            <span class="error" ng-show="charityCertification1.orgPartTimePopulation.$touched && charityCertification1.orgPartTimePopulation.$error.required">*请选择机构兼职人数</span>
+                                            <span class="error" ng-show="submited && org.partTimePopulation == null">*请选择机构兼职人数</span>
                                         </div>
                                         <div class="select-group fl">
                                             <span>志愿者人数</span>
@@ -622,21 +623,28 @@
                                                 <option value="超过50">超过50</option>
                                             </select>
 
-                                            <span class="error" ng-show="charityCertification1.orgVoluntaryPopulation.$touched && charityCertification1.orgVoluntaryPopulation.$error.required">*请选择机构志愿者人数</span>
+                                            <span class="error" ng-show="submited && org.voluntaryPopulation == null">*请选择机构志愿者人数</span>
                                         </div>
                                     </div>
                                     <div class="form-group input-group input-group-xs input-trigger clearfix">
                                         <label for="" class="fl control-label">成立日期</label>
                                         <!--<input type="text" class="fl form-control" ng-model="org.createTime">-->
-                                        <input type="text" name="orgCreateTime" ng-model="org.createTime"
+                                        <!--<input type="text" name="orgCreateTime" ng-model="org.createTime"
                                                class="f1 form-control" placeholder="到"
                                                datepicker-popup="yyyy-MM-dd" is-open="org.$toOpened"
                                                ng-required
                                                current-text="今天" clear-text="清除" close-text="关闭"
                                                datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                               ng-focus="openDatePicker($event, org, '$toOpened')">
+                                               ng-focus="openDatePicker($event, org, '$toOpened')">-->
+                                        <input type="text" ng-model="org.createTime" readonly style="float:left" required
+                                               class="date-choose f1 form-control" placeholder="成立日期"
+                                               datepicker-popup="yyyy-MM-dd" is-open="org.$toOpened"
+                                               ng-required="true" max-date="currentDay()"
+                                               current-text="今天" clear-text="清除" close-text="关闭"
+                                               datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                               ng-click="openDatePicker($event, org, '$toOpened')">
 
-                                        <span class="error" ng-show="charityCertification1.orgCreateTime.$touched && charityCertification1.orgCreateTime.$error.required">*请选择机构成立日期</span>
+                                        <span class="error" ng-show="submited && org.createTime == null">*请选择机构成立日期</span>
                                     </div>
                                     <div class="form-group clearfix home">
                                         <label for="" class="fl control-label">官方主页</label>
@@ -644,7 +652,7 @@
                                             <input required type="text" class="form-control" name="orgWebsite" ng-model="org.website">
                                             <p class="tip">(请填写您的官网地址,或者机构新浪微博地址,没有设置访问权限的QQ空间、微信公众号推送文章链接其中任意一个)</p>
 
-                                            <span class="error" ng-show="charityCertification1.orgWebsite.$touched && charityCertification1.orgWebsite.$error.required">*请填写机构官方主页</span>
+                                            <span class="error" ng-show="submited && charityCertification1.orgWebsite.$error.required">*请填写机构官方主页</span>
                                         </div>
                                     </div>
                                     <div class="form-group clearfix home">
@@ -655,9 +663,9 @@
                                                       placeholder="筹款来源、特色项目、服务片区、机构愿景、希望解决的社会问题等"></textarea>
                                             <p class="tip">机构简介建议保持在200~500字。</p>
 
-                                            <span class="error" ng-show="charityCertification1.orgSummary.$touched && charityCertification1.orgSummary.$error.required">*请填写机构简介</span>
-                                            <span class="error" ng-show="charityCertification1.orgSummary.$touched && charityCertification1.orgSummary.$error.maxlength">*机构简介字数过长</span>
-                                            <span class="error" ng-show="charityCertification1.orgSummary.$touched && charityCertification1.orgSummary.$error.minlength">*机构简介字数过少</span>
+                                            <span class="error" ng-show="submited && charityCertification1.orgSummary.$error.required">*请填写机构简介</span>
+                                            <span class="error" ng-show="submited && charityCertification1.orgSummary.$error.maxlength">*机构简介字数过长</span>
+                                            <span class="error" ng-show="submited && charityCertification1.orgSummary.$error.minlength">*机构简介字数过少</span>
                                         </div>
                                     </div>
                                     <!--<div class="form-group clearfix">
@@ -668,9 +676,8 @@
                                         </div>
                                     </div>-->
                                     <div class="text-left submitBtn">
-                                        <button class="btn" type="button" ng-click="saveStep1(org, 2)" ng-disabled="charityCertification1.$invalid">保存,下一步</button><a ui-sref="charityCertificationStep0">返回上一页</a></div>
+                                        <button class="btn" type="button" ng-click="saveStep1(org, 2, charityCertification1.$invalid)" >保存,下一步</button><a ui-sref="charityCertificationStep0">返回上一页</a></div>
                                     <!--<div class="text-left submitBtn"><a href="charityCertification2">保存,下一步</a><a href="charityCertification">返回上一页</a></div>-->
-                                </form>
                             </div>
                         </div>
                     </div>

+ 66 - 48
donate-console/src/main/webapp/resources/view/user/charityCertification2.html

@@ -504,57 +504,75 @@
                             <div class="message">
                                 <span>机构负责人</span>
                             </div>
-                            <form action="">
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">负责人姓名</label>
-                                    <input type="text" class="fl form-control" ng-model="org.managerName" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/">
-                                    <span class="control-help fl">(请填写机构当前负责人姓名)</span>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">身份证号</label>
-                                    <input type="text" class="fl form-control" ng-model="org.managerIdcard" required="true">
-                                    <span class="control-help fl">(请填写机构当前负责人身份证号码)</span>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">办公电话</label>
-                                    <input type="text" class="fl form-control" ng-model="org.managerOph" ng-pattern="/^0\d{2,3}-?\d{7,8}$/">
-                                    <span class="control-help fl">(请填写机构当前负责人有效联系电话)</span>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">个人手机</label>
-                                    <input type="text" class="fl form-control" ng-model="org.managerMobile" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/">
-                                    <span class="control-help fl">(请填写机构当前负责人常用联系手机号码)</span>
-                                </div>
-                            </form>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">负责人姓名</label>
+                                <input type="text" class="fl form-control" name="orgManagerName" ng-model="org.managerName" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/">
+                                <span class="control-help fl">(请填写机构当前负责人姓名)</span>
+
+                                <span class="error" ng-show="submited && charityCertification2.orgManagerName.$error.required">*负责人姓名不能为空</span>
+                                <span class="error" ng-show="submited && charityCertification2.orgManagerName.$error.pattern">*请输入正确的姓名</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">身份证号</label>
+                                <input type="text" class="fl form-control" name="orgManagerIdcard" ng-model="org.managerIdcard" required="true">
+                                <span class="control-help fl">(请填写机构当前负责人身份证号码)</span>
+
+                                <span class="error" ng-show="submited && charityCertification2.orgManagerIdcard.$error.required">*身份证号不能为空</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">办公电话</label>
+                                <input type="text" class="fl form-control" name="orgManagerOph" ng-model="org.managerOph" required="true" ng-pattern="/^0\d{2,3}-?\d{7,8}$/">
+                                <span class="control-help fl">(请填写机构当前负责人有效联系电话)</span>
+
+                                <span class="error" ng-show="submited && charityCertification2.orgManagerOph.$error.required">*办公电话不能为空</span>
+                                <span class="error" ng-show="submited && charityCertification2.orgManagerOph.$error.pattern">*办公电话输入有误</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">个人手机</label>
+                                <input type="text" class="fl form-control" name="orgManagerMobile" ng-model="org.managerMobile" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/">
+                                <span class="control-help fl">(请填写机构当前负责人常用联系手机号码)</span>
+
+                                <span class="error" ng-show="submited && charityCertification2.orgManagerMobile.$error.required">*个人手机不能为空</span>
+                                <span class="error" ng-show="submited && charityCertification2.orgManagerMobile.$error.pattern">*个人手机输入有误</span>
+                            </div>
                             <div class="message">
                                 <span>主要联系人</span>
                             </div>
-                            <form action="">
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">负责人姓名</label>
-                                    <input type="text" class="fl form-control" ng-model="org.contactName" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/">
-                                    <span class="control-help fl">(请填写机构当前联系人姓名)</span>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">身份证号</label>
-                                    <input type="text" class="fl form-control" ng-model="org.contactIdcard" required="true">
-                                    <span class="control-help fl">(请填写机构当前联系人身份证号码)</span>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">个人手机</label>
-                                    <input type="text" class="fl form-control" ng-model="org.contactTel" ng-pattern="/^1(3|4|5|7|8)\d{9}$/">
-                                    <span class="control-help fl">(请填写机构当前联系人有效联系手机号码)</span>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">个人邮箱</label>
-                                    <input type="text" class="fl form-control" ng-model="org.contactEmail" required="true" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/">
-                                    <span class="control-help fl">(请填写机构当前联系人电子邮箱)</span>
-                                </div>
-                                <div class="text-left submitBtn" style="margin-top: 55px;">
-                                    <button class="btn" type="button" ng-click="saveStep2(org, 2)" ng-disabled="charityCertification2.$invalid">保存,下一步</button>
-                                    <a ui-sref="charityCertificationStep1">返回上一页</a>
-                                </div>
-                            </form>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">负责人姓名</label>
+                                <input type="text" class="fl form-control" name="orgContactName" ng-model="org.contactName" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/">
+                                <span class="control-help fl">(请填写机构当前联系人姓名)</span>
+
+                                <span class="error" ng-show="submited && charityCertification2.orgContactName.$error.required">*负责人姓名不能为空</span>
+                                <span class="error" ng-show="submited && charityCertification2.orgContactName.$error.pattern">*请输入正确的姓名</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">身份证号</label>
+                                <input type="text" class="fl form-control" name="orgContactIdcard" ng-model="org.contactIdcard" required="true">
+                                <span class="control-help fl">(请填写机构当前联系人身份证号码)</span>
+
+                                <span class="error" ng-show="submited && charityCertification2.orgContactIdcard.$error.required">*身份证号不能为空</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">个人手机</label>
+                                <input type="text" class="fl form-control" name="orgContactTel" ng-model="org.contactTel" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/">
+                                <span class="control-help fl">(请填写机构当前联系人有效联系手机号码)</span>
+
+                                <span class="error" ng-show="submited && charityCertification2.orgContactTel.$error.required">*个人手机不能为空</span>
+                                <span class="error" ng-show="submited && charityCertification2.orgContactTel.$error.pattern">*个人手机输入有误</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">个人邮箱</label>
+                                <input type="text" class="fl form-control" name="orgContactEmail" ng-model="org.contactEmail" required="true" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/">
+                                <span class="control-help fl">(请填写机构当前联系人电子邮箱)</span>
+
+                                <span class="error" ng-show="submited && charityCertification2.orgContactEmail.$error.required">*个人邮箱不能为空</span>
+                                <span class="error" ng-show="submited && charityCertification2.orgContactEmail.$error.pattern">*个人邮箱输入有误</span>
+                            </div>
+                            <div class="text-left submitBtn" style="margin-top: 55px;">
+                                <button class="btn" type="button" ng-click="saveStep2(org, 2, charityCertification2.$invalid)">保存,下一步</button>
+                                <a ui-sref="charityCertificationStep1">返回上一页</a>
+                            </div>
                         </div>
                     </div>
                 </div>

+ 154 - 104
donate-console/src/main/webapp/resources/view/user/charityCertification3.html

@@ -483,15 +483,112 @@
         border: none;
     }
 
-    .lookImg{
-        margin-left: 40px;
-        width: 40px;
-        height: 34px;
-        line-height: 34px;
+    /*上传图片*/
+    .certificate .certificate-item .uploadImage .showImg {
+        position: relative ;
+        width: 160px;
+        height: 160px;
+        margin: 16px 0;
+    }
+    .certificate .certificate-item .uploadImage .showImgs{
+        width: 570px;
+        height: 70px;
+    }
+    .certificate .certificate-item .uploadImage .showImg img{
+        width: 100%;
+        height: 100%;
+    }
+    .certificate .certificate-item .uploadImage .showImg .hover-show {
+        position: absolute ;
+        top: 0;
+        left: -20px;
+        width: 100%;
+        height: 100%;
+        background: rgba(0,0,0,.5);
+        display: none;
+    }
+    .certificate .certificate-item .uploadImage .showImg:hover .hover-show {
+        display: block;
+    }
+    .certificate .certificate-item .uploadImage .showImg .hover-show .delete{
+        position: absolute;
+        top: 5px;
+        right: 5px;
+        color: #fff;
+        cursor: pointer;
+    }
+    .certificate .certificate-item .uploadImage .showImg .hover-show .delete em.fa-trash{
+        font-size: 18px;
+        color: #fff;
+    }
+    .certificate .certificate-item .uploadImage .showImg .hover-show a{
+        position: absolute;
+        top: 44%;
+        left: 36%;
+        font-size: 16px;
+        color: #fff;
+    }
+    /*封面图片Banner*/
+    .certificate .certificate-item .uploadImage{
+        position: relative;
+    }
+    .certificate .certificate-item .uploadImage div{
+        height: 28px;
+        line-height: 28px;
+    }
+    .certificate .certificate-item .uploadImage div button{
+        width: 90px;
+        height: 28px;
+        line-height: 28px;
         text-align: center;
-        vertical-align: middle ;
+        font-size: 14px;
+        color: #6d6d6d;
+        background: -webkit-linear-gradient(top, #fff 0%,#dadada 100%);
+        background: -o-linear-gradient(top, #fff 0%,#dadada 100%);
+        background: -ms-linear-gradient(top, #fff 0%,#dadada 100%);
+        background: linear-gradient(to bottom, #fff 0%,#dadada 100%);
         border: 1px solid #dcdcdc;
+        border-radius: 3px;
+    }
+    .certificate .certificate-item .uploadImage div span{
+        margin-left: 20px;
+        font-size: 12px;
+        color: #969696;
+    }
+    .certificate .certificate-item .uploadImage input{
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 90px;
+        height: 28px;
+        opacity: 0;
+        outline: none;
+    }
+    .certificate .certificate-item .uploadImage .img-show {
+        margin: 15px 0 25px;
+        width: 160px;
+        height: 160px;
+        line-height: 160px;
+        text-align: center;
+    }
+    .certificate .certificate-item.uploadImage .img-show img{
+        width: 100%;
+        height: 100%;
+    }
+    .certificate .certificate-item .uploadImage .img-shows {
+        margin: 15px 0 30px;
+        width: 480px;
+        height: 60px;
+        line-height: 60px;
+        text-align: center;
     }
+
+    /*  */
+    button.disabled {
+        opacity: 0.6;
+        cursor: not-allowed;
+    }
+
 </style>
 
 <!--主体内容-->
@@ -514,149 +611,102 @@
                             <div class="message">
                                 <span>机构银行卡信息</span>
                             </div>
-                            <form action="">
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">机构开户名称</label>
-                                    <input type="text" class="fl form-control" ng-model="org.bankCardName" required="true">
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">银行账号</label>
-                                    <input type="text" class="fl form-control" ng-model="org.account" required="true" ng-change="getBankName({{org.account}})">
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">开户银行支行</label>
-                                    <!--<select name="" id="" class="fl bankChoose" ng-model="org.cardOfBank">
-                                        <option value="">请选择</option>
-                                    </select>-->
-                                    <input type="text" class="fl form-control <!--bank-choose-->" ng-model="org.branchMessage" readonly='readonly'>
-                                </div>
-                            </form>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">机构开户名称</label>
+                                <input type="text" class="fl form-control" name="orgBankCardName" ng-model="org.bankCardName" required="true">
+
+                                <span class="error" ng-show="submited && charityCertification3.orgBankCardName.$error.required">*机构开户名称不能为空</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">银行账号</label>
+                                <input type="text" class="fl form-control" name="orgAccount" ng-model="org.account" required="true" ng-change="getBankName({{org.account}})">
+
+                                <span class="error" ng-show="submited && charityCertification3.orgAccount.$error.required">*银行账号不能为空</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">开户银行支行</label>
+                                <!--<select name="" id="" class="fl bankChoose" ng-model="org.cardOfBank">
+                                    <option value="">请选择</option>
+                                </select>-->
+                                <input type="text" class="fl form-control <!--bank-choose-->" ng-model="org.branchMessage" readonly='readonly'>
+                            </div>
                             <div class="message">
                                 <span>机构logo及证书</span>
                             </div>
                             <div class="certificate">
                                 <div class="certificate-item clearfix">
                                     <span class="fl">上传机构logo</span>
-                                    <!--<div class="fl uploadImg">
-                                        <button>上传图片</button>
-                                        <input type="file" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 0)'>
-                                    </div>
-                                    <img class="fl lookImg" src="{{org.logo}}">-->
-
                                     <div class="fl uploadImage">
                                         <div><button>上传图片</button></div>
-                                        <input type="file" accept="image/*" ng-multiple="false" id="logoUrl" onchange='angular.element(this).scope().fileChanged(this, 0)'>
                                         <a href="">查看样式</a>
-                                        <div ng-if="null != logoUrl" style="max-height: 100px; max-width: 300px">
-                                            <img style="max-height: 100px; max-width: 100px" src="{{logoUrl}}">
+                                        <input type="file" ng-multiple="false" id="logo" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 0)'>
+                                        <div ng-if="null != logoUrl" class="showImg" style="margin-left: 40px;">
+                                            <img src="{{logoUrl}}">
                                             <span class="hover-show">
-                                                <em style="cursor: pointer;" class="delete" title="删除" ng-click="clearFile('logo')">
-                                                    <em class="fa fa-2x fa-trash"></em>
-                                                </em>
-                                                <a ng-click="showImg('logo')" title="点击查看大图">
-                                                    <em class="fa fa-search"></em>查看
-                                                </a>
-                                            </span>
+                                                    <em class="delete" title="删除" ng-click="clearFile('logo')"><em class="fa fa-2x fa-trash"></em></em>
+                                                    <a ng-click="showImg('logo')" title="点击查看大图"><em class="fa fa-search" style="margin-right: 5px;"></em>查看</a>
+                                                </span>
                                         </div>
-                                        <input type="text" name="logoUrl" ng-show="false" ng-model="logoUrl" required>
-                                        <span class="error" ng-show="charityCertification3.$submitted && charityCertification3.logoUrl.$error.required">*需上传机构logo</span>
-
                                     </div>
+                                    <span class="error" ng-show="submited && logoUrl == null && org.logo == null">*请上传机构logo</span>
 
                                 </div>
                                 <div class="certificate-item clearfix">
                                     <span class="fl">慈善组织法人登记证书(加盖慈善机构红章)</span>
-                                    <!--<div class="fl uploadImg">
-                                        <button>上传图片</button>
-                                        <input type="file" id="personCertificateImage" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 1)'>
-                                        <a href="">查看样式</a>
-                                    </div>
-                                    <img class="fl lookImg" src="{{org.personCertificate}}">-->
-
                                     <div class="fl uploadImage">
                                         <div><button>上传图片</button></div>
-                                        <input type="file" accept="image/*" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 1)'>
                                         <a href="">查看样式</a>
-                                        <div ng-if="null != personCertificateUrl" style="max-height: 100px; max-width: 300px">
-                                            <img style="max-height: 100px; max-width: 100px" src="{{personCertificateUrl}}">
+                                        <input type="file" ng-multiple="false" id="personCertificate" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 1)'>
+                                        <div ng-if="null != personCertificateUrl" class="showImg" style="margin-left: 40px;">
+                                            <img src="{{personCertificateUrl}}">
                                             <span class="hover-show">
-                                                <em style="cursor: pointer;" class="delete" title="删除" ng-click="clearFile('personCertificate')">
-                                                    <em class="fa fa-2x fa-trash"></em>
-                                                </em>
-                                                <a ng-click="showImg('personCertificate')" title="点击查看大图">
-                                                    <em class="fa fa-search"></em>查看
-                                                </a>
-                                            </span>
+                                                    <em class="delete" title="删除" ng-click="clearFile('personCertificate')"><em class="fa fa-2x fa-trash"></em></em>
+                                                    <a ng-click="showImg('personCertificate')" title="点击查看大图"><em class="fa fa-search" style="margin-right: 5px;"></em>查看</a>
+                                                </span>
                                         </div>
-
-                                        <input type="text" name="personCertificateUrl" ng-show="false" ng-model="personCertificateUrl" required>
-                                        <span class="error" ng-show="charityCertification3.$submitted && charityCertification3.personCertificateUrl.$error.required">*需上传慈善组织法人登记证书</span>
                                     </div>
 
+                                    <span class="error" ng-show="submited && personCertificateUrl == null && org.personCertificate == null">*请上传慈善组织法人登记证书</span>
                                 </div>
                                 <div class="certificate-item clearfix">
                                     <span class="fl">慈善组织公开募捐资格证书(加盖机构红章)</span>
-                                    <!--<div class="fl uploadImg">
-                                        <button>上传图片</button>
-                                        <input type="file" id="donateCertificateImage" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 2)'>
-                                        <a href="">查看样式</a>
-                                    </div>
-                                    <img class="fl lookImg" src="{{org.donateCertificate}}">-->
-
                                     <div class="fl uploadImage">
                                         <div><button>上传图片</button></div>
-                                        <input type="file" accept="image/*" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 2)'>
                                         <a href="">查看样式</a>
-                                        <div ng-if="null != donateCertificateUrl" style="max-height: 100px; max-width: 300px">
-                                            <img style="max-height: 100px; max-width: 100px" src="{{donateCertificateUrl}}">
+                                        <input type="file" ng-multiple="false" id="donateCertificate" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 2)'>
+                                        <div ng-if="null != donateCertificateUrl" class="showImg" style="margin-left: 40px;">
+                                            <img src="{{donateCertificateUrl}}">
                                             <span class="hover-show">
-                                                <em style="cursor: pointer;" class="delete" title="删除" ng-click="clearFile('donateCertificate')">
-                                                    <em class="fa fa-2x fa-trash"></em>
-                                                </em>
-                                                <a ng-click="showImg('donateCertificate')" title="点击查看大图">
-                                                    <em class="fa fa-search"></em>查看
-                                                </a>
-                                            </span>
+                                                    <em class="delete" title="删除" ng-click="clearFile('donateCertificate')"><em class="fa fa-2x fa-trash"></em></em>
+                                                    <a ng-click="showImg('donateCertificate')" title="点击查看大图"><em class="fa fa-search" style="margin-right: 5px;"></em>查看</a>
+                                                </span>
                                         </div>
-
-                                        <input type="text" name="donateCertificateUrl" ng-show="false" ng-model="donateCertificateUrl" required>
-                                        <span class="error" ng-show="charityCertification3.$submitted && charityCertification3.donateCertificateUrl.$error.required">*需上传慈善组织公开募捐资格证书</span>
                                     </div>
 
+                                    <span class="error" ng-show="submited && donateCertificateUrl == null && org.donateCertificate == null">*请上传慈善组织公开募捐资格证书</span>
                                 </div>
                                 <div class="certificate-item clearfix">
                                     <span class="fl">法人身份证(加盖机构红章)</span>
-                                    <!--<div class="fl uploadImg">
-                                        <button>上传图片</button>
-                                        <input type="file" id="legalIdCardImage" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 3)'>
-                                        <a href="">查看样式</a>
-                                    </div>
-                                    <img class="fl lookImg" src="{{org.legalIdCard}}">-->
-
                                     <div class="fl uploadImage">
                                         <div><button>上传图片</button></div>
-                                        <input type="file" accept="image/*" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 3)'>
                                         <a href="">查看样式</a>
-                                        <div ng-if="null != legalIdCardUrl" style="max-height: 100px; max-width: 300px">
-                                            <img style="max-height: 100px; max-width: 100px" src="{{legalIdCardUrl}}">
+                                        <input type="file" ng-multiple="false" id="legalIdCard" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 3)'>
+                                        <div ng-if="null != legalIdCardUrl" class="showImg" style="margin-left: 40px;">
+                                            <img src="{{legalIdCardUrl}}">
                                             <span class="hover-show">
-                                                <em style="cursor: pointer;" class="delete" title="删除" ng-click="clearFile('legalIdCard')">
-                                                    <em class="fa fa-2x fa-trash"></em>
-                                                </em>
-                                                <a ng-click="showImg('legalIdCard')" title="点击查看大图">
-                                                    <em class="fa fa-search"></em>查看
-                                                </a>
-                                            </span>
+                                                    <em class="delete" title="删除" ng-click="clearFile('legalIdCard')"><em class="fa fa-2x fa-trash"></em></em>
+                                                    <a ng-click="showImg('legalIdCard')" title="点击查看大图"><em class="fa fa-search" style="margin-right: 5px;"></em>查看</a>
+                                                </span>
                                         </div>
-
-                                        <input type="text" name="legalIdCardUrl" ng-show="false" ng-model="legalIdCardUrl" required>
-                                        <span class="error" ng-show="charityCertification3.$submitted && charityCertification3.legalIdCardUrl.$error.required">*需上传法人身份证</span>
                                     </div>
 
+                                    <span class="error" ng-show="submited && legalIdCardUrl == null && org.legalIdCard == null">*请上传法人身份证</span>
                                 </div>
                                 <div class="text-left submitBtn" style="margin-top: 75px;">
-                                    <button class="btn" type="submit" ng-click="saveStep3(org, true, 2)" ng-disabled="charityCertification3.$invalid">保存,下一步</button>
-                                    <button class="btn" type="submit" ng-click="saveStep3(org, false, 2)" ng-disabled="charityCertification3.$invalid">提交</button>
+                                    <button class="btn" type="submit" ng-click="saveStep3(org, true, 2, charityCertification3.$invalid || (!logoUrl && !org.logo) || (!personCertificateUrl && !org.personCertificate) ||
+                                        (!donateCertificateUrl && !org.donateCertificate) || (!legalIdCardUrl && !org.legalIdCard))">保存,下一步</button>
+                                    <button class="btn" type="submit" ng-click="saveStep3(org, false, 2, charityCertification3.$invalid || (!logoUrl && !org.logo) || (!personCertificateUrl && !org.personCertificate) ||
+                                        (!donateCertificateUrl && !org.donateCertificate) || (!legalIdCardUrl && !org.legalIdCard))">提交</button>
                                     <a ui-sref="charityCertificationStep2">返回上一页</a>
                                 </div>
                             </div>

+ 142 - 143
donate-console/src/main/webapp/resources/view/user/publicOfferingCertification1.html

@@ -542,170 +542,169 @@
                             <div class="message">
                                 <span>机构基本信息</span>
                             </div>
-                            <form action="">
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">优软账号</label>
-                                    <input required type="text" name="orgUuid" class="fl form-control" ng-maxlength="15" placeholder="请输入企业UU号" ng-model="org.uuid">
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">优软账号</label>
+                                <input required type="text" name="orgUuid" class="fl form-control" ng-maxlength="15" placeholder="请输入企业UU号" ng-model="org.uuid">
 
-                                    <span class="error" ng-show="publicOfferingCertification1.orgUuid.$touched && publicOfferingCertification1.orgUuid.$error.required">*优软账号不能为空</span>
+                                <span class="error" ng-show="submited && publicOfferingCertification1.orgUuid.$error.required">*优软账号不能为空</span>
+                                <span class="error" ng-show="submited && publicOfferingCertification1.orgUuid.$error.maxlength">*请填写正确的账号</span>
 
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">机构全称</label>
+                                <input required type="text" name="orgName" class="fl form-control" placeholder="请输入机构全称" ng-model="org.name">
+                                <span class="control-help fl">(请填写机构全称,例如:优软公益慈善基金会)</span>
+
+                                <span class="error" ng-show="submited && publicOfferingCertification1.orgName.$error.required">*机构全称不能为空</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">机构电话</label>
+                                <!--验证规则:区号+号码,区号以0开头,3位或4位号码由7位或8位数字组成区号与号码之间可以无连接符,也可以“-”连接
+                                若电话号码与手机号码同时验证:(^(\d{3,4}-)?\d{7,8})$|(13[0-9]{9})-->
+                                <input required type="text" class="fl form-control" name="orgTelPhone" ng-pattern="/^0\d{2,3}-?\d{7,8}$/" ng-model="org.telphone">
+                                <span class="control-help fl">(请填写机构常用联系电话,例如:0755-26994808)</span>
+
+                                <span class="error" ng-show="submited && publicOfferingCertification1.orgTelPhone.$error.required">*机构电话不能为空</span>
+                                <span class="error" ng-show="submited && publicOfferingCertification1.orgTelPhone.$error.pattern">*电话号码有误</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">常驻地址</label>
+                                <div class="select-group fl">
+                                    <select required name="orgProvince" ng-model="org.province" ng-options="key as key for (key,value) in provinces" ng-change="org.city='';">
+                                        <option value="">请选择</option>
+                                    </select>
+                                    <span>省</span>
                                 </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">机构全称</label>
-                                    <input required type="text" class="fl form-control" placeholder="请输入机构全称" ng-model="org.name">
-                                    <span class="control-help fl">(请填写机构全称,例如:优软公益慈善基金会)</span>
+                                <div class="select-group fl">
+                                    <select required name="orgCity" ng-model="org.city" ng-options="key as key for (key,value) in provinces[org.province]">
+                                        <option value="">请选择</option>
+                                    </select>
+                                    <span>市</span>
                                 </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">机构电话</label>
-                                    <!--验证规则:区号+号码,区号以0开头,3位或4位号码由7位或8位数字组成区号与号码之间可以无连接符,也可以“-”连接
-                                    若电话号码与手机号码同时验证:(^(\d{3,4}-)?\d{7,8})$|(13[0-9]{9})-->
-                                    <input required type="text" class="fl form-control" name="orgTelPhone" ng-pattern="/^0\d{2,3}-?\d{7,8}$/" ng-model="org.telphone">
-                                    <span class="control-help fl">(请填写机构常用联系电话,例如:0755-26994808)</span>
-                                    <span class="error" ng-show="publicOfferingCertification1.orgTelPhone.$touched && publicOfferingCertification1.orgTelPhone.$error.required">*机构电话不能为空</span>
-                                    <span class="error" ng-show="cpublicOfferingCertification1.orgTelPhone.$touched && publicOfferingCertification1.orgTelPhone.$error.pattern">*机构电话不合法</span>
+                                <div class="select-group fl">
+                                    <input required type="text" placeholder="详细地址" class="form-control" name="orgAddress" ng-model="org.address">
                                 </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">常驻地址</label>
-                                    <div class="select-group fl">
-                                        <select required name="orgProvince" ng-model="org.province" ng-options="key as key for (key,value) in provinces" ng-change="org.city='';">
-                                            <option value="">请选择</option>
-                                        </select>
-                                        <span>省</span>
-                                    </div>
-                                    <div class="select-group fl">
-                                        <select required name="orgCity" ng-model="org.city" ng-options="key as key for (key,value) in provinces[org.province]">
-                                            <option value="">请选择</option>
-                                        </select>
-                                        <span>市</span>
-                                    </div>
-                                    <div class="select-group fl">
-                                        <input required type="text" placeholder="详细地址" class="form-control" name="orgAddress" ng-model="org.address">
-                                    </div>
-
-                                    <span class="error" ng-show="publicOfferingCertification1.orgProvince.$touched && publicOfferingCertification1.orgProvince.$error.required">*请选择省份</span>
-                                    <span class="error" ng-show="publicOfferingCertification1.orgCity.$touched && publicOfferingCertification1.orgCity.$error.required">*请选择市区</span>
-                                    <span class="error" ng-show="publicOfferingCertification1.orgAddress.$touched && publicOfferingCertification1.orgAddress.$error.required">*地区不能为空</span>
 
-                                </div>
-                            </form>
+                                <span class="error" ng-show="submited && publicOfferingCertification1.orgProvince.$error.required">*请选择省份</span>
+                                <span class="error" ng-show="submited && !publicOfferingCertification1.orgProvince.$error.required && publicOfferingCertification1.orgCity.$error.required">*请选择市区</span>
+                                <span class="error" ng-show="submited && !publicOfferingCertification1.orgCity.$error.required && publicOfferingCertification1.orgAddress.$error.required">*地区不能为空</span>
+                            </div>
                             <div class="message">
                                 <span>机构现状</span>
                             </div>
-                            <form action="">
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">机构登记性质</label>
-                                    <select required name="orgRegType" class="fl" ng-model="org.regType">
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">机构登记性质</label>
+                                <select required name="orgRegType" class="fl" ng-model="org.regType">
+                                    <option value="">请选择</option>
+                                    <option value="公益机构">公益机构</option>
+                                </select>
+
+                                <span class="error" ng-show="submited && org.regType == null">*请选择机构登记性质</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">主要领域</label>
+                                <div class="area fl" id="choose-major-area">
+                                    <input required type="text" ng-show="false" ng-model="org.majorArea">
+                                    <span ng-class="{'active': org.majorArea==1}" ng-click="selectMajorArea(1)">疾病援助</span>
+                                    <span ng-class="{'active': org.majorArea==2}" ng-click="selectMajorArea(2)">扶贫/救灾</span>
+                                    <span ng-class="{'active': org.majorArea==3}" ng-click="selectMajorArea(3)">教育/助学</span>
+                                    <span ng-class="{'active': org.majorArea==4}" ng-click="selectMajorArea(4)">环境/动物保护</span>
+                                    <span ng-class="{'active': org.majorArea==5}" ng-click="selectMajorArea(5)">其他</span>
+                                </div>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">年募捐额</label>
+                                <select required name="" id="" class="fl" ng-model="org.yearDonationAmount">
+                                    <option value="">请选择</option>
+                                    <option value="100w-1000w">100w-1000w</option>
+                                    <option value="1000w-10000w">1000w-10000w</option>
+                                    <option value="大于10000w">大于10000w</option>
+                                </select>
+                                <span class="fl control-help">(请选择机构上一年的全年募款金额)</span>
+
+                                <span class="error" ng-show="submited && org.yearDonationAmount == null">*请选择机构年募捐额</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">机构规模</label>
+                                <div class="select-group fl">
+                                    <span class="count">全职人数</span>
+                                    <select required name="orgFullTimePopulation" ng-model="org.fullTimePopulation">
                                         <option value="">请选择</option>
-                                        <option value="公益机构">公益机构</option>
+                                        <option value="10-100">10-100</option>
+                                        <option value="100-500">100-500</option>
+                                        <option value="超过500">超过500</option>
                                     </select>
 
-                                    <span class="error" ng-show="publicOfferingCertification1.orgRegType.$touched && publicOfferingCertification1.orgRegType.$error.required">*请选择机构登记性质</span>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">主要领域</label>
-                                    <div class="area fl" id="choose-major-area">
-                                        <input required type="text" ng-show="false" ng-model="org.majorArea">
-                                        <span ng-class="{'active': org.majorArea==1}" ng-click="selectMajorArea(1)">疾病援助</span>
-                                        <span ng-class="{'active': org.majorArea==2}" ng-click="selectMajorArea(2)">扶贫/救灾</span>
-                                        <span ng-class="{'active': org.majorArea==3}" ng-click="selectMajorArea(3)">教育/助学</span>
-                                        <span ng-class="{'active': org.majorArea==4}" ng-click="selectMajorArea(4)">环境/动物保护</span>
-                                        <span ng-class="{'active': org.majorArea==5}" ng-click="selectMajorArea(5)">其他</span>
-                                    </div>
+                                    <span class="error" ng-show="submited && org.fullTimePopulation == null">*请选择机构规模</span>
                                 </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">年募捐额</label>
-                                    <select required name="" id="" class="fl" ng-model="org.yearDonationAmount">
+                                <div class="select-group fl">
+                                    <span>兼职人数</span>
+                                    <select required name="orgPartTimePopulation" ng-model="org.partTimePopulation">
                                         <option value="">请选择</option>
-                                        <option value="100w-1000w">100w-1000w</option>
-                                        <option value="1000w-10000w">1000w-10000w</option>
-                                        <option value="大于10000w">大于10000w</option>
+                                        <option value="0-10">0-10</option>
+                                        <option value="10-50">10-50</option>
+                                        <option value="超过50">超过50</option>
                                     </select>
-                                    <span class="fl control-help">(请选择机构上一年的全年募款金额)</span>
 
-                                    <span class="error" ng-show="publicOfferingCertification1.orgRegType.$touched && publicOfferingCertification1.orgRegType.$error.required">*请选择机构登记性质</span>
+                                    <span class="error" ng-show="submited && org.partTimePopulation == null">*请选择机构兼职人数</span>
                                 </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">机构规模</label>
-                                    <div class="select-group fl">
-                                        <span class="count">全职人数</span>
-                                        <select required name="orgFullTimePopulation" ng-model="org.fullTimePopulation">
-                                            <option value="">请选择</option>
-                                            <option value="10-100">10-100</option>
-                                            <option value="100-500">100-500</option>
-                                            <option value="超过500">超过500</option>
-                                        </select>
-
-                                        <span class="error" ng-show="publicOfferingCertification1.orgFullTimePopulation.$touched && publicOfferingCertification1.orgFullTimePopulation.$error.required">*请选择机构规模</span>
-                                    </div>
-                                    <div class="select-group fl">
-                                        <span>兼职人数</span>
-                                        <select required name="orgPartTimePopulation" ng-model="org.partTimePopulation">
-                                            <option value="">请选择</option>
-                                            <option value="0-10">0-10</option>
-                                            <option value="10-50">10-50</option>
-                                            <option value="超过50">超过50</option>
-                                        </select>
-
-                                        <span class="error" ng-show="publicOfferingCertification1.orgPartTimePopulation.$touched && publicOfferingCertification1.orgPartTimePopulation.$error.required">*请选择机构兼职人数</span>
-                                    </div>
-                                    <div class="select-group fl">
-                                        <span>志愿者人数</span>
-                                        <select required name="orgVoluntaryPopulation" ng-model="org.voluntaryPopulation">
-                                            <option value="">请选择</option>
-                                            <option value="0-10">0-10</option>
-                                            <option value="10-50">10-50</option>
-                                            <option value="超过50">超过50</option>
-                                        </select>
-
-                                        <span class="error" ng-show="publicOfferingCertification1.orgVoluntaryPopulation.$touched && publicOfferingCertification1.orgVoluntaryPopulation.$error.required">*请选择机构志愿者人数</span>
-                                    </div>
+                                <div class="select-group fl">
+                                    <span>志愿者人数</span>
+                                    <select required name="orgVoluntaryPopulation" ng-model="org.voluntaryPopulation">
+                                        <option value="">请选择</option>
+                                        <option value="0-10">0-10</option>
+                                        <option value="10-50">10-50</option>
+                                        <option value="超过50">超过50</option>
+                                    </select>
+
+                                    <span class="error" ng-show="submited && org.voluntaryPopulation == null">*请选择机构志愿者人数</span>
                                 </div>
-                                <div class="form-group input-group input-group-xs input-trigger clearfix">
-                                    <label for="" class="fl control-label">成立日期</label>
-                                    <!--<input type="text" class="fl form-control" ng-model="org.createTime">-->
-                                    <input type="text" name="orgCreateTime" ng-model="org.createTime"
-                                           class="f1 form-control" placeholder="到"
-                                           datepicker-popup="yyyy-MM-dd" is-open="org.$toOpened"
-                                           ng-required
-                                           current-text="今天" clear-text="清除" close-text="关闭"
-                                           datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                           ng-focus="openDatePicker($event, org, '$toOpened')">
-
-                                    <span class="error" ng-show="publicOfferingCertification1.orgCreateTime.$touched && publicOfferingCertification1.orgCreateTime.$error.required">*请选择机构成立日期</span>
+                            </div>
+                            <div class="form-group input-group input-group-xs input-trigger clearfix">
+                                <label for="" class="fl control-label">成立日期</label>
+                                <!--<input type="text" class="fl form-control" ng-model="org.createTime">-->
+                                <input type="text" name="orgCreateTime" ng-model="org.createTime"
+                                       class="f1 form-control" placeholder="到"
+                                       datepicker-popup="yyyy-MM-dd" is-open="org.$toOpened"
+                                       ng-required
+                                       current-text="今天" clear-text="清除" close-text="关闭"
+                                       datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                       ng-focus="openDatePicker($event, org, '$toOpened')">
+
+                                <span class="error" ng-show="submited && org.createTime == null">*请选择机构成立日期</span>
+                            </div>
+                            <div class="form-group clearfix home">
+                                <label for="" class="fl control-label">官方主页</label>
+                                <div class="fl text-left">
+                                    <input required type="text" class="form-control" name="orgWebsite" ng-model="org.website">
+                                    <p class="tip">(请填写您的官网地址,或者机构新浪微博地址,没有设置访问权限的QQ空间、微信公众号推送文章链接其中任意一个)</p>
+
+                                    <span class="error" ng-show="submited && publicOfferingCertification1.orgWebsite.$error.required">*请填写机构官方主页</span>
                                 </div>
-                                <div class="form-group clearfix home">
-                                    <label for="" class="fl control-label">官方主页</label>
-                                    <div class="fl text-left">
-                                        <input required type="text" class="form-control" name="orgWebsite" ng-model="org.website">
-                                        <p class="tip">(请填写您的官网地址,或者机构新浪微博地址,没有设置访问权限的QQ空间、微信公众号推送文章链接其中任意一个)</p>
-
-                                        <span class="error" ng-show="publicOfferingCertification1.orgWebsite.$touched && publicOfferingCertification1.orgWebsite.$error.required">*请填写机构官方主页</span>
-                                    </div>
+                            </div>
+                            <div class="form-group clearfix home">
+                                <label for="" class="fl control-label">机构简介</label>
+                                <div class="fl text-left">
+                                        <textarea required name="orgSummary" cols="30" rows="10" class="fl"
+                                                  ng-model="org.summary" ng-maxlength="500" ng-minlength="10"
+                                                  placeholder="筹款来源、特色项目、服务片区、机构愿景、希望解决的社会问题等"></textarea>
+                                    <p class="tip">机构简介建议保持在200~500字。</p>
+
+                                    <span class="error" ng-show="submited && publicOfferingCertification1.orgSummary.$error.required">*请填写机构简介</span>
+                                    <span class="error" ng-show="submited && publicOfferingCertification1.orgSummary.$error.maxlength">*机构简介字数过长</span>
+                                    <span class="error" ng-show="submited && publicOfferingCertification1.orgSummary.$error.minlength">*机构简介字数过少</span>
                                 </div>
-                                <div class="form-group clearfix home">
-                                    <label for="" class="fl control-label">机构简介</label>
-                                    <div class="fl text-left">
-                                            <textarea required name="orgSummary" cols="30" rows="10" class="fl"
-                                                      ng-model="org.summary" ng-maxlength="500" ng-minlength="10"
-                                                      placeholder="筹款来源、特色项目、服务片区、机构愿景、希望解决的社会问题等"></textarea>
-                                        <p class="tip">机构简介建议保持在200~500字。</p>
-
-                                        <span class="error" ng-show="publicOfferingCertification1.orgSummary.$touched && publicOfferingCertification1.orgSummary.$error.required">*请填写机构简介</span>
-                                        <span class="error" ng-show="publicOfferingCertification1.orgSummary.$touched && publicOfferingCertification1.orgSummary.$error.maxlength">*机构简介字数过长</span>
-                                        <span class="error" ng-show="publicOfferingCertification1.orgSummary.$touched && publicOfferingCertification1.orgSummary.$error.minlength">*机构简介字数过少</span>
-                                    </div>
+                            </div>
+                            <!--<div class="form-group clearfix">
+                                <label for="" class="fl">验证码</label>
+                                <input type="text" class="form-control valid fl">
+                                <div class="clearfix valida">
+                                    <span>BBPf</span><a href="">刷新验证码</a>
                                 </div>
-                                <!--<div class="form-group clearfix">
-                                    <label for="" class="fl">验证码</label>
-                                    <input type="text" class="form-control valid fl">
-                                    <div class="clearfix valida">
-                                        <span>BBPf</span><a href="">刷新验证码</a>
-                                    </div>
-                                </div>-->
-                                <div class="text-left submitBtn">
-                                    <button class="btn" type="button" ng-click="saveStep1(org, 1)" ng-disabled="publicOfferingCertification1.$invalid">保存,下一步</button><a ui-sref="charityCertificationStep0">返回上一页</a></div>
-                                <!--<div class="text-left submitBtn"><a href="charityCertification2">保存,下一步</a><a href="charityCertification">返回上一页</a></div>-->
-                            </form>
+                            </div>-->
+                            <div class="text-left submitBtn">
+                                <button class="btn" type="button" ng-click="saveStep1(org, 1, publicOfferingCertification1.$invalid)">保存,下一步</button><a ui-sref="charityCertificationStep0">返回上一页</a></div>
+                            <!--<div class="text-left submitBtn"><a href="charityCertification2">保存,下一步</a><a href="charityCertification">返回上一页</a></div>-->
                         </div>
                     </div>
                 </div>

+ 66 - 48
donate-console/src/main/webapp/resources/view/user/publicOfferingCertification2.html

@@ -539,57 +539,75 @@
                             <div class="message">
                                 <span>机构负责人</span>
                             </div>
-                            <form action="">
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">负责人姓名</label>
-                                    <input type="text" class="fl form-control" ng-model="org.managerName" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/">
-                                    <span class="control-help fl">(请填写机构当前负责人姓名)</span>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">身份证号</label>
-                                    <input type="text" class="fl form-control" ng-model="org.managerIdcard" required="true">
-                                    <span class="control-help fl">(请填写机构当前负责人身份证号码)</span>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">办公电话</label>
-                                    <input type="text" class="fl form-control" ng-model="org.managerOph" ng-pattern="/^0\d{2,3}-?\d{7,8}$/">
-                                    <span class="control-help fl">(请填写机构当前负责人有效联系电话)</span>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">个人手机</label>
-                                    <input type="text" class="fl form-control" ng-model="org.managerMobile" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/">
-                                    <span class="control-help fl">(请填写机构当前负责人常用联系手机号码)</span>
-                                </div>
-                            </form>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">负责人姓名</label>
+                                <input type="text" class="fl form-control" name="orgManagerName" ng-model="org.managerName" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/">
+                                <span class="control-help fl">(请填写机构当前负责人姓名)</span>
+
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgManagerName.$error.required">*负责人姓名不能为空</span>
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgManagerName.$error.pattern">*请输入正确的姓名</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">身份证号</label>
+                                <input type="text" class="fl form-control" name="orgManagerIdcard" ng-model="org.managerIdcard" required="true">
+                                <span class="control-help fl">(请填写机构当前负责人身份证号码)</span>
+
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgManagerIdcard.$error.required">*身份证号不能为空</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">办公电话</label>
+                                <input type="text" class="fl form-control" name="orgManagerOph" ng-model="org.managerOph" required="true" ng-pattern="/^0\d{2,3}-?\d{7,8}$/">
+                                <span class="control-help fl">(请填写机构当前负责人有效联系电话)</span>
+
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgManagerOph.$error.required">*办公电话不能为空</span>
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgManagerOph.$error.pattern">*办公电话输入有误</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">个人手机</label>
+                                <input type="text" class="fl form-control" name="orgManagerMobile" ng-model="org.managerMobile" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/">
+                                <span class="control-help fl">(请填写机构当前负责人常用联系手机号码)</span>
+
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgManagerMobile.$error.required">*个人手机不能为空</span>
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgManagerMobile.$error.pattern">*个人手机输入有误</span>
+                            </div>
                             <div class="message">
                                 <span>主要联系人</span>
                             </div>
-                            <form action="">
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">负责人姓名</label>
-                                    <input type="text" class="fl form-control" ng-model="org.contactName" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/">
-                                    <span class="control-help fl">(请填写机构当前联系人姓名)</span>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">身份证号</label>
-                                    <input type="text" class="fl form-control" ng-model="org.contactIdcard" required="true">
-                                    <span class="control-help fl">(请填写机构当前联系人身份证号码)</span>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">个人手机</label>
-                                    <input type="text" class="fl form-control" ng-model="org.contactTel" ng-pattern="/^1(3|4|5|7|8)\d{9}$/">
-                                    <span class="control-help fl">(请填写机构当前联系人有效联系手机号码)</span>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">个人邮箱</label>
-                                    <input type="text" class="fl form-control" ng-model="org.contactEmail" required="true" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/">
-                                    <span class="control-help fl">(请填写机构当前联系人电子邮箱)</span>
-                                </div>
-                                <div class="text-left submitBtn" style="margin-top: 55px;">
-                                    <button class="btn" type="button" ng-click="saveStep2(org, 1)" ng-disabled="publicOfferingCertification2.$invalid">保存,下一步</button>
-                                    <a ui-sref="publicOfferingCertificationStep1">返回上一页</a>
-                                </div>
-                            </form>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">负责人姓名</label>
+                                <input type="text" class="fl form-control" name="orgContactName" ng-model="org.contactName" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/">
+                                <span class="control-help fl">(请填写机构当前联系人姓名)</span>
+
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgContactName.$error.required">*负责人姓名不能为空</span>
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgContactName.$error.pattern">*请输入正确的姓名</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">身份证号</label>
+                                <input type="text" class="fl form-control" name="orgContactIdcard" ng-model="org.contactIdcard" required="true">
+                                <span class="control-help fl">(请填写机构当前联系人身份证号码)</span>
+
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgContactIdcard.$error.required">*身份证号不能为空</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">个人手机</label>
+                                <input type="text" class="fl form-control" name="orgContactTel" ng-model="org.contactTel" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/">
+                                <span class="control-help fl">(请填写机构当前联系人有效联系手机号码)</span>
+
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgContactTel.$error.required">*个人手机不能为空</span>
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgContactTel.$error.pattern">*个人手机输入有误</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">个人邮箱</label>
+                                <input type="text" class="fl form-control" name="orgContactEmail" ng-model="org.contactEmail" required="true" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/">
+                                <span class="control-help fl">(请填写机构当前联系人电子邮箱)</span>
+
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgContactEmail.$error.required">*个人邮箱不能为空</span>
+                                <span class="error" ng-show="submited && publicOfferingCertification2.orgContactEmail.$error.pattern">*个人邮箱输入有误</span>
+                            </div>
+                            <div class="text-left submitBtn" style="margin-top: 55px;">
+                                <button class="btn" type="button" ng-click="saveStep2(org, 1, publicOfferingCertification2.$invalid)">保存,下一步</button>
+                                <a ui-sref="publicOfferingCertificationStep1">返回上一页</a>
+                            </div>
                         </div>
                     </div>
                 </div>

+ 155 - 107
donate-console/src/main/webapp/resources/view/user/publicOfferingCertification3.html

@@ -499,14 +499,110 @@
         color: #1968f9;
     }
 
-    .lookImg{
-        margin-left: 40px;
-        width: 40px;
-        height: 34px;
-        line-height: 34px;
+    /*上传图片*/
+    .certificate .certificate-item .uploadImage .showImg {
+        position: relative ;
+        width: 160px;
+        height: 160px;
+        margin: 16px 0;
+    }
+    .certificate .certificate-item .uploadImage .showImgs{
+        width: 570px;
+        height: 70px;
+    }
+    .certificate .certificate-item .uploadImage .showImg img{
+        width: 100%;
+        height: 100%;
+    }
+    .certificate .certificate-item .uploadImage .showImg .hover-show {
+        position: absolute ;
+        top: 0;
+        left: -20px;
+        width: 100%;
+        height: 100%;
+        background: rgba(0,0,0,.5);
+        display: none;
+    }
+    .certificate .certificate-item .uploadImage .showImg:hover .hover-show {
+        display: block;
+    }
+    .certificate .certificate-item .uploadImage .showImg .hover-show .delete{
+        position: absolute;
+        top: 5px;
+        right: 5px;
+        color: #fff;
+        cursor: pointer;
+    }
+    .certificate .certificate-item .uploadImage .showImg .hover-show .delete em.fa-trash{
+        font-size: 18px;
+        color: #fff;
+    }
+    .certificate .certificate-item .uploadImage .showImg .hover-show a{
+        position: absolute;
+        top: 44%;
+        left: 36%;
+        font-size: 16px;
+        color: #fff;
+    }
+    /*封面图片Banner*/
+    .certificate .certificate-item .uploadImage{
+        position: relative;
+    }
+    .certificate .certificate-item .uploadImage div{
+        height: 28px;
+        line-height: 28px;
+    }
+    .certificate .certificate-item .uploadImage div button{
+        width: 90px;
+        height: 28px;
+        line-height: 28px;
         text-align: center;
-        vertical-align: middle ;
+        font-size: 14px;
+        color: #6d6d6d;
+        background: -webkit-linear-gradient(top, #fff 0%,#dadada 100%);
+        background: -o-linear-gradient(top, #fff 0%,#dadada 100%);
+        background: -ms-linear-gradient(top, #fff 0%,#dadada 100%);
+        background: linear-gradient(to bottom, #fff 0%,#dadada 100%);
         border: 1px solid #dcdcdc;
+        border-radius: 3px;
+    }
+    .certificate .certificate-item .uploadImage div span{
+        margin-left: 20px;
+        font-size: 12px;
+        color: #969696;
+    }
+    .certificate .certificate-item .uploadImage input{
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 90px;
+        height: 28px;
+        opacity: 0;
+        outline: none;
+    }
+    .certificate .certificate-item .uploadImage .img-show {
+        margin: 15px 0 25px;
+        width: 160px;
+        height: 160px;
+        line-height: 160px;
+        text-align: center;
+    }
+    .certificate .certificate-item.uploadImage .img-show img{
+        width: 100%;
+        height: 100%;
+    }
+    .certificate .certificate-item .uploadImage .img-shows {
+        margin: 15px 0 30px;
+        width: 480px;
+        height: 60px;
+        line-height: 60px;
+        text-align: center;
+    }
+
+    /*  */
+    button.disabled {
+        opacity: 0.6;
+        cursor: not-allowed;
     }
 </style>
 
@@ -530,148 +626,100 @@
                             <div class="message">
                                 <span>机构银行卡信息</span>
                             </div>
-                            <form action="">
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">机构开户名称</label>
-                                    <input type="text" class="fl form-control" ng-model="org.bankCardName" required="true">
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">银行账号</label>
-                                    <input type="text" class="fl form-control" ng-model="org.account" required="true" ng-change="getBankName({{org.account}})">
-                                </div>
-                                <div class="form-group clearfix">
-                                    <label for="" class="fl control-label">开户银行支行</label>
-                                    <!--<select name="" id="" class="fl bankChoose" ng-model="org.cardOfBank">
-                                        <option value="">请选择</option>
-                                    </select>-->
-                                    <input type="text" class="fl form-control <!--bank-choose-->" ng-model="org.branchMessage" readonly='readonly'>
-                                </div>
-                            </form>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">机构开户名称</label>
+                                <input type="text" class="fl form-control" name="orgBankCardName" ng-model="org.bankCardName" required="true">
+
+                                <span class="error" ng-show="submited && publicOfferingCertification3.orgBankCardName.$error.required">*机构开户名称不能为空</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">银行账号</label>
+                                <input type="text" class="fl form-control" name="orgAccount" ng-model="org.account" required="true" ng-change="getBankName({{org.account}})">
+
+                                <span class="error" ng-show="submited && publicOfferingCertification3.orgAccount.$error.required">*银行账号不能为空</span>
+                            </div>
+                            <div class="form-group clearfix">
+                                <label for="" class="fl control-label">开户银行支行</label>
+                                <!--<select name="" id="" class="fl bankChoose" ng-model="org.cardOfBank">
+                                    <option value="">请选择</option>
+                                </select>-->
+                                <input type="text" class="fl form-control <!--bank-choose-->" ng-model="org.branchMessage" readonly='readonly'>
+                            </div>
                             <div class="message">
                                 <span>机构logo及证书</span>
                             </div>
                             <div class="certificate">
                                 <div class="certificate-item clearfix">
                                     <span class="fl">上传机构logo</span>
-                                    <!--<div class="fl uploadImg">
-                                        <button>上传图片</button>
-                                        <input type="file" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 0)'>
-                                    </div>
-                                    <img class="fl lookImg" src="{{org.logo}}">-->
-
                                     <div class="fl uploadImage">
-                                        <div><button>上传图片</button><span>(160*160)</span></div>
-                                        <input type="file" accept="image/*" ng-multiple="false" id="logoUrl" onchange='angular.element(this).scope().fileChanged(this, 0)'>
+                                        <div><button>上传图片</button></div>
                                         <a href="">查看样式</a>
-                                        <div ng-if="null != logoUrl" style="max-height: 100px; max-width: 300px">
-                                            <img style="max-height: 100px; max-width: 100px" src="{{logoUrl}}">
+                                        <input type="file" ng-multiple="false" id="logo" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 0)'>
+                                        <div ng-if="null != logoUrl" class="showImg" style="margin-left: 40px;">
+                                            <img src="{{logoUrl}}">
                                             <span class="hover-show">
-                                                <em style="cursor: pointer;" class="delete" title="删除" ng-click="clearFile('logo')">
-                                                    <em class="fa fa-2x fa-trash"></em>
-                                                </em>
-                                                <a ng-click="showImg('logo')" title="点击查看大图">
-                                                    <em class="fa fa-search"></em>查看
-                                                </a>
-                                            </span>
+                                                    <em class="delete" title="删除" ng-click="clearFile('logo')"><em class="fa fa-2x fa-trash"></em></em>
+                                                    <a ng-click="showImg('logo')" title="点击查看大图"><em class="fa fa-search" style="margin-right: 5px;"></em>查看</a>
+                                                </span>
                                         </div>
-                                        <input type="text" ng-show="false" ng-model="logoUrl" required>
-                                        <span class="error" ng-show="publicOfferingCertification3.$submitted && publicOfferingCertification3.logoUrl.$error.required">*需上传机构logo</span>
-
                                     </div>
+                                    <span class="error" ng-show="submited && logoUrl == null && org.logo == null">*请上传机构logo</span>
 
                                 </div>
                                 <div class="certificate-item clearfix">
                                     <span class="fl">慈善组织法人登记证书(加盖慈善机构红章)</span>
-                                    <!--<div class="fl uploadImg">
-                                        <button>上传图片</button>
-                                        <input type="file" id="personCertificateImage" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 1)'>
-                                        <a href="">查看样式</a>
-                                    </div>
-                                    <img class="fl lookImg" src="{{org.personCertificate}}">-->
-
                                     <div class="fl uploadImage">
-                                        <div><button>上传图片</button><span>(160*160)</span></div>
-                                        <input type="file" accept="image/*" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 1)'>
+                                        <div><button>上传图片</button></div>
                                         <a href="">查看样式</a>
-                                        <div ng-if="null != personCertificateUrl" style="max-height: 100px; max-width: 300px">
-                                            <img style="max-height: 100px; max-width: 100px" src="{{personCertificateUrl}}">
+                                        <input type="file" ng-multiple="false" id="personCertificate" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 1)'>
+                                        <div ng-if="null != personCertificateUrl" class="showImg" style="margin-left: 40px;">
+                                            <img src="{{personCertificateUrl}}">
                                             <span class="hover-show">
-                                                <em style="cursor: pointer;" class="delete" title="删除" ng-click="clearFile('personCertificate')">
-                                                    <em class="fa fa-2x fa-trash"></em>
-                                                </em>
-                                                <a ng-click="showImg('personCertificate')" title="点击查看大图">
-                                                    <em class="fa fa-search"></em>查看
-                                                </a>
-                                            </span>
+                                                    <em class="delete" title="删除" ng-click="clearFile('personCertificate')"><em class="fa fa-2x fa-trash"></em></em>
+                                                    <a ng-click="showImg('personCertificate')" title="点击查看大图"><em class="fa fa-search" style="margin-right: 5px;"></em>查看</a>
+                                                </span>
                                         </div>
-
-                                        <input type="text" ng-show="false" ng-model="personCertificateUrl" required>
-                                        <span class="error" ng-show="publicOfferingCertification3.$submitted && publicOfferingCertification3.personCertificateUrl.$error.required">*需上传慈善组织法人登记证书</span>
                                     </div>
 
+                                    <span class="error" ng-show="submited && personCertificateUrl == null && org.personCertificate == null">*请上传慈善组织法人登记证书</span>
                                 </div>
                                 <div class="certificate-item clearfix">
                                     <span class="fl">慈善组织公开募捐资格证书(加盖机构红章)</span>
-                                    <!--<div class="fl uploadImg">
-                                        <button>上传图片</button>
-                                        <input type="file" id="donateCertificateImage" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 2)'>
-                                        <a href="">查看样式</a>
-                                    </div>
-                                    <img class="fl lookImg" src="{{org.donateCertificate}}">-->
-
                                     <div class="fl uploadImage">
-                                        <div><button>上传图片</button><span>(160*160)</span></div>
-                                        <input type="file" accept="image/*" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 2)'>
+                                        <div><button>上传图片</button></div>
                                         <a href="">查看样式</a>
-                                        <div ng-if="null != donateCertificateUrl" style="max-height: 100px; max-width: 300px">
-                                            <img style="max-height: 100px; max-width: 100px" src="{{donateCertificateUrl}}">
+                                        <input type="file" ng-multiple="false" id="donateCertificate" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 2)'>
+                                        <div ng-if="null != donateCertificateUrl" class="showImg" style="margin-left: 40px;">
+                                            <img src="{{donateCertificateUrl}}">
                                             <span class="hover-show">
-                                                <em style="cursor: pointer;" class="delete" title="删除" ng-click="clearFile('donateCertificate')">
-                                                    <em class="fa fa-2x fa-trash"></em>
-                                                </em>
-                                                <a ng-click="showImg('donateCertificate')" title="点击查看大图">
-                                                    <em class="fa fa-search"></em>查看
-                                                </a>
-                                            </span>
+                                                    <em class="delete" title="删除" ng-click="clearFile('donateCertificate')"><em class="fa fa-2x fa-trash"></em></em>
+                                                    <a ng-click="showImg('donateCertificate')" title="点击查看大图"><em class="fa fa-search" style="margin-right: 5px;"></em>查看</a>
+                                                </span>
                                         </div>
-
-                                        <input type="text" ng-show="false" ng-model="donateCertificateUrl" required>
-                                        <span class="error" ng-show="publicOfferingCertification3.$submitted && publicOfferingCertification3.donateCertificateUrl.$error.required">*需上传慈善组织公开募捐资格证书</span>
                                     </div>
 
+                                    <span class="error" ng-show="submited && donateCertificateUrl == null && org.donateCertificate == null">*请上传慈善组织公开募捐资格证书</span>
                                 </div>
                                 <div class="certificate-item clearfix">
                                     <span class="fl">法人身份证(加盖机构红章)</span>
-                                    <!--<div class="fl uploadImg">
-                                        <button>上传图片</button>
-                                        <input type="file" id="legalIdCardImage" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 3)'>
-                                        <a href="">查看样式</a>
-                                    </div>
-                                    <img class="fl lookImg" src="{{org.legalIdCard}}">-->
-
                                     <div class="fl uploadImage">
-                                        <div><button>上传图片</button><span>(160*160)</span></div>
-                                        <input type="file" accept="image/*" ng-multiple="false" onchange='angular.element(this).scope().fileChanged(this, 3)'>
+                                        <div><button>上传图片</button></div>
                                         <a href="">查看样式</a>
-                                        <div ng-if="null != legalIdCardUrl" style="max-height: 100px; max-width: 300px">
-                                            <img style="max-height: 100px; max-width: 100px" src="{{legalIdCardUrl}}">
+                                        <input type="file" ng-multiple="false" id="legalIdCard" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 3)'>
+                                        <div ng-if="null != legalIdCardUrl" class="showImg" style="margin-left: 40px;">
+                                            <img src="{{legalIdCardUrl}}">
                                             <span class="hover-show">
-                                                <em style="cursor: pointer;" class="delete" title="删除" ng-click="clearFile('legalIdCard')">
-                                                    <em class="fa fa-2x fa-trash"></em>
-                                                </em>
-                                                <a ng-click="showImg('legalIdCard')" title="点击查看大图">
-                                                    <em class="fa fa-search"></em>查看
-                                                </a>
-                                            </span>
+                                                    <em class="delete" title="删除" ng-click="clearFile('legalIdCard')"><em class="fa fa-2x fa-trash"></em></em>
+                                                    <a ng-click="showImg('legalIdCard')" title="点击查看大图"><em class="fa fa-search" style="margin-right: 5px;"></em>查看</a>
+                                                </span>
                                         </div>
-
-                                        <input type="text" ng-show="false" ng-model="legalIdCardUrl" required>
-                                        <span class="error" ng-show="publicOfferingCertification3.$submitted && publicOfferingCertification3.legalIdCardUrl.$error.required">*需上传法人身份证</span>
                                     </div>
 
+                                    <span class="error" ng-show="submited && legalIdCardUrl == null && org.legalIdCard == null">*请上传法人身份证</span>
                                 </div>
                                 <div class="text-left submitBtn" style="margin-top: 75px;">
-                                    <button class="btn" type="button" ng-click="saveStep3(org, true, 1)" ng-disabled="publicOfferingCertification3.$invalid">保存,下一步</button>
+                                    <button class="btn" type="button" ng-click="saveStep3(org, true, 1, publicOfferingCertification3.$invalid || (!logoUrl && !org.logo) || (!personCertificateUrl && !org.personCertificate) ||
+                                        (!donateCertificateUrl && !org.donateCertificate) || (!legalIdCardUrl && !org.legalIdCard))">保存,下一步</button>
                                     <a ui-sref="publicOfferingCertificationStep2">返回上一页</a>
                                 </div>
                             </div>