diff --git a/.env.development b/.env.development index 30e5588..e05d914 100644 --- a/.env.development +++ b/.env.development @@ -4,5 +4,5 @@ # VITE_BASE_URL = 'http://milk.api.test.86698.cn' # VITE_BASE_URL = 'http://milk.test.api.cdlsxd.cn' # 邮储音视频 -# VITE_BASE_URL = 'http://milk.api.test.86698.cn' -VITE_BASE_URL = 'http://192.168.110.128:8081' +VITE_BASE_URL = 'http://192.168.110.128:8000/ycav' +# VITE_BASE_URL = 'https://gateway.dev.cdlsxd.cn/ycav' diff --git a/.env.production b/.env.production index 0f39b4e..873e03e 100644 --- a/.env.production +++ b/.env.production @@ -2,9 +2,14 @@ # VITE_BASE_URL = 'http://192.168.110.50:8083' # 邮储奶茶活动(测试环境) -VITE_BASE_URL = 'http://milk.test.api.cdlsxd.cn' +# VITE_BASE_URL = 'http://milk.test.api.cdlsxd.cn' # VITE_YCNC_MERCH_CODE = '100310100018908' -VITE_YCNC_MERCH_CODE = '100610100019042' +# VITE_YCNC_MERCH_CODE = '100610100019042' # 邮储奶茶活动(正式环境) # VITE_BASE_URL = 'https://milk.api.cdlsxd.cn' -# VITE_YCNC_MERCH_CODE = '100510102303326' \ No newline at end of file +# VITE_YCNC_MERCH_CODE = '100510102303326' + +# 邮储音视频活动(测试环境) +VITE_BASE_URL = 'https://gateway.dev.cdlsxd.cn/ycav' +VITE_YCNC_MERCH_CODE = '100610100019042' + diff --git a/src/api/ycysp.js b/src/api/ycysp.js index 8bf12c9..1709ed9 100644 --- a/src/api/ycysp.js +++ b/src/api/ycysp.js @@ -2,27 +2,39 @@ import http from "../utils/http"; export const login = (params) => http({ - url:'/api/v1/login', + url:'/v1/login', method:'POST', noToken:true, ...params }) export const getBrandList = (params) => http({ - url:'/api/v1/brand', + url:'/v1/brand', method:'GET', ...params }) export const getProductList = (params) => http({ - url:'/api/v1/product', + url:'/v1/product', method:'GET', ...params }) export const createOrder = (params) => http({ - url:'/api/v1/order', + url:'/v1/order', + method:'POST', + ...params +}) + +export const getOrderList = (params) => http({ + url:'/v1/order/list', + method:'GET', + ...params +}) + +export const refundOrder = (params) => http({ + url:'/v1/order/refund', method:'POST', ...params }) \ No newline at end of file diff --git a/src/pages/ycysp/component/member.vue b/src/pages/ycysp/component/member.vue index 1e3de06..9738672 100644 --- a/src/pages/ycysp/component/member.vue +++ b/src/pages/ycysp/component/member.vue @@ -1,22 +1,22 @@ @@ -211,20 +243,16 @@ onMounted(async () => { } .title-text{ font-size: 36rpx; - font-weight: normal; - line-height: normal; + font-weight: 400; letter-spacing: 0.04em; - font-family: PingFang SC; color: #212F3B; margin-left:14rpx; } .title-more{ position: absolute; right:0; - font-family: PingFang SC; font-size: 26rpx; font-weight: normal; - line-height: normal; letter-spacing: 0.04em; color: #666E7E; } @@ -243,7 +271,7 @@ onMounted(async () => { .swiper{ display: flex; flex-wrap: wrap; - max-width:calc((100vw - 68rpx) / 3 * 4 + 64rpx) + width:calc((100vw - 68rpx) / 3 * 4 + 64rpx) } .member-item{ margin:0 16rpx 16rpx 0; @@ -277,6 +305,7 @@ onMounted(async () => { padding:0 40rpx; box-sizing: border-box; input{ + width: 100%; font-size: 32rpx; font-weight: normal; line-height: normal; @@ -332,7 +361,7 @@ onMounted(async () => { .order-btn{ position: fixed; right: 20rpx; - top:100rpx; + bottom:100rpx; width: 96rpx; height: 96rpx; font-size: 24rpx; diff --git a/src/pages/ycysp/hooks/usePay.js b/src/pages/ycysp/hooks/usePay.js index 1145335..063046c 100644 --- a/src/pages/ycysp/hooks/usePay.js +++ b/src/pages/ycysp/hooks/usePay.js @@ -1,5 +1,6 @@ import dayjs from "dayjs"; import md5 from 'js-md5'; + const handleParams = (obj) => Object.entries(obj).reduce((total,curr) => { if(!total){ total += `${curr[0]}=${curr[1]}` @@ -15,12 +16,11 @@ export default function usePay(){ const {order_no,notify_url,TranAmt,MerName,sign,plain_text} = args; const MercCode = import.meta.env.VITE_YCNC_MERCH_CODE const tranAmt = Number(TranAmt).toFixed(2) - // const plainText = handleParams({MercCode,TranAmt:tranAmt,TermSsn:order_no}) const Plain = { MercUrl:notify_url, TranAmt:tranAmt, TermSsn:order_no, - BackLink:encodeURIComponent(`${window.location.origin}/#/pages/ycnc/orderDetail?order_no=${order_no}&isPayBack=true`), + BackLink:encodeURIComponent(`${window.location.origin}/#/pages/ycysp/orderDetail?order_no=${order_no}&isPayBack=true`), psbcmcc:'LSXD', TxnDt:dayjs(Date.now()).format('YYYY-MM-DD'), MercCode:MercCode, diff --git a/src/pages/ycysp/order.vue b/src/pages/ycysp/order.vue index 4e3cfab..25db405 100644 --- a/src/pages/ycysp/order.vue +++ b/src/pages/ycysp/order.vue @@ -10,15 +10,11 @@