Browse Source

一元捐后台管理项目右侧弹出框宽度的调整 。

hangb 8 years ago
parent
commit
16715ac642

+ 161 - 157
donate-console/src/main/webapp/WEB-INF/views/activeList.html

@@ -162,7 +162,7 @@
             position: absolute;
             top: 0;
             right: 0;
-            width: 905px;
+            width: 50%;
             height: 924px;
             background: #fff;
             z-index: 100;
@@ -1238,129 +1238,130 @@
         </div>
         <!--正在进行右侧内容部分-->
         <aside class="content-right show">
-            <div class="right-header clearfix">
-                <div class="fl"><span>优软一元捐感恩回馈038</span><a href="" class="edit">编辑</a><a href="">查看网页</a></div>
-                <div class="fr close">&times;</div>
-            </div>
-            <div class="right-nav"><span class="active" style="margin-left: -379px;">活动信息</span><span>奖品信息</span><span>参与名单</span></div>
-            <!--活动信息-->
-            <div class="right-list show">
-                <div class="list-message">
-                    <div class="list-body clearfix">
-                        <div class="msg-list fl">
-                            <span class="fl">活动信息</span>
-                            <span class="fl long">2017-08-20 14:00:00 至 2017-09-20 20:30:00</span>
-                        </div>
-                        <div class="msg-list fl">
-                            <span class="fl">兑奖时间</span>
-                            <span class="fl long">2017-08-20 14:00:00 至 2017-09-20 20:30:00</span>
+            <div class="container">
+                <div class="right-header clearfix">
+                    <div class="fl"><span>优软一元捐感恩回馈038</span><a href="" class="edit">编辑</a><a href="">查看网页</a></div>
+                    <div class="fr close">&times;</div>
+                </div>
+                <div class="right-nav"><span class="active" style="margin-left: -379px;">活动信息</span><span>奖品信息</span><span>参与名单</span></div>
+                <!--活动信息-->
+                <div class="right-list show">
+                    <div class="list-message">
+                        <div class="list-body clearfix">
+                            <div class="msg-list fl">
+                                <span class="fl">活动信息</span>
+                                <span class="fl long">2017-08-20 14:00:00 至 2017-09-20 20:30:00</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">兑奖时间</span>
+                                <span class="fl long">2017-08-20 14:00:00 至 2017-09-20 20:30:00</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">发布人</span>
+                                <span class="fl">管理员01</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">发布时间</span>
+                                <span class="fl">2017-10-10 14:36:11</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">已筹善款</span>
+                                <span class="fl">155641.00元</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">参与人数</span>
+                                <span class="fl">1142</span>
+                            </div>
                         </div>
-                        <div class="msg-list fl">
-                            <span class="fl">发布人</span>
-                            <span class="fl">管理员01</span>
+                    </div>
+                    <div class="list-message">
+                        <div class="list-header">
+                            <span>活动介绍</span>
                         </div>
-                        <div class="msg-list fl">
-                            <span class="fl">发布时间</span>
-                            <span class="fl">2017-10-10 14:36:11</span>
+                        <div class="list-body">
+                            <p>1、活动介绍:基层团组织通过学校在校园内公布申请条件,学生及其监护人提出求助申请学校对申请学生进行家访,核实家庭经济状况后
+                                报县级团委审核,县级团委上报市级团委汇总;</p>
+                            <p>2、参加条件:确认市级团委汇总地区申请资料后报市青基会;</p>
+                            <p>3、开奖时间等:市青基会终审申请,制作项目档案,并报理事会审议;
+                                审议通过后向申请人进行资助,并做审计和公示。</p>
                         </div>
-                        <div class="msg-list fl">
-                            <span class="fl">已筹善款</span>
-                            <span class="fl">155641.00元</span>
+                    </div>
+                    <div class="list-message">
+                        <div class="list-header">
+                            <span>相关项目</span>
                         </div>
-                        <div class="msg-list fl">
-                            <span class="fl">参与人数</span>
-                            <span class="fl">1142</span>
+                        <div class="list-body">
+                            <div class="project-list"><a href="">关注XXXX罕见病</a></div>
+                            <div class="project-list"><a href="">让寒门学子多回一趟家</a></div>
+                            <div class="project-list"><a href="">孝子为老母勇斗病魔</a></div>
                         </div>
                     </div>
                 </div>
