From 6e37d51e821cf8fbc8bcf8f45c21d3e8791b36a2 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 5 Feb 2024 17:03:44 +0800
Subject: [PATCH] fix

---
 src/pages/activity/manage/preview/index.vue   | 597 +++---------------
 src/pages/join/add/index.vue                  |   2 +-
 .../miniProgramMg/index/banner/add/index.vue  |  10 +-
 .../miniProgramMg/index/banner/list/index.vue |   4 +-
 .../miniProgramMg/index/hot/add/index.vue     |  11 +-
 .../miniProgramMg/index/hot/list/index.vue    |   4 +-
 src/pages/preschool/manage/auth.vue           |   1 -
 src/pages/supplier/manage/auth.vue            |   1 -
 src/router/routes.js                          |  17 +-
 src/setting.js                                |   2 +-
 10 files changed, 122 insertions(+), 527 deletions(-)

diff --git a/src/pages/activity/manage/preview/index.vue b/src/pages/activity/manage/preview/index.vue
index 2929a37..aa1dd4c 100644
--- a/src/pages/activity/manage/preview/index.vue
+++ b/src/pages/activity/manage/preview/index.vue
@@ -1,563 +1,144 @@
 <template>
-  <div class="wrap index">
-    <div class="banner"
-         :style="{backgroundImage: 'url(' + (form.carouselUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220613/png/1536269450851409920.png') + ')'}"></div>
-    <div class="center-con">
-      <div class="center-wrap">
-        <breadcrumb ref="breadcrumb"
-                    :data="'全部项目/' + form.projectName"></breadcrumb>
-        <div class="content">
-          <div class="tool flex-between">
-            <el-tabs v-model="curType"
-                     @tab-click="typeChange">
-              <el-tab-pane v-for="(item, index) in typeList"
-                           :key="index"
-                           :label="item.name"
-                           :name="item.id"></el-tab-pane>
-            </el-tabs>
-            <div class="status wait">等待报名</div>
-          </div>
-          <div class="info">
-            <h6 class="title">{{ form.projectName }}</h6>
-            <div class="meta">最近编辑时间：{{ form.updateTime }}</div>
-          </div>
+  <div class="wrap">
+    <div class="banner">
+      <img class="pic"
+           :src="form.coverUrl" />
+    </div>
 
-          <div v-show="curType < 4">
-            <div class="l-title"
-                 id="part1"><img src="@/assets/img/label.png"
-                   alt=""> 项目信息</div>
-            <div v-if="form.projectDescribe"
-                 class="texts ql-editor"
-                 v-html="form.projectDescribe"></div>
-            <template v-if="form.activityFileList">
-              <h6 class="p-title">附件下载</h6>
-              <ul class="files">
-                <li v-for="(item, i) in form.activityFileList"
-                    :key="i">
-                  <el-link v-if="item.canPreview"
-                           class="m-r-10"
-                           type="primary"
-                           @click="preview(item)">{{ item.fileName }}</el-link>
-                  <span v-else
-                        class="fileName">{{ item.fileName }}</span>
-                  <el-link type="primary"
-                           :underline="false"
-                           @click="download(item)">下载</el-link>
-                </li>
-              </ul>
-            </template>
+    <div class="info">
+      <div class="line">
+        <div class="label">活动名称：</div>
+        <div class="val">{{ form.name }}</div>
+      </div>
+      <div class="line">
+        <div class="label">状态：</div>
+        <div class="val">待开始</div>
+      </div>
+      <div v-if="form.whetherToShowApplicants === '1'"
+           class="line">
+        <div class="label">人数限制：</div>
+        <div class="val">{{ form.quantityLimit }}</div>
+      </div>
+      <div class="line items-start">
+        <div class="label">举办时间：</div>
+        <div class="val">{{ form.playStartTime + ' ~ ' + form.playEndTime }}</div>
+      </div>
+      <div class="line">
+        <div class="label">活动地点：</div>
+        <div class="val">{{ form.reportingPlace }}</div>
+      </div>
+      <div class="line">
+        <div class="label">主办方：</div>
+        <div class="val">{{ form.sponsor }}</div>
+      </div>
+      <div v-if="form.whetherToShowApplicants === '1'"
+           class="line">
+        <div class="label">已报名人员：</div>
+        <div class="val">({{ form.applicantNum }}/{{ form.quantityLimit }})</div>
+      </div>
+    </div>
 
