Merge remote-tracking branch 'origin/master'

src/components/apply/hotCitySearch.vue

@@ -667,7 +667,7 @@
 
     .cityChoiceBox .city-Box span {
         display: inline-block;
-        width: 31%;
+        min-width: 31%;
         height: 32px;
         margin: 6px 6px 6px 0;
         line-height: 32px;

src/views/mobile/activityApply/detail.vue

@@ -10,7 +10,7 @@
         <div class="activeContent">
             <p class="title">{{detailInfo.channelTitle}}</p>
             <div class="basicInfo">
-                <p v-if="detailInfo.timeZoneName"><i class="iconfont icon-shijian"></i><span>{{$t("activityInfo.timeZone")}}：</span><span>{{detailInfo.timeZoneName}}</span></p>
+                <p v-if="detailInfo.timeZoneName"><i class="iconfont icon-shijian"></i><span>{{$t("activityInfo.timeZone")}}：</span><span style="padding-left: .2rem;">{{detailInfo.timeZoneName}}</span></p>
                 <p><i class="iconfont icon-shijian"></i><span>{{$t("activityInfo.activityTime")}}：</span><span>{{detailInfo.channelStartTime}} - {{detailInfo.channelEndTime}}</span></p>
                 <p><i class="iconfont icon-riqi"></i><span>{{$t("activityInfo.applyEnd")}}：</span><span>{{detailInfo.activityEndTime}}</span></p>
                 <p style="display: flex;align-items: center;"><i class="iconfont icon-renshu"></i><span>{{$t("activityInfo.activityCreated")}}：</span><span>{{detailInfo.channelOriginateName}}</span><img src="../../../assets/img/vipIcon@2x.png" v-if="detailInfo.roleType==7" alt=""><img src="../../../assets/img/apply/official@2x.png" alt="" v-if="detailInfo.roleType<7"></p>