-                <div class="list-message">
-                    <div class="list-header">
-                        <span>活动介绍</span>
-                    </div>
-                    <div class="list-body">
-                        <p>1、活动介绍:基层团组织通过学校在校园内公布申请条件,学生及其监护人提出求助申请学校对申请学生进行家访,核实家庭经济状况后
-                            报县级团委审核,县级团委上报市级团委汇总;</p>
-                        <p>2、参加条件:确认市级团委汇总地区申请资料后报市青基会;</p>
-                        <p>3、开奖时间等:市青基会终审申请,制作项目档案,并报理事会审议;
-                            审议通过后向申请人进行资助,并做审计和公示。</p>
-                    </div>
-                </div>
-                <div class="list-message">
-                    <div class="list-header">
-                        <span>相关项目</span>
-                    </div>
-                    <div class="list-body">
-                        <div class="project-list"><a href="">关注XXXX罕见病</a></div>
-                        <div class="project-list"><a href="">让寒门学子多回一趟家</a></div>
-                        <div class="project-list"><a href="">孝子为老母勇斗病魔</a></div>
+                <!--奖品信息-->
+                <div class="right-list right-lists">
+                    <div class="list-message" style="margin-bottom: -20px;">
+                        <div class="list-body clearfix" style="margin-left: 15px;">
+                            <div class="msg-list fl">
+                                <span class="fl">奖品总数</span>
+                                <span class="fl" style="width: 310px;">60</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">中奖概率</span>
+                                <span class="fl" style="width: 310px;">13.1%</span>
+                            </div>
+                        </div>
                     </div>
-                </div>
-            </div>
-            <!--奖品信息-->
-            <div class="right-list right-lists">
-                <div class="list-message" style="margin-bottom: -20px;">
-                    <div class="list-body clearfix" style="margin-left: 15px;">
-                        <div class="msg-list fl">
-                            <span class="fl">奖品总数</span>
-                            <span class="fl" style="width: 310px;">60</span>
+                    <div class="prise">
+                        <div class="prise-detail">
+                            <input type="text" class="award form-control" value="苹果8"/>
+                            <span>1</span>
                         </div>
-                        <div class="msg-list fl">
-                            <span class="fl">中奖概率</span>
-                            <span class="fl" style="width: 310px;">13.1%</span>
+                        <div class="award-detail clearfix">
+                            <span class="fl">数量</span>
+                            <input type="text" class="fl form-control" value="5"/>
+                        </div>
+                        <div class="award-detail clearfix">
+                            <span class="fl">奖品等级</span>
+                            <input type="text" class="fl form-control" value="一等奖">
+                        </div>
+                        <div class="award-detail clearfix">
+                            <span class="fl">赠送方式</span>
+                            <select name="" id="" class="form-control">
+                                <option value="">快递配送</option>
+                                <option value="">短信通知</option>
+                            </select>
+                        </div>
+                        <div class="price">
+                            <img src="static/images/award.png" alt=""/>
                         </div>
                     </div>
