Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/WebSet/WebSiteAdmanage.vue

@@ -3,27 +3,40 @@
     padding: 6px;
   }
 
-  .webSiteUp {
+  .WebSiteAdmanage .webSiteUp {
     min-height: 150px;
     border: 2px dashed #d1d1d1;
     position: relative;
     margin-top: 10px;
-    line-height: 150px;
+    line-height: 0;
   }
 
-  .webSiteUp i {
+  .WebSiteAdmanage .webSiteUp i {
     font-size: 50px;
     color: #d1d1d1;
-    left: 43%;
+    left: 45%;
     cursor: pointer;
     position: absolute;
-    top: 0;
+    top: 50%;
   }
 
-  .web_imgUrl {
+  .WebSiteAdmanage .web_imgUrl {
     max-width: 100%;
   }
-
+  .WebSiteAdmanage .el-checkbox+.el-checkbox{
+    margin-left:20px;
+  }
+  .WebSiteAdmanage .addIconDiv{
+    position: absolute;
+    width:100%;
+    height:100%;
+    top:0;
+    background-color: transparent;
+  }
+  .WebSiteAdmanage .addIconDiv:hover{
+    background: rgba(0, 0, 0, 0.5);
+    color:#fff;
+  }
 </style>
 <template>
   <!--廣告版面管理(广告管理)-->
@@ -78,7 +91,7 @@
       </el-pagination>
     </div>
     <el-dialog title="广告版面设定" :visible.sync="outerVisible" center width="1200px;">
-      <el-form :model="addMsg" ref="addMsg" label-width="200px">
+      <el-form :model="addMsg" ref="addMsg" label-width="190px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="广告版面名称" label-width="120px">
@@ -91,10 +104,10 @@
           <el-col :span="10">
             <div>上传档案请小于3M</div>
             <div class="webSiteUp">
-              <el-upload   :http-request="UploadImage" :multiple="true"
+              <el-upload :http-request="UploadImage" :multiple="true"
                 accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
+                <img v-if="addMsg.AdImg" :src="addMsg.AdImg" class="web_imgUrl" alt="" />
                 <div class="addIconDiv">
-                  <img v-if="addMsg.AdImg" :src="addMsg.AdImg" class="web_imgUrl" alt="" />
                   <i class="web_addImg iconfont icon-img_haha"></i>
                 </div>
               </el-upload>