diff --git a/common/api/member.js b/common/api/member.js
index 72ffe14..9074f90 100644
--- a/common/api/member.js
+++ b/common/api/member.js
@@ -3,6 +3,7 @@ import request from '@/common/api/request.js'
const urlAccount = '/account'
const urlProduct = '/product'
const urlOrder = '/order'
+const urlMarket = '/market'
//桌码换取详细店铺信息
export const APIproductqueryShop = (data) => {
@@ -63,7 +64,7 @@ export const APIusershopInfodetail = (data) => {
//通过用户Id 查找优惠券
export const APIcouponfindByUserId = (data) => {
return request({
- url: urlAccount + '/user/coupon/findByUserId',
+ url: urlMarket + '/user/coupon/findByUserId',
method: 'get',
data: data
})
diff --git a/framework/0-conf.js b/framework/0-conf.js
index 48b02f2..6186f4e 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -5,16 +5,16 @@ const proxyApi = "/api"
// #endif
// #ifdef MP-WEIXIN || APP || MP-ALIPAY
-const proxyApi = 'http://192.168.1.31' // 调试地址
-const proxyApiwws = 'ws://192.168.1.31:2348' // 调试地址
+const proxyApi = 'http://192.168.0.71' // 调试地址
+const proxyApiwws = 'ws://192.168.0.71:2348' // 调试地址
// 测试
// const proxyApi = "https://fv901fw8033.vicp.fun"
// const proxyApiwws = 'wss://sockets.sxczgkj.com/wss'
// #endif
// #ifdef H5
-const baseUrl = debug ? proxyApi : "http://192.168.1.31"
-const baseUrlwws = 'ws://192.168.1.31:2348'
+const baseUrl = debug ? proxyApi : "http://192.168.0.71"
+const baseUrlwws = 'ws://192.168.0.71:2348'
// #endif
// #ifdef APP || MP-WEIXIN || MP-ALIPAY
diff --git a/pages.json b/pages.json
index f21abd6..235d5d2 100644
--- a/pages.json
+++ b/pages.json
@@ -163,24 +163,28 @@
}
},
{
- "path" : "pages/test/test",
- "style" :
- {
- "navigationBarTitleText" : ""
+ "path": "pages/test/test",
+ "style": {
+ "navigationBarTitleText": ""
}
},
{
- "path" : "pages/order/histpry-order/histpry-order",
- "style" :
- {
- "navigationBarTitleText" : ""
+ "path": "pages/order/histpry-order/histpry-order",
+ "style": {
+ "navigationBarTitleText": ""
}
},
{
- "path" : "pages/order/confirm-order",
- "style" :
- {
- "navigationBarTitleText" : "确认订单",
+ "path": "pages/order/confirm-order",
+ "style": {
+ "navigationBarTitleText": "确认订单",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/user/member/czzx",
+ "style": {
+ "navigationBarTitleText": "充值中心",
"navigationStyle": "custom"
}
}
diff --git a/pages/user/coupon.vue b/pages/user/coupon.vue
index 26e39a5..fb2824f 100644
--- a/pages/user/coupon.vue
+++ b/pages/user/coupon.vue
@@ -6,7 +6,7 @@
-
+
@@ -16,13 +16,7 @@
-
+
{{ item.label }}
@@ -39,10 +33,10 @@
- {{ item.title }}
+ {{ item.name }}
- 有效期至:{{ item.startTime }}-{{ item.endTime }}
+ {{ dayjs(item.effectStartTime).format('YYYY.MM.DD') }} - {{ dayjs(item.effectEndTime).format('YYYY.MM.DD') }}
@@ -51,9 +45,9 @@
- {{ item.remark }}
+ 1、可适用门店:{{ item.useShops }} 2、可适用商品:{{ item.foods }}3、可使用类型:{{ convertValuesToLabels(item.useType) }}
-
+
查看详情
@@ -82,10 +76,35 @@
+
+
+
@@ -235,6 +359,9 @@ page {
border-radius: 18upx;
background-color: #fff;
padding: 28upx;
+ &:not(:first-child) {
+ margin-top: 28upx;
+ }
.top {
display: flex;
align-items: center;
@@ -322,7 +449,7 @@ page {
}
}
.popup-list {
- height: 50vh;
+ max-height: 50vh;
.item {
height: 100upx;
border-radius: 12upx;
@@ -336,6 +463,17 @@ page {
color: #555;
}
}
+ .ul {
+ .li {
+ color: #999;
+ font-size: 28upx;
+ padding: 8upx 0;
+ .t {
+ color: #999;
+ font-size: 28upx;
+ }
+ }
+ }
}
}
diff --git a/pages/user/member/czzx.vue b/pages/user/member/czzx.vue
new file mode 100644
index 0000000..10da58c
--- /dev/null
+++ b/pages/user/member/czzx.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/czzx_header_bg.png b/static/czzx_header_bg.png
new file mode 100644
index 0000000..f3d71f0
Binary files /dev/null and b/static/czzx_header_bg.png differ