Browse Source

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

dongbw 8 years ago
parent
commit
3e6c11168f

+ 71 - 1
donate-console/src/main/webapp/WEB-INF/views/activityInitiated.html

@@ -35,7 +35,7 @@
             background: #ffffff;
             margin-bottom: 20px;
             width: 100%;
-            height: 1320px;
+            height: 1700px;
             border: 1px solid #dcdcdc;
             box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
         }
@@ -469,6 +469,60 @@
             font-size: 14px;
             color: #b4b4b4;
         }
+        /*封面图片Banner*/
+        .content-setting .form-group .uploadImage{
+            position: relative;
+        }
+        .content-setting .form-group .uploadImage div{
+            height: 28px;
+            line-height: 28px;
+        }
+        .content-setting .form-group .uploadImage div button{
+            width: 90px;
+            height: 28px;
+            line-height: 28px;
+            text-align: center;
+            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;
+        }
+        .content-setting .form-group .uploadImage div span{
+            margin-left: 20px;
+            font-size: 12px;
+            color: #969696;
+        }
+        .content-setting .form-group .uploadImage input{
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 90px;
+            height: 28px;
+            opacity: 0;
+            outline: none;
+        }
+        .content-setting .form-group .uploadImage .img-show {
+            margin: 15px 0 25px;
+            width: 160px;
+            height: 160px;
+            line-height: 160px;
+            text-align: center;
+        }
+        .content-setting .form-group .uploadImage .img-show img{
+            width: 100%;
+            height: 100%;
+        }
+        .content-setting .form-group .uploadImage .img-shows {
+            margin: 15px 0 30px;
+            width: 480px;
+            height: 60px;
+            line-height: 60px;
+            text-align: center;
+        }
     </style>
 </head>
 <body class="skin-blue sidebar-mini  pace-done">
@@ -630,6 +684,22 @@
                                 <textarea name="" id="" cols="30" rows="10" class="form-control"></textarea>
                             </div>
                         </div>
+                        <div class="form-group clearfix">
+                            <label for="" class="control-label fl">封面图片</label>
+                            <div class="fl uploadImage">
+                                <div><button>上传图片</button><span>(160*160)</span></div>
+                                <input type="file">
+                                <div class="img-show"><img src="static/images/reward.png" alt=""/></div>
+                            </div>
+                        </div>
+                        <div class="form-group clearfix">
+                            <label for="" class="control-label fl">Banner</label>
+                            <div class="fl uploadImage">
+                                <div><button>上传图片</button><span>(1140*140)</span></div>
+                                <input type="file">
+                                <div class="img-show img-shows"><img src="static/images/active01.png" alt=""/></div>
+                            </div>
+                        </div>
                         <div class="form-group clearfix">
                             <label for="" class="control-label fl">活动奖品</label>
                             <div class="prise fl">

BIN
donate-console/src/main/webapp/resources/images/active01.png


BIN
donate-console/src/main/webapp/resources/images/reward.png


+ 13 - 2
donate-service/src/main/webapp/WEB-INF/views/activeDetail.html

@@ -105,15 +105,23 @@
             color: #303030;
         }
         .section1 .img{
+            position: relative;
             margin: 15px 0 20px 0;
             width: 100%;
             height: 140px;
-            border: 1px solid #e1e1e1;
+            line-height: 140px;
         }
         .section1 .img img{
             width: 100%;
             height: 140px;
         }
+        .section1 .img span{
+            position: absolute;
+            top: 0px;
+            left: 180px;
+            font-size: 30px;
+            color: #fff;
+        }
         .section2 .intro{
             width: 800px;
             text-align: left;
@@ -580,7 +588,10 @@
     <div class="container">
         <div class="section section1">
           <div class="nav"><span><a href="">活动列表</a></span><span>&gt;</span><span>优软一元捐感恩活动一</span></div>
-          <div class="img"><img src="static/images/activeCenter/active01.png" alt=""></div>
+          <div class="img">
+              <img src="static/images/activeCenter/active01.png" alt="">
+              <span>优软一元捐感恩活动一</span>
+          </div>
       </div>
         <div class="section section2">
             <div class="fl intro">

BIN
donate-service/src/main/webapp/resources/images/activeCenter/active01.png