-                </div>
-                <div class="prise">
-                    <div class="prise-detail">
-                        <input type="text" class="award form-control" value="苹果8"/>
-                        <span>1</span>
-                    </div>
-                    <div class="award-detail clearfix">
-                        <span class="fl">数量</span>
-                        <input type="text" class="fl form-control" value="5"/>
-                    </div>
-                    <div class="award-detail clearfix">
-                        <span class="fl">奖品等级</span>
-                        <input type="text" class="fl form-control" value="一等奖">
-                    </div>
-                    <div class="award-detail clearfix">
-                        <span class="fl">赠送方式</span>
-                        <select name="" id="" class="form-control">
-                            <option value="">快递配送</option>
-                            <option value="">短信通知</option>
-                        </select>
-                    </div>
-                    <div class="price">
-                        <img src="static/images/award.png" alt=""/>
-                    </div>
-                </div>
-                <div class="prise">
-                    <div class="prise-detail">
-                        <input type="text" class="award form-control" value="苹果air"/>
-                        <span>2</span>
-                    </div>
-                    <div class="award-detail clearfix">
-                        <span class="fl">数量</span>
-                        <input type="text" class="fl form-control" value="40"/>
-                    </div>
-                    <div class="award-detail clearfix">
-                        <span class="fl">奖品等级</span>
-                        <input type="text" class="fl form-control" value="二等奖">
-                    </div>
-                    <div class="award-detail clearfix">
-                        <span class="fl">赠送方式</span>
-                        <select name="" id="" class="form-control">
-                            <option value="">快递配送</option>
-                            <option value="">短信通知</option>
-                        </select>
-                    </div>
-                    <div class="price">
-                        <img src="static/images/award.png" alt=""/>
+                    <div class="prise">
+                        <div class="prise-detail">
+                            <input type="text" class="award form-control" value="苹果air"/>
+                            <span>2</span>
+                        </div>
+                        <div class="award-detail clearfix">
+                            <span class="fl">数量</span>
+                            <input type="text" class="fl form-control" value="40"/>
+                        </div>
+                        <div class="award-detail clearfix">
+                            <span class="fl">奖品等级</span>
+                            <input type="text" class="fl form-control" value="二等奖">
+                        </div>
+                        <div class="award-detail clearfix">
+                            <span class="fl">赠送方式</span>
+                            <select name="" id="" class="form-control">
+                                <option value="">快递配送</option>
+                                <option value="">短信通知</option>
+                            </select>
+                        </div>
+                        <div class="price">
+                            <img src="static/images/award.png" alt=""/>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <!--参与名单-->
-            <div class="right-list show">
+                <!--参与名单-->
+                <div class="right-list">
                 <div class="list-table table">
                     <table>
                         <thead>
@@ -1386,61 +1387,63 @@
                     </table>
                 </div>
             </div>
+            </div>
         </aside>
         <!--未开始右侧内容部分-->
         <aside class="content-right">
-            <div class="right-header clearfix">
-                <div class="fl"><span>优软一元捐感恩回馈038</span><a href="">编辑</a></div>
-                <div class="fr close">&times;</div>
-            </div>
-            <div class="right-nav"><span class="active" style="margin-left: -260px;">活动信息</span><span>领奖信息</span></div>
-            <!--活动信息-->
-            <div class="right-list">
-                <div class="list-message">
-                    <div class="list-body clearfix">
-                        <div class="msg-list fl">
-                            <span class="fl">活动信息</span>
-                            <span class="fl long">2017-08-20 14:00:00 至 2017-09-20 20:30:00</span>
-                        </div>
-                        <div class="msg-list fl">
-                            <span class="fl">兑奖时间</span>
-                            <span class="fl long">2017-08-20 14:00:00 至 2017-09-20 20:30:00</span>
+            <div class="container">
+                <div class="right-header clearfix">
+                    <div class="fl"><span>优软一元捐感恩回馈038</span><a href="">编辑</a></div>
+                    <div class="fr close">&times;</div>
+                </div>
+                <div class="right-nav"><span class="active" style="margin-left: -260px;">活动信息</span><span>领奖信息</span></div>
+                <!--活动信息-->
+                <div class="right-list show">
+                    <div class="list-message">
+                        <div class="list-body clearfix">
+                            <div class="msg-list fl">
+                                <span class="fl">活动信息</span>
+                                <span class="fl long">2017-08-20 14:00:00 至 2017-09-20 20:30:00</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">兑奖时间</span>
+                                <span class="fl long">2017-08-20 14:00:00 至 2017-09-20 20:30:00</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">发布人</span>
+                                <span class="fl">管理员02</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">发布时间</span>
+                                <span class="fl">2017-10-12 09:00:00</span>
+                            </div>
                         </div>
-                        <div class="msg-list fl">
-                            <span class="fl">发布人</span>
-                            <span class="fl">管理员02</span>
+                    </div>
+                    <div class="list-message">
+                        <div class="list-header">
+                            <span>活动介绍</span>
                         </div>
