plutosdk 1.0.2-beta.1 → 1.0.2-beta.3

package/lib/components/CheckIn/index.js

@@ -13,8 +13,8 @@ import walletManager from '../../utils/WalletManager';
 import ContentBg from '../ContentBg';
 import BlurMask from '../BlurMask';
 import ContentTitle from '../ContentTitle';
-import SignInInfo from '../CheckInInfo';
-import SignInButton from '../CheckInButton';
+import CheckInInfo from '../CheckInInfo';
+import CheckInButton from '../CheckInButton';
 import Toast from '../Toast';
 import Loading from '../Loading';
 /**
@@ -80,7 +80,7 @@ export default class CheckIn extends PureComponent {
      */
     render() {
         const { showSlide } = this.state;
-        return (_jsxs(Box, Object.assign({ sx: { width: 1, height: 1, position: 'relative' } }, { children: [_jsx(BlurMask, {}), _jsxs(Box, Object.assign({ sx: { width: 1, height: 1, position: 'relative' } }, { children: [_jsx(Box, { sx: { width: 1, height: 1, position: 'fixed' }, onClick: this.onClickClose }), _jsx(Box, Object.assign({ sx: { width: 1, position: 'absolute', bottom: 40, pointerEvents: 'none' } }, { children: _jsx(Slide, Object.assign({ direction: 'up', in: showSlide, mountOnEnter: true, unmountOnExit: true, timeout: { enter: 600, exit: 600 }, onEntered: this.onEntered, onExited: this.onExited }, { children: _jsxs(Box, Object.assign({ sx: { width: '96%', maxWidth: 430, m: '0 auto', position: 'relative', pointerEvents: 'auto' } }, { children: [_jsx(ContentBg, {}), _jsx(ContentTitle, { title: 'Claim' }), _jsx(SignInInfo, {}), _jsx(Stack, Object.assign({ spacing: 2, sx: { mx: 5, pb: 4 } }, { children: _jsx(SignInButton, { onClickSignIn: this.onClickSignIn }) }))] })) })) }))] }))] })));
+        return (_jsxs(Box, Object.assign({ sx: { width: 1, height: 1, position: 'relative' } }, { children: [_jsx(BlurMask, {}), _jsxs(Box, Object.assign({ sx: { width: 1, height: 1, position: 'relative' } }, { children: [_jsx(Box, { sx: { width: 1, height: 1, position: 'fixed' }, onClick: this.onClickClose }), _jsx(Box, Object.assign({ sx: { width: 1, position: 'absolute', bottom: 40, pointerEvents: 'none' } }, { children: _jsx(Slide, Object.assign({ direction: 'up', in: showSlide, mountOnEnter: true, unmountOnExit: true, timeout: { enter: 600, exit: 600 }, onEntered: this.onEntered, onExited: this.onExited }, { children: _jsxs(Box, Object.assign({ sx: { width: '96%', maxWidth: 430, m: '0 auto', position: 'relative', pointerEvents: 'auto' } }, { children: [_jsx(ContentBg, {}), _jsx(ContentTitle, { title: 'Claim' }), _jsx(CheckInInfo, {}), _jsx(Stack, Object.assign({ spacing: 2, sx: { mx: 5, pb: 4 } }, { children: _jsx(CheckInButton, { onClickSignIn: this.onClickSignIn }) }))] })) })) }))] }))] })));
     }
     /**
      *

package/lib/components/PayButton/index.d.ts

@@ -1,7 +1,9 @@
 import { MouseEventHandler, PureComponent } from 'react';
 interface IProps {
-    content: string;
-    icon: string;
+    currency: string;
+    price: number;
+    oldPrice: number;
+    discount: number;
     onClickPay: MouseEventHandler<HTMLButtonElement>;
 }
 /**

package/lib/components/PayButton/index.js

@@ -3,6 +3,7 @@ import { PureComponent } from 'react';
 import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
 import { getRes } from '../../utils/Utils';
+import { CURRENCY, CURRENCY_ICON, CURRENCY_NAME } from '../../utils/constant';
 import StrokeText from '../StrokeText';
 /**
  *
@@ -12,7 +13,11 @@ export default class PayButton extends PureComponent {
      *
      */
     render() {
-        const { content, icon, onClickPay } = this.props;
-        return (_jsx(Box, Object.assign({ sx: { height: 50, position: 'relative' } }, { children: _jsxs(Button, Object.assign({ sx: { width: 1, height: 1, borderRadius: 3 }, variant: 'contained', onClick: onClickPay }, { children: [_jsx(Box, { sx: { width: 1, height: 1, position: 'absolute', top: 0, borderImage: `url(${getRes('button_2.png')})`, borderWidth: 20, borderStyle: 'solid', borderImageRepeat: 'repeat', borderImageSlice: '20 fill' } }), _jsx(Box, { component: 'img', src: icon, sx: { width: 30, height: 30, mr: 1, position: 'relative' } }), _jsx(StrokeText, { content: content, fontSize: 22, color: '#fff', strokeColor: '#4a7408', strokeWidth: 3 })] })) })));
+        const { currency, price, oldPrice, discount, onClickPay } = this.props;
+        const icon = getRes(CURRENCY_ICON[currency]);
+        const name = CURRENCY_NAME[currency];
+        const priceStr = `${currency == CURRENCY.star ? price : price.toFixed(2)} ${name}`;
+        const oldPriceStr = `\xa0${currency == CURRENCY.star ? oldPrice : oldPrice.toFixed(2)} ${name}\xa0`;
+        return (_jsxs(Box, Object.assign({ sx: { height: 50, position: 'relative' } }, { children: [_jsxs(Button, Object.assign({ sx: { width: 1, height: 1, borderRadius: 3 }, variant: 'contained', onClick: onClickPay }, { children: [_jsx(Box, { sx: { width: 1, height: 1, position: 'absolute', top: 0, borderImage: `url(${getRes('button_2.png')})`, borderWidth: 20, borderStyle: 'solid', borderImageRepeat: 'repeat', borderImageSlice: '20 fill' } }), _jsx(Box, { component: 'img', src: icon, sx: { width: 30, height: 30, mr: 1, position: 'relative' } }), _jsx(StrokeText, { content: priceStr, fontSize: 22, color: '#fff', strokeColor: '#4a7408', strokeWidth: 3 }), _jsx(Box, { sx: { width: '10px' } }), discount > 0 ? (_jsx(StrokeText, { content: oldPriceStr, fontSize: 14, color: '#fff', strokeColor: '#4a7408', strokeWidth: 2, decorationLine: true })) : null] })), discount > 0 ? (_jsx(Box, Object.assign({ sx: { top: -12, right: -20, bottom: 0, left: -20, position: 'absolute', pointerEvents: 'none' } }, { children: _jsxs(Box, Object.assign({ sx: { width: 62, height: 50, rotate: '-20deg', position: 'relative', float: 'right', display: 'inline-block' } }, { children: [_jsx(Box, { component: 'img', src: getRes('sale_off.png'), sx: { width: 62, height: 50, position: 'absolute', display: 'block' } }), _jsx(Box, Object.assign({ sx: { top: 6, width: 62, height: 25, textAlign: 'center', color: '#fff', fontSize: 16, fontWeight: 'bold', position: 'absolute' } }, { children: `${discount * 100}%` })), _jsx(Box, Object.assign({ sx: { bottom: 6, width: 62, height: 25, textAlign: 'center', color: '#fff', fontSize: 16, fontWeight: 'bold', position: 'absolute' } }, { children: "OFF" }))] })) }))) : null] })));
     }
 }

