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

donate-console/src/main/webapp/resources/view/project/project_detail.html

@@ -1,3 +1,14 @@
+<style>
+    .msg-list .project-txt .project-intro .code a{
+         background-color: transparent !important ;
+    }
+    .msg-list .project-txt .project-intro .code p{
+        text-indent: 2em !important ;
+        line-height: 21px !important ;
+        font-size: 14px !important ;
+        color: #323232 !important ;
+    }
+</style>
 <!--详细内容部分-->
 <aside class="content-right" style="padding-bottom: 50px;">
     <!--<div class="container">-->
@@ -86,7 +97,7 @@
                     <div class="project-intro fl">
                         <div class="project-txt fl">
                             <div class="project-intro">
-                                <div ng-bind-html="code"></div>
+                                <div ng-bind-html="code" style="overflow: hidden" class="code"></div>
                                 <!--<img src="static/images/active05.png" alt=""/>-->
                             </div>
                             <!--<div class="projectIntro">-->

donate-service/src/main/webapp/resources/view/activity/activity_detail.html

@@ -95,12 +95,14 @@
         margin: 15px 0 20px 0;
         width: 100%;
         height: 140px;
-        border: 1px solid #e1e1e1;
     }
     .section1 .img img{
         width: 100%;
         height: 140px;
     }
+    .section2{
+        border-top: none !important;
+    }
     .section2 .intro{
         width: 800px;
         text-align: left;
@@ -359,7 +361,7 @@
         line-height: 34px;
         margin-left: 15px;
         padding-left: 15px;
-        border: 1px solid #f00;
+        /*border: 1px solid #f00;*/
         border-radius: 0;
         outline: none;
     }
@@ -367,11 +369,19 @@
         margin-left: 15px;
     }
     .pop .body .choose .fl div select{
-        width: 130px;
+        width: 108px;
         height: 34px;
         font-size: 16px;
         color: #313131;
-        border: 1px solid #f00;
+        /*border: 1px solid #f00;*/
+        border-radius: 0;
+    }
+    .pop .body .choose .select select{
+        width: 108px;
+        height: 34px;
+        font-size: 14px;
+        color: #313131;
+        /*border: 1px solid #f00;*/
         border-radius: 0;
     }
     .pop .body .choose .fl div span{
@@ -386,7 +396,7 @@
         border-radius: 0;
     }
     .pop .body .choose .tip{
-        margin: 12px 0 0 15px;
+        margin: 12px 0 0 83px;
         text-align: left;
         font-size: 12px;
         color: #f00;
@@ -694,7 +704,7 @@
                             <option value="">区</option>
                         </select>
                     </div>
-                    <input type="text" placeholder="请填写详细地址" ng-model="activityRecord.address" required class="form-control" style="margin-top: 50px;">
+                    <input type="text" placeholder="请填写详细地址" ng-model="activityRecord.address" required class="form-control" style="margin-top: 50px;margin-left: 85px;">
                     <div class="tip">请填写联系电话和收货地址，便于奖品的发放。</div>
                 </div>
                 <button data-toggle="modal" data-target="#{{awardStatus}}" ng-click="takeAward(activityRecord)">确认领奖</button>