up

houtai/src/utils/request.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 const service = axios.create({
   // baseURL: 'http://192.168.20.55:8018', // 本地调试
-  // baseURL: 'http://project.4dage.com:8018', // 线上调试
-  baseURL: '', // build
+  baseURL: 'http://project.4dage.com:8018', // 线上调试
+  // baseURL: '', // build
   timeout: 5000
 })
 // 请求拦截器

houtai/src/views/Login.vue

@@ -9,6 +9,9 @@
       </div>
       <div class="mainCon">
         <div class="mainConL">
+          <div class="leftLogo">
+            <img src="../assets/img/logo.png" alt="" />
+          </div>
           <p>温岭社教活动</p>
           <p>管理后台</p>
         </div>
@@ -142,6 +145,7 @@ export default {
       height: 430px;
       box-shadow: 1px 1px 6px 0px;
       .mainConL {
+        position: relative;
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -149,6 +153,14 @@ export default {
         width: 300px;
         height: 100%;
         background-color: #6f774e;
+        .leftLogo{
+          position: absolute;
+          top: 10px;
+          left: 10px;
+          &>img{
+            width: 100px;
+          }
+        }
         & > p {
           letter-spacing: 2px;
           text-align: center;

houtai/src/views/tab1/add.vue

@@ -15,7 +15,11 @@
             label-width="140px"
             class="demo-ruleForm"
           >
-            <el-form-item label="活动名称：" prop="name" :class="{wanQuan:look}">
+            <el-form-item
+              label="活动名称："
+              prop="name"
+              :class="{ wanQuan: look }"
+            >
               <el-input
                 placeholder="请输入"
                 v-model="ruleForm.name"
@@ -23,7 +27,11 @@
                 show-word-limit
               ></el-input>
             </el-form-item>
-            <el-form-item label="活动地点：" prop="address" :class="{wanQuan:look}">
+            <el-form-item
+              label="活动地点："
+              prop="address"
+              :class="{ wanQuan: look }"
+            >
               <el-input
                 placeholder="请输入"
                 v-model="ruleForm.address"
@@ -39,7 +47,7 @@
                 show-word-limit
               ></el-input>
             </el-form-item>
-            <div class="row" :class="{none:look}">
+            <div class="row" :class="{ none: look }">
               <el-form-item label="参与活动年龄段：">
                 <span class="biaoshi biaoshi3">*</span>
                 <el-select
@@ -131,7 +139,7 @@
             <div>
               <span>活动时间：</span>
               <el-date-picker
-                style="width:350px"
+                style="width: 350px"
                 :picker-options="pickerOptions"
                 value-format="yyyy-MM-dd"
                 v-model="ruleForm.startDay"
@@ -307,7 +315,8 @@ export default {
         return this.$message.warning("图片封面不能为空!");
       if (this.ruleForm.filePath === "")
         return this.$message.warning("活动顶部配图不能为空!");
-      if (!this.ruleForm.startDay) return this.$message.warning("请选择活动时间!");
+      if (!this.ruleForm.startDay)
+        return this.$message.warning("请选择活动时间!");
       let timeFlag = false;
       let numFlag = false;
       let startTimeArr = [];
@@ -425,8 +434,10 @@ export default {
       }
     },
     handleRemove1(file, fileList) {
-      this.$message.success("删除成功");
-      this.ruleForm.thumb = "";
+      if (file && file.status === "success") {
+        this.$message.success("删除成功");
+        this.ruleForm.thumb = "";
+      }
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
@@ -462,8 +473,10 @@ export default {
     },
     // 照片墙2
     async handleRemove2(file, fileList) {
-      this.$message.success("删除成功");
-      this.ruleForm.filePath = "";
+      if (file && file.status === "success") {
+        this.$message.success("删除成功");
+        this.ruleForm.filePath = "";
+      }
     },
     upload_thumb_successImg2(data) {
       this.$message.success("上传图片成功");
@@ -524,8 +537,8 @@ export default {
     // 如果是查看
     if (this.$route.query.flag == 1) {
       this.look = true;
-      this.editor.disable()
-      }
+      this.editor.disable();
+    }
   },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
@@ -544,7 +557,7 @@ export default {
   /deep/.el-upload-list__item-delete {
     display: none !important;
   }
-  /deep/.el-input__suffix{
+  /deep/.el-input__suffix {
     display: none !important;
   }
 }
@@ -593,7 +606,7 @@ export default {
       .none {
         pointer-events: none !important;
       }
-      .wanQuan{
+      .wanQuan {
         width: 100% !important;
       }
       .mainBox {

houtai/src/views/tab1/index.vue

@@ -32,7 +32,7 @@
           >
           </el-date-picker>
         </div>
-        <div>
+        <div  @keyup.enter="getList(formData)">
           <span>关 键 字：</span>
           <el-input
             style="width: 300px"
@@ -77,10 +77,10 @@
           </el-table-column>
           <el-table-column label="操作" width="340">
             <template #default="{ row }">
-              <el-button type="text" @click="toInfo(row.id)"
+              <el-button type="text" @click="toInfo(row.id)" v-if="row.status!==0"
                 >预约详情</el-button
               >
-              <el-button type="text" @click="exportExcel(row.name, row.id)"
+              <el-button type="text" @click="exportExcel(row.name, row.id)" v-if="row.status!==0"
                 >预约名单导出</el-button
               >
               <el-button
@@ -101,7 +101,7 @@
                 v-if="row.display == 0"
                 >编辑</el-button
               >
-              <el-button type="text" @click="toEdit(row.id, 1)">查看</el-button>
+              <el-button type="text" @click="toEdit(row.id, 1)" v-if="row.status!==0">查看</el-button>
               <el-button type="text" @click="activityRemove(row.id)"
                 >删除</el-button
               >
@@ -176,8 +176,8 @@ export default {
     time(val) {
       if (!val) this.formData.startTime = this.formData.endTime = "";
       else {
-        this.formData.startTime = val[0];
-        this.formData.endTime = val[1];
+        this.formData.startTime = val[0]+' 00:00:00';
+        this.formData.endTime = val[1]+' 23:59:59';
       }
     },
   },

web/src/utlis/request.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 const service = axios.create({
   // baseURL: 'http://192.168.20.55:8018', // 本地调试
-  // baseURL: 'http://project.4dage.com:8018', // 线上调试
-  baseURL: '', // build
+  baseURL: 'http://project.4dage.com:8018', // 线上调试
+  // baseURL: '', // build
   timeout: 5000
 })
 // // 请求拦截器

web/src/views/Home.vue

@@ -66,6 +66,7 @@ export default {
   watch: {
     topId(val) {
       this.getList(`?status=${val}`);
+      this.$route.meta.metaPage = val;
       // 回到顶点
       window.scrollTo({ top: 0 });
     },
@@ -89,7 +90,9 @@ export default {
   created() {
     // 获取服务器前缀地址
     this.baseURL = axios.defaults.baseURL;
-    this.getList();
+    if (this.$route.meta.metaPage) {
+      this.topId = this.$route.meta.metaPage;
+    } else this.getList();
     if (this.$route.meta.sroolBack) {
       setTimeout(() => {
         window.scrollTo({ top: this.$route.meta.sroolBack });

web/src/views/Info.vue

@@ -35,7 +35,7 @@
             :key="index"
             :class="{
               active: sectionId === index,
-              dis: timeFlag && item.dis,
+              dis: (timeFlag && item.dis) || data.status == 3,
               diss: item.quota <= 0,
             }"
             @click="
@@ -49,7 +49,9 @@
             "
           >
             <div class="one">{{ item.startTime }}-{{ item.endTime }}</div>
-            <div v-if="timeFlag && item.dis">已结束预约</div>
+            <div v-if="(timeFlag && item.dis) || data.status == 3">
+              已结束预约
+            </div>
             <div v-else>剩余:{{ item.quota }}</div>
           </div>
         </div>
@@ -59,7 +61,7 @@
     <!-- 个人信息 -->
     <div class="time">
       <p>个人信息</p>
-      <div class="from">
+      <div class="from" :class="{ endFrom: data.status == 3 }">
         <div class="row">
           <div class="name">姓名：</div>
           <input
@@ -118,7 +120,9 @@
         </div>
       </div>
       <!-- 按钮 -->
-      <div class="btn" @click="save">立即预约</div>
+      <div class="btn" :class="{ end: data.status == 3 }" @click="save">
+        {{ data.status == 3 ? "活动已结束" : "立即预约" }}
+      </div>
     </div>
     <ToIndex />
   </div>
@@ -588,6 +592,12 @@ export default {
       }
     }
   }
+  .endFrom {
+      pointer-events: none;
+      .row .numChange .none{
+        pointer-events: none;
+      }
+  }
   .btn {
     background-color: #858b6b;
     color: #fff;
@@ -599,5 +609,9 @@ export default {
     font-weight: 700;
     text-align: center;
   }
+  .end {
+    background-color: #ccc;
+    pointer-events: none;
+  }
 }
 </style>

web/src/views/Inquire.vue

@@ -3,7 +3,7 @@
     <Back />
     <div class="num" @keyup.enter="toSearch">
       <h3>身份证号</h3>
-      <input type="text" class="IDInput" v-model="value" @blur="blurInput" />
+      <input type="text" class="IDInput" v-model="value" @blur="blurInput" placeholder="请输入参与活动者身份证号。"/>
       <div class="tit" :class="{ opcNone: tit }">身份证号有误，请重新输入!</div>
       <div class="btn" @click="toSearch">预约查询</div>
     </div>

web/src/views/orderList.vue

@@ -25,7 +25,9 @@
       >
         <div class="ll">
           <h4>{{ item.activityName }}</h4>
-          <div @click="toDetail(item.activityId)">查看活动详情<img src="../assets/img/to.png" alt="" /></div>
+          <div @click="toDetail(item.activityId)">
+            查看活动详情<img src="../assets/img/to.png" alt="" />
+          </div>
         </div>
         <div class="rr">
           <p>申请时间：{{ item.createTime }}</p>
@@ -89,6 +91,7 @@ export default {
   watch: {
     topId(val) {
       this.getList({ identity: this.ID, status: val });
+      this.$route.meta.metaPage = val;
       // 回到顶点
       window.scrollTo({ top: 0 });
     },
@@ -96,8 +99,15 @@ export default {
   //方法集合
   methods: {
     // 点击查看活动详情
-    toDetail(id){
-      this.$router.push(`/detail/${id}`)
+    toDetail(id) {
+      let sroll =
+        window.pageYOffset ||
+        document.documentElement.scrollTop ||
+        document.body.scrollTop;
+      this.$route.meta.metaPage = this.topId;
+      this.$route.meta.sroolBack = sroll;
+
+      this.$router.push(`/detail/${id}`);
     },
     async beforeClose(action, done) {
       if (action === "confirm") {
@@ -145,7 +155,17 @@ export default {
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
     this.ID = this.$route.params.ID;
-    this.getList({ identity: this.ID });
+    if (this.$route.meta.metaPage) {
+      this.topId = this.$route.meta.metaPage;
+    } else this.getList({ identity: this.ID });
+    if (this.$route.meta.sroolBack) {
+      setTimeout(() => {
+        window.scrollTo({ top: this.$route.meta.sroolBack });
+      }, 200);
+    }
+    setTimeout(() => {
+      this.$route.meta.metaPage = "";
+    }, 200);
   },
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {},