Merge remote-tracking branch 'origin/master'

public/css/common.scss

@@ -163,8 +163,25 @@ input.el-input__inner {
 
 //组件
 .applyCheckbox.el-checkbox-button {
-  margin: 10px;
+  margin: 5px 2px;
+
+}
 
+.eventDatepicker.el-input__inner{
+  height: 30px!important;
+  line-height: 30px!important;
+}
+.eventDatepicker.el-date-editor .el-range__icon{
+  line-height: 30px!important;
+}
+.eventDatepicker.el-range-editor.el-input__inner{
+  padding: 0px 10px;
+}
+.eventDatepicker.el-date-editor .el-range-separator{
+  line-height: 30px!important;
+}
+.eventDatepicker.el-date-editor{
+  width: 300px!important;
 }
 
 .moneyCheckbox.el-checkbox-button {
@@ -177,7 +194,7 @@ input.el-input__inner {
 }
 
 .applyCheckbox.el-checkbox-button--small .el-checkbox-button__inner {
-  padding: 7px 15px;
+  padding: 7px 10px;
   max-width: 240px;
   white-space: nowrap;
   overflow: hidden;

src/components/index/Pagescreen.vue

@@ -2,7 +2,7 @@
     <div style="padding: 6px 0">
         <div style="padding-left: 10px" class="gendisplay">
             <div :style="titleType?'width: 0;overflow: hidden;':''">
-                <p class="titleNameP" :class="labelWidth?'labelWidth':''">{{titleName}}:</p>
+                <p class="titleNameP" :style="'width:'+labelWidth +'px'">{{titleName}}:</p>
             </div>
             <div style="font-weight: normal" class="gendisplay">
                 <div>
@@ -477,7 +477,8 @@
 
     .titleNameP{
         width: 140px;
-        line-height: 48px;
+        color: #1A1A1E;
+        line-height: 37px;
         font-weight: bold;
     }
     .labelWidth{

src/components/index/regionchoice.vue

@@ -2,7 +2,7 @@
     <div>
         <el-row :gutter="20" style=" padding: 6px 0 6px 10px;margin:0;">
             <el-col :span="3" style="padding-left: 0;width: 130px;">
-                <div style="line-height: 45px;font-weight: bold">{{titleName}}：</div>
+                <div style="line-height: 45px;font-weight: bold;color: #1A1A1E;">{{titleName}}：</div>
             </el-col>
             <el-col :span="21" style="font-weight:normal;padding-left: 10px;width: 80%;">
                 <div style="width: 80%;">
@@ -15,7 +15,7 @@
                                 </el-checkbox-button>
                             </el-checkbox-group>
                         </el-col>
-                        <el-col :span="20" style="margin-left: 35px;">
+                        <el-col :span="20">
                             <el-checkbox-group v-model="checkboxlocation" size="small" @change="changecity">
                                 <el-checkbox-button class="applyCheckbox" v-for="item in cityList" :label="item.lab" :key="item.lab">
                                     {{item.lab}} <i v-if="item.checked" class="el-icon-close"></i>

src/views/findeventpage/newEventpage.vue

@@ -24,9 +24,10 @@
             <div class="condition_top">
                 <div class="gendisplay condition_state">
                     <div class="gendisplay">
-                        <page-screen :screenlist="timeTypelist" :labelWidth="true" :screenchildListIf="true" ref="projecttimechild" titleName="活动时间"  @changecheck="timestateData"></page-screen>
+                        <page-screen :screenlist="timeTypelist" :labelWidth="75" :screenchildListIf="true" ref="projecttimechild" titleName="活动时间"  @changecheck="timestateData"></page-screen>
                         <el-date-picker
-                                style="margin-top: 10px;"
+                                style="margin: 10px 0 0 10px;"
+                                class="eventDatepicker"
                                 v-model="searchsTitme"
                                 value-format="yyyy-MM-dd"
                                 @change="searchsTitmement"
@@ -39,11 +40,11 @@
                     <p v-if="activityContact.contactImg" @click="vueQrVisible = true" class="condition_state_btn" slot="reference"><span>免费发布活动</span></p>
                 </div>
                 <div>
-                    <page-screen :style="Citychecked?'':'height: 50px;overflow: hidden;'" :screenlist="getHotCitylist" :labelWidth="true" :screenchildListIf="true" ref="projectCitychild" titleName="活动区域"  @changecheck="projectCityData"></page-screen>
+                    <page-screen :style="Citychecked?'':'height: 50px;overflow: hidden;'" :screenlist="getHotCitylist" :labelWidth="75" :screenchildListIf="true" ref="projectCitychild" titleName="活动区域"  @changecheck="projectCityData"></page-screen>
                     <i class="iconfont" @click="Citychecked = !Citychecked" :class="Citychecked?'icon-xiala-copy':'icon-xiala'"></i>
                 </div>
                 <div>
-                    <page-screen :style="groupchecked?'':'height: 50px;overflow: hidden;'" :screenlist="groupalllist" :labelWidth="true" :screenchildListIf="false" ref="projectstatechild" titleName="行业标签"  @changecheck="projectstateData"></page-screen>
+                    <page-screen :style="groupchecked?'':'height: 50px;overflow: hidden;'" :screenlist="groupalllist" :labelWidth="75" :screenchildListIf="false" ref="projectstatechild" titleName="行业标签"  @changecheck="projectstateData"></page-screen>
                     <i class="iconfont" @click="groupchecked = !groupchecked" :class="groupchecked?'icon-xiala-copy':'icon-xiala'"></i>
                 </div>
             </div>
@@ -99,7 +100,7 @@
                     <span>没有找到相应的活动，请更换筛选条件！</span>
                 </div>
                 <div v-else class="content_btn">
-                    <p v-if="sizeListResult > searchs.pageIndex" @click="load">查看更多活动</p>
+                    <p v-if="sizeListResult > searchs.pageIndex" @click="load" class="mouseHover">查看更多活动</p>
                     <span v-else>没有更多活动数据了</span>
                 </div>
             </div>
@@ -117,7 +118,7 @@
                     </el-col>
                 </el-row>
             </div>
-            <div class="left_tabs">
+            <div class="left_tabs" style="margin: 0;">
                 <div class="left_tabs_title">
                     <p>
                         <span>内容推荐<i></i></span>
@@ -639,6 +640,7 @@
                 line-height: 56px;
                 color: #ffffff;
                 padding: 0 15px;
+                border-radius: 3px;
                 background: linear-gradient(180deg, rgba(26, 26, 30, 0) 0%, rgba(26, 26, 30, 0.7) 100%);
             }
         }
@@ -672,6 +674,7 @@
                     line-height: 30px;
                     color: #ffffff;
                     padding: 0 15px;
+                    border-radius: 3px;
                     background: linear-gradient(180deg, rgba(26, 26, 30, 0) 0%, rgba(26, 26, 30, 0.7) 100%);
                 }
             }
