刘洋 1 жил өмнө
parent
commit
b79e45282f

+ 1 - 1
src/pages/applyResult.vue

@@ -39,7 +39,7 @@ const continueApply = () => {
   bus.emit("continueApply");
 };
 const seeOrders = () => {
-  router.push({ name: "MyHistory", replace: true });
+  router.push({ name: "Index", replace: true });
 };
 </script>
 <style lang="less" scoped>

+ 11 - 3
src/pages/tab-pages/reservation.vue

@@ -127,12 +127,16 @@
             </div>
             <van-button
               v-if="item.status === 'AVAILABLE'"
-              type="success"
+              :type="!unApplyNumber ? 'default' : 'success'"
               size="small"
               @click="reservationHandle(item)"
+              :disabled="!unApplyNumber"
               >预约</van-button
             >
             <span class="full" v-else-if="item.status === 'FULL'">约满</span>
+            <span class="finish" v-else-if="item.status === 'FINISHED'"
+              >已预约</span
+            >
             <span class="stop" v-else>停止</span>
           </div>
         </div>
@@ -381,11 +385,15 @@ onUnmounted(() => {
         }
         span.full {
           color: #00b42a;
-          font-weight: bold;
+          font-size: 14px;
         }
         span.stop {
           color: #bfbfbf;
-          font-weight: bold;
+          font-size: 14px;
+        }
+        span.finish {
+          color: #8c8c8c;
+          font-size: 14px;
         }
         .left {
           .s1 {

+ 2 - 2
vite.config.js

@@ -26,8 +26,8 @@ export default defineConfig(({ mode }) => {
       cors: true,
       proxy: {
         "/api": {
-          // target: "http://192.168.10.41:8080",
-          target: "http://apply.qmth.com.cn",
+          target: "http://192.168.10.41:8080",
+          // target: "http://apply.qmth.com.cn",
           changeOrigin: true,
           // rewrite: (path) => path.replace(new RegExp(`^${envConfig.proxy}`), ''),
         },