-                        <div class="msg-list fl">
-                            <span class="fl">发布时间</span>
-                            <span class="fl">2017-10-12 09:00:00</span>
+                        <div class="list-body">
+                            <p>1、、活动介绍:基层团组织通过学校在校园内公布申请条件,学生及其监护人提出求助申请学校对申请学生进行家访,核实家庭经济状况后
+                                报县级团委审核,县级团委上报市级团委汇总;</p>
+                            <p>2、参加条件:确认市级团委汇总地区申请资料后报市青基会;</p>
+                            <p>3、开奖时间等:市青基会终审申请,制作项目档案,并报理事会审议;
+                                审议通过后向申请人进行资助,并做审计和公示。</p>
                         </div>
                     </div>
-                </div>
-                <div class="list-message">
-                    <div class="list-header">
-                        <span>活动介绍</span>
-                    </div>
-                    <div class="list-body">
-                        <p>1、、活动介绍:基层团组织通过学校在校园内公布申请条件,学生及其监护人提出求助申请学校对申请学生进行家访,核实家庭经济状况后
-                            报县级团委审核,县级团委上报市级团委汇总;</p>
-                        <p>2、参加条件:确认市级团委汇总地区申请资料后报市青基会;</p>
-                        <p>3、开奖时间等:市青基会终审申请,制作项目档案,并报理事会审议;
-                            审议通过后向申请人进行资助,并做审计和公示。</p>
-                    </div>
-                </div>
-                <div class="list-message">
-                    <div class="list-header">
-                        <span>相关项目</span>
-                    </div>
-                    <div class="list-body">
-                        <div class="project-list"><a href="">关注XXXX罕见病</a></div>
-                        <div class="project-list"><a href="">让寒门学子多回一趟家</a></div>
-                        <div class="project-list"><a href="">孝子为老母勇斗病魔</a></div>
+                    <div class="list-message">
+                        <div class="list-header">
+                            <span>相关项目</span>
+                        </div>
+                        <div class="list-body">
+                            <div class="project-list"><a href="">关注XXXX罕见病</a></div>
+                            <div class="project-list"><a href="">让寒门学子多回一趟家</a></div>
+                            <div class="project-list"><a href="">孝子为老母勇斗病魔</a></div>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <!--奖品信息-->
-            <div class="right-list show">
+                <!--奖品信息-->
+                <div class="right-list">
                 <div class="list-body clearfix">
                     <div class="msg-list fl" style="margin-left: 22px;">
                         <span class="fl">活动信息</span>
@@ -1647,6 +1650,7 @@
                     </div>
                 </div>
             </div>
+            </div>
         </aside>
     </div>
     <!--短息编辑弹出框-->

File diff suppressed because it is too large
+ 469 - 464
donate-console/src/main/webapp/WEB-INF/views/listOfInstitutions.html


+ 10 - 8
donate-console/src/main/webapp/WEB-INF/views/messageList.html

@@ -141,7 +141,7 @@
             position: absolute;
             top: 0;
             right: 0;
-            width: 905px;
+            width: 50%;
             height: 924px;
             background: #fff;
             z-index: 100;
@@ -557,13 +557,14 @@
         </div>
         <!--右侧内容部分-->
         <aside class="content-right show">
-            <div class="right-header clearfix">
-                <div class="fl"><span>活动通知:优软一元捐感恩回馈038</span></div>
-                <div class="fr close">&times;</div>
-            </div>
-            <div class="right-nav"><span style="margin-left: -334px;" class="active">信息详情</span></div>
-            <!--信息详情-->
-            <div class="right-list show">
+            <div class="container">
+                <div class="right-header clearfix">
+                    <div class="fl"><span>活动通知:优软一元捐感恩回馈038</span></div>
+                    <div class="fr close">&times;</div>
+                </div>
+                <div class="right-nav"><span style="margin-left: -334px;" class="active">信息详情</span></div>
+                <!--信息详情-->
+                <div class="right-list show">
                 <div class="list-message">
                     <div class="list-body clearfix">
                         <div class="msg-list fl">
@@ -615,6 +616,7 @@
                     </div>
                 </div>
             </div>
+            </div>
         </aside>
     </div>
 <!--js begin-->

+ 70 - 68
donate-console/src/main/webapp/WEB-INF/views/projectFinancialDisclosure.html

@@ -118,7 +118,7 @@
             position: absolute;
             top: 0;
             right: 0;
