Explorar o código

Merge remote-tracking branch 'origin/master'

xuzuoyun %!s(int64=5) %!d(string=hai) anos
pai
achega
5daf3794e1

+ 17 - 15
src/views/modules/appad/modules/AppAdModal.vue

@@ -97,11 +97,13 @@
           <a-table :columns="goodsColumns" :dataSource="model" :pagination="{ pageSize: 5 }" :scroll="{ y: 300 }">
             <!-- 图片预览 -->
             <div slot="ADcoverImagePreview" slot-scope="text, record">
-              <img
-                style="width:100px;"
-                :src="record.coverUrl"
-                @click="coverPreviewShowModal(record,'preview')"
-              />
+              <div style="max-width:100px">
+                  <img
+                    style="width:100%;"
+                    :src="record.coverUrl"
+                    @click="coverPreviewShowModal(record,'preview')"
+                  />
+              </div>
               <a-modal
                 title="图片预览"
                 v-model="coverPreviewVisible"
@@ -360,23 +362,17 @@ export default {
     },
     coverPreviewHandleOk() {
       this.coverPreviewVisible = false
-      this.coverPreviewMaskStyle.background = 0
+      this.coverPreviewMaskStyle.background = 'rgba(0,0,0,0)'
     },
     coverPreviewHandleCancel() {
       this.coverPreviewVisible = false
       this.coverPreviewUrl = ''
-      this.coverPreviewMaskStyle.background = 0
+      this.coverPreviewMaskStyle.background = 'rgba(0,0,0,0)'
     }
   }
 }
 </script>
 <style lang="scss">
-.ad_cover_container {
-  .ant-modal-body {
-    max-height: 650px;
-    overflow-y: scroll;
-  }
-}
 .ant-carousel >>> .slick-slide {
   text-align: center;
   //   height: 160px;
@@ -413,10 +409,16 @@ export default {
     height: 40px;
   }
   .slick_arrow_left {
-    background-image: url(../images/arrow_left.png);
+    background: url(../images/arrow_left.png);
   }
   .slick_arrow_right {
-    background-image: url(../images/arrow_right.png);
+    background: url(../images/arrow_right.png);
+  }
+    .slick_arrow_left:hover {
+    background: url(../images/arrow_left.png)!important;
+  }
+  .slick_arrow_right:hover {
+    background: url(../images/arrow_right.png)!important;
   }
 }
 </style>

+ 1 - 1
src/views/modules/kuaishouapp/campaignCreate.vue

@@ -150,7 +150,7 @@
     methods: {
       ...mapGetters(["nickname", "avatar", "userInfo"]),
       handleConfirmValue(rule, value,callback) {
-        if (this.dayBudget == '' || this.dayBudget <= 500 || this.dayBudget >= 100000000) {
+        if (this.dayBudget == '' || this.dayBudget < 500 || this.dayBudget >= 100000000) {
           callback('请输入正确预算金额')
         }
         callback()

+ 41 - 39
src/views/modules/kuaishouapp/creativeCreate.vue

@@ -107,7 +107,7 @@
       >
         <div>
           <a type="primary" @click="showModalVideo">点击选中已上传作品</a>
-          <a-modal
+          <a-modal class="ant_modal_body_container"
             title="选择作品"
             v-model="visibleVideo"
             @ok="handleOkVideo"
@@ -141,7 +141,7 @@
       >
         <div>
           <a type="primary" @click="showSinglePicModalVideo">点击选中已上传作品</a>
-          <a-modal
+          <a-modal class="ant_modal_body_container"
             title="选择作品"
             v-model="visibleSinglePicVideo"
             @ok="handleOkSinglePicVideo"
@@ -204,7 +204,7 @@
       >
         <div>
           <a type="primary" @click="showSinglePicCoverModal">点击选中已上传封面</a>
-          <a-modal
+          <a-modal class="ant_modal_body_container"
             title="选择封面"
             v-model="visibleSinglePicCover"
             @ok="handleOkSinglePicCover"
@@ -302,7 +302,7 @@
       <a-form-item v-if="showCover" label="选择封面" :labelCol="labelCol" :wrapperCol="wrapperCol">
         <div>
           <a type="primary" @click="showModal">点击选中已上传封面</a>
-          <a-modal title="选择封面" v-model="visible" @ok="handleOk" :width="860">
+          <a-modal title="选择封面" v-model="visible" @ok="handleOk" :width="860" class="ant_modal_body_container">
             <template>
               <input
                 v-model="isAllChecked"
@@ -1085,10 +1085,11 @@
 
 
 <style lang="scss">
-  .select_all {
-    margin-bottom: 10px;
-  }
+.select_all {
+  margin-bottom: 10px;
+}
 
+.ant_modal_body_container {
   .ant-modal-body {
     max-height: 650px;
     overflow-y: scroll;
@@ -1129,53 +1130,54 @@
         }
       }
     }
+  }
 
-    .video_item_container {
-      .video {
-        width: 100%;
-      }
+  .video_item_container {
+    .video {
+      width: 100%;
     }
   }
+}
 
-  //   多选框
-  .checkbox_item_container {
-    .item_ul {
-      margin: 0 -10px;
+//   多选框
+.checkbox_item_container {
+  .item_ul {
+    margin: 0 -10px;
 
-      .item_li {
-        width: 20%;
-        float: left;
-        padding: 0 10px;
-        box-sizing: border-box;
+    .item_li {
+      width: 20%;
+      float: left;
+      padding: 0 10px;
+      box-sizing: border-box;
 
-        .item {
-          position: relative;
+      .item {
+        position: relative;
 
-          video {
-            width: 100%;
-            min-height: 255px;
-          }
+        video {
+          width: 100%;
+          min-height: 255px;
+        }
 
-          .checkbox_item {
-            display: block;
+        .checkbox_item {
+          display: block;
 
-            .ant-checkbox {
-              display: inline-block;
-            }
+          .ant-checkbox {
+            display: inline-block;
+          }
 
-            span {
-              display: block;
-              padding: 0;
+          span {
+            display: block;
+            padding: 0;
 
-              .item_txt {
-                text-align: left;
-                height: 42px;
-                overflow: hidden;
-              }
+            .item_txt {
+              text-align: left;
+              height: 42px;
+              overflow: hidden;
             }
           }
         }
       }
     }
   }
+}
 </style>

+ 2 - 2
src/views/modules/kuaishouapp/groupCreate.vue

@@ -85,7 +85,7 @@
                   {rules: [{ required: true, message: ' ' },
                   {validator: handleConfirmValue}]}
                 ]"
-          placeholder="不小于500,不超过100000000,仅支持输入自然数" type="number" style="width: 70%"></a-input>
+          placeholder="不小于100,不超过100000000,仅支持输入自然数" type="number" style="width: 70%"></a-input>
       </a-form-item>
 
@@ -456,7 +456,7 @@
 
 
       handleConfirmValue(rule, value, callback) {
-        if (this.dayBudget == '' || this.dayBudget <= 500 || this.dayBudget >= 100000000) {
+        if (this.dayBudget == '' || this.dayBudget < 100 || this.dayBudget >= 100000000) {
           callback('请输入正确预算金额')
         }
         callback()