diff --git a/CatmDogd-Mall-Front-test/.env.development b/CatmDogd-Mall-Front-test/.env.development
index a25a7b7..d8a74eb 100644
--- a/CatmDogd-Mall-Front-test/.env.development
+++ b/CatmDogd-Mall-Front-test/.env.development
@@ -8,7 +8,7 @@ VUE_APP_TITLE = 下单伴宠师综合管理平台
# VUE_APP_BASE_API = 'https://api.catmdogd.com'
# VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api/'
# VUE_APP_BASE_API = 'http://h5.xzaiyp.top'
-VUE_APP_BASE_API = 'http://localhost:8080'
+VUE_APP_BASE_API = 'http://localhost:8002'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/CatmDogd-Mall-Front-test/.env.production b/CatmDogd-Mall-Front-test/.env.production
index 5d47529..9f707f2 100644
--- a/CatmDogd-Mall-Front-test/.env.production
+++ b/CatmDogd-Mall-Front-test/.env.production
@@ -5,6 +5,6 @@ VUE_APP_TITLE = 下单伴宠师综合管理平台
ENV = 'production'
# 若依管理系统/生产环境
-# VUE_APP_BASE_API = '/api'
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/api'
+# VUE_APP_BASE_API = '/prod-api'
VUE_APP_JUDGE_STAR = 0
diff --git a/CatmDogd-Mall-Front-test/src/api/model/AppletAmountLog.js b/CatmDogd-Mall-Front-test/src/api/model/AppletAmountLog.js
index 5250620..32d40d6 100644
--- a/CatmDogd-Mall-Front-test/src/api/model/AppletAmountLog.js
+++ b/CatmDogd-Mall-Front-test/src/api/model/AppletAmountLog.js
@@ -42,3 +42,21 @@ export function delAppletAmountLog(id) {
method: 'delete'
})
}
+
+// 导出金额明细
+export function exportAppletAmountLog(query) {
+ return request({
+ url: '/model/AppletAmountLog/export',
+ method: 'get',
+ params: query
+ })
+}
+
+// 审核金额明细
+export function auditAppletAmountLog(data) {
+ return request({
+ url: '/model/AppletAmountLog/audit',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/CatmDogd-Mall-Front-test/src/api/oms/omsOrderEvaluation.js b/CatmDogd-Mall-Front-test/src/api/oms/omsOrderEvaluation.js
new file mode 100644
index 0000000..65de866
--- /dev/null
+++ b/CatmDogd-Mall-Front-test/src/api/oms/omsOrderEvaluation.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询订单评价列表
+export function listOmsOrderEvaluation(query) {
+ return request({
+ url: '/model/omsOrderEvaluation/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询订单评价详细
+export function getOmsOrderEvaluation(id) {
+ return request({
+ url: '/model/omsOrderEvaluation/' + id,
+ method: 'get'
+ })
+}
+
+// 新增订单评价
+export function addOmsOrderEvaluation(data) {
+ return request({
+ url: '/model/omsOrderEvaluation',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改订单评价
+export function updateOmsOrderEvaluation(data) {
+ return request({
+ url: '/model/omsOrderEvaluation',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除订单评价
+export function delOmsOrderEvaluation(id) {
+ return request({
+ url: '/model/omsOrderEvaluation/' + id,
+ method: 'delete'
+ })
+}
+
+// 导出订单评价
+export function exportOmsOrderEvaluation(query) {
+ return request({
+ url: '/model/omsOrderEvaluation/export',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/CatmDogd-Mall-Front-test/src/views/marketing/wechatMemberCoupon/index.vue b/CatmDogd-Mall-Front-test/src/views/marketing/wechatMemberCoupon/index.vue
index feca8ce..2f26f2b 100644
--- a/CatmDogd-Mall-Front-test/src/views/marketing/wechatMemberCoupon/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/marketing/wechatMemberCoupon/index.vue
@@ -168,7 +168,11 @@
-
+
+
+ {{ getStockTypeName(scope.row.stockType) }}
+
+
@@ -192,7 +196,11 @@
{{ parseTime(scope.row.useTime, '')}}
-
+
+
+ {{ getCouponStateName(scope.row.couponState) }}
+
+
@@ -561,6 +569,30 @@ export default {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
+ },
+ /** 获取券类型中文名称 */
+ getStockTypeName(type) {
+ const map = {
+ 'NORMAL': '微信满减券',
+ 'DISCOUNT': '微信折扣券',
+ 'EXCHANGE': '微信换购券',
+ 'PNORMAL': '平台满减券',
+ 'PDISCOUNT': '平台折扣券',
+ 'PTRAIL': '平台体验券'
+ };
+ return map[type] || type;
+ },
+ /** 获取商家券状态中文名称 */
+ getCouponStateName(state) {
+ const map = {
+ 'UNUSED': '未使用',
+ 'USED': '已使用',
+ 'EXPIRED': '已过期',
+ 'CANCELLED': '已作废',
+ 'SENDING': '发放中',
+ 'SEND_FAILED': '发放失败'
+ };
+ return map[state] || state;
}
}
};
diff --git a/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue b/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue
index c22f07e..2d0fcc2 100644
--- a/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue
@@ -30,33 +30,33 @@
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -206,9 +206,9 @@
-
-
-
+
+
+
@@ -249,24 +249,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+