-            width: 905px;
+            width: 50%;
             height: 924px;
             background: #fff;
             z-index: 100;
@@ -617,85 +617,86 @@
         </div>
         <!--右侧内容部分-->
         <aside class="content-right show">
-            <div class="right-header clearfix">
-                <div class="fl"><span>让寒门学子多回趟家</span></div>
-                <div class="fr close">&times;</div>
-            </div>
-            <div class="right-nav"><span style="margin-left: -188px;" class="active">财务信息</span><span>披露录入</span></div>
-            <!--财务信息-->
-            <div class="right-list show">
-                <div class="list-message">
-                    <div class="list-header">
-                        <span>财务信息</span>
-                    </div>
-                    <div class="list-body clearfix">
-                        <div class="msg-list fl">
-                            <span class="fl">项目总募款</span>
-                            <span class="fl info mCount">126819.00元</span>
-                        </div>
-                        <div class="msg-list fl">
-                            <span class="fl">善款总支出</span>
-                            <span class="fl">80510.00元</span>
-                        </div>
-                        <div class="msg-list fl">
-                            <span class="fl">执行进度</span>
-                            <span class="fl">66.81%</span>
-                        </div>
-                        <div class="msg-list fl">
-                            <span class="fl">执行成本</span>
-                            <span class="fl">10029.61(12.35%)</span>
+            <div class="container">
+                <div class="right-header clearfix">
+                    <div class="fl"><span>让寒门学子多回趟家</span></div>
+                    <div class="fr close">&times;</div>
+                </div>
+                <div class="right-nav"><span style="margin-left: -188px;" class="active">财务信息</span><span>披露录入</span></div>
+                <!--财务信息-->
+                <div class="right-list show">
+                    <div class="list-message">
+                        <div class="list-header">
+                            <span>财务信息</span>
                         </div>
-                        <div class="msg-list fl">
-                            <span class="fl">项目支出</span>
-                            <span class="fl">70480.39(87.65%)</span>
+                        <div class="list-body clearfix">
+                            <div class="msg-list fl">
+                                <span class="fl">项目总募款</span>
+                                <span class="fl info mCount">126819.00元</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">善款总支出</span>
+                                <span class="fl">80510.00元</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">执行进度</span>
+                                <span class="fl">66.81%</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">执行成本</span>
+                                <span class="fl">10029.61(12.35%)</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">项目支出</span>
+                                <span class="fl">70480.39(87.65%)</span>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="list-message">
-                    <div class="list-header">
-                        <span>支出明细</span>
-                    </div>
-                    <div class="list-body clearfix">
-                        <div class="msg-list">
-                            <span class="fl">2017-09-16</span>
-                            <div class="spending-detail fl">
-                                <span class="detail">项目支出</span>
-                                <div><b>3758.00元</b><span>购买XXX*35,购买学生节日补贴小礼品(包括粽子50个,水果10kg,大米5kg)</span></div>
-                                <div><b>4200.00元</b><span>购买学生来回车票70张</span></div>
-                                <div class="thumbnail-img clearfix">
-                                    <div class="thumb fl">
-                                        发票略缩图
-                                        <input type="file">
-                                    </div>
-                                    <div class="thumb fl">
-                                        发票略缩图
-                                        <input type="file">
+                    <div class="list-message">
+                        <div class="list-header">
+                            <span>支出明细</span>
+                        </div>
+                        <div class="list-body clearfix">
+                            <div class="msg-list">
+                                <span class="fl">2017-09-16</span>
+                                <div class="spending-detail fl">
+                                    <span class="detail">项目支出</span>
+                                    <div><b>3758.00元</b><span>购买XXX*35,购买学生节日补贴小礼品(包括粽子50个,水果10kg,大米5kg)</span></div>
+                                    <div><b>4200.00元</b><span>购买学生来回车票70张</span></div>
+                                    <div class="thumbnail-img clearfix">
+                                        <div class="thumb fl">
+                                            发票略缩图
+                                            <input type="file">
+                                        </div>
+                                        <div class="thumb fl">
+                                            发票略缩图
+                                            <input type="file">
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="msg-list msg-lists">
-                            <span class="fl">2017-09-16</span>
-                            <div class="spending-detail fl">
-                                <span class="detail">执行成本</span>
-                                <div><b>1058.00元</b><span>执行人员车票20人*50元,中午用餐费428元,机构管理费48元</span></div>
-                                <div class="thumbnail-img clearfix">
-                                    <div class="thumb fl">
-                                        发票略缩图
-                                        <input type="file">
-                                    </div>
-                                    <div class="thumb fl">
-                                        发票略缩图
-                                        <input type="file">
+                            <div class="msg-list msg-lists">
+                                <span class="fl">2017-09-16</span>
+                                <div class="spending-detail fl">
+                                    <span class="detail">执行成本</span>
+                                    <div><b>1058.00元</b><span>执行人员车票20人*50元,中午用餐费428元,机构管理费48元</span></div>
+                                    <div class="thumbnail-img clearfix">
+                                        <div class="thumb fl">
+                                            发票略缩图
+                                            <input type="file">
+                                        </div>
+                                        <div class="thumb fl">
+                                            发票略缩图
+                                            <input type="file">
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
-            </div>
-            <!--披露录入-->
-            <div class="right-list">
+                <!--披露录入-->
+                <div class="right-list">
                 <div class="list-message">
                     <div class="list-body clearfix">
                         <div class="msg-list msgs-list fl">