-            <!-- 进展 -->
-            <div class="l-title"
-                 id="part2"><img src="@/assets/img/label.png"
-                   alt=""> 项目进展</div>
-            <ul class="progress"
-                v-if="progress.length">
-              <li v-for="(item,index) in progress"
-                  :key="index"
-                  :class="item.status == 0 ? 'not' : (item.status == 1 ? 'ing' : 'done')">
-                <i class="dot"></i>
-                <p class="name">{{item.title}}</p>
-                <p class="desc">{{item.description}}</p>
-              </li>
-              <img class="rocket"
-                   src="@/assets/img/rocket.png"
-                   alt="">
-            </ul>
-            <template v-else>
-              <div class="empty">
-                <div>
-                  <img src="@/assets/img/none.png"
-                       alt="">
-                  <p>暂无数据</p>
-                </div>
-              </div>
-            </template>
+    <ul class="tabs">
+      <li class="item"
+          :class="{active: curTab === 0}"
+          @click="tabChange(0)">活动详情</li>
+      <!-- <li :class="{active: curTab === 1}" @click="tabChange(1)">活动通知</li> -->
+      <li class="item"
+          v-if="form.whetherToShowApplicants === '1'"
+          :class="{active: curTab === 1}"
+          @click="tabChange(1)">已报名人员</li>
+    </ul>
 
-            <!-- 公告 -->
-            <div class="l-title"
-                 id="part3"><img src="@/assets/img/label.png"
-                   alt=""> 通知公告</div>
-            <ul class="notice-list"
-                v-if="notices.length">
-              <li v-for="(item, i) in notices"
-                  :key="i"
-                  @click="toNotice(item)">
-                <h6>{{ item.announcementTitle }}</h6>
-                <p class="meta">{{ item.updateTime }}</p>
-                <div class="des"
-                     v-html="item.announcementText"></div>
-              </li>
-            </ul>
-            <template v-else>
-              <div class="empty">
-                <div>
-                  <img src="@/assets/img/none.png"
-                       alt="">
-                  <p>暂无通知公告</p>
-                </div>
-              </div>
-            </template>
-          </div>
-        </div>
-      </div>
+    <div v-if="!curTab"
+         class="detail">
+      <div class="des"
+           v-html="form.description"></div>
     </div>
   </div>
 </template>
 
 <script>
