Merge branch 'main' of https://dd3skj.picp.vip/zhouhefeng/zhgh_zjitc

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

@@ -164,6 +164,24 @@ layout("/mobile/platform.html"){
         color: #666666;
     }
 
+    .course-action {
+        margin-top: 10px;
+        padding-top: 10px;
+        border-top: 1px solid #ebedf0;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+    }
+
+    .course-action .van-button {
+        min-width: 96px;
+        height: 28px;
+    }
+
+    .course-action .van-button + .van-button {
+        margin-left: 12px;
+    }
+
 </style>
 <div id="app" v-cloak>
     <van-sticky>
@@ -240,24 +258,28 @@ layout("/mobile/platform.html"){
                             <span style="color: #1867b0">{{o.courseTimeName}}</span>
                         </div>
                     </template>
-                    <div>
+                    <div class="course-action"
-                        <span @click.stop="showPic(FILE_DOMAIN + '/fileStreamPreview?id=' + o.classQrCode)"
+                         v-if="(activityStatus !== '1' && o.isSign === false)
-                              v-if="o.isSign === true && o.classQrCode"
+                         || (o.isSign === true && getWechatFileId())
-                              style="color: #dd6363">点我查看微信群二维码</span>
+                         || (o.isSign === true && moment().valueOf() < moment(activity.activitySignUpEndTime).valueOf())">
-                    </div>
                         <van-button type="primary" color="#1867b0" round size="mini"
                                     v-if="activityStatus !== '1' && o.isSign === false"
-                                style="position: absolute; left: 74%; bottom: 10%; width: 74px; height: 28px"
                                     @click.stop="signUp(o)">
                             我要报名
                         </van-button>
 
+                        <van-button type="primary" color="#07c160" round size="mini"
+                                    v-if="o.isSign === true && getWechatFileId()"
+                                    @click.stop="showWechatQrCode">
+                            微信群二维码
+                        </van-button>
+
                         <van-button type="primary" color="#dd6363" round size="mini"
                                     v-if="o.isSign === true && moment().valueOf() < moment(activity.activitySignUpEndTime).valueOf()"
-                                style="position: absolute; left: 74%; bottom: 10%; width: 74px; height: 28px"
                                     @click.stop="cancel(o)">
                             取消报名
                         </van-button>
+                    </div>
 
                     <image v-if="activityStatus !== '1' && o.isSign === true && moment().valueOf() >= moment(activity.activitySignUpEndTime).valueOf()"
                            style="position: absolute; left: 77%; top: 58%;"
@@ -494,6 +516,24 @@ layout("/mobile/platform.html"){
             showPic(url) {
                 vant.ImagePreview([url])
             },
+            getWechatFileId() {
+                const wechat = this.tableData.wechat
+                if (!wechat) {
+                    return ''
+                }
+                if (Array.isArray(wechat)) {
+                    return wechat.length > 0 ? wechat[0].id : ''
+                }
+                return wechat.id
+            },
+            showWechatQrCode() {
+                const id = this.getWechatFileId()
+                if (!id) {
+                    vant.Toast('暂无微信群二维码')
+                    return
+                }
+                this.showPic(FILE_DOMAIN + '/fileStreamPreview?id=' + id)
+            },
             findTime(o) {
                 const today = moment().format('YYYY-MM-DD')
                 return o.courseStartTime.substr(0, 10) === today