From de3c1595198675306f5efd4e4a19b224dc99de76 Mon Sep 17 00:00:00 2001
From: "2358328281@qq.com" <邮箱地址>
Date: Sat, 4 Jul 2026 00:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/AdminLayout.vue         |  2 +-
 src/main.js                                   |  2 +
 src/service/request/index.js                  |  4 +-
 src/stores/signInDialog.js                    |  2 +
 src/views/admin/hospitals/service.vue         | 10 ++--
 src/views/hospital/LotteryDialog.vue          | 16 +++---
 src/views/hospital/SignInDialog.vue           | 57 +++++++++++++------
 src/views/hospital/orders/OrderFormDialog.vue | 12 ++--
 src/views/hospital/orders/list.vue            |  2 +-
 src/views/hospital/points.vue                 |  2 +-
 10 files changed, 68 insertions(+), 41 deletions(-)

diff --git a/src/components/layout/AdminLayout.vue b/src/components/layout/AdminLayout.vue
index 23daf09..846af1f 100644
--- a/src/components/layout/AdminLayout.vue
+++ b/src/components/layout/AdminLayout.vue
@@ -96,7 +96,7 @@
       :total-points="signInDialogStore.summary.totalPoints"
       :consecutive-sign-in-days="signInDialogStore.summary.consecutiveSignInDays"
       :sign-in-rank="signInDialogStore.summary.signInRank" :beat-percent="signInDialogStore.summary.beatPercent"
-      @success="onSignInDialogSuccess" />
+      :has-drawn="signInDialogStore.summary.isDraw" @success="onSignInDialogSuccess" />
 
     <!-- 全局奖励结果弹窗（抽奖/签到/提交工单 共用） -->
     <RewardResultDialog />
diff --git a/src/main.js b/src/main.js
index 94288aa..e136a5c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,3 +1,4 @@
+
 import { createApp } from "vue";
 import App from "./App.vue";
 import router from "./router";
@@ -10,6 +11,7 @@ import "@/assets/style/reset.css";
 import "@/assets/style/index.scss";
 import "@/assets/style/common.scss";
 
+
 // SVG sprite 虚拟模块（必须引入才能注入 symbol）
 import "virtual:svg-icons-register";
 
diff --git a/src/service/request/index.js b/src/service/request/index.js
index b7b8397..6091243 100644
--- a/src/service/request/index.js
+++ b/src/service/request/index.js
@@ -61,8 +61,10 @@ class Request {
           if (!silent) ElMessage.error("无操作权限");
         } else if (status >= 500) {
           if (!silent) ElMessage.error("服务器内部错误");
+        }else {
+         ElMessage.error(error.response.data.message);
+         return Promise.reject(error);
         }
-        return Promise.reject(error);
       },
     );
   }