package/lib/components/Purchase/index.js

@@ -6,7 +6,7 @@ import Stack from '@mui/material/Stack';
 import PubSub from 'pubsub-js';
 import { CHAIN } from '@tonconnect/ui';
 import { CODE, CURRENCY, PS_PURCHASE_COMPLETED, PS_SWITCH_PAGE, PAGE_ID, PAY_TYPE, TOKEN_NAME } from '../../utils/constant';
-import { getRes, isAppleClient, onMobile } from '../../utils/Utils';
+import { isAppleClient, onMobile } from '../../utils/Utils';
 import Config from '../../utils/Config';
 import user from '../../utils/User';
 import platform from '../../utils/Platform';
@@ -145,9 +145,9 @@ export default class Purchase extends PureComponent {
      *
      */
     render() {
-        const { ton, usdt, cati, star } = user.purchaseData;
+        const { ton, tonOld, tonDiscount, usdt, usdtOld, usdtDiscount, cati, catiOld, catiDiscount, star, starOld, starDiscount } = user.purchaseData;
         const { showSlide } = this.state;
-        return (_jsxs(Box, Object.assign({ sx: { width: 1, height: 1, position: 'relative' } }, { children: [_jsx(BlurMask, {}), _jsxs(Box, Object.assign({ sx: { width: 1, height: 1, position: 'relative', overflowY: 'auto', '::-webkit-scrollbar': { display: 'none' } } }, { children: [_jsx(Box, { sx: { width: 1, height: 1, position: 'fixed' }, onClick: this.onClickClose }), _jsx(Box, Object.assign({ sx: { width: '100%', position: 'absolute', pointerEvents: 'none', '@media (orientation: portrait)': { bottom: 20 }, '@media (orientation: landscape)': { top: 10 } } }, { children: _jsx(Slide, Object.assign({ direction: 'up', in: showSlide, mountOnEnter: true, unmountOnExit: true, timeout: { enter: 600, exit: 600 }, onExited: this.onExited }, { children: _jsxs(Box, Object.assign({ sx: { width: 1, maxWidth: 430, m: '0 auto', position: 'relative', pointerEvents: 'auto' } }, { children: [_jsx(ContentBg, {}), _jsx(ContentTitle, { title: 'Purchase' }), _jsx(PurchaseInfo, {}), _jsxs(Stack, Object.assign({ spacing: 2, sx: { mx: 5, pb: 4 } }, { children: [Config.TEST_MODE || (!onMobile() && !isAppleClient()) ? (_jsxs(_Fragment, { children: [_jsx(PayButton, { content: `${cati.toFixed(2)} CATI`, icon: getRes('coin_cati.png'), onClickPay: this.onClickCati }), _jsx(PayButton, { content: `${ton.toFixed(2)} TON`, icon: getRes('coin_ton.png'), onClickPay: this.onClickTon }), _jsx(PayButton, { content: `${usdt.toFixed(2)} USDT`, icon: getRes('coin_usdt.png'), onClickPay: this.onClickUsdt })] })) : null, _jsx(PayButton, { content: `${star} Star`, icon: getRes('coin_star.png'), onClickPay: this.onClickStar })] }))] })) })) }))] }))] })));
+        return (_jsxs(Box, Object.assign({ sx: { width: 1, height: 1, position: 'relative' } }, { children: [_jsx(BlurMask, {}), _jsxs(Box, Object.assign({ sx: { width: 1, height: 1, position: 'relative', overflowY: 'auto', '::-webkit-scrollbar': { display: 'none' } } }, { children: [_jsx(Box, { sx: { width: 1, height: 1, position: 'fixed' }, onClick: this.onClickClose }), _jsx(Box, Object.assign({ sx: { width: '100%', position: 'absolute', pointerEvents: 'none', '@media (orientation: portrait)': { bottom: 20 }, '@media (orientation: landscape)': { top: 10 } } }, { children: _jsx(Slide, Object.assign({ direction: 'up', in: showSlide, mountOnEnter: true, unmountOnExit: true, timeout: { enter: 600, exit: 600 }, onExited: this.onExited }, { children: _jsxs(Box, Object.assign({ sx: { width: 1, maxWidth: 430, m: '0 auto', position: 'relative', pointerEvents: 'auto' } }, { children: [_jsx(ContentBg, {}), _jsx(ContentTitle, { title: 'Purchase' }), _jsx(PurchaseInfo, {}), _jsxs(Stack, Object.assign({ spacing: 2, sx: { mx: 5, pb: 4 } }, { children: [Config.TEST_MODE || (!onMobile() && !isAppleClient()) ? (_jsxs(_Fragment, { children: [_jsx(PayButton, { currency: CURRENCY.cati, price: cati, oldPrice: catiOld, discount: catiDiscount, onClickPay: this.onClickCati }), _jsx(PayButton, { currency: CURRENCY.ton, price: ton, oldPrice: tonOld, discount: tonDiscount, onClickPay: this.onClickTon }), _jsx(PayButton, { currency: CURRENCY.usdt, price: usdt, oldPrice: usdtOld, discount: usdtDiscount, onClickPay: this.onClickUsdt })] })) : null, _jsx(PayButton, { currency: CURRENCY.star, price: star, oldPrice: starOld, discount: starDiscount, onClickPay: this.onClickStar })] }))] })) })) }))] }))] })));
     }
     /**
      *

package/lib/components/StrokeText/index.d.ts

@@ -5,6 +5,7 @@ interface IProps {
     color: string;
     strokeColor: string;
     strokeWidth: number;
+    decorationLine?: boolean;
 }
 /**
  *

package/lib/components/StrokeText/index.js

@@ -9,7 +9,7 @@ export default class StrokeText extends PureComponent {
      *
      */
     render() {
-        const { content, fontSize, color, strokeColor, strokeWidth } = this.props;
+        const { content, fontSize, color, strokeColor, strokeWidth, decorationLine } = this.props;
         const sx = {
             color: color,
             fontSize: fontSize,
@@ -17,6 +17,9 @@ export default class StrokeText extends PureComponent {
             position: 'relative',
             zIndex: 0,
             textTransform: 'none',
+            textDecorationLine: decorationLine ? 'line-through' : 'none',
+            textDecorationColor: '#f30808',
+            textDecorationThickness: '0.1em',
             '&:after': {
                 content: 'attr(content)',
                 WebkitTextStrokeColor: strokeColor,

package/lib/interface.d.ts

@@ -20,20 +20,35 @@ export interface IPurchase {
     name?: string;
     productId?: string;
     orderId?: string;
-    ton?: number;
+    customData?: string;
+    orderNo?: string;
     usdt?: number;
+    usdtOld?: number;
+    usdtDiscount?: number;
+    ton?: number;
+    tonOld?: number;
+    tonDiscount?: number;
     cati?: number;
+    catiOld?: number;
+    catiDiscount?: number;
     star?: number;
-    customData?: string;
-    orderNo?: string;
+    starOld?: number;
+    starDiscount?: number;
 }
-export interface IOrder {
+export interface IPayOrder {
     amount: string;
     orderNo: string;
     payload: string;
     payLink: string;
     address: string;
 }
+export interface IQueryOrder {
+    name: string;
+    productId: string;
+    orderId: string;
+    orderNo: string;
+    customData: string;
+}
 export interface ICheckIn {
     name?: string;
     orderId?: string;

package/lib/main.js

@@ -43,6 +43,10 @@ const start = () => {
  *
  */
 const run = () => {
+    //删除路径里Telegram参数
+    const baseUrl = location.origin + location.pathname + location.search;
+    history.replaceState(null, null, baseUrl);
+    //
     if (document.body) {
         start();
         return;

package/lib/sdk.d.ts

@@ -1,4 +1,4 @@
-import { ILogin, IPurchase } from './interface';
+import { ILogin, IQueryOrder } from './interface';
 /**
  *
  */
@@ -59,7 +59,7 @@ export declare const consumePurchase: (orderNo: string) => Promise<void>;
 /**
  *
  */
-export declare const queryPurchses: () => Promise<IPurchase[]>;
+export declare const queryPurchses: () => Promise<IQueryOrder[]>;
 /**
  *
  * @param type

package/lib/sdk.js

@@ -404,7 +404,7 @@ class Sdk {
                 code: CODE.NotInit,
                 message: 'Pluto sdk not initialize'
             });
-        } //
+        }
         return platform.reqUnfinishRecord();
     }
     /**

package/lib/utils/Platform.d.ts

@@ -1,4 +1,4 @@
-import { IGame, ILogin, IOrder, IPurchase } from "../interface";
+import { IGame, ILogin, IPayOrder, IQueryOrder } from "../interface";
 import { CURRENCY, PAY_TYPE } from './constant';
 /**
  *
@@ -29,7 +29,7 @@ declare class Platform {
      * @param payType
      * @param currency
      */
-    reqOrder(payType: PAY_TYPE, currency: CURRENCY): Promise<IOrder>;
+    reqOrder(payType: PAY_TYPE, currency: CURRENCY): Promise<IPayOrder>;
     /**
      *
      * @param orderNo
@@ -38,7 +38,7 @@ declare class Platform {
     /**
      *
      */
-    reqUnfinishRecord(): Promise<IPurchase[]>;
+    reqUnfinishRecord(): Promise<IQueryOrder[]>;
     /**
      *
      * @param name

package/lib/utils/Platform.js

@@ -81,15 +81,35 @@ class Platform {
      */
     reqPurchase(productId, name, orderId, amount, customData) {
         return Api.priceExchange(amount).then(data => {
+            const usdt = parseFloat(data['usdt']) || 0;
+            const ton = parseFloat(data['ton']) || 0;
+            const cati = parseFloat(data['cati']) || 0;
+            const star = parseInt(data['star']) || 0;
+            const usdtOff = parseFloat(data['usdtoff']) || 0;
+            const tonOff = parseFloat(data['tonoff']) || 0;
+            const catiOff = parseFloat(data['catioff']) || 0;
+            const starOff = parseFloat(data['staroff']) || 0;
+            const usdtDiscount = parseFloat(data['usdtdiscount']) || 0;
+            const tonDiscount = parseFloat(data['tondiscount']) || 0;
+            const catiDiscount = parseFloat(data['catidiscount']) || 0;
+            const starDiscount = parseFloat(data['stardiscount']) || 0;
             user.purchaseData = {
                 name: name,
                 productId: productId,
                 orderId: orderId,
-                usdt: parseFloat(data['usdt']),
-                ton: parseFloat(data['ton']),
-                cati: parseFloat(data['cati']),
-                star: parseInt(data['star']),
-                customData: customData
+                customData: customData,
+                usdt: usdtDiscount ? usdtOff : usdt,
+                usdtOld: usdt,
+                usdtDiscount: usdtDiscount,
+                ton: tonDiscount ? tonOff : ton,
+                tonOld: ton,
+                tonDiscount: tonDiscount,
+                cati: catiDiscount ? catiOff : cati,
+                catiOld: cati,
+                catiDiscount: catiDiscount,
+                star: starDiscount ? starOff : star,
+                starOld: star,
+                starDiscount: starDiscount
             };
         });
     }
@@ -102,7 +122,6 @@ class Platform {
         const { productId, name, orderId, usdt, customData } = user.purchaseData;
         return Api.order(productId, name, orderId, usdt, payType, currency, customData).then(data => {
             user.purchaseData.orderNo = data['orderNo'];
-            //
             return {
                 amount: data['amount'],
                 orderNo: data['orderNo'],

package/lib/utils/constant.d.ts

@@ -63,8 +63,8 @@ export declare enum PAY_TYPE {
     tonConnect = 2
 }
 export declare enum CURRENCY {
-    ton = "TON",
     usdt = "USDT",
+    ton = "TON",
     cati = "CATI",
     star = "STAR"
 }
@@ -76,3 +76,15 @@ export declare enum ORIENTATION_TYPE {
     portrait = 1,
     landscape = 2
 }
+export declare const CURRENCY_NAME: {
+    USDT: string;
+    TON: string;
+    CATI: string;
+    STAR: string;
+};
+export declare const CURRENCY_ICON: {
+    USDT: string;
+    TON: string;
+    CATI: string;
+    STAR: string;
+};

package/lib/utils/constant.js

@@ -67,8 +67,8 @@ export var PAY_TYPE;
 })(PAY_TYPE || (PAY_TYPE = {}));
 export var CURRENCY;
 (function (CURRENCY) {
-    CURRENCY["ton"] = "TON";
     CURRENCY["usdt"] = "USDT";
+    CURRENCY["ton"] = "TON";
     CURRENCY["cati"] = "CATI";
     CURRENCY["star"] = "STAR";
 })(CURRENCY || (CURRENCY = {}));
@@ -82,3 +82,15 @@ export var ORIENTATION_TYPE;
     ORIENTATION_TYPE[ORIENTATION_TYPE["portrait"] = 1] = "portrait";
     ORIENTATION_TYPE[ORIENTATION_TYPE["landscape"] = 2] = "landscape";
 })(ORIENTATION_TYPE || (ORIENTATION_TYPE = {}));
+export const CURRENCY_NAME = {
+    [CURRENCY.usdt]: 'USDT',
+    [CURRENCY.ton]: 'TON',
+    [CURRENCY.cati]: 'CATI',
+    [CURRENCY.star]: 'Star'
+};
+export const CURRENCY_ICON = {
+    [CURRENCY.usdt]: 'coin_usdt.png',
+    [CURRENCY.ton]: 'coin_ton.png',
+    [CURRENCY.cati]: 'coin_cati.png',
+    [CURRENCY.star]: 'coin_star.png'
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "plutosdk",
-    "version": "1.0.2-beta.1",
+    "version": "1.0.2-beta.3",
     "author": "pluto",
     "main": "./lib/index.js",
     "files": [