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

src/components/LeaveGroupDownload/travelDays.vue

@@ -83,7 +83,19 @@
 
         <div class="travelDaysContent column">
           <div class="travelDaysContent-text" v-for="(jindian,j) in item.details" v-if="item.details.length>0">
-            <span>{{jindian.title?'【'+jindian.title+'】':''}}</span>
+            <span>
+              <template v-if="!jindian.playTimeHour&&!jindian.playTimeMinutes&&jindian.title">
+                {{'【'+jindian.title+'】'}}
+              </template>
+              <template v-else>
+                <template v-if="jindian.playTimeHour!=null&&jindian.playTimeHour&&jindian.playTimeMinutes">
+                  {{'【'+jindian.title+'(约'+jindian.playTimeHour+'小时'+jindian.playTimeMinutes+'分钟'+')】'}}
+                </template>
+                <template v-if="(!jindian.playTimeHour||jindian.playTimeHour==null)&&jindian.playTimeMinutes">
+                  {{'【'+jindian.title+'(约'+jindian.playTimeMinutes+'分钟'+')】'}}
+                </template>
+              </template>
+            </span>
             {{jindian.content}}
           </div>
           <div class="travelDaysContent-text" v-else>