commit

src/main/resources/views/mobile/train/trainInfo.html

@@ -153,6 +153,15 @@ layout("/mobile/platform.html"){
         padding: 0;
     }
 
+    .remark-content{
+        width: 100%;
+        max-width: 100%;
+    }
+
+    .remark-content *{
+        max-width: 100%!important;
+    }
+
 </style>
 <div id="app" v-cloak>
     <van-sticky>
@@ -213,7 +222,7 @@ layout("/mobile/platform.html"){
                         <template v-else>
                             <span v-if="o.courseTimeList && o.courseTimeList.length > 1" @click="trainClick(o)"
                                   style="color: #1867b0">点我查看</span>
-                            <span @click="trainClick(o)" v-if="o.courseTimeList && o.courseTimeList.length === 1"
+                            <span @click.stop="trainClick(o)" v-if="o.courseTimeList && o.courseTimeList.length === 1"
                                   style="color: #1867b0">
                             {{o.courseTimeList[0].courseStartTime.substring(11, 19) + ' ~ ' + o.courseTimeList[0].courseEndTime.substring(11, 19)}}
                         </span>
@@ -225,6 +234,12 @@ layout("/mobile/platform.html"){
                             <span style="color: #1867b0">{{o.courseTimeName}}</span>
                         </div>
                     </template>
+                    <template v-if="o.remarks">
+                        <div>
+                            <span class="train-title">详细信息：</span>
+                            <span @click.stop="showRemark(o)" style="color: #1867b0">点我查看</span>
+                        </div>
+                    </template>
                     <div>
                         <span @click.stop="showPic(FILE_DOMAIN + '/fileStreamPreview?id=' + tableData.wechat.id)"
                               v-if="o.isSign === true && tableData.wechat"
@@ -354,6 +369,11 @@ layout("/mobile/platform.html"){
     </van-popup>
 
 
+    <van-action-sheet v-model="remarkShow" title="详情" >
+        <div class="remark-content" v-html="courseRemark" @click="remarkClick"></div>
+    </van-action-sheet>
+
+
     <div>
         <van-tabbar v-model="tarBarActive">
             <van-tabbar-item icon="home-o" replace @click="pjaxReplace('/platform/mobile/trainSignUpActivity/trainList')">活动报名</van-tabbar-item>
@@ -399,6 +419,9 @@ layout("/mobile/platform.html"){
 
                 showCoursePicker: false,
                 courseTimeSelectList: [],
+
+                remarkShow: false,
+                courseRemark: '',
             }
         },
         components: {
@@ -427,8 +450,12 @@ layout("/mobile/platform.html"){
                         + "，<span style='color: red'>候补余" + lave2 + "</span>/" + o.courseReservedNumber + "人）"
                     return str
                 } else {
-                    let lave = o.coursePeopleNumber - (o.hasRegisterNum + o.courseReservedNumber)
-                    return "（<span style='color: red'>余" + lave +"</span>/" + o.coursePeopleNumber + "人）"
+                    if (Number(o.coursePeopleNumber) >= 1000) {
+                        return "（<span style='color: #ff8400'>无名额限制</span>/已报<span style='color: red'>" + o.hasRegisterNum + "</span>人）"
+                    } else {
+                        let lave = o.coursePeopleNumber - (o.hasRegisterNum + o.courseReservedNumber)
+                        return "（<span style='color: red'>余" + lave +"</span>/" + o.coursePeopleNumber + "人）"
+                    }
                 }
             },
             getCourseTypeName(o) {
@@ -728,6 +755,16 @@ layout("/mobile/platform.html"){
                 }
                 this.popupShow = true
             },
+            showRemark(o){
+                this.remarkShow = true
+                this.courseRemark = o.remarks
+            },
+            remarkClick(event){
+                //如果点击的是图片
+                if(event.target.tagName === 'IMG'){
+                    vant.ImagePreview([event.target.src])
+                }
+            },
             initMap(o) {
                 if (o.courseLocationCoordinates && o.courseLocationCoordinates.length < 2) {
                     return

src/main/resources/views/mobile/train/trainList.html

@@ -110,9 +110,9 @@ layout("/mobile/platform.html"){
                 </div>
                 <div @click="welfareClick(o)">
                     <div>
-                        <van-image :src="CREATE_PREVIEW_URL(o.cover.id)"
+                        <van-image :src="CREATE_PREVIEW_URL(o.cover)"
                                    style="display: contents"
-                                   v-if="o.cover && o.cover.filepath"></van-image>
+                                   v-if="o.cover"></van-image>
                         <van-image src=""
                                    style="display: contents"
                                    v-else></van-image>