From 38d547d91d7eee81ed56ca6ceba7fd393952a082 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 12 May 2025 16:12:15 +0800
Subject: [PATCH] feat(sign): 增加签到获得会员经验或积分的功能 - 在 ApiSignVo 中添加 mostSignIn 字段，用于区分签到获得的类型 - 在 ScoreFlowTypeEnum 中新增 SIGN_EXPERIENCE 和 SIGN_SCORE 类型 - 修改 ScoreServiceImpl 中的签到逻辑，支持获得会员经验和积分 - 更新 ScoreSettingDto，添加 mostSignIn 字段用于配置签到获得类型 - 在前端设置页面添加签到获得类型的选项
---
src/main/resources/templates/febs/views/modules/order/orderDetail.html | 57 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/order/orderDetail.html b/src/main/resources/templates/febs/views/modules/order/orderDetail.html
index 0348849..a65cd5b 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderDetail.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderDetail.html
@@ -39,13 +39,20 @@
</div>
</div>
</div>
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">地址：</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input type="text" name="address"-->
-<!-- autocomplete="off" class="layui-input" readonly>-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label">地区：</label>
+ <div class="layui-input-block">
+ <input type="text" name="address"
+ autocomplete="off" class="layui-input" readonly>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">地址：</label>
+ <div class="layui-input-block">
+ <input type="text" name="addressInfo"
+ autocomplete="off" class="layui-input" readonly>
+ </div>
+ </div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">支付订单号：</label>-->
<!-- <div class="layui-input-block">-->
@@ -74,20 +81,20 @@
<textarea id="lay_edit" lay-verify="orderItems" name = "orderItems" class="layui-textarea" readonly></textarea>
</div>
</div>
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">物流单号：</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input type="text" name="expressNo"-->
-<!-- autocomplete="off" class="layui-input" readonly>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">物流公司：</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input type="text" name="expressCom"-->
-<!-- autocomplete="off" class="layui-input" readonly >-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label">物流单号：</label>
+ <div class="layui-input-block">
+ <input type="text" name="expressNo"
+ autocomplete="off" class="layui-input" readonly>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">物流公司：</label>
+ <div class="layui-input-block">
+ <input type="text" name="expressCom"
+ autocomplete="off" class="layui-input" readonly >
+ </div>
+ </div>
</form>
</div>
@@ -116,11 +123,13 @@
"phone": orderDetail.phone,
"amount": orderDetail.amount,
"orderItems": orderDetail.orderItems,
- // "expressNo": orderDetail.expressNo,
- // "expressCom": orderDetail.expressCom,
+ "addressArea": orderDetail.addressArea,
+ "addressInfo": orderDetail.addressInfo,
+ "expressNo": orderDetail.expressNo,
+ "expressCom": orderDetail.expressCom,
// "payImage": orderDetail.payImage,
// "payOrderNo": orderDetail.payOrderNo,
- // "address": orderDetail.address
+ "address": orderDetail.address
});
}
--
Gitblit v1.9.1