From d3a0e2503cd9429ee93eb6d0fecd373707f42304 Mon Sep 17 00:00:00 2001 From: Wik-T <812952667@qq.com> Date: Fri, 4 Nov 2022 09:18:14 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E9=93=B6=E8=81=942.0=20?= =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=20=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- high-unionPay/App.vue | 28 +- high-unionPay/Utils/Api.js | 108 +- .../rec-confirmation/rec-confirmation.vue | 61 +- .../node_modules/jweixin-module/README.md | 30 - .../node_modules/jweixin-module/lib/index.js | 1 - .../node_modules/jweixin-module/package.json | 54 - high-unionPay/node_modules/vue-jsonp/LICENSE | 42 +- .../node_modules/vue-jsonp/README.md | 306 +-- .../node_modules/vue-jsonp/dist/index.d.ts | 146 +- .../vue-jsonp/dist/utils/index.d.ts | 40 +- .../node_modules/vue-jsonp/package.json | 130 +- high-unionPay/package-lock.json | 250 ++- high-unionPay/package.json | 4 +- high-unionPay/pages/goods/goods.vue | 2 +- .../goods/refuel-confirm/refuel-confirm.vue | 27 +- high-unionPay/pages/order/confirmation.vue | 561 +++--- high-unionPay/pages/qianZhuPay/qianZhuPay.vue | 3 - high-unionPay/pages/tabBar/home/home.vue | 915 ++++----- high-unionPay/pages/tabBar/user/user.vue | 172 +- .../unionComfirmation/unionComfirmation.vue | 52 +- high-unionPay/pages/user/deposit/deposit.vue | 3 - high-unionPay/pages/user/news/news.vue | 116 +- .../user/order_details/order_details.vue | 1661 +++++++++-------- .../pages/user/order_list/order_list.vue | 165 +- .../qianzhu-KFC/confirmOrder/confirmOrder.vue | 297 +-- .../order-details/order-details.vue | 134 +- .../payment-method/payment-method.vue | 3 - high-unionPay/static/img/user/kefu.png | Bin 0 -> 4959 bytes high-unionPay/static/img/user/notive.png | Bin 0 -> 3471 bytes high-unionPay/static/img/user/order.png | Bin 0 -> 1661 bytes high-unionPay/static/img/user/overdue.png | Bin 0 -> 5388 bytes high-unionPay/static/img/user/use.png | Bin 0 -> 4947 bytes .../coupon-comfirmation.vue | 76 +- 34 files changed, 2847 insertions(+), 2543 deletions(-) delete mode 100644 high-unionPay/node_modules/jweixin-module/README.md delete mode 100644 high-unionPay/node_modules/jweixin-module/lib/index.js delete mode 100644 high-unionPay/node_modules/jweixin-module/package.json create mode 100644 high-unionPay/static/img/user/kefu.png create mode 100644 high-unionPay/static/img/user/notive.png create mode 100644 high-unionPay/static/img/user/order.png create mode 100644 high-unionPay/static/img/user/overdue.png create mode 100644 high-unionPay/static/img/user/use.png diff --git a/.gitignore b/.gitignore index 99057ba..9501077 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -unpackage/ \ No newline at end of file +unpackage/ +node_modules \ No newline at end of file diff --git a/high-unionPay/App.vue b/high-unionPay/App.vue index d41fe0c..f3d7090 100644 --- a/high-unionPay/App.vue +++ b/high-unionPay/App.vue @@ -5,18 +5,22 @@ // brestUrl: 'http://192.168.3.4:9302/brest', // imgUrl: 'https://192.168.3.4:9301/filesystem/', //正式 - // url: 'https://hsg.dctpay.com/crest', - // v1url:'https://hsg.dctpay.com/v1', - // imgUrl: 'https://hsg.dctpay.com/filesystem/', - // brestUrl: 'https://hsg.dctpay.com/brest', - // imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/', - // imageqrImg: 'https://hsg.dctpay.com/filesystem/temporary/', - //测试 - url: 'https://hsgcs.dctpay.com/crest', - v1url: 'https://hsgcs.dctpay.com/v1', - brestUrl: 'https://hsgcs.dctpay.com/brest', - imgUrl: 'https://hsgcs.dctpay.com/filesystem/', - imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/', + // url: 'https://hsg.dctpay.com/crest', + // v1url:'https://hsg.dctpay.com/v1', + // orderurl:' https://hsg.dctpay.com/order', + // userurl:'https://hsg.dctpay.com/user', + // imgUrl: 'https://hsg.dctpay.com/filesystem/', + // brestUrl: 'https://hsg.dctpay.com/brest', + // imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/', + // imageqrImg: 'https://hsg.dctpay.com/filesystem/temporary/', + //测试 + url: 'https://hsgcs.dctpay.com/crest', + v1url: 'https://hsgcs.dctpay.com/v1', + orderurl:'https://hsgcs.dctpay.com/order', + userurl:'https://hsgcs.dctpay.com/user', + brestUrl: 'https://hsgcs.dctpay.com/brest', + imgUrl: 'https://hsgcs.dctpay.com/filesystem/', + imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/', imageqrImg: 'https://hsgcs.dctpay.com/filesystem/temporary/', userInfo: "", brestUserInfo: '', diff --git a/high-unionPay/Utils/Api.js b/high-unionPay/Utils/Api.js index a5a6567..aed0b25 100644 --- a/high-unionPay/Utils/Api.js +++ b/high-unionPay/Utils/Api.js @@ -5,6 +5,8 @@ import { POSTBREST} from "./bRequest.js"; let app = getApp(); let base = app.globalData.url; +let orderbase = app.globalData.orderurl; +let userbase = app.globalData.userurl; let v1base = app.globalData.v1url; let brestBase = app.globalData.brestUrl; //公众号获取跳小程序参数 @@ -26,10 +28,6 @@ export const HandleCode = params => { export const GetPhoneNumber = params => { return POST('GET', `${base}/wechat/getPhoneNumber`, params).then(res => res.data); }; -//银联手机号登录 -export const unionPhoneLogin = params => { - return POST('GET', `${base}/user/unionPhoneLogin`, params).then(res => res.data); -}; //获取用户授权信息 export const getUserInfo = params => { return POST('GET', `${base}/wechat/getUserInfo`, params).then(res => res.data); @@ -47,10 +45,6 @@ export const updateUserPayPwd = params => { return POST('POST', `${base}/highUser/updateUserPayPwd`, params).then(res => res.data); } -//获取用户信息 -export const findUser = params => { - return POST('GET', `${base}/highUser/findUser`, params).then(res => res.data); -} //微信登录 export const WXlogin = params => { return POST('GET', `${base}/wechat/login`, params).then(res => res.data); @@ -131,23 +125,12 @@ export const getUserCouponDetail = params => { export const getUserNewCouponDetail = params => { return POST('GET', `${base}/coupon/getUserNewCouponDetail`, params).then(res => res.data); } -//获取订单信息 -export const getUserOrderList = params => { - return POST('GET', `${base}/highOrder/getUserOrderList`, params).then(res => res.data); -} -//取消订单 -export const cancelOrder = params => { - return POST('GET', `${base}/highOrder/cancelOrder`, params).then(res => res.data); -} + //订单查询详情 export const getOrderById = params => { return POST('GET', `${base}/highOrder/getOrderById`, params).then(res => res.data); } -//已完成未查看 -export const orderCheck = params => { - return POST('GET', `${base}/highOrder/orderCheck`, params).then(res => res.data); -} //获取商户列表 export const getMerchantList = params => { return POST('GET', `${base}/highMerchantStore/getMerchantList`, params).then(res => res.data); @@ -176,10 +159,6 @@ export const getCouponByDiscount = params => { export const againReceiveCoupon = params => { return POST('GET', `${base}/coupon/againReceiveCoupon`, params).then(res => res.data); } -//查询我的优惠券 -export const getUserDiscountList = params => { - return POST('GET', `${base}/userDiscount/getUserDiscountList`, params).then(res => res.data); -} //我的优惠券查详情 export const getDiscountByUserDiscountId = params => { return POST('GET', `${base}/userDiscount/getDiscountByUserDiscountId`, params).then(res => res.data); @@ -247,10 +226,6 @@ export const getPhoneOrderById = params => { export const cancelRechargeOrder = params => { return POST('GET', `${base}/outRechargeOrder/cancelOrder`, params).then(res => res.data); } -//银联提交订单 -export const unionPay = params => { - return POST('POST', `${base}/order/unionPay`, params).then(res => res.data); -} // 银联话费充值 export const orderToUnionPay = params => { return POST('POST', `${base}/czOrder/orderToUnionPay`, params).then(res => res.data); @@ -315,10 +290,6 @@ export const getHuiLianTongCardBalance = params => { export const getHuiLianTongCardConsume = params => { return POST('GET', `${base}/highUserCard/getHuiLianTongCardConsume`, params).then(res => res.data); } -// 汇联通工会卡支付 -export const hltUnionCardPay = params => { - return POST('POST', `${base}/order/hltUnionCardPay`, params).then(res => res.data); -} export const czhltUnionCardPay = params => { return POST('POST', `${base}/thirdOrder/hltUnionCardPay`, params).then(res => res.data); } @@ -373,14 +344,7 @@ export const getKfcStoresList = params => { export const listByStoreCode = params => { return POST('GET', `${base}/highThirdParty/listByStoreCode`, params).then(res => res.data); } -//肯德基订单详情 -export const getThirdOrderByOrderId = params => { - return POST('GET', `${base}/highThirdParty/getThirdOrderByOrderId`, params).then(res => res.data); -} -//肯德基,星巴克取消订单 -export const thirdCancelOrder = params => { - return POST('GET', `${base}/highThirdParty/thirdCancelOrder`, params).then(res => res.data); -} + //肯德基银联支付 export const qianzhuorderToUnionPay = params => { return POST('POST', `${base}/thirdOrder/orderToUnionPay`, params).then(res => res.data); @@ -527,3 +491,67 @@ export const getUserOrderListhuafei = params => { export const getRebateIntegral = params => { return POST('POST', `${base}/common/getRebateIntegral`, params).then(res => res.data); } +//站内信列表 +export const queryMsgByList = params => { + return POST('GET', `${base}/bsMsg/queryMsgByList`, params).then(res => res.data); +} + + + +// -----------订单新接口------------ +//新建订单 +export const create = params => { + return POST('POST', `${orderbase}/create`, params).then(res => res.data); +} +//获取订单列表 +export const getUserOrderList = params => { + return POST('GET', `${orderbase}/getUserOrderList`, params).then(res => res.data); +} +//订单详情 +export const getDetailByOrderNo = params => { + return POST('GET', `${orderbase}/getDetailByOrderNo`, params).then(res => res.data); +} +//取消订单 +export const cancel = params => { + return POST('POST', `${orderbase}/cancel`, params).then(res => res.data); +} +//银联支付 +export const unionPay = params => { + return POST('POST', `${orderbase}/orderPay/unionPay`, params).then(res => res.data); +} +//工会卡、油卡 +export const cardPay = params => { + return POST('POST', `${orderbase}/orderPay/cardPay`, params).then(res => res.data); +} + +//已完成未查看 +export const orderCheck = params => { + return POST('GET', `${orderbase}/orderCheck`, params).then(res => res.data); +} + +//在线加油详情 +export const getOrderByOrderNo = params => { + return POST('GET', `${orderbase}/oil/getOrderByOrderNo`, params).then(res => res.data); +} + +//----------------我的页面接口 + +// 手机号登录 +export const unionPhoneLogin = params => { + return POST('POST', `${userbase}/login/union`, params).then(res => res.data); +} + +// 获取用户信息 +export const findUser = params => { + return POST('POST', `${userbase}/getUserDetail`, params).then(res => res.data); +} + +// 获取用户余额 +export const getUserAccount = params => { + return POST('POST', `${userbase}/getUserAccount`, params).then(res => res.data); +} +//查询优惠券 +export const getUserDiscountList = params => { + return POST('GET', `${userbase}/discount/getUserDiscountList`, params).then(res => res.data); +} + diff --git a/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue b/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue index 5017bc6..7c0454e 100644 --- a/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue +++ b/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue @@ -167,18 +167,15 @@ import ssPaymentPassword from '@/components/sanshui-payment-password/index.vue'; import wybPopup from '../../components/wyb-popup/wyb-popup.vue'; import { - xbkaddOrder, + create, getThirdPartyByDetail, getHuiLianTongCardBalance, findUser, - qianzhuorderToUnionPay, - czhltUnionCardPay, + unionPay, + cardPay, getUserOrderPreList, getRebateIntegral } from '../../Utils/Api.js'; - // #ifdef H5 - var jweixin = require('jweixin-module'); - // #endif let app = getApp(); export default { components: { @@ -388,22 +385,25 @@ title: '提交订单中...' }) let datas = { - "customerMobile": this.customerMobile, - "regionId": app.globalData.cityId, - "productType": 3, - "platformId": this.showType, - "password": this.PaymentPassword, - "integralNum": this.priceValue[1], + "childOrderList": [{ + "goodsId": this.goodId, + "customerMobile": this.customerMobile, + "platformId": this.showType, + "productType": this.productType, + "goodsType": 10, + "saleCount": 1, + }], + "payGold": this.priceValue[1], + "companyId": app.globalData.companyId, "memDiscountId": this.memDiscountId, - "goodsId": this.goodId } - xbkaddOrder(datas).then(res => { + create(datas).then(res => { uni.hideLoading(); if (res.return_code == '000000') { - this.orderId = res.return_data.id; + this.orderId = res.return_data.orderNo; let params = { - "orderId": res.return_data.id, + "orderNo": res.return_data.orderNo, } this.qianzhuorderToUnionPay(params); } else { @@ -514,7 +514,7 @@ qianzhuorderToUnionPay(item) { let that = this; if (that.paytype == '4') { - qianzhuorderToUnionPay(item).then(res => { + unionPay(item).then(res => { if (res.return_code == '000000') { that.uniontopay(res.return_data.prepayid); } else { @@ -606,20 +606,25 @@ } if (this.payPrice == 0) { let datas = { - "customerMobile": this.customerMobile, - "regionId": app.globalData.cityId, - "productType": 3, - "platformId": this.showType, - "password": this.PaymentPassword, - "integralNum": this.priceValue[1], + "childOrderList": [{ + "goodsId": this.goodId, + "customerMobile": this.customerMobile, + "platformId": this.showType, + "productType": 3, + "goodsType": 10, + "saleCount": 1, + }], + "payGold": this.priceValue[1], + "companyId": app.globalData.companyId, + // "promoteCode": this.identificationCode, "memDiscountId": this.memDiscountId, - "goodsId": this.goodId + "payPwd": this.PaymentPassword } - xbkaddOrder(datas).then(res => { + create(datas).then(res => { uni.hideLoading(); if (res.return_code == '000000') { - this.orderId = res.return_data.id; + this.orderId = res.return_data.orderNo; uni.reLaunch({ url: '/qianzhu-KFC/order-details/order-details?id=' + this.orderId }) @@ -640,11 +645,11 @@ return; } let params = { - "orderId": this.orderId, + "orderNo": this.orderId, "cardNo": this.user.hltCardNo.cardNo, "password": this.PaymentPassword } - czhltUnionCardPay(params).then(res => { + cardPay(params).then(res => { uni.hideLoading(); if (res.return_code == '000000') { uni.showToast({ diff --git a/high-unionPay/node_modules/jweixin-module/README.md b/high-unionPay/node_modules/jweixin-module/README.md deleted file mode 100644 index 7c91d7b..0000000 --- a/high-unionPay/node_modules/jweixin-module/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# jweixin-module - -微信JS-SDK - -## 安装 - -### NPM - -```shell -npm install jweixin-module --save -``` - -### UMD - -```http -https://unpkg.com/jweixin-module/out/index.js -``` - -## 使用 - -```js -var jweixin = require('jweixin-module') -jweixin.ready(function(){ - // TODO -}); -``` - -## 完整API - ->[微信JS-SDK说明文档](https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115) diff --git a/high-unionPay/node_modules/jweixin-module/lib/index.js b/high-unionPay/node_modules/jweixin-module/lib/index.js deleted file mode 100644 index 1b5014b..0000000 --- a/high-unionPay/node_modules/jweixin-module/lib/index.js +++ /dev/null @@ -1 +0,0 @@ -!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(window,function(o,e){if(!o.jWeixin){var n,c={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},a=function(){var e={};for(var n in c)e[c[n]]=n;return e}(),i=o.document,t=i.title,r=navigator.userAgent.toLowerCase(),s=navigator.platform.toLowerCase(),d=!(!s.match("mac")&&!s.match("win")),u=-1!=r.indexOf("wxdebugger"),l=-1!=r.indexOf("micromessenger"),p=-1!=r.indexOf("android"),f=-1!=r.indexOf("iphone")||-1!=r.indexOf("ipad"),m=(n=r.match(/micromessenger\/(\d+\.\d+\.\d+)/)||r.match(/micromessenger\/(\d+\.\d+)/))?n[1]:"",g={initStartTime:L(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},h={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:f?1:p?2:-1,clientVersion:m,url:encodeURIComponent(location.href)},v={},S={_completes:[]},y={state:0,data:{}};O(function(){g.initEndTime=L()});var I=!1,_=[],w={config:function(e){B("config",v=e);var t=!1!==v.check;O(function(){if(t)M(c.config,{verifyJsApiList:C(v.jsApiList),verifyOpenTagList:C(v.openTagList)},function(){S._complete=function(e){g.preVerifyEndTime=L(),y.state=1,y.data=e},S.success=function(e){h.isPreVerifyOk=0},S.fail=function(e){S._fail?S._fail(e):y.state=-1};var t=S._completes;return t.push(function(){!function(){if(!(d||u||v.debug||m<"6.0.2"||h.systemType<0)){var i=new Image;h.appId=v.appId,h.initTime=g.initEndTime-g.initStartTime,h.preVerifyTime=g.preVerifyEndTime-g.preVerifyStartTime,w.getNetworkType({isInnerInvoke:!0,success:function(e){h.networkType=e.networkType;var n="https://open.weixin.qq.com/sdk/report?v="+h.version+"&o="+h.isPreVerifyOk+"&s="+h.systemType+"&c="+h.clientVersion+"&a="+h.appId+"&n="+h.networkType+"&i="+h.initTime+"&p="+h.preVerifyTime+"&u="+h.url;i.src=n}})}}()}),S.complete=function(e){for(var n=0,i=t.length;n` - - - `jsonp: (url: string, param?: IJsonpParam, timeout?: number) => Promise` - -## API - -### IJsonpParam - -IJsonpParam is the type of param for jsonp function. - -```ts -/** - * JSONP parameter declaration. - */ -interface IJsonpParam { - /** - * Callback query name. - * This param is used to define the query name of the callback function. - * - * @example - * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice" - * jsonp('/some-url', { - * callbackQuery: 'myCallback', - * callbackName: 'jsonp_func', - * myCustomUrlParam: 'veryNice' - * }) - * - * @default callback - */ - callbackQuery?: string - - /** - * Callback function name. - * This param is used to define the jsonp function name. - * - * @example - * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice" - * jsonp('/some-url', { - * callbackQuery: 'myCallback', - * callbackName: 'jsonp_func', - * myCustomUrlParam: 'veryNice' - * }) - * - * @default jsonp_ + randomStr() - */ - callbackName?: string - - /** - * Custom data. - */ - [key: string]: any -} -``` - -## Example - -```ts -import Vue from 'vue' -import { VueJsonp } from 'vue-jsonp' - -Vue.use(VueJsonp) - -const vm = new Vue() -const { code, data, message } = await vm.$jsonp<{ - code: number, - message: string, - data: { - id: number, - nickname: string - } -}>('/my-awesome-url', { - name: 'MyName', age: 20 -}) - -assert(code === 0) -assert(message === 'ok') -assert(data.id === 1) -assert(data.nickname === 'John Smith') -``` - -```ts -import { jsonp } from 'vue-jsonp' - -const result = await jsonp('/my-awesome-url') -assert(result === 'such a jsonp') -``` - -## License - -MIT +# Vue-jsonp + +[![VueJsonp](https://github.com/LancerComet/vue-jsonp/workflows/Test/badge.svg)](https://github.com/LancerComet/vue-jsonp/actions) + +A tiny library for handling JSONP request. + +## Quick Start + +As Vue plugin: + +```ts +import { VueJsonp } from 'vue-jsonp' + +// Vue Plugin. +Vue.use(VueJsonp) + +// Now you can use this.$jsonp in Vue components. +const vm = new Vue() +vm.$jsonp('/some-jsonp-url', { + myCustomUrlParam: 'veryNice' +}) +``` + +Use function directly: + +```ts +import { jsonp } from 'vue-jsonp' + +jsonp('/some-jsonp-url', { + myCustomUrlParam: 'veryNice' +}) +``` + +## Send data and set query & function name + +### Send data + +```ts +// The request url will be "/some-jsonp-url?name=LancerComet&age=100&callback=jsonp_{RANDOM_STR}". +jsonp('/some-jsonp-url', { + name: 'LancerComet', + age: 100 +}) +``` + +### Custom query & function name + +The url uniform is `/url?{callbackQuery}={callbackName}&...`, the default is `/url?callback=jsonp_{RANDOM_STRING}&...`. + +And you can change it like this: + +```ts +// The request url will be "/some-jsonp-url?name=LancerComet&age=100&cb=jsonp_func". +jsonp('/some-jsonp-url', { + callbackQuery: 'cb', + callbackName: 'jsonp_func', + name: 'LancerComet', + age: 100 +}) +``` + +## Module exports + + - `VueJsonp: PluginObject` + + - `jsonp: (url: string, param?: IJsonpParam, timeout?: number) => Promise` + +## API + +### IJsonpParam + +IJsonpParam is the type of param for jsonp function. + +```ts +/** + * JSONP parameter declaration. + */ +interface IJsonpParam { + /** + * Callback query name. + * This param is used to define the query name of the callback function. + * + * @example + * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice" + * jsonp('/some-url', { + * callbackQuery: 'myCallback', + * callbackName: 'jsonp_func', + * myCustomUrlParam: 'veryNice' + * }) + * + * @default callback + */ + callbackQuery?: string + + /** + * Callback function name. + * This param is used to define the jsonp function name. + * + * @example + * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice" + * jsonp('/some-url', { + * callbackQuery: 'myCallback', + * callbackName: 'jsonp_func', + * myCustomUrlParam: 'veryNice' + * }) + * + * @default jsonp_ + randomStr() + */ + callbackName?: string + + /** + * Custom data. + */ + [key: string]: any +} +``` + +## Example + +```ts +import Vue from 'vue' +import { VueJsonp } from 'vue-jsonp' + +Vue.use(VueJsonp) + +const vm = new Vue() +const { code, data, message } = await vm.$jsonp<{ + code: number, + message: string, + data: { + id: number, + nickname: string + } +}>('/my-awesome-url', { + name: 'MyName', age: 20 +}) + +assert(code === 0) +assert(message === 'ok') +assert(data.id === 1) +assert(data.nickname === 'John Smith') +``` + +```ts +import { jsonp } from 'vue-jsonp' + +const result = await jsonp('/my-awesome-url') +assert(result === 'such a jsonp') +``` + +## License + +MIT diff --git a/high-unionPay/node_modules/vue-jsonp/dist/index.d.ts b/high-unionPay/node_modules/vue-jsonp/dist/index.d.ts index ec621c7..4f3f502 100644 --- a/high-unionPay/node_modules/vue-jsonp/dist/index.d.ts +++ b/high-unionPay/node_modules/vue-jsonp/dist/index.d.ts @@ -1,73 +1,73 @@ -/** - * Vue Jsonp. - * # Carry Your World # - * - * @author: LancerComet - * @license: MIT - */ -import { PluginObject } from 'vue/types/plugin'; -declare module 'vue/types/vue' { - interface Vue { - $jsonp: typeof jsonp; - } -} -/** - * Vue JSONP. - */ -declare const VueJsonp: PluginObject; -/** - * JSONP function. - * - * @param { string } url Target URL address. - * @param { IJsonpParam } param Querying params object. - * @param { number } timeout Timeout setting (ms). - * - * @example - * jsonp('/url', { - * callbackQuery: '' - * callbackName: '', - * name: 'LancerComet', - * age: 26 - * }, 1000) - */ -declare function jsonp(url: string, param?: IJsonpParam, timeout?: number): Promise; -export { VueJsonp, jsonp }; -/** - * JSONP parameter declaration. - */ -interface IJsonpParam { - /** - * Callback query name. - * This param is used to define the query name of the callback function. - * - * @example - * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice" - * jsonp('/some-url', { - * callbackQuery: 'myCallback', - * callbackName: 'jsonp_func', - * myCustomUrlParam: 'veryNice' - * }) - * - * @default callback - */ - callbackQuery?: string; - /** - * Callback function name. - * This param is used to define the jsonp function name. - * - * @example - * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice" - * jsonp('/some-url', { - * callbackQuery: 'myCallback', - * callbackName: 'jsonp_func', - * myCustomUrlParam: 'veryNice' - * }) - * - * @default jsonp_ + randomStr() - */ - callbackName?: string; - /** - * Custom data. - */ - [key: string]: any; -} +/** + * Vue Jsonp. + * # Carry Your World # + * + * @author: LancerComet + * @license: MIT + */ +import { PluginObject } from 'vue/types/plugin'; +declare module 'vue/types/vue' { + interface Vue { + $jsonp: typeof jsonp; + } +} +/** + * Vue JSONP. + */ +declare const VueJsonp: PluginObject; +/** + * JSONP function. + * + * @param { string } url Target URL address. + * @param { IJsonpParam } param Querying params object. + * @param { number } timeout Timeout setting (ms). + * + * @example + * jsonp('/url', { + * callbackQuery: '' + * callbackName: '', + * name: 'LancerComet', + * age: 26 + * }, 1000) + */ +declare function jsonp(url: string, param?: IJsonpParam, timeout?: number): Promise; +export { VueJsonp, jsonp }; +/** + * JSONP parameter declaration. + */ +interface IJsonpParam { + /** + * Callback query name. + * This param is used to define the query name of the callback function. + * + * @example + * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice" + * jsonp('/some-url', { + * callbackQuery: 'myCallback', + * callbackName: 'jsonp_func', + * myCustomUrlParam: 'veryNice' + * }) + * + * @default callback + */ + callbackQuery?: string; + /** + * Callback function name. + * This param is used to define the jsonp function name. + * + * @example + * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice" + * jsonp('/some-url', { + * callbackQuery: 'myCallback', + * callbackName: 'jsonp_func', + * myCustomUrlParam: 'veryNice' + * }) + * + * @default jsonp_ + randomStr() + */ + callbackName?: string; + /** + * Custom data. + */ + [key: string]: any; +} diff --git a/high-unionPay/node_modules/vue-jsonp/dist/utils/index.d.ts b/high-unionPay/node_modules/vue-jsonp/dist/utils/index.d.ts index 6b2f521..e78bb4b 100644 --- a/high-unionPay/node_modules/vue-jsonp/dist/utils/index.d.ts +++ b/high-unionPay/node_modules/vue-jsonp/dist/utils/index.d.ts @@ -1,20 +1,20 @@ -/** - * Generate random string. - * - * @return { string } - */ -declare function randomStr(): string; -/** - * Format params into querying string. - * - * @return {string[]} - */ -declare function formatParams(queryKey: string, value: any): string[]; -/** - * Flat querys. - * - * @param {string[] | (string[])[]} array - * @returns - */ -declare function flatten(array: string[] | (string[])[]): string[]; -export { formatParams, flatten, randomStr }; +/** + * Generate random string. + * + * @return { string } + */ +declare function randomStr(): string; +/** + * Format params into querying string. + * + * @return {string[]} + */ +declare function formatParams(queryKey: string, value: any): string[]; +/** + * Flat querys. + * + * @param {string[] | (string[])[]} array + * @returns + */ +declare function flatten(array: string[] | (string[])[]): string[]; +export { formatParams, flatten, randomStr }; diff --git a/high-unionPay/node_modules/vue-jsonp/package.json b/high-unionPay/node_modules/vue-jsonp/package.json index c3ceeaf..c268779 100644 --- a/high-unionPay/node_modules/vue-jsonp/package.json +++ b/high-unionPay/node_modules/vue-jsonp/package.json @@ -1,80 +1,50 @@ -{ - "_from": "vue-jsonp", - "_id": "vue-jsonp@2.0.0", - "_inBundle": false, - "_integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA==", - "_location": "/vue-jsonp", - "_phantomChildren": {}, - "_requested": { - "type": "tag", - "registry": true, - "raw": "vue-jsonp", - "name": "vue-jsonp", - "escapedName": "vue-jsonp", - "rawSpec": "", - "saveSpec": null, - "fetchSpec": "latest" - }, - "_requiredBy": [ - "#USER", - "/" - ], - "_resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz", - "_shasum": "3bfac56bb72941a2511c11e1a123b876f03427f7", - "_spec": "vue-jsonp", - "_where": "C:\\Users\\Administrator\\Documents\\high-mini", - "author": { - "name": "LancerComet", - "email": "chw644@hotmail.com" - }, - "bugs": { - "url": "https://github.com/LancerComet/vue-jsonp/issues" - }, - "bundleDependencies": false, - "deprecated": false, - "description": "A tiny library for handling JSONP request.", - "devDependencies": { - "@types/expect-puppeteer": "^4.4.3", - "@types/jest": "^26.0.14", - "@types/jest-environment-puppeteer": "^4.4.0", - "@types/puppeteer": "^3.0.2", - "jest": "^26.4.2", - "jest-puppeteer": "^4.4.0", - "puppeteer": "^5.3.1", - "rollup": "^2.28.2", - "rollup-plugin-cleanup": "^3.2.1", - "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-terser": "^7.0.2", - "rollup-plugin-typescript2": "^0.27.3", - "ts-jest": "^26.4.1", - "tslint": "^6.1.3", - "typescript": "^4.0.3", - "vue": "^2.6.12" - }, - "files": [ - "dist/", - "index.d.ts", - "README.md" - ], - "homepage": "https://github.com/LancerComet/vue-jsonp#readme", - "keywords": [ - "Vue", - "JSONP" - ], - "license": "MIT", - "main": "./dist/index.js", - "module": "./dist/index.esm.js", - "name": "vue-jsonp", - "repository": { - "type": "git", - "url": "git+https://github.com/LancerComet/vue-jsonp.git" - }, - "scripts": { - "build": "rollup -c", - "prepublish": "npm run test", - "pretest": "npm run build", - "preversion": "npm run test", - "test": "jest" - }, - "version": "2.0.0" -} +{ + "name": "vue-jsonp", + "version": "2.0.0", + "description": "A tiny library for handling JSONP request.", + "main": "./dist/index.js", + "module": "./dist/index.esm.js", + "keywords": [ + "Vue", + "JSONP" + ], + "files": [ + "dist/", + "index.d.ts", + "README.md" + ], + "scripts": { + "build": "rollup -c", + "test": "jest", + "pretest": "npm run build", + "preversion": "npm run test", + "prepublish": "npm run test" + }, + "author": { + "name": "LancerComet", + "email": "chw644@hotmail.com" + }, + "repository": { + "type": "git", + "url": "https://github.com/LancerComet/vue-jsonp.git" + }, + "license": "MIT", + "devDependencies": { + "@types/expect-puppeteer": "^4.4.3", + "@types/jest": "^26.0.14", + "@types/jest-environment-puppeteer": "^4.4.0", + "@types/puppeteer": "^3.0.2", + "jest": "^26.4.2", + "jest-puppeteer": "^4.4.0", + "puppeteer": "^5.3.1", + "rollup": "^2.28.2", + "rollup-plugin-cleanup": "^3.2.1", + "rollup-plugin-delete": "^2.0.0", + "rollup-plugin-terser": "^7.0.2", + "rollup-plugin-typescript2": "^0.27.3", + "ts-jest": "^26.4.1", + "tslint": "^6.1.3", + "typescript": "^4.0.3", + "vue": "^2.6.12" + } +} diff --git a/high-unionPay/package-lock.json b/high-unionPay/package-lock.json index 8325a35..262b5c5 100644 --- a/high-unionPay/package-lock.json +++ b/high-unionPay/package-lock.json @@ -1,23 +1,235 @@ { - "name": "视频播放器组件", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "base-64": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz", - "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==" + "name": "视频播放器组件", + "version": "1.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "视频播放器组件", + "version": "1.0.0", + "dependencies": { + "base-64": "^1.0.0", + "vue-jsonp": "^2.0.0", + "vue-lottie": "^0.2.1" + } + }, + "node_modules/@babel/parser": { + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.0.tgz", + "integrity": "sha512-G9VgAhEaICnz8iiJeGJQyVl6J2nTjbW0xeisva0PK6XcKsga7BIaqm4ZF8Rg1Wbaqmy6znspNqhPaPkyukujzg==", + "peer": true, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@vue/compiler-sfc": { + "version": "2.7.13", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz", + "integrity": "sha512-zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg==", + "peer": true, + "dependencies": { + "@babel/parser": "^7.18.4", + "postcss": "^8.4.14", + "source-map": "^0.6.1" + } + }, + "node_modules/base-64": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz", + "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==" + }, + "node_modules/csstype": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", + "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==", + "peer": true + }, + "node_modules/lottie-web": { + "version": "5.9.6", + "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.9.6.tgz", + "integrity": "sha512-JFs7KsHwflugH5qIXBpB4905yC1Sub2MZWtl/elvO/QC6qj1ApqbUZJyjzJseJUtVpgiDaXQLjBlIJGS7UUUXA==" + }, + "node_modules/nanoid": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "peer": true, + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "peer": true + }, + "node_modules/postcss": { + "version": "8.4.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", + "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + } + ], + "peer": true, + "dependencies": { + "nanoid": "^3.3.4", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.2" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/vue": { + "version": "2.7.13", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz", + "integrity": "sha512-QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ==", + "peer": true, + "dependencies": { + "@vue/compiler-sfc": "2.7.13", + "csstype": "^3.1.0" + } + }, + "node_modules/vue-jsonp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz", + "integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA==" + }, + "node_modules/vue-lottie": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/vue-lottie/-/vue-lottie-0.2.1.tgz", + "integrity": "sha512-zInUX69Ij8MhVR3XArpu4PqqBoufwKxS5UMutWCPm59VUaB5H6GtnaIzf9M+l6aYU+Kr8gF/W9dzWLgRuU6V+Q==", + "dependencies": { + "lottie-web": "^5.1.9" + }, + "peerDependencies": { + "vue": "^2.5.16" + } + } }, - "jweixin-module": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz", - "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==" - }, - "vue-jsonp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz", - "integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA==" + "dependencies": { + "@babel/parser": { + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.0.tgz", + "integrity": "sha512-G9VgAhEaICnz8iiJeGJQyVl6J2nTjbW0xeisva0PK6XcKsga7BIaqm4ZF8Rg1Wbaqmy6znspNqhPaPkyukujzg==", + "peer": true + }, + "@vue/compiler-sfc": { + "version": "2.7.13", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz", + "integrity": "sha512-zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg==", + "peer": true, + "requires": { + "@babel/parser": "^7.18.4", + "postcss": "^8.4.14", + "source-map": "^0.6.1" + } + }, + "base-64": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz", + "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==" + }, + "csstype": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", + "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==", + "peer": true + }, + "lottie-web": { + "version": "5.9.6", + "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.9.6.tgz", + "integrity": "sha512-JFs7KsHwflugH5qIXBpB4905yC1Sub2MZWtl/elvO/QC6qj1ApqbUZJyjzJseJUtVpgiDaXQLjBlIJGS7UUUXA==" + }, + "nanoid": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "peer": true + }, + "picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "peer": true + }, + "postcss": { + "version": "8.4.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", + "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", + "peer": true, + "requires": { + "nanoid": "^3.3.4", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.2" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "peer": true + }, + "source-map-js": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "peer": true + }, + "vue": { + "version": "2.7.13", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz", + "integrity": "sha512-QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ==", + "peer": true, + "requires": { + "@vue/compiler-sfc": "2.7.13", + "csstype": "^3.1.0" + } + }, + "vue-jsonp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz", + "integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA==" + }, + "vue-lottie": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/vue-lottie/-/vue-lottie-0.2.1.tgz", + "integrity": "sha512-zInUX69Ij8MhVR3XArpu4PqqBoufwKxS5UMutWCPm59VUaB5H6GtnaIzf9M+l6aYU+Kr8gF/W9dzWLgRuU6V+Q==", + "requires": { + "lottie-web": "^5.1.9" + } + } } - } } diff --git a/high-unionPay/package.json b/high-unionPay/package.json index a37ecd9..3ee4dcc 100644 --- a/high-unionPay/package.json +++ b/high-unionPay/package.json @@ -11,6 +11,8 @@ "uniapp" ], "dependencies": { - "base-64": "^1.0.0" + "base-64": "^1.0.0", + "vue-jsonp": "^2.0.0", + "vue-lottie": "^0.2.1" } } diff --git a/high-unionPay/pages/goods/goods.vue b/high-unionPay/pages/goods/goods.vue index e9058fd..c462ca8 100644 --- a/high-unionPay/pages/goods/goods.vue +++ b/high-unionPay/pages/goods/goods.vue @@ -54,7 +54,7 @@ 嗨森逛 - 月销 500 + 月销 {{goodsData[0].salesCount}} diff --git a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue index 9ef122a..1ed7a12 100644 --- a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue +++ b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue @@ -77,6 +77,13 @@ ¥0 + + + + 邀请码 + + + @@ -245,9 +252,6 @@ import wybPopup from '../../../components/wyb-popup/wyb-popup.vue'; import cjSlider from '@/components/cj-slider/cj-slider.vue'; let app = getApp(); - // #ifdef H5 - var jweixin = require('jweixin-module'); - // #endif export default { components: { ssPaymentPassword, @@ -278,12 +282,19 @@ availIntegal: 0, // 可用积分 gasOrderList: '', //存的订单信息 rebateIntegral: '', //返回积分 - Integrastu: 1 //返积分状态 + Integrastu: 1 ,//返积分状态 + identificationCode: '', //渠道商 } }, onLoad(e) { this.gasOrderList = app.globalData.pelletoilList; - this.orderPrice = this.gasOrderList.highChildOrderList[0].goodsPrice; + this.orderPrice = this.gasOrderList.highChildOrderList[0].goodsPrice; + // #ifdef H5 + this.identificationCode = app.globalData.staffCode; + // #endif + // #ifdef MP + this.identificationCode = app.globalData.identificationCode; + // #endif }, onShow() { let that = this; @@ -491,7 +502,8 @@ }) if (this.payPrice == 0 && !this.orderNo) { let goods = { - "identificationCode": this.gasOrderList.identificationCode, + "identificationCode": this.gasOrderList.identificationCode, + "promoteCode":this.identificationCode, "payGold": this.priceValue[1], "memDiscountId": this.memDiscountId, "payPwd": this.PaymentPassword, @@ -729,7 +741,8 @@ title: '提交订单中...' }) let goods = { - "identificationCode": this.gasOrderList.identificationCode, + "identificationCode": this.gasOrderList.identificationCode, + "promoteCode":this.identificationCode, "payGold": this.priceValue[1], "memDiscountId": this.memDiscountId, "highChildOrderList": [{ diff --git a/high-unionPay/pages/order/confirmation.vue b/high-unionPay/pages/order/confirmation.vue index 1db1a5b..97991e2 100644 --- a/high-unionPay/pages/order/confirmation.vue +++ b/high-unionPay/pages/order/confirmation.vue @@ -8,29 +8,15 @@ {{couponList.couponName}} 规格: 默认 - ￥{{couponList.salesPrice}} - - - {{couponList.salesPrice * 100}} - + ￥{{couponList.salesPrice}} x1 - ￥{{couponList.discountPrice}} - - - {{couponList.discountPrice*100}} - - + ￥{{couponList.discountPrice}} + v-if="couponList.salesPrice != couponList.discountPrice"> ￥{{couponList.salesPrice}} - - - {{couponList.salesPrice*100}} - x1 @@ -40,24 +26,12 @@ 商品总额 - + ￥{{couponList.salesPrice}} - - - {{couponList.salesPrice*100}} - - + ￥{{couponList.discountPrice}} - - - {{couponList.discountPrice*100}} - @@ -96,85 +70,88 @@ - - - 支付方式积分充值 + + + + 积分抵扣 + + + 0 + + {{availIntegal}} - - + + - 积分支付可用积分: {{user.gold}} + 抵扣金额 - + ¥{{priceValue[1] / 100}} - - - - 银联支付 + + + + + + 下单返积分 - - + 返{{rebateIntegral}}积分 - - - - - 工会卡支付可用余额: {{tongCardPrice}}元 - - - + {{rebateIntegral}} - - - + + + 积分抵扣与优惠券抵扣不同享 + - - - + + + + + + 银联支付 + + + + + + + + + 工会卡支付可用余额: {{tongCardPrice}}元 + + + + - --> + + - 实付:￥{{paytheprice}} - - - {{paytheprice*100}} - + 实付:￥{{paytheprice}} - - - - - - - @@ -199,19 +176,18 @@ diff --git a/high-unionPay/pages/tabBar/user/user.vue b/high-unionPay/pages/tabBar/user/user.vue index 3859232..e360b19 100644 --- a/high-unionPay/pages/tabBar/user/user.vue +++ b/high-unionPay/pages/tabBar/user/user.vue @@ -47,6 +47,9 @@ :text="therrNum" type="error" size="normal"> + + @@ -54,22 +57,22 @@ {{row.text}} - - - - - - - - 等待付款 - 剩余时间: 13:44 - - - 去支付 - - - - + + + + + + + + 等待付款 + 剩余时间: {{countdownm}}:{{countdowns}} + + + 去支付 + + + + @@ -88,20 +91,22 @@ - - **** - ¥2400 - 积分余额 - - - **** - ¥2400 - 油卡余额 - - - **** - ¥2400 - 工会卡余额 + + **** + {{userAccount.integral}} + 积分余额 + + + **** + ¥{{userAccount.oilCardPrice}} + + 油卡余额 + + + **** + ¥{{userAccount.hltCardPrice}} + + 工会卡余额 @@ -150,8 +155,10 @@ @@ -78,10 +137,9 @@ background-color: #f3f3f3; } - .srollview { - position: fixed; - top: 0px; - height: 70px; + .srollview { + position: fixed; + height: 70px; background-color: #ffffff; display: flex; flex-direction: row; @@ -90,11 +148,11 @@ .conent { height: 24px; - line-height: 24px; + line-height: 24px; margin-top: 15px; padding-left: 10px; - font-size: 11px; - padding-right: 10px; + font-size: 11px; + padding-right: 10px; margin-left: 15px; display: inline-flex; flex-direction: column; diff --git a/high-unionPay/pages/user/order_details/order_details.vue b/high-unionPay/pages/user/order_details/order_details.vue index 5a6c3bd..3178459 100644 --- a/high-unionPay/pages/user/order_details/order_details.vue +++ b/high-unionPay/pages/user/order_details/order_details.vue @@ -1,120 +1,132 @@ diff --git a/high-unionPay/pages/user/order_list/order_list.vue b/high-unionPay/pages/user/order_list/order_list.vue index d44ae3b..1b4c254 100644 --- a/high-unionPay/pages/user/order_list/order_list.vue +++ b/high-unionPay/pages/user/order_list/order_list.vue @@ -1,7 +1,7 @@