diff --git a/.env b/.env
index 8a9742f..235df28 100644
--- a/.env
+++ b/.env
@@ -20,8 +20,8 @@ VITE_OAUTH2_APP_CLIENT='mini:mini'
# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api # 域名线上
#VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
# VITE_APP_DEV_SERVICE = http://192.168.101.174:9999 # 邓-本地
-#VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # 邓-本地
-VITE_APP_DEV_SERVICE = http://123.157.250.162:8089/api # 测试线上
+VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # 邓-本地
+# VITE_APP_DEV_SERVICE = http://123.157.250.162:8089/api # 测试线上
# --------------------------- 开发环境 图片访问基础地址 ---------------------------
# VITE_IMAGE_DEV_PATH = https://stgl.pj.gov.cn/api # 域名线上
diff --git a/package.json b/package.json
index ea80943..c9270c2 100644
--- a/package.json
+++ b/package.json
@@ -90,4 +90,4 @@
"vite": "5.2.8",
"vue-tsc": "^1.0.24"
}
-}
+}
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 667f094..3466a14 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -706,4 +706,4 @@
}
]
}
-}
+}
\ No newline at end of file
diff --git a/src/pages/cabinet/openDoor.vue b/src/pages/cabinet/openDoor.vue
index 1cc225d..8f222d9 100644
--- a/src/pages/cabinet/openDoor.vue
+++ b/src/pages/cabinet/openDoor.vue
@@ -1,23 +1,18 @@
-
+ }" @change="payMethodTabChange" />
-
+
{{ state.isUseDoorTip }}
去充值
@@ -55,18 +50,8 @@
-
+
{{ state.authDesc }}
@@ -147,7 +132,7 @@ const openDoor = async () => {
}
// 支付方式tab改变
-const payMethodTabChange = (e: number) => {}
+const payMethodTabChange = (e: number) => { }
// 确认或拒绝协议
const appAuthHardDoor = async (type: 1 | 0) => {
diff --git a/src/pages/integrated/notice/detail.vue b/src/pages/integrated/notice/detail.vue
index 0bdfd17..6f836d6 100644
--- a/src/pages/integrated/notice/detail.vue
+++ b/src/pages/integrated/notice/detail.vue
@@ -6,7 +6,8 @@
{{ detail.title }}
-
+ {{ getTypeLabel(detail.type)
+ }}
{{ formatTime(detail.createTime) }}
浏览 {{ detail.viewCount }}
@@ -18,7 +19,8 @@
附件
-
+
{{ file.name }}
{{ formatFileSize(file.size) }}
@@ -30,21 +32,33 @@
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 8bcc75f..619d2cf 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -2,13 +2,10 @@
-
-
+
+
{{ state.userInfo?.sysUser?.name }}
ID {{ state.userInfo?.sysUser?.userId }}
@@ -21,7 +18,8 @@
-
+
{{ v.text }}
@@ -31,13 +29,15 @@
-
+
退出登录
-
+
切换角色
@@ -50,7 +50,8 @@
-
+
是否核销该活动兑换券？
确认核销将自动对用户的 消费钱包 扣费
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index 198279f..2de54ce 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -48,14 +48,14 @@ const pageHook = hooks.usePage(
getLaunchParam() == "canteen" // 食堂
? orderApi.caneenPage
: getLaunchParam() == "selfMerchant"
- ? orderApi.supPage
- : getLaunchParam() == "coopMerchant"
- ? orderApi.supPage
- : getLaunchParam() == "onlineShop"
- ? orderApi.supPage
- : getLaunchParam() == "prosperityShop"
- ? orderApi.farmerSpuPage
- : async () => [],
+ ? orderApi.supPage
+ : getLaunchParam() == "coopMerchant"
+ ? orderApi.supPage
+ : getLaunchParam() == "onlineShop"
+ ? orderApi.supPage
+ : getLaunchParam() == "prosperityShop"
+ ? orderApi.farmerSpuPage
+ : async () => [],
null,
"data.records",
)
@@ -71,7 +71,7 @@ const doToDetail = (v: any) => {
router.jump("/pages/order/detail", { id: v.id })
}
-const doAppraise = () => {}
+const doAppraise = () => { }
const doRefund = (v: any) => {
router.jump("/pages/refund/apply", { id: v.id })
@@ -80,20 +80,9 @@ const doRefund = (v: any) => {
-
+
@@ -116,15 +105,15 @@ const doRefund = (v: any) => {
下单时间
- {{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
+ {{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}")
+ }}
{{ hooks.useEnum("hardwareRefundStatusEnum", v.refundStatus) }}
+ class="second-text-30 mr-2">
共 {{ v.carList.length }} 件
¥ {{ hooks.useMoney(v.totalPrice) }}
@@ -135,12 +124,16 @@ const doRefund = (v: any) => {
-
-
+
+
-
-
+
+
{{ pV.productName }}
@@ -158,7 +151,8 @@ const doRefund = (v: any) => {
-
+
核销码
diff --git a/src/pages/wallet/list.vue b/src/pages/wallet/list.vue
index 7b628ec..69c1eaf 100644
--- a/src/pages/wallet/list.vue
+++ b/src/pages/wallet/list.vue
@@ -29,7 +29,7 @@ const freezeForm = reactive({
remark: "",
})
-onLoad(() => {})
+onLoad(() => { })
onShow(async () => {
const isLogin = await hooks.useCheckLogin()
if (!isLogin) return
@@ -140,35 +140,22 @@ const doTransferMoney = (v: any) => {
-
+
-
+
卡号: {{ v.cardNumber }}
-
-
+
+
@@ -191,14 +178,12 @@ const doTransferMoney = (v: any) => {
转账
-
+
申请冻结
-
+
去充值
@@ -206,15 +191,8 @@ const doTransferMoney = (v: any) => {
-
+
@@ -224,15 +202,8 @@ const doTransferMoney = (v: any) => {
绑定
-
+
@@ -242,15 +213,8 @@ const doTransferMoney = (v: any) => {
冻结
-
+
diff --git a/src/sheep/api/act-com.ts b/src/sheep/api/act-com.ts
new file mode 100644
index 0000000..bfadc71
--- /dev/null
+++ b/src/sheep/api/act-com.ts
@@ -0,0 +1,31 @@
+import request from "@/sheep/utils/request"
+
+export default {
+ /**
+ * 根据公告id查询对应的活动
+ */
+ getActByNotifyId: (params: any) =>
+ request({
+ url: "/wallet/act/com/app/get-act-by-notify-id",
+ method: "GET",
+ params,
+ }),
+ /**
+ * 获取活动详情
+ */
+ getActDetail: (params: any) =>
+ request({
+ url: "/wallet/act/com/app/get-act-detail",
+ method: "GET",
+ params,
+ }),
+ /**
+ * 判断用户是否可以参加活动
+ */
+ isEligibleForAct: (params: any) =>
+ request({
+ url: "/wallet/act/com/app/is-eligible-for-act",
+ method: "GET",
+ params,
+ }),
+}
diff --git a/src/sheep/api/act-coupon.ts b/src/sheep/api/act-coupon.ts
new file mode 100644
index 0000000..d6c402c
--- /dev/null
+++ b/src/sheep/api/act-coupon.ts
@@ -0,0 +1,13 @@
+import request from "@/sheep/utils/request"
+
+export default {
+ /**
+ * 领取优惠券
+ */
+ receive: (data: any) =>
+ request({
+ url: "/wallet/act-coupon-record/app/receive",
+ method: "POST",
+ data,
+ }),
+}
diff --git a/src/sheep/api/index.ts b/src/sheep/api/index.ts
index bd1f641..adefe95 100644
--- a/src/sheep/api/index.ts
+++ b/src/sheep/api/index.ts
@@ -1,4 +1,6 @@
export { default as actCancel } from "./act-cancel"
+export { default as actComApi } from "./act-com"
+export { default as actCouponApi } from "./act-coupon"
export { default as applyApi } from "./apply"
diff --git a/src/sheep/components/verifyDeviceImpModel/verifyDeviceImpModel.ts b/src/sheep/components/verifyDeviceImpModel/verifyDeviceImpModel.ts
index e2a25d8..29d3b00 100644
--- a/src/sheep/components/verifyDeviceImpModel/verifyDeviceImpModel.ts
+++ b/src/sheep/components/verifyDeviceImpModel/verifyDeviceImpModel.ts
@@ -1,3 +1,4 @@
+// #ifdef WEB
import { h, render } from "vue"
import VerifyDeviceImpModel from "./verify-device-imp-model.vue"
@@ -24,3 +25,9 @@ const showVerifyDeviceImpModel = (onClose: () => any = () => null) => {
}
export default showVerifyDeviceImpModel
+// #endif
+
+// #ifndef WEB
+const showVerifyDeviceImpModel = (onClose: () => any = () => null) => {}
+export default showVerifyDeviceImpModel
+// #endif
diff --git a/src/sheep/constant/service-enum.ts b/src/sheep/constant/service-enum.ts
index 1bde5f7..aaed80b 100644
--- a/src/sheep/constant/service-enum.ts
+++ b/src/sheep/constant/service-enum.ts
@@ -55,6 +55,32 @@ const actCancelStatusEnum = {
"3": "已过期",
}
+const actCouponLimitTypeEnum = {
+ "1": "活动期间一次",
+ "2": "每天",
+ "3": "每周",
+ "4": "每月",
+ "5": "每年",
+}
+
+const actCouponTypeEnum = {
+ "1": "满减券",
+ "2": "折扣券",
+ "3": "立减券",
+ "4": "兑换券",
+}
+
+// 用户活动状态
+const actUserReceiveEnum = {
+ "1": "活动不在进行中",
+ "2": "活动不存在",
+ "3": "活动未开启",
+ "4": "用户参加活动已达上限",
+ "5": "用户不能参加此活动",
+ "6": "其他错误",
+ "99": "用户可以参加活动",
+}
+
export default {
hardwareOrderStatusEnum,
hardwareOrderTypeEnum,
@@ -64,4 +90,7 @@ export default {
hardwareRefundStatusEnum,
carTypeEnum,
actCancelStatusEnum,
+ actCouponLimitTypeEnum,
+ actCouponTypeEnum,
+ actUserReceiveEnum,
}
diff --git a/unocss.config.ts b/unocss.config.ts
index e16d390..94e1092 100644
--- a/unocss.config.ts
+++ b/unocss.config.ts
@@ -1,103 +1,102 @@
-import presetWeapp from "unocss-preset-weapp";
-import {
- extractorAttributify,
- transformerClass,
-} from "unocss-preset-weapp/transformer";
+import { defineConfig } from "unocss"
+import { presetWeapp } from "unocss-preset-weapp"
+import { extractorAttributify, transformerClass } from "unocss-preset-weapp/transformer"
-const { presetWeappAttributify, transformerAttributify } =
- extractorAttributify();
+const { presetWeappAttributify, transformerAttributify } = extractorAttributify()
export default {
- presets: [
- presetWeapp({
- whRpx: true,
- }),
- presetWeappAttributify(),
- ],
- shortcuts: [
- {
- "border-base": "border border-gray-500_10",
- "flex-col-center": "flex flex-col justify-center items-center",
- "flex-row-center": "flex flex-row justify-center items-center",
- "flex-col": "flex flex-col",
- "flex-row": "flex flex-row",
- },
- ],
- theme: {
- colors: {
- blue: {
- DEFAULT: "#0094ff",
- },
- red: {
- DEFAULT: "#f63a36",
- },
- yellow: {
- DEFAULT: "#F2A817",
- },
- },
- },
- rules: [
- [
- /^main-text-(\d+)$/,
- ([, d]) => ({
- "font-size": `${d}rpx`,
- "font-weight": 800,
- color: "#000",
- "line-height": `1.4em`,
- }),
- ],
- [
- /^sub-text-(\d+)$/,
- ([, d]) => ({
- "font-size": `${d}rpx`,
- "font-weight": 500,
- color: "#333",
- "line-height": `1.4em`,
- }),
- ],
- [
- /^second-text-(\d+)$/,
- ([, d]) => ({
- "font-size": `${d}rpx`,
- "font-weight": 500,
- color: "#999",
- "line-height": `1.4em`,
- }),
- ],
- [
- "card",
- {
- "background-color": "white",
- "box-shadow": "0rpx 8rpx 26rpx -4rpx rgba(210,210,210,0.5)",
- "border-radius": "16rpx",
- },
- ],
- [
- "shadow-main",
- {
- "box-shadow": "0rpx 0rpx 4rpx 0rpx rgba(0, 0, 0, 0.1)",
- },
- ],
- [
- /^show-line$/,
- ([, d]) => ({
- overflow: "hidden",
- "white-space": "nowrap",
- "text-overflow": "ellipsis",
- }),
- ],
- [
- /^show-line-(\d+)$/,
- ([, d]) => ({
- display: "-webkit-box !important",
- overflow: "hidden",
- "text-overflow": "ellipsis !important",
- "word-break": "break-all",
- "-webkit-line-clamp": d,
- "-webkit-box-orient": "vertical !important",
- }),
- ],
- ],
-
- transformers: [transformerAttributify(), transformerClass()],
-};
+ content: {
+ filesystem: ["src/**/*.{vue,js,ts,jsx,tsx}"],
+ },
+ presets: [
+ presetWeapp({
+ whRpx: true,
+ }),
+ presetWeappAttributify(),
+ ],
+ transformers: [transformerAttributify(), transformerClass()],
+ shortcuts: [
+ {
+ "border-base": "border border-gray-500_10",
+ "flex-col-center": "flex flex-col justify-center items-center",
+ "flex-row-center": "flex flex-row justify-center items-center",
+ "flex-col": "flex flex-col",
+ "flex-row": "flex flex-row",
+ },
+ ],
+ theme: {
+ colors: {
+ blue: {
+ DEFAULT: "#0094ff",
+ },
+ red: {
+ DEFAULT: "#f63a36",
+ },
+ yellow: {
+ DEFAULT: "#F2A817",
+ },
+ },
+ },
+ rules: [
+ [
+ /^main-text-(\d+)$/,
+ ([, d]) => ({
+ "font-size": `${d}rpx`,
+ "font-weight": 800,
+ color: "#000",
+ "line-height": `1.4em`,
+ }),
+ ],
+ [
+ /^sub-text-(\d+)$/,
+ ([, d]) => ({
+ "font-size": `${d}rpx`,
+ "font-weight": 500,
+ color: "#333",
+ "line-height": `1.4em`,
+ }),
+ ],
+ [
+ /^second-text-(\d+)$/,
+ ([, d]) => ({
+ "font-size": `${d}rpx`,
+ "font-weight": 500,
+ color: "#999",
+ "line-height": `1.4em`,
+ }),
+ ],
+ [
+ "card",
+ {
+ "background-color": "white",
+ "box-shadow": "0rpx 8rpx 26rpx -4rpx rgba(210,210,210,0.5)",
+ "border-radius": "16rpx",
+ },
+ ],
+ [
+ "shadow-main",
+ {
+ "box-shadow": "0rpx 0rpx 4rpx 0rpx rgba(0, 0, 0, 0.1)",
+ },
+ ],
+ [
+ /^show-line$/,
+ ([, d]) => ({
+ overflow: "hidden",
+ "white-space": "nowrap",
+ "text-overflow": "ellipsis",
+ }),
+ ],
+ [
+ /^show-line-(\d+)$/,
+ ([, d]) => ({
+ display: "-webkit-box !important",
+ overflow: "hidden",
+ "text-overflow": "ellipsis !important",
+ "word-break": "break-all",
+ "-webkit-line-clamp": d,
+ "-webkit-box-orient": "vertical !important",
+ }),
+ ],
+ ],
+}