@@ -733,6 +734,7 @@
                     </div>
                 </div>
             </div>
+            </div>
         </aside>
     </div>
 <!--js begin-->

File diff suppressed because it is too large
+ 498 - 493
donate-console/src/main/webapp/WEB-INF/views/projectList.html


+ 25 - 23
donate-console/src/main/webapp/WEB-INF/views/projectReportToFillIn.html

@@ -122,7 +122,7 @@
             position: absolute;
             top: 0;
             right: 0;
-            width: 905px;
+            width: 50%;
             height: 924px;
             background: #fff;
             z-index: 100;
@@ -621,30 +621,31 @@
         </div>
         <!--右侧内容部分-->
         <aside class="content-right show">
-            <div class="right-header clearfix">
-                <div class="fl"><span>让寒门学子多回趟家</span></div>
-                <div class="fr close">&times;</div>
-            </div>
-            <div class="right-nav"><span style="margin-left: -188px;" class="active">项目进度</span><span>进度录入</span></div>
-            <!--项目进度-->
-            <div class="right-list show">
-                <div class="list-message">
-                    <p class="first-txt">
-                        7月29日,上午辗转几处洽谈,寻找购置商家,由于当初预算课桌椅和餐桌椅报价太低,经反复思索与寻求朋友帮忙,终于找到本地
-                        一个爱心老板愿意援手,无偿支持。
-                    </p>
-                    <p>
-                        河南省信阳市平桥区五里镇柿元小学“换个课桌黑板好读书”项目,实际筹款总额:4455.7 元,“一校一梦想”基金配捐:10381
-                        元,实际拨付善款:14830元。剩余6.7元用于“一校一梦想”其他项目。
-                    </p>
-                    <div class="img">
-                        <img src="static/images/active04.png" alt=""/>
+            <div class="container">
+                <div class="right-header clearfix">
+                    <div class="fl"><span>让寒门学子多回趟家</span></div>
+                    <div class="fr close">&times;</div>
+                </div>
+                <div class="right-nav"><span style="margin-left: -188px;" class="active">项目进度</span><span>进度录入</span></div>
+                <!--项目进度-->
+                <div class="right-list show">
+                    <div class="list-message">
+                        <p class="first-txt">
+                            7月29日,上午辗转几处洽谈,寻找购置商家,由于当初预算课桌椅和餐桌椅报价太低,经反复思索与寻求朋友帮忙,终于找到本地
+                            一个爱心老板愿意援手,无偿支持。
+                        </p>
+                        <p>
+                            河南省信阳市平桥区五里镇柿元小学“换个课桌黑板好读书”项目,实际筹款总额:4455.7 元,“一校一梦想”基金配捐:10381
+                            元,实际拨付善款:14830元。剩余6.7元用于“一校一梦想”其他项目。
+                        </p>
+                        <div class="img">
+                            <img src="static/images/active04.png" alt=""/>
+                        </div>
+                        <div class="time"><span>2017-07-29&nbsp;&nbsp;&nbsp;16:55:31</span><a href="">删除</a></div>
                     </div>
