diff --git a/.env.development b/.env.development index e36b881..5f85737 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,4 @@ NODE_ENV = 'development' -# 邮储奶茶活动 -VITE_BASE_URL = 'http://milk.test.api.cdlsxd.cn' + # 邮储音视频 -# VITE_BASE_URL = 'https://gateway.dev.cdlsxd.cn/ycav' +VITE_BASE_URL = 'https://gateway.dev.cdlsxd.cn/ycav' diff --git a/.env.production b/.env.production index 9045317..56fad45 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,6 @@ NODE_ENV = 'production' -# 邮储奶茶活动(正式环境) -VITE_BASE_URL = 'https://milk.api.cdlsxd.cn' -VITE_YCNC_MERCH_CODE = '100510102303326' # 邮储音视频活动(生产环境) -# VITE_BASE_URL = 'https://mv.h5.cdlsxd.cn' -# VITE_YCNC_MERCH_CODE = '100510102303326' +VITE_BASE_URL = 'https://mv.h5.cdlsxd.cn' +VITE_YCNC_MERCH_CODE = '100510102303326' diff --git a/.env.test b/.env.test index 7bf308a..9be58f6 100644 --- a/.env.test +++ b/.env.test @@ -1,10 +1,5 @@ NODE_ENV = 'test' -# 邮储奶茶活动(测试环境) -VITE_BASE_URL = 'http://milk.test.api.cdlsxd.cn' -VITE_YCNC_MERCH_CODE = '100310100018908' - - # 邮储音视频活动(测试环境) -# VITE_BASE_URL = 'https://gateway.dev.cdlsxd.cn' -# VITE_YCNC_MERCH_CODE = '100310100018908' \ No newline at end of file +VITE_BASE_URL = 'https://gateway.dev.cdlsxd.cn' +VITE_YCNC_MERCH_CODE = '100310100018908' \ No newline at end of file diff --git a/custom.page.js b/custom.page.js index d068551..cb5baf2 100644 --- a/custom.page.js +++ b/custom.page.js @@ -4,8 +4,7 @@ import path from 'path' const config = { pages:'./src/pages', - // pagesInclude:['ycysp/home.vue','ycysp/pay.vue','ycysp/order.vue','ycysp/orderDetail.vue',] - pagesInclude:['ycnc'] + pagesInclude:['ycysp/home.vue','ycysp/pay.vue','ycysp/order.vue','ycysp/orderDetail.vue',] } const { pages, pagesInclude } = config diff --git a/src/api/xyyk.js b/src/api/xyyk.js deleted file mode 100644 index 4e3c792..0000000 --- a/src/api/xyyk.js +++ /dev/null @@ -1,31 +0,0 @@ -import http from "../utils/http"; - -export const login = (params) => http({ - url:'/v1/xy/login', - method:'POST', - ...params -}) - -export const getProduceList = (params) => http({ - url:'/v1/auth/activity', - method:'POST', - ...params -}) - -export const goBuy = (params) => http({ - url:'/v1/auth/order/buy', - method:'POST', - ...params -}) - -export const getTicketList = (params) => http({ - url:'/v1/auth/order/list', - method:'POST', - ...params -}) - -export const queryOrder = (params) => http({ - url:'/v1/auth/order/query', - ...params -}) - diff --git a/src/api/ycnc.js b/src/api/ycnc.js deleted file mode 100644 index ee99bfc..0000000 --- a/src/api/ycnc.js +++ /dev/null @@ -1,60 +0,0 @@ -import http from "../utils/http"; - - -export const login = (params) => http({ - url:'/api/v1/UnionLogin', - method:'POST', - noToken:true, - ...params -}) - -export const getProductList = (params) => http({ - url:'/api/v1/VoucherList', - method:'POST', - ...params -}) - -export const queryDetail = (params) => http({ - url:'/api/v1/product/detail', - method:'POST', - ...params -}) - -export const getOrderList = (params) => http({ - url:'/api/v1/auth/order/list', - method:'POST', - ...params -}) - -export const goPay = (params) => http({ - url:'/api/v1/auth/order/create', - method:'POST', - ...params -}) - -export const queryOrderDetail = (params) => http({ - url:'/api/v1/auth/order/query', - method:'POST', - ...params -}) - -export const deleteOrder = (params) => http({ - url:'/api/v1/auth/order/delete', - method:'POST', - ...params -}) - -export const refundOrder = (params) => http({ - url:'/api/v1/auth/order/refund', - method:'POST', - ...params -}) - - -//查询订单状态，主要针对短连接 -export const queryOrderState = (params) => http({ - url:'/api/v1/auth/order/state', - method:'POST', - ...params -}) - diff --git a/src/pages.json b/src/pages.json index e0e218b..d8abf8f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,25 +1,16 @@ { "pages": [ { - "path": "pages/ycnc/index", + "path": "pages/ycysp/home", "type": "home", "style": { "navigationStyle": "custom", - "navigationBarTitleText": "奶茶活动", + "navigationBarTitleText": "音视频专区", "navigationBarBackgroundColor": "#FFF" } }, { - "path": "pages/ycnc/detail", - "type": "page", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "商品详情", - "navigationBarBackgroundColor": "#FFF" - } - }, - { - "path": "pages/ycnc/order", + "path": "pages/ycysp/order", "type": "page", "style": { "navigationStyle": "custom", @@ -28,13 +19,22 @@ } }, { - "path": "pages/ycnc/orderDetail", + "path": "pages/ycysp/orderDetail", "type": "page", "style": { "navigationStyle": "custom", "navigationBarTitleText": "订单详情", "navigationBarBackgroundColor": "#FFF" } + }, + { + "path": "pages/ycysp/pay", + "type": "page", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "支付确认", + "navigationBarBackgroundColor": "#FFF" + } } ], "globalStyle": { diff --git a/src/pages/xyyk/components/product-item.vue b/src/pages/xyyk/components/product-item.vue deleted file mode 100644 index 2c23231..0000000 --- a/src/pages/xyyk/components/product-item.vue +++ /dev/null @@ -1,87 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/xyyk/components/ticket-item.vue b/src/pages/xyyk/components/ticket-item.vue deleted file mode 100644 index 29ab72f..0000000 --- a/src/pages/xyyk/components/ticket-item.vue +++ /dev/null @@ -1,80 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/xyyk/index.vue b/src/pages/xyyk/index.vue deleted file mode 100644 index aecf0ac..0000000 --- a/src/pages/xyyk/index.vue +++ /dev/null @@ -1,241 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/xyyk/tickets.vue b/src/pages/xyyk/tickets.vue deleted file mode 100644 index 331db59..0000000 --- a/src/pages/xyyk/tickets.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/ycnc/components/brand.vue b/src/pages/ycnc/components/brand.vue deleted file mode 100644 index 8650f3b..0000000 --- a/src/pages/ycnc/components/brand.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/ycnc/components/order-item.vue b/src/pages/ycnc/components/order-item.vue deleted file mode 100644 index 02e20e5..0000000 --- a/src/pages/ycnc/components/order-item.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/ycnc/components/product-item.vue b/src/pages/ycnc/components/product-item.vue deleted file mode 100644 index 5f9a078..0000000 --- a/src/pages/ycnc/components/product-item.vue +++ /dev/null @@ -1,131 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/ycnc/config.js b/src/pages/ycnc/config.js deleted file mode 100644 index 0d98313..0000000 --- a/src/pages/ycnc/config.js +++ /dev/null @@ -1,94 +0,0 @@ -import MX from '/static/ycnc/bg-mxbc.png' -import BW from '/static/ycnc/bg-bwcj.png' -import NX from '/static/ycnc/bg-nxdc.png' -import CoCo from '/static/ycnc/bg-coco.png' -import CBD from '/static/ycnc/bg-cbd.png' -import GM from '/static/ycnc/bg-gm.png' -import SYSXC from '/static/ycnc/bg-sysxc.png' -// import CYYS from '/static/ycnc/bg-cyys.png' - -const config = { - "MX":{ - name:'蜜雪冰城', - src:MX, - height:974, - order:1 - }, - "BW":{ - name:'霸王茶姬', - src:BW, - height:974, - order:2 - }, - "NX":{ - name:'奈雪的茶', - src:NX, - height:584, - order:5 - }, - "CoCo":{ - name:'CoCo', - src:CoCo, - height:584, - order:6 - }, - "CBD":{ - name:'茶百道', - src:CBD, - height:584, - order:7 - }, - "YCGM":{ - name:'古茗', - src:GM, - height:584, - order:3, - }, - "YCSY":{ - name:'书亦烧仙草', - src:SYSXC, - height:584, - order:4 - }, - // "CYYS":{ - // name:'茶颜悦色', - // src:CYYS, - // height:974, - // }, -} - -export const stateConfig = { - 1: '待支付', - 2: '已支付', - 3: '充值完成', - 4: '充值异常', - 5: '订单核销', - 6: '退款中', - 7: '退款完成', - 8: '退款失败' , - 9: '订单取消' -} - -export const stateColor = { - 2: '#FF8400', - 7: '#FF0000', -} - -export const tabs = [{ - tabName:'全部订单', - state:0, -},{ - tabName:'待付款', - state:1, -},{ - tabName:'处理中', - state:2, -},{ - tabName:'已完成', - state:3, -},{ - tabName:"已退款", - state:7 -}] - -export default config \ No newline at end of file diff --git a/src/pages/ycnc/detail.vue b/src/pages/ycnc/detail.vue deleted file mode 100644 index 2ac7c02..0000000 --- a/src/pages/ycnc/detail.vue +++ /dev/null @@ -1,216 +0,0 @@ - - { - style: { - navigationStyle: 'custom', - navigationBarTitleText: '商品详情', - navigationBarBackgroundColor:'#FFF', - }, - } - - - - - - - \ No newline at end of file diff --git a/src/pages/ycnc/hooks/useCode.js b/src/pages/ycnc/hooks/useCode.js deleted file mode 100644 index 614ef37..0000000 --- a/src/pages/ycnc/hooks/useCode.js +++ /dev/null @@ -1,29 +0,0 @@ -import md5 from 'js-md5'; -export default function useCode(){ - return new Promise((resolve,reject) => { - const authCallback = (params) => { - console.log('authCallback-use',params); - const {code} = params - resolve(code) - } - const getNewAuthorization = () => { - let appId = import.meta.env.VITE_YCNC_APPID; - let time = Date.now().toString(); - let secret = import.meta.env.VITE_YCNC_SECRET; - let signBefore = appId + time + secret; - let sign = md5(signBefore);//普通md5 - let param = { - appId: appId, - sign: sign, - time: time, - tran_code: "157", - fn: "authCallback", - needBind: "" - }; - console.log('auth-param157-use',param); - Fw.device.api.getNewAuthorization(param) - }; - window.authCallback = authCallback; - getNewAuthorization() - }) -} \ No newline at end of file diff --git a/src/pages/ycnc/hooks/usePay.js b/src/pages/ycnc/hooks/usePay.js deleted file mode 100644 index 1145335..0000000 --- a/src/pages/ycnc/hooks/usePay.js +++ /dev/null @@ -1,41 +0,0 @@ -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]}` - }else{ - total += `|${curr[0]}=${curr[1]}` - } - return total -},'') - - -export default function usePay(){ - const payFunc = (args) => { - 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`), - psbcmcc:'LSXD', - TxnDt:dayjs(Date.now()).format('YYYY-MM-DD'), - MercCode:MercCode, - IsIntegral:'1', - MerName:MerName, - } - const params = { - Plain:handleParams(Plain), - plainText:plain_text, - sign:sign, - Signature: '', - } - console.log('handCodePay-plain',Plain); - console.log('handCodePay-params',params); - Fw.device.api.handCodePay(params); - } - return {payFunc} -} \ No newline at end of file diff --git a/src/pages/ycnc/index.vue b/src/pages/ycnc/index.vue deleted file mode 100644 index 0e76e6e..0000000 --- a/src/pages/ycnc/index.vue +++ /dev/null @@ -1,145 +0,0 @@ - - { - style: { - navigationStyle: 'custom', - navigationBarTitleText: '奶茶活动', - navigationBarBackgroundColor:'#FFF', - }, - } - - - - - - - \ No newline at end of file diff --git a/src/pages/ycnc/order.vue b/src/pages/ycnc/order.vue deleted file mode 100644 index b9a934f..0000000 --- a/src/pages/ycnc/order.vue +++ /dev/null @@ -1,279 +0,0 @@ - - { - style: { - navigationStyle: 'custom', - navigationBarTitleText: '我的订单', - navigationBarBackgroundColor:'#FFF', - }, - } - - - - - - - \ No newline at end of file diff --git a/src/pages/ycnc/orderDetail.vue b/src/pages/ycnc/orderDetail.vue deleted file mode 100644 index 9d3c4e4..0000000 --- a/src/pages/ycnc/orderDetail.vue +++ /dev/null @@ -1,311 +0,0 @@ - - { - style: { - navigationStyle: 'custom', - navigationBarTitleText: '订单详情', - navigationBarBackgroundColor:'#FFF', - }, - } - - - - - - - \ No newline at end of file diff --git a/src/static/xyyk/bg-banner.png b/src/static/xyyk/bg-banner.png deleted file mode 100644 index 4dc110e..0000000 Binary files a/src/static/xyyk/bg-banner.png and /dev/null differ diff --git a/src/static/xyyk/bg-popup.png b/src/static/xyyk/bg-popup.png deleted file mode 100644 index c4f8045..0000000 Binary files a/src/static/xyyk/bg-popup.png and /dev/null differ diff --git a/src/static/xyyk/bg-product.png b/src/static/xyyk/bg-product.png deleted file mode 100644 index 9cff40b..0000000 Binary files a/src/static/xyyk/bg-product.png and /dev/null differ diff --git a/src/static/xyyk/bg-title.png b/src/static/xyyk/bg-title.png deleted file mode 100644 index 607f4ed..0000000 Binary files a/src/static/xyyk/bg-title.png and /dev/null differ diff --git a/src/static/xyyk/bg.png b/src/static/xyyk/bg.png deleted file mode 100644 index 0a2f30e..0000000 Binary files a/src/static/xyyk/bg.png and /dev/null differ diff --git a/src/static/xyyk/icon-ticket.png b/src/static/xyyk/icon-ticket.png deleted file mode 100644 index a4e07ea..0000000 Binary files a/src/static/xyyk/icon-ticket.png and /dev/null differ diff --git a/src/static/ycnc/bg-bwcj.png b/src/static/ycnc/bg-bwcj.png deleted file mode 100644 index ba28a26..0000000 Binary files a/src/static/ycnc/bg-bwcj.png and /dev/null differ diff --git a/src/static/ycnc/bg-cbd.png b/src/static/ycnc/bg-cbd.png deleted file mode 100644 index 3096fdc..0000000 Binary files a/src/static/ycnc/bg-cbd.png and /dev/null differ diff --git a/src/static/ycnc/bg-coco.png b/src/static/ycnc/bg-coco.png deleted file mode 100644 index bc71cfd..0000000 Binary files a/src/static/ycnc/bg-coco.png and /dev/null differ diff --git a/src/static/ycnc/bg-gm.png b/src/static/ycnc/bg-gm.png deleted file mode 100644 index 92273d7..0000000 Binary files a/src/static/ycnc/bg-gm.png and /dev/null differ diff --git a/src/static/ycnc/bg-mxbc.png b/src/static/ycnc/bg-mxbc.png deleted file mode 100644 index a970429..0000000 Binary files a/src/static/ycnc/bg-mxbc.png and /dev/null differ diff --git a/src/static/ycnc/bg-nodata.png b/src/static/ycnc/bg-nodata.png deleted file mode 100644 index c40b061..0000000 Binary files a/src/static/ycnc/bg-nodata.png and /dev/null differ diff --git a/src/static/ycnc/bg-nxdc.png b/src/static/ycnc/bg-nxdc.png deleted file mode 100644 index 94ceff2..0000000 Binary files a/src/static/ycnc/bg-nxdc.png and /dev/null differ diff --git a/src/static/ycnc/bg-product.png b/src/static/ycnc/bg-product.png deleted file mode 100644 index 5d4a33c..0000000 Binary files a/src/static/ycnc/bg-product.png and /dev/null differ diff --git a/src/static/ycnc/bg-sysxc.png b/src/static/ycnc/bg-sysxc.png deleted file mode 100644 index 7e614e7..0000000 Binary files a/src/static/ycnc/bg-sysxc.png and /dev/null differ diff --git a/src/static/ycnc/bg.png b/src/static/ycnc/bg.png deleted file mode 100644 index 63d8b9c..0000000 Binary files a/src/static/ycnc/bg.png and /dev/null differ diff --git a/src/utils/http.js b/src/utils/http.js index 6b5bdd7..9a2749f 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -1,10 +1,7 @@ -//邮储银行（奶茶）专用的 -import useCode from "../pages/ycnc/hooks/useCode"; -import {login} from '../api/ycnc' //邮储银行（音视频）专用的 -// import useCode from "../pages/ycysp/hooks/useCode"; -// import {login} from '../api/ycysp' +import useCode from "../pages/ycysp/hooks/useCode"; +import {login} from '../api/ycysp' //邮储音视频baseURL专用 const baseURL = '/ycav' @@ -16,15 +13,12 @@ function http(options) { }); return new Promise((resolve, reject) => { //邮储音视频添加前缀 - // const newOptions = {...options,url:baseURL + options.url} + const newOptions = {...options,url:baseURL + options.url} uni.request({ - // ...newOptions, - ...options, + ...newOptions, header: { //邮储音视频 - // 'content-type': 'application/json', - //邮储奶茶 - 'content-type': 'application/x-www-form-urlencoded', + 'content-type': 'application/json', }, responseType: 'json', success: async (res) => { @@ -48,11 +42,7 @@ function http(options) { const {token} = await login({params}); window.localStorage.setItem('token',token); //邮储音视频专用的 - // http(newOptions).then(_res => { - // resolve(_res) - // }) - //邮储奶茶 - http(options).then(_res => { + http(newOptions).then(_res => { resolve(_res) }) }else{ diff --git a/uni-pages.d.ts b/uni-pages.d.ts index 2c45296..866ff1e 100644 --- a/uni-pages.d.ts +++ b/uni-pages.d.ts @@ -4,10 +4,10 @@ // Generated by vite-plugin-uni-pages interface NavigateToOptions { - url: "/pages/ycnc/index" | - "/pages/ycnc/detail" | - "/pages/ycnc/order" | - "/pages/ycnc/orderDetail"; + url: "/pages/ycysp/home" | + "/pages/ycysp/order" | + "/pages/ycysp/orderDetail" | + "/pages/ycysp/pay"; } interface RedirectToOptions extends NavigateToOptions {}