-import breadcrumb from '@/components/breadcrumb'
 import util from '@/libs/util'
 import Setting from "@/setting"
 export default {
   data () {
     return {
       form: util.local.get('activity'),
-      curType: '1',
+      curTab: 0,
       typeList: [
         {
-          id: '1',
-          name: '项目信息'
-        },
-        {
-          id: '2',
-          name: '项目进展'
+          id: 0,
+          name: '活动详情'
         },
         {
-          id: '3',
-          name: '通知公告'
+          id: 1,
+          name: '已报名人员'
         },
       ],
-      progress: [],
-      timer: null,
-      notices: [],
     };
   },
-  components: {
-    breadcrumb
-  },
   mounted () {
-    if (this.form.id) {
-      this.getProgress()
-      this.getNotice()
-    }
+    console.log(11, this.form)
   },
   methods: {
-    getProgress () { // 获取项目进展
-      this.$get(this.api.listActivityProgress, {
-        activityId: this.form.id
-      }).then(res => {
-        this.progress = res.activityProgressList.reverse()
-      }).catch(err => { });
-    },
-    // 公告列表
-    getNotice () {
-      this.$post(`${this.api.listActivityAnnouncement}?pageNum=1&pageSize=1000&competitionId=${this.form.id}`).then(({ data }) => {
-        const records = data.records.filter(e => e.status) // 只显示已发布的（status 0草稿 1为已发布）
-        records.map(e => {
-          e.announcementText = e.announcementText.replace(/<img.*?(?:>|\/>)/gi, '')
-        })
-        this.notices = records
-      }).catch(res => { })
-    },
-    // 预览附件
-    preview (item) {
-      const { filePath } = item
-      const suffix = filePath.substr(filePath.lastIndexOf('.') + 1)
-      window.open((util.isDoc(suffix) ? 'https://view.officeapps.live.com/op/view.aspx?src=' : '') + item.filePath)
-    },
-    // 下载附件
-    download (item) {
-      util.downloadFile(item.fileName, item.filePath)
-    },
     // tab切换
-    typeChange () {
-      document.querySelector(`#part${type}`).scrollIntoView()
-    },
+    // tab回调
+    tabChange (i) {
+      this.curTab = i
+    }
   }
 };
 </script>
 
 <style lang="scss" scoped>
 .wrap {
-    margin: -24px;
+    width: 400px;
+    margin: 50px auto 0;
 }
 .banner {
-    width: 100%;
-    height: 350px;
-    padding: 120px 0 0 20%;
-    color: #fff;
-    background-size: 100% 350px;
-    background-repeat: no-repeat;
-}
-.l-title {
-    font-size: 18px;
-}
-.main .center-con {
-    width: 1000px;
-    margin: 40px auto 0;
-    background: url(../../../../assets/img/match-bg1.png) (0px 95px) / auto auto no-repeat,
-        url(../../../../assets/img/match-bg2.png) (98% 300px) / auto auto no-repeat;
-}
-.main .center-wrap {
-    margin-top: 30px;
-}
-.rule-title {
-    margin-bottom: 10px;
-    font-size: 16px;
-}
-.rule {
-    padding: 15px;
-    margin-bottom: 15px;
-    border: 1px solid #dfdfdf;
-    p {
-        font-size: 14px;
-        line-height: 30px;
-        color: #6e6e6e;
+    .pic {
+        width: 100%;
+        max-height: 250px;
     }
 }
-/deep/.el-tabs__item {
-    box-shadow: none !important;
-}
-.content {
+.info {
     position: relative;
-    padding: 20px 40px;
-    margin-top: 30px;
+    padding: 10px;
+    margin: -75px 15px 0;
     background-color: #fff;
-    .title {
-        width: 67%;
-        margin: 0 auto;
-        font-size: 28px;
-        text-align: center;
-        color: #0b1d30;
-    }
-    .tool {
-        z-index: 100;
-        position: sticky;
-        top: 64px;
-        margin-bottom: 20px;
-        background-color: #fff;
-    }
-    .info .meta {
-        padding: 16px 0;
-        font-size: 12px;
-        color: #999;
-        text-align: center;
-    }
-    .action {
-        display: inline-flex;
-        align-items: center;
-    }
-    .status {
-        max-width: 120px;
-        padding: 0 16px;
-        margin-left: 20px;
-        line-height: 34px;
-        font-size: 14px;
-        color: #fff;
-        background-color: #52c41a;
-        border-radius: 4px;
-        cursor: pointer;
-        @include ellipsis();
-        &.wait {
-            background-color: #faad14;
-        }
-        &.signing {
-            background-color: $main-color;
-        }
-        &.signed {
-            background-color: #52c41a;
-        }
-        &.playing {
-            background-color: #f96d6d;
-        }
-        &.finish {
-            background-color: #ccc;
-        }
-    }
-    .end-text {
-        font-size: 12px;
-        color: #666;
-        em {
-            font-style: normal;
-            color: #f00;
-        }
-    }
-    .texts {
-        margin: 20px 0 50px;
-        font-size: 14px;
-        line-height: 1.6;
-        text-indent: 2em;
-        overflow: hidden;
-        /deep/img {
-            max-width: 100%;
-        }
-    }
-    .progress {
-        position: relative;
-        width: 95%;
-        padding: 50px 0;
-        margin: 40px auto 80px;
-        text-align: left;
-        &:before {
-            content: '';
-            position: absolute;
-            top: 0;
-            left: 50%;
-            width: 2px;
-            height: 100%;
-            background-color: #e1e6f2;
-        }
-        &:after {
-            content: '';
-            position: absolute;
-            top: -10px;
-            left: 430px;
-            border: 8px solid transparent;
-            border-bottom-color: #e1e6f2;
-        }
-        .rocket {
-            position: absolute;
-            bottom: -50px;
-            left: 425px;
-        }
-        li {
-            position: relative;
-            width: 400px;
-            margin-bottom: 42px;
-            .dot {
-                position: absolute;
-                top: 12px;
-                left: 431px;
-                width: 15px;
-                height: 15px;
-                background-color: #dcdcdc;
-                border-radius: 50%;
-            }
-            .name {
-                display: inline-block;
-                padding: 0 19px;
-                margin-bottom: 16px;
-                line-height: 40px;
-                text-align: center;
-                font-size: 16px;
-                color: #fff;
-                border-radius: 20px;
-                background-color: #c4c4c4;
-            }
-            .desc {
-                position: relative;
-                color: #333;
-                font-size: 14px;
-            }
-            &.ing,
-            &.done {
-                .dot {
-                    top: 8px;
-                    background-color: #007eff;
-                }
-                .name {
-                    background-color: #007eff;
-                }
-            }
-            &.ing {
-                .dot {
-                    width: 27px;
-                    height: 27px;
-                    border: 6px solid #e2f1fb;
-                }
-            }
-            &:nth-child(odd) {
-                text-align: right;
-                &.ing {
-                    .dot {
-                        left: auto;
-                        right: -51px;
-                    }
-                }
-                .name {
-                    &:before {
-                        content: '';
-                        z-index: 2;
-                        position: absolute;
-                        top: 14px;
-                        right: -35px;
-                        border: 18px solid transparent;
-                        border-top-width: 6px;
-                        border-bottom-width: 6px;
-                        border-left-color: #c4c4c4;
-                    }
-                }
-                .desc {
-                    text-align: right;
-                }
-                &.ing,
-                &.done {
-                    .name {
-                        &:before {
-                            border-left-color: #007eff;
-                        }
-                    }
-                }
-            }
-            &:nth-child(even) {
-                margin-left: 482px;
-                .dot {
-                    left: -51px;
-                }
-                &.ing {
-                    .dot {
-                        left: -57px;
-                    }
-                }
-                .name {
-                    text-align: left;
-                    &:after {
-                        content: '';
-                        z-index: 2;
-                        position: absolute;
-                        top: 14px;
-                        left: -35px;
-                        border: 18px solid transparent;
-                        border-top-width: 6px;
-                        border-bottom-width: 6px;
-                        border-right-color: #c4c4c4;
-                    }
-                }
-                .desc {
-                    &:before {
-                        left: auto;
-                        right: -16px;
-                        border: 8px solid transparent;
-                        border-left-color: #fff;
-                    }
-                    &:after {
-                        left: auto;
-                        right: -18px;
-                        border: 9px solid transparent;
-                        border-left-color: #e6e6e6;
-                    }
-                }
-
-                &.ing,
-                &.done {
-                    .name {
-                        &:after {
-                            border-right-color: #007eff;
-                        }
-                    }
-                }
-            }
-            &:last-child {
-                margin-bottom: 0;
-            }
-        }
-    }
-}
-.files {
-    margin-bottom: 30px;
-    li {
+    border-radius: 8px;
+    .line {
         display: flex;
         align-items: center;
         margin: 10px 0;
     }
-    .fileName {
-        margin-right: 10px;
-        font-size: 12px;
-    }
-}
-.notice-list {
-    text-align: left;
-    li {
-        padding: 16px;
-        margin-bottom: 12px;
-        transition: all 0.3s;
-        cursor: pointer;
-        border-radius: 6px;
-        background-color: #fff;
-        border-bottom: 1px dashed #ebebeb;
-        &:last-child {
-            border-bottom: 0;
-        }
-    }
-    h6 {
-        font-size: 20px;
-        font-weight: 500;
-        color: #0b1d30;
-        &:hover {
-            color: #007eff;
-        }
+    .items-start {
+        align-items: flex-start;
     }
-    .meta {
-        margin: 10px 0;
+    .label {
+        min-width: 90px;
         font-size: 14px;
-        color: #666;
+        text-align: right;
     }
-    .des {
+    .val {
         font-size: 14px;
+        font-weight: 600;
         color: #333;
-        line-height: 24px;
-        display: -webkit-box;
-        display: -moz-box;
-        -webkit-box-orient: vertical;
-        -moz-box-orient: vertical;
-        -webkit-line-clamp: 2;
-        -moz-line-clamp: 2;
-        overflow: hidden;
-        text-overflow: ellipsis;
     }
 }
-.table {
-    width: 100%;
-    border-collapse: collapse;
-    th,
-    td {
-        padding: 12px;
-        border: 1px solid #ebeef5;
-    }
-    &.tc {
-        text-align: center;
-    }
-    th {
-        text-align: center;
-        background-color: #f8faff;
-    }
-    .icon {
-        margin-right: 10px;
-        font-size: 16px;
-        color: #7a7a7a;
-        cursor: pointer;
-        &:hover {
-            color: #007eff;
-        }
-    }
-    .plus {
-        margin-bottom: 10px;
-        text-align: right;
-    }
-    .line {
-        display: flex;
-        align-items: center;
-        margin-bottom: 10px;
-        .el-input {
-            margin-right: 15px;
-        }
-    }
+.tabs {
+    justify-content: space-around;
 }
-.flex-center {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 15px;
+.detail {
+    padding: 17px 16px;
+    margin: 10px;
+    border-radius: 20px;
+    background-color: #fff;
 }
-/deep/.dia-form {
-    .w-100 {
-        width: 100%;
-    }
-    .tips {
-        display: flex;
-        justify-content: center;
-        align-items: center;
+/deep/.des {
+    overflow: auto;
+    img {
+        max-width: 100%;
     }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/join/add/index.vue b/src/pages/join/add/index.vue
index 01c05ef..fbb4dae 100644
--- a/src/pages/join/add/index.vue
+++ b/src/pages/join/add/index.vue
@@ -7,7 +7,7 @@
           <img src="@/assets/images/house.png"
                alt="">
         </div>
-        <p class="text">{{ teamName ? (teamName + '邀请你加入他的团队') : '加入并自动为你创建一个团队群组' }}</p>
+        <p class="text">{{ teamName + '邀请你加入他的团队' }}</p>
       </div>
       <div class="inner">
         <el-form class="form"
diff --git a/src/pages/miniProgramMg/index/banner/add/index.vue b/src/pages/miniProgramMg/index/banner/add/index.vue
index bb8b907..9068c29 100644
--- a/src/pages/miniProgramMg/index/banner/add/index.vue
+++ b/src/pages/miniProgramMg/index/banner/add/index.vue
@@ -162,9 +162,7 @@ export default {
         if (this.id) {
           this.getData()
         } else {
-          this.pics = []
-          this.form = JSON.parse(JSON.stringify(this.originForm))
-          this.getDetails()
+          this.resetForm()
         }
       },
     }
@@ -206,6 +204,12 @@ export default {
         this.getDetails()
       }).catch(err => { })
     },
+    // 重置表单
+    resetForm () {
+      this.pics = []
+      this.form = JSON.parse(JSON.stringify(this.originForm))
+      this.getDetails()
+    },
     // 链接详情（要查询4个模块的列表）
     async getDetails (id) {
       if (id) this.form.correspondingLinkId = ''
diff --git a/src/pages/miniProgramMg/index/banner/list/index.vue b/src/pages/miniProgramMg/index/banner/list/index.vue
index f7ddf6f..da26fbc 100644
--- a/src/pages/miniProgramMg/index/banner/list/index.vue
+++ b/src/pages/miniProgramMg/index/banner/list/index.vue
@@ -62,7 +62,8 @@
                size="900px"
                :visible.sync="diaVisible"
                @closed="diaClose">
-      <Add :id.sync="id"
+      <Add ref="add"
+           :id.sync="id"
            @closeDia="closeDia" />
     </el-drawer>
   </div>
@@ -139,6 +140,7 @@ export default {
     },
     // 弹框关闭回调
     diaClose () {
+      this.$refs.add.resetForm()
       this.id = ''
     },
     // 关闭弹框
diff --git a/src/pages/miniProgramMg/index/hot/add/index.vue b/src/pages/miniProgramMg/index/hot/add/index.vue
index faa53a3..e3aad8a 100644
--- a/src/pages/miniProgramMg/index/hot/add/index.vue
+++ b/src/pages/miniProgramMg/index/hot/add/index.vue
@@ -44,7 +44,6 @@
           <el-button>选择</el-button>
         </el-form-item> -->
       </template>
-
       <template v-else>
         <el-form-item class="req"
                       label="链接类型">
@@ -181,9 +180,7 @@ export default {
         if (this.id) {
           this.getData()
         } else {
-          this.pics = []
-          this.form = JSON.parse(JSON.stringify(this.originForm))
-          this.getDetails()
+          this.resetForm()
         }
       },
     }
@@ -226,6 +223,12 @@ export default {
         this.getDetails()
       }).catch(err => { })
     },
+    // 重置表单
+    resetForm () {
+      this.pics = []
+      this.form = JSON.parse(JSON.stringify(this.originForm))
+      this.getDetails()
+    },
     // 链接详情（要查询4个模块的列表）
     async getDetails (id) {
       if (id) this.form.correspondingLinkId = ''
diff --git a/src/pages/miniProgramMg/index/hot/list/index.vue b/src/pages/miniProgramMg/index/hot/list/index.vue
index b55187d..4d397cb 100644
--- a/src/pages/miniProgramMg/index/hot/list/index.vue
+++ b/src/pages/miniProgramMg/index/hot/list/index.vue
@@ -79,7 +79,8 @@
                size="900px"
                :visible.sync="diaVisible"
                @closed="diaClose">
-      <Add :id.sync="id"
+      <Add ref="add"
+           :id.sync="id"
            @closeDia="closeDia" />
     </el-drawer>
   </div>
@@ -156,6 +157,7 @@ export default {
     },
     // 弹框关闭回调
     diaClose () {
+      this.$refs.add.resetForm()
       this.id = ''
     },
     // 关闭弹框
diff --git a/src/pages/preschool/manage/auth.vue b/src/pages/preschool/manage/auth.vue
index 635b96d..2fdff49 100644
--- a/src/pages/preschool/manage/auth.vue
+++ b/src/pages/preschool/manage/auth.vue
@@ -225,7 +225,6 @@ export default {
     }
     .val {
         font-size: 15px;
-        font-weight: 600;
         color: #333;
     }
 }
diff --git a/src/pages/supplier/manage/auth.vue b/src/pages/supplier/manage/auth.vue
index 39c1f1c..32148dd 100644
--- a/src/pages/supplier/manage/auth.vue
+++ b/src/pages/supplier/manage/auth.vue
@@ -204,7 +204,6 @@ export default {
     }
     .val {
         font-size: 15px;
-        font-weight: 600;
         color: #333;
     }
 }
diff --git a/src/router/routes.js b/src/router/routes.js
index 5b0e9bb..88f1c78 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -46,12 +46,17 @@ const frameOut = [
 			path: `/join`,
 			component: () => import('@/pages/join/add'),
 			meta: { title: 'GPAC' }
-			},
-			{
-				path: `/join/success`,
-				component: () => import('@/pages/join/success'),
-				meta: { title: 'GPAC' }
-			}
+		},
+		{
+			path: `/join/success`,
+			component: () => import('@/pages/join/success'),
+			meta: { title: 'GPAC' }
+		},
+    {
+      path: `/activity/preview`,
+      component: () => import("@/pages/activity/manage/preview"),
+      meta: { title: '活动预览' }
+    }
 ];
 /**
  * 错误页面
diff --git a/src/setting.js b/src/setting.js
index 20edb8f..d3d1f0f 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -5,7 +5,7 @@ const isDev = process.env.NODE_ENV === 'development' // 开发环境
 let host = `${location.origin}/`
 if (isDev) {
   host = 'http://124.71.79.122/'
-	host = 'http://192.168.31.217:10010/'
+	// host = 'http://192.168.31.217:10010/'
 }
 
 const Setting = {