-                    <div class="time"><span>2017-07-29&nbsp;&nbsp;&nbsp;16:55:31</span><a href="">删除</a></div>
                 </div>
-            </div>
-            <!--进度录入-->
-            <div class="right-list">
+                <!--进度录入-->
+                <div class="right-list">
                 <div class="message-detail">
                     <div class="header">
                         <div class="img"><img src="static/images/pic.png" alt="">图片</div>
@@ -656,6 +657,7 @@
                     <div class="release"><a href="">发布</a></div>
                 </div>
             </div>
+            </div>
         </aside>
     </div>
 <!--js begin-->

+ 121 - 119
donate-console/src/main/webapp/WEB-INF/views/userList.html

@@ -150,7 +150,7 @@
             position: absolute;
             top: 0;
             right: 0;
-            width: 905px;
+            width: 50%;
             height: 924px;
             background: #fff;
             z-index: 100;
@@ -720,134 +720,135 @@
         </div>
         <!--右侧内容部分-->
         <aside class="content-right">
-            <div class="right-header clearfix">
-                <div class="fl"><span>钟勇斌</span><a href="" data-toggle="modal" data-target="#userMsg">编辑</a></div>
-                <div class="fr close">&times;</div>
-            </div>
-            <div class="right-nav"><span class="active">用户信息</span><span>参与项目</span><span>参与活动</span></div>
-            <!--用户信息-->
-            <div class="right-list show">
-                <div class="list-message">
-                    <div class="list-header">
-                        <span>基本信息</span>
-                    </div>
-                    <div class="list-body clearfix">
-                        <div class="msg-list fl">
-                            <span class="fl">优软账号</span>
-                            <span class="fl">13800001111</span>
-                        </div>
-                        <div class="msg-list fl">
-                            <span class="fl">身份证号</span>
-                            <span class="fl">456194689162198465</span>
-                        </div>
-                        <div class="msg-list fl">
-                            <span class="fl">所在地</span>
-                            <span class="fl">广东 深圳</span>
-                        </div>
-                        <div class="msg-list fl">
-                            <span class="fl">详细地址</span>
-                            <span class="fl">南山区高新技术产业园科技南五路英唐大厦6楼</span>
-                        </div>
-                        <div class="msg-list fl">
-                            <span class="fl">工作单位</span>
-                            <span class="fl">深圳市优软科技有限公司</span>
-                        </div>
-                        <div class="msg-list fl">
-                            <span class="fl">个人手机</span>
-                            <span class="fl">456194689162198465</span>
+            <div class="container">
+                <div class="right-header clearfix">
+                    <div class="fl"><span>钟勇斌</span><a href="" data-toggle="modal" data-target="#userMsg">编辑</a></div>
+                    <div class="fr close">&times;</div>
+                </div>
+                <div class="right-nav"><span class="active">用户信息</span><span>参与项目</span><span>参与活动</span></div>
+                <!--用户信息-->
+                <div class="right-list show">
+                    <div class="list-message">
+                        <div class="list-header">
+                            <span>基本信息</span>
                         </div>
-                        <div class="msg-list fl">
-                            <span class="fl">用户权限</span>
-                            <span class="fl">个人用户</span>
+                        <div class="list-body clearfix">
+                            <div class="msg-list fl">
+                                <span class="fl">优软账号</span>
+                                <span class="fl">13800001111</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">身份证号</span>
+                                <span class="fl">456194689162198465</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">所在地</span>
+                                <span class="fl">广东 深圳</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">详细地址</span>
+                                <span class="fl">南山区高新技术产业园科技南五路英唐大厦6楼</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">工作单位</span>
+                                <span class="fl">深圳市优软科技有限公司</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">个人手机</span>
+                                <span class="fl">456194689162198465</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">用户权限</span>
+                                <span class="fl">个人用户</span>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="list-message">
-                    <div class="list-header">
-                        <span>银行信息</span>
-                    </div>
-                    <div class="list-body clearfix">
-                        <div class="msg-list fl">
-                            <span class="fl">开户支行</span>
-                            <span class="fl">招商银行 蛇口支行</span>
+                    <div class="list-message">
+                        <div class="list-header">
+                            <span>银行信息</span>
                         </div>