diff --git a/src/stores/signInDialog.js b/src/stores/signInDialog.js
index e424bc5..e5b7c41 100644
--- a/src/stores/signInDialog.js
+++ b/src/stores/signInDialog.js
@@ -21,6 +21,7 @@ export const useSignInDialogStore = defineStore("signInDialog", () => {
   // 透传给 SignInDialog 的字段（来自 /hospital/points 接口 summary）
   const summary = ref({
     isSignIn: false,
+    isDraw: false,
     totalPoints: 0,
     consecutiveSignInDays: 0,
     signInRank: 0,
@@ -54,6 +55,7 @@ export const useSignInDialogStore = defineStore("signInDialog", () => {
   const setSummary = (data) => {
     summary.value = {
       isSignIn: !!data?.isSignIn,
+      isDraw: !!data?.isDraw,
       totalPoints: Number(data?.totalPoints) || 0,
       consecutiveSignInDays: Number(data?.consecutiveSignInDays) || 0,
       signInRank: Number(data?.signInRank) || 0,
diff --git a/src/views/admin/hospitals/service.vue b/src/views/admin/hospitals/service.vue
index b367bf9..1af4ebe 100644
--- a/src/views/admin/hospitals/service.vue
+++ b/src/views/admin/hospitals/service.vue
@@ -41,10 +41,10 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="维保截止日期" width="140">
+        <el-table-column label="维保截止日期" width="120">
           <template #default="{ row }">{{ formatDate(row.maintenanceEnd) }}</template>
         </el-table-column>
-        <el-table-column prop="managerName" label="客户经理" width="110" show-overflow-tooltip />
+        <el-table-column prop="managerName" label="客户经理" width="80" show-overflow-tooltip />
         <el-table-column label="续保完成" width="90" align="center">
           <template #default="{ row }">
             <img style="width:16px;height:16px;" v-if="row.renewal === 'no'" src="@/assets/image/admin/orders/no.svg"
@@ -77,7 +77,7 @@
               alt="">
           </template>
         </el-table-column>
-        <el-table-column label="服务操作" min-width="320" class-name="op-cell">
+        <el-table-column label="服务操作" min-width="415" class-name="op-cell">
           <template #default="{ row }">
             <div class="op-buttons">
               <el-button class="op-btn" plain @click="openRecord(row, 'call')">
@@ -357,7 +357,7 @@ onMounted(() => {
   .op-buttons {
     display: flex;
     flex-wrap: nowrap;
-    gap: 10px;
+    gap: 5px;
   }
 
   .op-btn {
@@ -370,7 +370,7 @@ onMounted(() => {
     line-height: 18px;
     background: #fff;
     font-weight: 400;
-    padding: 5px 10px;
+    padding: 6px 10px !important;
     margin: 0;
 
     .el-icon {
diff --git a/src/views/hospital/LotteryDialog.vue b/src/views/hospital/LotteryDialog.vue
index 12a5148..66eb708 100644
--- a/src/views/hospital/LotteryDialog.vue
+++ b/src/views/hospital/LotteryDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :model-value="modelValue" @update:model-value="onDialogUpdate" :show-close="false"
-    :close-on-click-modal="true" width="420px" align-center append-to-body class="lottery-dialog" @closed="onClosed">
+    :close-on-click-modal="true" align-center append-to-body class="lottery-dialog" @closed="onClosed">
     <div class="lottery-main">
       <div class="lottery-header">
         <h2 class="lottery-title">积分抽奖</h2>
@@ -236,13 +236,13 @@ const onClosed = () => {
 /* ============ 所有样式都嵌套在 .lottery-dialog 下 ============ */
 .lottery-dialog {
   // ===== 弹窗外壳 =====
-  overflow: hidden;
-  padding: 0;
-  width: 638px;
-  height: 766px;
-  background: transparent;
-  box-shadow: none;
-  transform: scale(0.75);
+  overflow: hidden !important;
+  padding: 0 !important;
+  width: 638px !important;
+  height: 766px !important;
+  background: transparent !important;
+  box-shadow: none !important;
+  transform: scale(0.75) !important;
 
 
   .el-dialog__header {
diff --git a/src/views/hospital/SignInDialog.vue b/src/views/hospital/SignInDialog.vue
index 39d0afa..0d34621 100644
--- a/src/views/hospital/SignInDialog.vue
+++ b/src/views/hospital/SignInDialog.vue
@@ -64,6 +64,15 @@
       </div>
     </div>
   </el-dialog>
+
+  <!-- 签到成功 → 今日未抽奖则弹出抽奖弹窗(抽过则不再弹,避免重复打扰) -->
+  <LotteryDialog
+    v-model="lotteryVisible"
+    :drawable="!hasDrawn"
+    :batch-goal="500"
+    :batch-current="0"
+    @success="onLotterySuccess"
+  />
 </template>
 
 <script setup>
@@ -73,6 +82,7 @@ import { ElMessage } from "element-plus";
 import { signIn, getPoints } from "@/service/modular/hospital";
 import { useSignInDialogStore } from "@/stores/signInDialog";
 import { useRewardResultStore } from "@/stores/rewardResult";
+import LotteryDialog from "@/views/hospital/LotteryDialog.vue";
 import checkIcon from "@/assets/image/hospital/ponits/coin.svg";
 import iconSign from "@/assets/image/hospital/ponits/icon-sign-large.svg";
 
@@ -88,6 +98,8 @@ const props = defineProps({
   signInRank: { type: Number, default: 0 },
   // 击败医院百分比 0-100，0 表示未上榜（接口字段：beatPercent）
   beatPercent: { type: Number, default: 0 },
+  // 今日是否已抽奖(来自 summary.isDraw)；未抽过奖时签到成功会顺带弹抽奖
+  hasDrawn: { type: Boolean, default: false },
 });
 
 const emit = defineEmits(["update:modelValue", "success"]);
@@ -144,6 +156,7 @@ watch(
 );
 
 const submitting = ref(false);
+const lotteryVisible = ref(false);
 const signInDialogStore = useSignInDialogStore();
 const rewardResultStore = useRewardResultStore();
 
@@ -156,7 +169,7 @@ const onClosed = () => {
   submitting.value = false;
 };
 
-// 取最新积分（用于结果区进度条）
+// 取最新积分（用于签到成功结果区进度条）
 const fetchLatestPoints = async () => {
   try {
     const res = unwrap(await getPoints());
@@ -166,6 +179,11 @@ const fetchLatestPoints = async () => {
   }
 };
 
+// 抽奖成功后：刷新 summary(让 hasDrawn/isDraw 等状态同步)
+const onLotterySuccess = async () => {
+  await signInDialogStore.refreshSummary();
+};
+
 // ============ 签到 ============
 const handleSignIn = async () => {
   if (props.signedIn) {
@@ -179,21 +197,26 @@ const handleSignIn = async () => {
     // 重新生成 7 天(刷新签到状态)
     days.value = buildSignInDays(props.consecutiveSignInDays, props.signedIn);
 
-    // 取最新积分 + 关闭签到弹窗 + 打开全局奖励结果弹窗
+    // 取最新积分,用于签到成功结果区进度条 / 后续场景
     const totalPoints = await fetchLatestPoints();
 
-    // 先关闭签到弹窗(在父层),再下一帧 open 全局结果
+    // 先关闭签到弹窗(在父层),再下一帧按是否抽过奖选择弹哪个反馈
     emit("update:modelValue", false);
-
     setTimeout(() => {
-      rewardResultStore.open({
-        title: "签到成功",
-        icon: iconSign,
-        points: 1,
-        batchGoal: 500,
-        batchCurrent: totalPoints,
-        rewardName: "康小虎 AI 吉祥物",
-      });
+      if (!props.hasDrawn) {
+        // 未抽过奖 → 弹抽奖弹窗(抽完后内部会自己弹奖励结果)
+        lotteryVisible.value = true;
+      } else {
+        // 已抽过奖 → 弹签到成功的奖励结果(原注释里那块的复用)
+        // rewardResultStore.open({
+        //   title: "签到成功",
+        //   icon: iconSign,
+        //   points: 1,
+        //   batchGoal: 500,
+        //   batchCurrent: totalPoints,
+        //   rewardName: "康小虎 AI 吉祥物",
+        // });
+      }
     }, 100);
 
     // 通知外层 signInDialogStore 触发 onSigned 回调(同步刷新 summary)
@@ -211,11 +234,11 @@ const handleSignIn = async () => {
 <style lang="scss">
 /* ============ 所有样式都嵌套在 .signin-dialog 下 ============ */
 .signin-dialog {
-  min-width: 502px;
-  padding: 0;
-  background: transparent;
-  box-shadow: none;
-  overflow: hidden;
+  min-width: 502px !important;
+  padding: 0 !important;
+  background: transparent !important;
+  box-shadow: none !important;
+  overflow: hidden !important;
 
   .el-dialog__header {
     display: none;
diff --git a/src/views/hospital/orders/OrderFormDialog.vue b/src/views/hospital/orders/OrderFormDialog.vue
index c1f6323..9152aef 100644
--- a/src/views/hospital/orders/OrderFormDialog.vue
+++ b/src/views/hospital/orders/OrderFormDialog.vue
@@ -12,8 +12,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item :label="$t('label.type')" prop="serviceType">
-              <el-select v-model="form.serviceType" :placeholder="$t('placeholder.type')" clearable
-                style="width: 100%">
+              <el-select v-model="form.serviceType" :placeholder="$t('placeholder.type')" clearable style="width: 100%">
                 <el-option label="故障报修" value="故障报修" />
                 <el-option label="业务咨询" value="业务咨询" />
                 <el-option label="需求变更" value="需求变更" />
@@ -58,11 +57,10 @@
         <!-- 标题 + 颜色标签 + 优先级 同一行 -->
         <el-form-item :label="$t('label.title')" prop="title">
           <div class="title-row">
-            <el-input v-model="form.title" :placeholder="$t('placeholder.title')" maxlength="300"
-              class="title-input">
+            <el-input v-model="form.title" :placeholder="$t('placeholder.title')" maxlength="300" class="title-input">
               <template #suffix>
                 <span class="title-counter"><span :style="{ color: form.colorTag || '#dcdfe6' }">{{ form.title.length
-                }}</span>/300</span>
+                    }}</span>/300</span>
                 <el-popover v-model:visible="colorPickerVisible" :width="180" placement="bottom-end" trigger="click"
                   :show-arrow="false" popper-class="color-tag-popper">
                   <template #reference>
@@ -108,8 +106,7 @@
         </el-form-item>
         <el-form-item class="fujian" :label="$t('label.attachment')">
           <el-upload class="upload-wrap" v-model:file-list="form.files" :auto-upload="false" :limit="1"
-            :on-exceed="handleAttachmentExceed" :on-remove="handleAttachmentRemove"
-            :on-change="handleAttachmentChange">
+            :on-exceed="handleAttachmentExceed" :on-remove="handleAttachmentRemove" :on-change="handleAttachmentChange">
             <div class="upload-btn">
               <div class="left">+ 添加文件</div>
               <div class="right">{{ $t('label.attachmentTip') }}</div>
@@ -689,6 +686,7 @@ onBeforeUnmount(() => {
 
 <style lang="scss">
 .hospital-order-form-dialog {
+  max-width: 90vw;
   width: 1168px;
   overflow: visible;
 
diff --git a/src/views/hospital/orders/list.vue b/src/views/hospital/orders/list.vue
index 4cf1fc2..e5d2c01 100644
--- a/src/views/hospital/orders/list.vue
+++ b/src/views/hospital/orders/list.vue
@@ -384,7 +384,7 @@ onBeforeUnmount(() => {
   flex-wrap: wrap;
   gap: 12px;
   align-items: center;
-  width: 1800px;
+  width: 100%;
 
   :deep(.el-form-item),
   :deep(.el-button) {
diff --git a/src/views/hospital/points.vue b/src/views/hospital/points.vue
index 5accb70..c8215e9 100644
--- a/src/views/hospital/points.vue
+++ b/src/views/hospital/points.vue
@@ -62,7 +62,7 @@
           <img src="@/assets/image/hospital/ponits/gift-bear.svg" class="reward-img" alt="" />
           <div class="reward-text">
             <div class="name">{{ REWARD_NAME }}</div>
-            <div class="desc">赚徽章·智聊语音互动</div>
+            <div class="desc">限量款 · 智能语音互动</div>
           </div>
           <button class="exchange-btn" :class="{ active: canExchange }" :disabled="!canExchange"
             @click="openExchangeModal">