Merge remote-tracking branch 'origin/master'

src/common/lang/en.js

@@ -1955,12 +1955,9 @@ module.exports = {
         activityGuest:"Event Guests",
         recentParticipated:"Recently Participated",
         recentParticipatedList:"Participant List",
-        guestList:"Guest List"
-
-
-
-
-
+        guestList:"Guest List",
+        open:'Open',
+        close:'Close',
     },
 
     shareInfo:{

src/common/lang/zh.js

@@ -2050,7 +2050,9 @@ module.exports = {
         activityGuest:"活动嘉宾",
         recentParticipated:"最近参与",
         recentParticipatedList:"参与者列表",
-        guestList:"嘉宾列表"
+        guestList:"嘉宾列表",
+        open:'查看全部',
+        close:'收起',
 
 
     },

src/views/dashboard/pages/statistics.vue

@@ -34,12 +34,12 @@
                                         <span style="margin-right: 20px;" :class="tabIndex==4?'activeSpan':''"
                                               @click="handleTab(4)">近30天</span>
 
-                                        <el-date-picker style="width: 190px;" v-model="startTime" type="datetime"
+                                        <el-date-picker style="width: 190px;" @change="handleChangeTime(startTime,endTime)" v-model="startTime" type="datetime"
                                                         value-format="yyyy-MM-dd HH:mm:ss"
                                                         :placeholder="$t('operationjson.authBegin')"></el-date-picker>
                                         <span style="width: 50px;text-align: center;line-height: 40px;">
                                             {{$t('operationjson.tos')}}</span>
-                                        <el-date-picker style="width: 190px;" v-model="endTime" type="datetime"
+                                        <el-date-picker style="width: 190px;" v-model="endTime"  @change="handleChangeTime(startTime,endTime)" type="datetime"
                                                         value-format="yyyy-MM-dd HH:mm:ss"
                                                         :placeholder="$t('operationjson.authEnd')"></el-date-picker>
                                     </div>
@@ -491,6 +491,10 @@
                 this.getStatisticsdata();
             },
 
+            handleChangeTime(startTime,endTime){
+                if(startTime&&endTime) this.tabIndex = 0;
+            },
+
             //导出
             exportFunc() {
                 let params = {

src/views/mobile/activityApply/detail.vue

@@ -77,7 +77,7 @@
                     <div v-html="detailInfo.channelIntroduction" v-if="showAll" ref="richTextarea"
                          style="margin-bottom: .2rem;"></div>
                     <div class="lookAll">
-                        <span @click="handleShowAll">{{showAll?'收起':'查看全部'}} <i class="iconfont"
+                        <span @click="handleShowAll">{{showAll?$t('activityInfo.close'):$t('activityInfo.open')}} <i class="iconfont"
                                                                                 :class="showAll?'icon-xiala-copy':'icon-xiala'"></i></span>
                     </div>
                 </div>
@@ -604,7 +604,7 @@
                         this.detailInfo.channelEndTime = this.detailInfo.channelEndTime.split(":")[0] + ":" + this.detailInfo.channelEndTime.split(":")[1];
                         this.detailInfo.activityEndTime = this.detailInfo.activityEndTime.split(":")[0] + ":" + this.detailInfo.activityEndTime.split(":")[1];
                         this.getDocumentFunc();
-                        this.getRecommandInfo();
+                        if(this.lang==1&&this.detailInfo.channelType!=2) this.getRecommandInfo();
                         this.getRecentlyParticipatedFunc();
                         this.getSameContentFunc();
                         if (this.userInfo) this.getNickName();