diff --git a/.env.development b/.env.development index e36b881..a555c94 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' + diff --git a/.env.production b/.env.production index 9045317..1a60fe5 100644 --- a/.env.production +++ b/.env.production @@ -4,6 +4,4 @@ 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' + diff --git a/.env.test b/.env.test index 7bf308a..b7151d0 100644 --- a/.env.test +++ b/.env.test @@ -2,9 +2,4 @@ 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_YCNC_MERCH_CODE = '100310100018908' \ No newline at end of file diff --git a/custom.page.js b/custom.page.js index d068551..b678fc2 100644 --- a/custom.page.js +++ b/custom.page.js @@ -4,7 +4,6 @@ import path from 'path' const config = { pages:'./src/pages', - // pagesInclude:['ycysp/home.vue','ycysp/pay.vue','ycysp/order.vue','ycysp/orderDetail.vue',] pagesInclude:['ycnc'] } const { pages, pagesInclude } = config diff --git a/src/pages/ycysp/components/coupon-item.vue b/src/pages/ycysp/components/coupon-item.vue deleted file mode 100644 index fb400b6..0000000 --- a/src/pages/ycysp/components/coupon-item.vue +++ /dev/null @@ -1,85 +0,0 @@ - - - - diff --git a/src/pages/ycysp/components/member.vue b/src/pages/ycysp/components/member.vue deleted file mode 100644 index 01e6c01..0000000 --- a/src/pages/ycysp/components/member.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - - diff --git a/src/pages/ycysp/components/order-item.vue b/src/pages/ycysp/components/order-item.vue deleted file mode 100644 index 02f7f33..0000000 --- a/src/pages/ycysp/components/order-item.vue +++ /dev/null @@ -1,236 +0,0 @@ - - - - - diff --git a/src/pages/ycysp/components/recharge-item.vue b/src/pages/ycysp/components/recharge-item.vue deleted file mode 100644 index 91c8acf..0000000 --- a/src/pages/ycysp/components/recharge-item.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - diff --git a/src/pages/ycysp/components/ticket-recieve.vue b/src/pages/ycysp/components/ticket-recieve.vue deleted file mode 100644 index 83524ee..0000000 --- a/src/pages/ycysp/components/ticket-recieve.vue +++ /dev/null @@ -1,167 +0,0 @@ - - - - diff --git a/src/pages/ycysp/config.js b/src/pages/ycysp/config.js deleted file mode 100644 index ce0b469..0000000 --- a/src/pages/ycysp/config.js +++ /dev/null @@ -1,84 +0,0 @@ -const config = { - 1:{ - name:'优酷', - }, - 2:{ - name:'腾讯', - }, - 3:{ - name:'网易云', - }, - 4:{ - name:'芒果TV', - }, - 5:{ - name:'QQ音乐', - }, - 6:{ - name:'喜马拉雅', - }, - 7:{ - name:'哔哩哔哩', - }, - 8:{ - name:'爱奇艺', - }, -} - -export const stateConfig = { - 1: "待支付", - 2: "已支付", - 3: "充值中", - 4: "充值失败", - 5: "退款中", - 6: "退款失败", - 7: "退款成功", - 8: "充值成功", - 9: "订单作废", - 10:'支付失败' -}; - -export const stateColor = { - 2: "#FF911A", - 3: "#FF8400", - 4: "#FF0000", - 7: "#EA722D", - 8: "#FF0000", - 10: "#FF0000" -}; - -export const checkedColor = { - 1: "#4A98FB", - 2: "#4A98FB", - 3: "#FE3B34", - 4: "#FF8103", - 5: "#17BE73", - 6: "#F82801", - 7: "#FE306E", - 8: "#61D93F", -}; - -export const tabs = [ - { - tabName: "全部订单", - status: 0, - }, - { - tabName: "待付款", - status: 1, - }, - { - tabName: "处理中", - status: 2, - }, - { - tabName: "已完成", - status: 8, - }, - { - tabName: "已退款", - status: 7, - }, -]; - -export default config diff --git a/src/pages/ycysp/coupon.vue b/src/pages/ycysp/coupon.vue deleted file mode 100644 index a74db02..0000000 --- a/src/pages/ycysp/coupon.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/pages/ycysp/home.vue b/src/pages/ycysp/home.vue deleted file mode 100644 index eee0d3b..0000000 --- a/src/pages/ycysp/home.vue +++ /dev/null @@ -1,454 +0,0 @@ - -{ - style: { - navigationStyle: "custom", - navigationBarTitleText: "音视频专区", - navigationBarBackgroundColor: "#FFF", - }, -} - - - - - - - diff --git a/src/pages/ycysp/hooks/useCode.js b/src/pages/ycysp/hooks/useCode.js deleted file mode 100644 index a72b558..0000000 --- a/src/pages/ycysp/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(); - }); -} diff --git a/src/pages/ycysp/hooks/usePay.js b/src/pages/ycysp/hooks/usePay.js deleted file mode 100644 index 3a01fb8..0000000 --- a/src/pages/ycysp/hooks/usePay.js +++ /dev/null @@ -1,45 +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 Plain = { - MercUrl: notify_url, - TranAmt: tranAmt, - TermSsn: order_no, - BackLink: encodeURIComponent( - `${window.location.origin}${ - window.location.pathname || "" - }/#/pages/ycysp/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("CodePay-plain", Plain); - console.log("CodePay-params", params); - Fw.device.api.handCodePay(params); - }; - return { payFunc }; -} diff --git a/src/pages/ycysp/order.vue b/src/pages/ycysp/order.vue deleted file mode 100644 index cc7b9dc..0000000 --- a/src/pages/ycysp/order.vue +++ /dev/null @@ -1,251 +0,0 @@ - -{ - style: { - navigationStyle: "custom", - navigationBarTitleText: "我的订单", - navigationBarBackgroundColor: "#FFF", - }, -} - - - - - - - diff --git a/src/pages/ycysp/orderDetail.vue b/src/pages/ycysp/orderDetail.vue deleted file mode 100644 index 2e757b7..0000000 --- a/src/pages/ycysp/orderDetail.vue +++ /dev/null @@ -1,325 +0,0 @@ - -{ - style: { - navigationStyle: "custom", - navigationBarTitleText: "订单详情", - navigationBarBackgroundColor: "#FFF", - }, -} - - - - - - - diff --git a/src/pages/ycysp/pay.vue b/src/pages/ycysp/pay.vue deleted file mode 100644 index 1029413..0000000 --- a/src/pages/ycysp/pay.vue +++ /dev/null @@ -1,217 +0,0 @@ - -{ - style: { - navigationStyle: "custom", - navigationBarTitleText: "支付确认", - navigationBarBackgroundColor: "#FFF", - }, -} - - - - - - diff --git a/src/static/ycysp/aiqiyi.webp b/src/static/ycysp/aiqiyi.webp deleted file mode 100644 index 1ff131e..0000000 Binary files a/src/static/ycysp/aiqiyi.webp and /dev/null differ diff --git a/src/static/ycysp/banner-bg.webp b/src/static/ycysp/banner-bg.webp deleted file mode 100644 index 2726997..0000000 Binary files a/src/static/ycysp/banner-bg.webp and /dev/null differ diff --git a/src/static/ycysp/banner.webp b/src/static/ycysp/banner.webp deleted file mode 100644 index 031ea6a..0000000 Binary files a/src/static/ycysp/banner.webp and /dev/null differ diff --git a/src/static/ycysp/bg-nodata.png b/src/static/ycysp/bg-nodata.png deleted file mode 100644 index c40b061..0000000 Binary files a/src/static/ycysp/bg-nodata.png and /dev/null differ diff --git a/src/static/ycysp/bilibili.webp b/src/static/ycysp/bilibili.webp deleted file mode 100644 index e270961..0000000 Binary files a/src/static/ycysp/bilibili.webp and /dev/null differ diff --git a/src/static/ycysp/circle.svg b/src/static/ycysp/circle.svg deleted file mode 100644 index 7cc4371..0000000 --- a/src/static/ycysp/circle.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/static/ycysp/cloud.webp b/src/static/ycysp/cloud.webp deleted file mode 100644 index 1a85187..0000000 Binary files a/src/static/ycysp/cloud.webp and /dev/null differ diff --git a/src/static/ycysp/coupon.webp b/src/static/ycysp/coupon.webp deleted file mode 100644 index 526ce50..0000000 Binary files a/src/static/ycysp/coupon.webp and /dev/null differ diff --git a/src/static/ycysp/gou.svg b/src/static/ycysp/gou.svg deleted file mode 100644 index 3748820..0000000 --- a/src/static/ycysp/gou.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/static/ycysp/mgtv.webp b/src/static/ycysp/mgtv.webp deleted file mode 100644 index 0a57cdc..0000000 Binary files a/src/static/ycysp/mgtv.webp and /dev/null differ diff --git a/src/static/ycysp/qqyy.webp b/src/static/ycysp/qqyy.webp deleted file mode 100644 index 8396875..0000000 Binary files a/src/static/ycysp/qqyy.webp and /dev/null differ diff --git a/src/static/ycysp/ticket-large.webp b/src/static/ycysp/ticket-large.webp deleted file mode 100644 index 1a5ebc0..0000000 Binary files a/src/static/ycysp/ticket-large.webp and /dev/null differ diff --git a/src/static/ycysp/ticket-small.webp b/src/static/ycysp/ticket-small.webp deleted file mode 100644 index 17e005b..0000000 Binary files a/src/static/ycysp/ticket-small.webp and /dev/null differ diff --git a/src/static/ycysp/txsp.webp b/src/static/ycysp/txsp.webp deleted file mode 100644 index 937720f..0000000 Binary files a/src/static/ycysp/txsp.webp and /dev/null differ diff --git a/src/static/ycysp/xmly.webp b/src/static/ycysp/xmly.webp deleted file mode 100644 index c7c9572..0000000 Binary files a/src/static/ycysp/xmly.webp and /dev/null differ diff --git a/src/static/ycysp/yksp.webp b/src/static/ycysp/yksp.webp deleted file mode 100644 index 5ede8d3..0000000 Binary files a/src/static/ycysp/yksp.webp and /dev/null differ diff --git a/src/utils/http.js b/src/utils/http.js index 6b5bdd7..3f3c083 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -2,12 +2,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' -//邮储音视频baseURL专用 -const baseURL = '/ycav' function http(options) { uni.showLoading({ @@ -15,14 +10,11 @@ function http(options) { mask: true, }); return new Promise((resolve, reject) => { - //邮储音视频添加前缀 - // const newOptions = {...options,url:baseURL + options.url} + uni.request({ - // ...newOptions, ...options, header: { - //邮储音视频 - // 'content-type': 'application/json', + //邮储奶茶 'content-type': 'application/x-www-form-urlencoded', }, @@ -47,10 +39,6 @@ function http(options) { const params = {code:authCode}; const {token} = await login({params}); window.localStorage.setItem('token',token); - //邮储音视频专用的 - // http(newOptions).then(_res => { - // resolve(_res) - // }) //邮储奶茶 http(options).then(_res => { resolve(_res)