From 7dec9973c30deb675581a0f82e6a38da7cce6014 Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Mon, 20 Jan 2025 16:15:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=92=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WelfareCommonController.java   |   3 +
 .../components/welfare/CourierNumberInfo.vue  | 142 +++++++++---------
 .../views/mobile/welfare/mine/myWelfare.html  |   7 +-
 .../views/platform/welfare/mine.html          |   4 +-
 4 files changed, 81 insertions(+), 75 deletions(-)

diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareCommonController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareCommonController.java
index 218a476..fdd2134 100644
--- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareCommonController.java
+++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareCommonController.java
@@ -610,6 +610,9 @@ public class WelfareCommonController {
     public Object courierNumberInfo(String welfareId, String userId) {
         //查询的时候去触发福利最新信息
         List<WelfareCourierNumber> welfareCourierNumberList = dao.query(WelfareCourierNumber.class, Cnd.where("welfareId", "=", welfareId).and("selectUserId", "=", userId));
+        if (Lang.isEmpty(welfareCourierNumberList)) {
+            return Result.error("未获取到您的快递单号，请耐心等待管理员录入");
+        }
         for (WelfareCourierNumber courierNumber : welfareCourierNumberList) {
             //如果有上次查询的时间
 
diff --git a/src/main/resources/static/components/welfare/CourierNumberInfo.vue b/src/main/resources/static/components/welfare/CourierNumberInfo.vue
index d480422..65c0c4a 100644
--- a/src/main/resources/static/components/welfare/CourierNumberInfo.vue
+++ b/src/main/resources/static/components/welfare/CourierNumberInfo.vue
@@ -1,84 +1,84 @@
 <template>
-  <el-dialog title="快递物流信息" width="60%" :visible.sync="dialogVisible" :append-to-body="true"
-             top="50px">
-    <el-tabs v-model="activeName" v-loading="loading">
-      <el-tab-pane v-for="(v,k) in courierNumberInfoData"
-                   :label="k"
-                   :key="k"
-                   :name="k">
-        <div style="height: 600px;overflow-y: auto">
-          <div class="alert alert-info" v-if="v.length>1">
-            <strong>此套餐有多个快递单号</strong>
-          </div>
+    <el-dialog title="快递物流信息" width="60%" :visible.sync="dialogVisible" :append-to-body="true"
+               top="50px">
+        <el-tabs v-model="activeName" v-loading="loading">
+            <el-tab-pane v-for="(v,k) in courierNumberInfoData"
+                         :label="k"
+                         :key="k"
+                         :name="k">
+                <div style="height: 600px;overflow-y: auto">
+                    <div class="alert alert-info" v-if="v.length>1">
+                        <strong>此套餐有多个快递单号</strong>
+                    </div>
 
-          <template v-for="item in v" :key="item.courierNumber">
-            <div class="alert alert-info">
-              <strong>快递单号</strong>
-              {{ item.courierNumber || '暂无' }}
-            </div>
+                    <template v-for="item in v" :key="item.courierNumber">
+                        <div class="alert alert-info">
+                            <strong>快递单号</strong>
+                            {{ item.courierNumber || "暂无" }}
+                        </div>
 
-            <div>
-              <el-timeline reverse="true"
-                           v-if="item.logisticsTrace && item.logisticsTrace.logisticsTraceDetailList">
-                <el-timeline-item
-                    :color="timeline.color"
-                    :key="timelineIndex"
-                    :timestamp="moment(timeline.time).format('YYYY-MM-DD HH:mm:ss')"
-                    v-for="(timeline, timelineIndex) in item.logisticsTrace.logisticsTraceDetailList">
-                  {{ timeline.desc }}
-                </el-timeline-item>
-              </el-timeline>
-              <div v-else>
-                <el-empty description="暂无物流信息"></el-empty>
-              </div>
-            </div>
-          </template>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-  </el-dialog>
+                        <div>
+                            <el-timeline reverse="true"
+                                         v-if="item.logisticsTrace && item.logisticsTrace.logisticsTraceDetailList">
+                                <el-timeline-item
+                                    :color="timeline.color"
+                                    :key="timelineIndex"
+                                    :timestamp="moment(timeline.time).format('YYYY-MM-DD HH:mm:ss')"
+                                    v-for="(timeline, timelineIndex) in item.logisticsTrace.logisticsTraceDetailList">
+                                    {{ timeline.desc }}
+                                </el-timeline-item>
+                            </el-timeline>
+                            <div v-else>
+                                <el-empty description="暂无物流信息"></el-empty>
+                            </div>
+                        </div>
+                    </template>
+                </div>
+            </el-tab-pane>
+        </el-tabs>
+    </el-dialog>
 </template>
 
 <script>
 module.exports = {
-  name: "CourierNumberInfo",
-  props: {},
-  data() {
-    return {
-      dialogVisible: false,
-      courierNumberInfoData: [],
-      activeName: null,
-      loading: true
-    }
-  },
-  methods: {
-    async openView(welfareId, userId) {
-      this.dialogVisible = true
-      this.loading = true
-      const {
-        code,
-        data,
-        msg
-      } = await $.get('/platform/welfare/common/courierNumberInfo', {welfareId, userId})
-      this.loading = false
-      if (code === 0) {
-        if (data == null || data.length === 0) {
-          this.dialogVisible = false
-          this.$message.warning('您还没有选择福利套餐')
-          return
+    name: "CourierNumberInfo",
+    props: {},
+    data() {
+        return {
+            dialogVisible: false,
+            courierNumberInfoData: [],
+            activeName: null,
+            loading: true
         }
-        this.courierNumberInfoData = data
-        const keys = Object.keys(this.courierNumberInfoData)
-        this.activeName = keys && keys[0]
+    },
+    methods: {
+        async openView(welfareId, userId) {
+            this.loading = true
+            const {
+                code,
+                data,
+                msg
+            } = await $.get("/platform/welfare/common/courierNumberInfo", { welfareId, userId })
+            this.loading = false
+            if (code === 0) {
+                if (data == null || data.length === 0) {
+                    this.dialogVisible = false
+                    this.$message.warning("您还没有选择福利套餐")
+                    return
+                }
+                this.dialogVisible = true
+                this.courierNumberInfoData = data
+                const keys = Object.keys(this.courierNumberInfoData)
+                this.activeName = keys && keys[0]
+
+            } else {
+                this.$message.warning(msg)
+            }
+        }
+    },
+    created() {
 
-      } else {
-        this.$message.warning(msg)
-      }
     }
-  },
-  created() {
-
-  }
 }
 </script>
 
diff --git a/src/main/resources/views/mobile/welfare/mine/myWelfare.html b/src/main/resources/views/mobile/welfare/mine/myWelfare.html
index 72457ef..4b0836e 100644
--- a/src/main/resources/views/mobile/welfare/mine/myWelfare.html
+++ b/src/main/resources/views/mobile/welfare/mine/myWelfare.html
@@ -508,7 +508,7 @@ layout("/mobile/platform.html"){
                     })
                     this.logisticsTrace = resp.data
                 } else {
-                    this.$message.error(resp.msg);
+                    this.$toast.msgError(resp.msg);
                 }
             },
 
@@ -532,7 +532,10 @@ layout("/mobile/platform.html"){
                     this.activeName = this.optionCourierNumberInfo[keys[0]][0].courierNumber
                     this.courierNumberShow = true
                 } else {
-                    this.$modal.msgError(msg)
+                    vant.Dialog.alert({
+                        title: '提示',
+                        message: msg
+                    });
                 }
 
             },
diff --git a/src/main/resources/views/platform/welfare/mine.html b/src/main/resources/views/platform/welfare/mine.html
index bd3f6b6..8a7d057 100644
--- a/src/main/resources/views/platform/welfare/mine.html
+++ b/src/main/resources/views/platform/welfare/mine.html
@@ -126,11 +126,11 @@ layout("/layouts/platform.html"){
                             <el-button @click="openView(row)" size="mini" type="primary">
                                 查看
                             </el-button>
-                            <el-button :disabled="!row.courierNumber" @click="openExpress(row)"
+                            <!--<el-button :disabled="!row.courierNumber" @click="openExpress(row)"
                                        size="mini"
                                        type="primary">
                                 查看物流
-                            </el-button>
+                            </el-button>-->
                             <el-button :disabled="!row.courierNumber" @click="openEvaluate(row)"
                                        size="mini"
                                        type="primary">