温馨提示

src/config/server.js

@@ -17,12 +17,16 @@
 // export const SERVER_WS_URL = "wss://apiy.thuers.com"; // websocket
 
 // 测试
-export const SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; // 正式环境
-export const DEVELOPMENT_SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; //开发环境
-export const SERVER_WS_URL = "wss://tgwapi.campcenter.cn"; // websocket
+// export const SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; // 正式环境
+// export const DEVELOPMENT_SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; //开发环境
+// export const SERVER_WS_URL = "wss://tgwapi.campcenter.cn"; // websocket
 
 // 正式
-// export const SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; // 正式环境
-// export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; //开发环境
-// export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
+export const SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; // 正式环境
+export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; //开发环境
+export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
 
+// 测试
+// export const SERVER_URL = "http:// 8088/modules-campsite"; // 正式环境
+// export const DEVELOPMENT_SERVER_URL = "http://43.143.166.79:8088/modules-campsite"; //开发环境
+// export const SERVER_WS_URL = "wss://43.143.166.79:8088"; // websocket

src/views/base/active/ActiveInfo.vue

@@ -83,31 +83,47 @@
           </ul>
         </div>
       </div>
-      <div :style="{
+      <div class="center-area">
+        <div :style="{
           'min-height':minHeight+'px'
-        }" class="center-area card-box">
-        <div class="center-area-title">
-          <div class="center-area-title-box">
-            <div :class="activeContent==1?'is-active':''"
-                 @click="changeActive(1)"
-                 class="center-area-title-box-item"
-            >活动简章
-            </div>
-            <div :class="activeContent==2?'is-active':''"
-                 @click="changeActive(2)"
-                 class="center-area-title-box-item"
-                 v-if="activeInfo.previousActivities"
-            >活动回顾
+        }" class=" card-box">
+          <div class="center-area-title">
+            <div class="center-area-title-box">
+              <div :class="activeContent==1?'is-active':''"
+                   @click="changeActive(1)"
+                   class="center-area-title-box-item"
+              >活动简章
+              </div>
+              <div :class="activeContent==2?'is-active':''"
+                   @click="changeActive(2)"
+                   class="center-area-title-box-item"
+                   v-if="activeInfo.previousActivities"
+              >活动回顾
+              </div>
             </div>
           </div>
+          <div class="center-area-cont">
+            <div v-html="activeInfo.admissionsBrochure"
+                 v-show="activeContent==1"></div>
+            <div v-html="activeInfo.previousActivities"
+                 v-show="activeContent==2"></div>
+          </div>
+
         </div>
-        <div class="center-area-cont">
-          <div v-html="activeInfo.admissionsBrochure"
-               v-show="activeContent==1"></div>
-          <div v-html="activeInfo.previousActivities"
-               v-show="activeContent==2"></div>
+        <div class="card-box tips">
+          <div class="title">温馨提示:</div>
+          <div>
+            扫码添加下方企业微信（备注选科+高考年份+姓名），一步获取更多高校营地信息！
+          </div>
+          <div class="img">
+            <img src="../../../assets/img/active/code.png"/>
+          </div>
+          <div>
+            声明：本文信息来源于网络，由CAMP CENTER团队（微信公众号：CAMPCENTER）排版编辑，如有侵权请及时联系管理员删除。
+          </div>
         </div>
       </div>
+
       <div class="right-area" ref="RightArea">
         <div class="question-area card-box">
           <div class="question-area-title">
@@ -182,6 +198,7 @@
         </div>
       </div>
     </div>
+
   </div>
 </template>
 
@@ -298,7 +315,6 @@
           this.questionList = res.data.data.question;
           this.currActivity = res.data.data.currActivity;
           this.oldActivity = res.data.data.oldActivity;
-
           setTimeout(() => {
             let content1 = this.activeInfo.admissionsBrochure;
             let content2 = this.activeInfo.previousActivities;
@@ -593,6 +609,27 @@
           padding: 20px 30px;
           min-height: 218px;
         }
+
+        .tips {
+          margin-top: 30px;
+          padding: 20px 30px;
+          font-size: 14px;
+
+          .title {
+            font-size: 18px;
+            margin-bottom: 10px;
+          }
+
+          .img {
+            display: flex;
+            justify-content: center;
+          }
+
+          img {
+            width: 150px;
+            margin: 10px 0;
+          }
+        }
       }
 
       .right-area {