@@ -689,17 +692,17 @@
     }
     .condition_top{
         background: #ffffff;
-        padding: 14px 20px 14px 0;
-        border-radius: 4px;
+        padding: 10px 20px 10px 0;
+        border-radius: 3px;
         margin: 20px 0;
-        border-radius: 4px;
         >div{
             position: relative;
+            margin-left: 10px;
             >i{
                 font-size: 12px;
                 display: inline-block;
                 cursor: pointer;
-                padding-top: 24px;
+                padding-top: 18px;
                 position: absolute;
                 top: 0px;
                 right: 0px;
@@ -713,6 +716,7 @@
                 width: 140px;
                 text-align: right;
                 >span{
+                    font-weight: bold;
                     display: inline-block;
                     padding: 0 28px;
                     color: #ffffff;
@@ -733,7 +737,7 @@
             overflow: hidden;
             margin-bottom: 20px;
             border: 1px solid #F2F2F2;
-            border-radius: 4px;
+            border-radius: 3px;
             background: #ffffff;
             text-align: left;
             position: relative;
@@ -773,7 +777,7 @@
             >p:nth-child(3){
                 color: #9197B4;
                 font-size: 12px;
-                margin: 0px 0px 8px 10px;
+                margin: 0px 10px 8px 10px;
                 text-align: left;
                 line-height: 20px;
             }
@@ -835,7 +839,7 @@
             width: 220px;
             height: 46px;
             cursor: pointer;
-            border-radius: 4px;
+            border-radius: 3px;
             background: #ffffff;
             color: #1A1A1E;
             line-height: 46px;
@@ -853,8 +857,8 @@
         background: #ffffff;
         padding: 20px;
         overflow: hidden;
-        border-radius: 10px;
-        margin-bottom: 15px;
+        border-radius: 4px;
+        margin-bottom: 20px;
         & .left_tabs_title{
             >p{
                 line-height: 28px;
@@ -881,14 +885,14 @@
         }
         .partner_content{
             .partnerBanner_Img{
-                padding: 10px;
+                /*padding: 10px;*/
                 margin-top: 20px;
                 width: 176px;
                 height: 76px;
                 border: 1px solid #E8E8E8;
                 >img{
-                    width: 100%;
-                    height: 40px;
+                    width: 174px;
+                    height: 74px;
                 }
             }
         }
@@ -920,8 +924,8 @@
                     cursor: pointer;
                     >p{
                         color: #7A7A7A;
-                        font-size: 12px;
-                        line-height: 24px;
+                        font-size: 14px;
+                        line-height: 22px;
                         height: 48px;
                         overflow: hidden;
                     }
@@ -937,6 +941,7 @@
                         }
                         .recommend_fenxiang{
                             color: #5D78FF;
+                            padding-top: 2px;
                             text-align: right;
                             >i{
                                 display: inline-block;