-                        <div class="msg-list fl">
-                            <span class="fl">银行账号</span>
-                            <span class="fl">456194689162198465</span>
+                        <div class="list-body clearfix">
+                            <div class="msg-list fl">
+                                <span class="fl">开户支行</span>
+                                <span class="fl">招商银行 蛇口支行</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">银行账号</span>
+                                <span class="fl">456194689162198465</span>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="list-message">
-                    <div class="list-header">
-                        <span>募捐信息</span>
-                    </div>
-                    <div class="list-body clearfix">
-                        <div class="msg-list fl">
-                            <span class="fl">参加项目</span>
-                            <span class="fl">8个</span>
-                        </div>
-                        <div class="msg-list fl">
-                            <span class="fl">捐赠善款</span>
-                            <span class="fl">15616.00元</span>
+                    <div class="list-message">
+                        <div class="list-header">
+                            <span>募捐信息</span>
                         </div>
-                        <div class="msg-list fl">
-                            <span class="fl">参加活动</span>
-                            <span class="fl">2个</span>
+                        <div class="list-body clearfix">
+                            <div class="msg-list fl">
+                                <span class="fl">参加项目</span>
+                                <span class="fl">8个</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">捐赠善款</span>
+                                <span class="fl">15616.00元</span>
+                            </div>
+                            <div class="msg-list fl">
+                                <span class="fl">参加活动</span>
+                                <span class="fl">2个</span>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
-            <!--参与项目-->
-            <div class="right-list">
-                <table>
-                    <thead>
-                    <tr>
-                        <th width="30"></th>
-                        <th width="210">项目名称</th>
-                        <th width="120">捐款金额(元)</th>
-                        <th width="120">捐款时间</th>
-                        <th width="120">捐款方式</th>
-                        <th width="240"></th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td></td>
-                        <td>让寒门学子多回趟家</td>
-                        <td>1.00</td>
-                        <td>2017-08-20 14:23:11</td>
-                        <td>微信支付</td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td></td>
-                        <td>让寒门学子多回趟家</td>
-                        <td>1.00</td>
-                        <td>2017-08-20 14:23:11</td>
-                        <td>微信支付</td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td></td>
-                        <td>让寒门学子多回趟家</td>
-                        <td>1.00</td>
-                        <td>2017-08-20 14:23:11</td>
-                        <td>微信支付</td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td></td>
-                        <td>让寒门学子多回趟家</td>
-                        <td>1.00</td>
-                        <td>2017-08-20 14:23:11</td>
-                        <td>微信支付</td>
-                        <td></td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-           <!--参与活动-->
-            <div class="right-list">
+                <!--参与项目-->
+                <div class="right-list">
+                    <table>
+                        <thead>
+                        <tr>
+                            <th width="30"></th>
+                            <th width="210">项目名称</th>
+                            <th width="120">捐款金额(元)</th>
+                            <th width="120">捐款时间</th>
+                            <th width="120">捐款方式</th>
+                            <th width="240"></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr>
+                            <td></td>
+                            <td>让寒门学子多回趟家</td>
+                            <td>1.00</td>
+                            <td>2017-08-20 14:23:11</td>
+                            <td>微信支付</td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <td></td>
+                            <td>让寒门学子多回趟家</td>
+                            <td>1.00</td>
+                            <td>2017-08-20 14:23:11</td>
+                            <td>微信支付</td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <td></td>
+                            <td>让寒门学子多回趟家</td>
+                            <td>1.00</td>
+                            <td>2017-08-20 14:23:11</td>
+                            <td>微信支付</td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <td></td>
+                            <td>让寒门学子多回趟家</td>
+                            <td>1.00</td>
+                            <td>2017-08-20 14:23:11</td>
+                            <td>微信支付</td>
+                            <td></td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+               <!--参与活动-->
+                <div class="right-list">
                 <table>
                     <thead>
                     <tr>
@@ -876,6 +877,7 @@
                     </tbody>
                 </table>
             </div>
+            </div>
         </aside>
     </div>
     <!--用户信息编辑弹出框-->

Some files were not shown because too many files changed in this diff