s-material-react 0.1.13 → 0.1.15

package/dist/components/PlaceOrder/hooks/usePlaceOrder.js

@@ -0,0 +1,234 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { queryToContractImpl, queryAddressBymerberCode, getFalgSettingForPaydate, calculateFreightFare, getTotalDiscountPriceImpl, saveContract, queryShoppingToContract } from '../../../utils/payment';
+import { useEffect, useRef, useState } from 'react';
+import { _ } from '@brushes/tools';
+import { navigatorImpl } from '@brushes/qj-simulate-component';
+import { routerMap } from '../../../routerMap';
+const { set } = _;
+export function usePlaceOrder({ skuId, goodsNum, shoppingGoodsId }) {
+    const list = useRef([]);
+    const [address, setAddress] = useState({});
+    const promotionCode = useRef('');
+    const ocContractSettlList = useRef([]); //优惠信息
+    const shoppingGoodsList = useRef([]); // 获取优惠劵列表需要传所有商品的参数
+    const rsSkuListStr = useRef([]);
+    const payState = useRef({
+        contractSettlOpno: 0,
+        promotionCodes: null,
+        shoppingCountPrice: 0,
+        totalDiscountPrice: 0,
+        accountsSumPrice: 0,
+        discount: 0,
+        freight: 0,
+        comDisMoney: 0,
+        copyComDisMoney: 0
+    });
+    useEffect(() => {
+        (() => __awaiter(this, void 0, void 0, function* () {
+            // 初始化地址信息
+            // 预订单详情
+            // 购物车到下单页面
+            if (shoppingGoodsId) {
+                yield initImpl(() => queryShoppingToContract({
+                    shoppingGoodsIdStr: `[${shoppingGoodsId}]`
+                }));
+            }
+            else {
+                // 商品详情到下单页
+                yield initImpl(() => queryToContractImpl(skuId, goodsNum));
+            }
+        }))();
+    }, []);
+    const initImpl = (callback) => __awaiter(this, void 0, void 0, function* () {
+        const data = yield Promise.all([queryAddressBymerberCode(), callback()]);
+        const [addressData = [], contractData] = data;
+        const addressInfo = addressData.find((item) => item.addressDefault === '1');
+        setAddress(addressInfo);
+        computedValue(contractData);
+    });
+    //
+    // const initializePrice = () => {
+    //   // 初始化涉及到钱的变量，防止页面从后台到前台的时候在原有基础上再次计算
+    //   that.shoppingCountPrice = 0;
+    //   that.totalDiscountPrice = 0;
+    //   that.accountsSumPrice = 0;
+    //   that.discount = 0;
+    //   that.freight = 0;
+    //   that.comDisMoney = 0;
+    //   that.copyComDisMoney = 0;
+    //   // that.baseColor = '#' + $storage.get('baseColor');
+    // }
+    const computedValue = (res) => {
+        res.forEach((v) => {
+            // 查看商品是否促销
+            v.shoppingpackageList.forEach((vk) => {
+                payState.current.comDisMoney += vk.disMoney;
+                payState.current.copyComDisMoney += vk.disMoney;
+                vk.shoppingGoodsList.forEach((item) => {
+                    shoppingGoodsList.current.push(item);
+                    payState.current.shoppingCountPrice += item.pricesetNprice * item.goodsCamount;
+                    item.contractGoodsGtype = 0;
+                    promotionCode.current = vk.promotionCode;
+                    console.log(82, promotionCode.current);
+                    // 普通商品获取自动取消订单时间
+                    if (item.goodsType == '00') {
+                        getFalgSettingForPaydate().then((res) => {
+                            if (res) {
+                                // 暂时放这里不处理
+                                // $storage.set('payTime', Number(res.flagSettingInfo));
+                            }
+                        });
+                    }
+                });
+                // 优惠
+                if (vk.disMoney > 0) {
+                    ocContractSettlList.current.push({
+                        contractSettlBlance: vk.promotionInType == 0 ? 'PM' : 'COP',
+                        contractPmode: '0',
+                        contractSettlGmoney: Number(vk.disMoney.toFixed(2)),
+                        contractSettlPmoney: Number(vk.disMoney.toFixed(2)),
+                        contractSettlOpno: vk.promotionCode,
+                        contractSettlOpemo: vk.promotionName
+                    });
+                }
+                if (vk.giftList) {
+                    vk.shoppingGoodsList.forEach((eItem) => {
+                        // 满赠  0001
+                        eItem.ginfoCode = eItem.pmPromotionList.find((gift) => gift.pbCode == '0001').promotionCode;
+                    });
+                    list.current = [...vk.shoppingGoodsList, ...vk.giftList];
+                }
+                else {
+                    list.current = vk.shoppingGoodsList;
+                }
+            });
+            resultPrice();
+            //运费计算
+            freightCalculation();
+            //用户权益差价
+            userEquitySpread();
+        });
+    };
+    const resultPrice = () => {
+        const { shoppingCountPrice, totalDiscountPrice, discount, comDisMoney, freight } = payState.current;
+        payState.current.accountsSumPrice = shoppingCountPrice - totalDiscountPrice - discount - comDisMoney + freight;
+    };
+    //运费计算
+    const freightCalculation = () => __awaiter(this, void 0, void 0, function* () {
+        let payload = {};
+        if (shoppingGoodsId) {
+            // 购物车计算运费
+            payload = { shoppingGoodsIdStr: `[${shoppingGoodsId}]` };
+        }
+        else {
+            // 商品详情计算运费
+            payload = { skuIdStr: JSON.stringify([{ skuId, goodsNum }]) };
+        }
+        const data = yield calculateFreightFare(Object.assign(Object.assign({}, payload), { areaCode: 110000 }));
+        payState.current.freight = data.dataObj;
+        resultPrice();
+    });
+    // 参数数据处理
+    const paramsDataHandle = () => {
+        return [
+            {
+                contractPaytime: new Date().valueOf(),
+                contractPaydate: new Date().valueOf(),
+                goodsPbillno: 0,
+                goodsPmbillno: payState.current.promotionCodes,
+                contractProperty: '0',
+                contractBlance: 0,
+                contractPmode: 0,
+                contractPumode: '0',
+                goodsSupplierName: '',
+                goodsSupplierCode: '',
+                packageList: [
+                    {
+                        contractGoodsList: list.current,
+                        shoppingGoodsIdList: [],
+                        promotionCode: promotionCode.current,
+                        packageRemark: null
+                    }
+                ],
+                packageMode: '',
+                contractType: '00',
+                ocContractSettlList: [],
+                contractInmoney: salesTax(),
+                contractMoney: finalSales(),
+                goodsReceiptMem: '1',
+                goodsReceiptPhone: '13123123112',
+                goodsReceiptArrdess: '北京市北京市东城区123',
+                areaCode: '110000',
+                contractNbillcode: null,
+                skuIdList: skuId
+                    ? [
+                        {
+                            skuId: +skuId,
+                            goodsNum: +goodsNum
+                        }
+                    ]
+                    : [],
+                giftSkuIdList: []
+            }
+        ];
+    };
+    // 最终销售含税金额 (优惠后)
+    const finalSales = () => {
+        const { shoppingCountPrice, copyComDisMoney, discount } = payState.current;
+        return (shoppingCountPrice - copyComDisMoney - discount).toFixed(2);
+    };
+    //  销售含税金额 (优惠前)
+    const salesTax = () => {
+        const { shoppingCountPrice, copyComDisMoney, freight } = payState.current;
+        return (shoppingCountPrice - copyComDisMoney + freight).toFixed(2);
+    };
+    // 用户权益差价计算
+    const userEquitySpread = () => {
+        rsSkuListStr.current = paramsDataHandle();
+        let skuList = { rsSkuListStr: JSON.stringify(rsSkuListStr.current) };
+        getTotalDiscountPriceImpl(skuList).then((res) => {
+            payState.current.totalDiscountPrice = res.dataObj.totalDiscountPrice;
+            payState.current.contractSettlOpno = res.dataObj.contractSettlOpno;
+            resultPrice();
+        });
+    };
+    // 会员权益差价
+    const getMembership = () => {
+        const { contractSettlOpno, totalDiscountPrice } = payState.current;
+        if (contractSettlOpno && totalDiscountPrice != 0) {
+            // index 暂时 0；
+            ocContractSettlList.current.push({
+                contractSettlBlance: 'UR',
+                contractPmode: '0',
+                contractSettlPmoney: totalDiscountPrice,
+                contractSettlOpno
+            });
+        }
+    };
+    //计算优惠券
+    const getCouple = () => { };
+    // 确认预订单 立即支付
+    const savePayPrice = () => {
+        getMembership();
+        // 优惠信息
+        set(rsSkuListStr.current, '[0].ocContractSettlList', ocContractSettlList.current);
+        const params = { orderDomainStr: JSON.stringify(rsSkuListStr.current) };
+        saveContract(params).then((res) => {
+            navigatorImpl(`${routerMap.paymentMode}?code=${res.dataObj.contractBillcode}`);
+        });
+    };
+    return {
+        savePayPrice,
+        address,
+        list,
+        payState
+    };
+}

package/dist/components/PlaceOrder/index.d.ts

@@ -1,2 +1,7 @@
 /// <reference types="react" />
-export declare const PlaceOrder: import("react").MemoExoticComponent<() => JSX.Element>;
+export interface PaymentOrderType {
+    skuId?: string;
+    goodsNum?: string;
+    shoppingGoodsId?: string;
+}
+export declare const PlaceOrder: import("react").NamedExoticComponent<PaymentOrderType>;

package/dist/components/PlaceOrder/index.js

@@ -3,11 +3,16 @@ import { memo } from 'react';
 import { navigatorImpl, useComponent } from '@brushes/qj-simulate-component';
 import { getEnv } from '@brushes/api';
 import { routerMap } from '../../routerMap';
+import { usePlaceOrder } from './hooks/usePlaceOrder';
+import { Address } from './components/address';
+import ShopJsx from './components/shop';
+import OrderPrice from './components/orderPrice';
 const flag = getEnv();
-const PlaceOrderJsx = () => {
+const PlaceOrderJsx = ({ goodsNum, skuId, shoppingGoodsId }) => {
     const { View, Text } = useComponent();
+    const { savePayPrice, address, list, payState } = usePlaceOrder({ skuId, goodsNum, shoppingGoodsId });
     return (_jsxs(View, Object.assign({ className: 'placeOrder', style: {
-            height: flag ? '100vh' : '600px'
-        } }, { children: [_jsxs(View, Object.assign({ className: 'chooseAddress' }, { children: [_jsxs(View, Object.assign({ className: 'group' }, { children: [_jsx(Text, { className: 'local' }), _jsx(Text, Object.assign({ className: 'address' }, { children: "\u9009\u62E9\u6536\u8D27\u5730\u5740" }))] })), _jsx(Text, { className: 'arrow' })] })), _jsxs(View, Object.assign({ className: 'info blcWrap' }, { children: [_jsxs(View, Object.assign({ className: 'express blcItem' }, { children: [_jsx(View, Object.assign({ className: 'label' }, { children: "\u914D\u9001\u65B9\u5F0F" })), _jsx(View, Object.assign({ className: 'value' }, { children: "\u5FEB\u9012" }))] })), _jsxs(View, Object.assign({ className: 'coupon blcItem' }, { children: [_jsx(View, Object.assign({ className: 'label' }, { children: "\u4F7F\u7528\u4F18\u60E0" })), _jsxs(View, Object.assign({ className: 'value' }, { children: ["\u53EF\u9009\u62E9\u4F7F\u7528\u4F18\u60E0\u7801/\u4F18\u60E0\u7801", _jsx(Text, { className: 'icon' })] }))] }))] })), _jsxs(View, Object.assign({ className: 'price blcWrap' }, { children: [_jsx(View, Object.assign({ className: 'title' }, { children: "\u4EF7\u683C\u660E\u7EC6" })), _jsxs(View, Object.assign({ className: 'express blcItem' }, { children: [_jsx(View, Object.assign({ className: 'label' }, { children: "\u5546\u54C1\u603B\u91D1\u989D" })), _jsx(View, Object.assign({ className: 'value' }, { children: "\uFFE5 890" }))] })), _jsxs(View, Object.assign({ className: 'coupon blcItem' }, { children: [_jsx(View, Object.assign({ className: 'label' }, { children: "\u4F18\u60E0\u91D1\u989D" })), _jsx(View, Object.assign({ className: 'value' }, { children: "\u4E0D\u4F7F\u7528\u4F18\u60E0" }))] })), _jsxs(View, Object.assign({ className: 'express blcItem' }, { children: [_jsx(View, Object.assign({ className: 'label' }, { children: "\u8FD0\u8D39" })), _jsx(View, Object.assign({ className: 'value' }, { children: "\uFFE5 9000" }))] })), _jsxs(View, Object.assign({ className: 'all blcItem' }, { children: [_jsx(View, Object.assign({ className: 'label' }, { children: "\u603B\u8BA1" })), _jsx(View, Object.assign({ className: 'value', style: { color: '#000' } }, { children: "\uFFE5 9000" }))] }))] })), _jsxs(View, Object.assign({ className: 'placeOrderFooter' }, { children: [_jsx(Text, Object.assign({ className: 'price' }, { children: "\u5408\u8BA1: \uFFE517782.00" })), _jsx(View, Object.assign({ className: 'btn', onClick: () => navigatorImpl(routerMap.result) }, { children: "\u786E\u8BA4\u652F\u4ED8" }))] }))] })));
+            height: flag ? '100vh' : '667px'
+        } }, { children: [_jsx(View, Object.assign({ className: 'chooseAddress', onClick: () => navigatorImpl(routerMap.addressList) }, { children: _jsx(Address, { address: address }) })), _jsx(ShopJsx, { goodsList: list.current }), _jsxs(View, Object.assign({ className: 'info blcWrap' }, { children: [_jsxs(View, Object.assign({ className: 'express blcItem' }, { children: [_jsx(View, Object.assign({ className: 'label' }, { children: "\u914D\u9001\u65B9\u5F0F" })), _jsx(View, Object.assign({ className: 'value' }, { children: "\u5FEB\u9012" }))] })), _jsxs(View, Object.assign({ className: 'coupon blcItem' }, { children: [_jsx(View, Object.assign({ className: 'label' }, { children: "\u4F7F\u7528\u4F18\u60E0" })), _jsxs(View, Object.assign({ className: 'value' }, { children: ["\u53EF\u9009\u62E9\u4F7F\u7528\u4F18\u60E0\u7801/\u4F18\u60E0\u7801", _jsx(Text, { className: 'icon' })] }))] }))] })), _jsx(OrderPrice, { savePayPrice: savePayPrice, payState: payState.current })] })));
 };
 export const PlaceOrder = memo(PlaceOrderJsx);

package/dist/components/PlaceOrderResult/hooks/useOrderResult.d.ts

@@ -0,0 +1,3 @@
+export declare function useOrderResult(code: string): {
+    paymentImpl: () => Promise<void>;
+};

package/dist/components/PlaceOrderResult/hooks/useOrderResult.js

@@ -0,0 +1,93 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { useEffect, useRef } from 'react';
+import { saveOrderToPay, syncContractState, paymentCommit } from '../../../utils/payment';
+import { _ } from '@brushes/tools';
+const { get } = _;
+export function useOrderResult(code) {
+    const result = useRef({});
+    const amount = useRef(0);
+    useEffect(() => {
+        (() => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const data = yield syncContractState({
+                    contractBillcode: code
+                });
+                amount.current = get(data, 'dataObj.dataBmoney', 0);
+                const contractBillcode = get(data, 'dataObj.contractBillcode', '');
+                result.current = yield saveOrderToPay({
+                    contractBillcode
+                });
+                console.log(result);
+            }
+            catch (err) {
+                console.log(err);
+            }
+        }))();
+    }, []);
+    const paymentImpl = () => __awaiter(this, void 0, void 0, function* () {
+        const { ptradeSeqno, contractBlance, payChannelList } = result.current;
+        // 模拟微信支付场景
+        const pyJsons = [
+            {
+                faccountIdType: 'ACCOUNT',
+                fchannelCode: payChannelList[1].fchannelCode,
+                orderAmount: amount.current,
+                faccountId: payChannelList[1].faccountOuterNo || ''
+            }
+        ];
+        try {
+            const res = yield paymentCommit({
+                ptradeSeqno,
+                payCommitStr: JSON.stringify(pyJsons),
+                contractBlance
+            });
+            console.log(51, res);
+            let data = res.dataObj.requestData;
+            console.log(data);
+            wx.requestPayment({
+                timeStamp: data.timeStamp,
+                nonceStr: data.nonceStr,
+                package: data.package,
+                signType: data.signType,
+                paySign: data.paySign,
+                success: function (res) {
+                    console.log(64, res);
+                    // http.post(syncContractPayState, {
+                    //   contractBillcode: $storage.get('contractBillcode')
+                    // })
+                    //   .then(res => {
+                    //     if (res.success) {
+                    //       $router.replace('pay/paySuccess', {
+                    //         contractBillcode: $storage.get('contractBillcode')
+                    //       });
+                    //     } else {
+                    //       $router.replace('pay/payFail', {
+                    //         contractBillcode: $storage.get('contractBillcode')
+                    //       });
+                    //     }
+                    //   })
+                    //   .catch(err => {
+                    //     $message.alert('支付失败！');
+                    //   });
+                },
+                fail: function (res) {
+                    console.log(res, '失败参数');
+                    //$router.replace('pay/payFail')
+                },
+                complete: function (res) { }
+            });
+        }
+        catch (err) { }
+    });
+    return {
+        paymentImpl
+    };
+}

package/dist/components/PlaceOrderResult/index.d.ts

@@ -1,2 +1,4 @@
 /// <reference types="react" />
-export declare const PlaceOrderResult: import("react").MemoExoticComponent<() => JSX.Element>;
+export declare const PlaceOrderResult: import("react").MemoExoticComponent<({ code }: {
+    code: string;
+}) => JSX.Element>;

package/dist/components/PlaceOrderResult/index.js

@@ -3,11 +3,13 @@ import { memo } from 'react';
 import { navigatorImpl, useComponent } from '@brushes/qj-simulate-component';
 import { getEnv } from '@brushes/api';
 import { routerMap } from '../../routerMap';
+import { useOrderResult } from './hooks/useOrderResult';
 const flag = getEnv();
-const PlaceOrderResultJsx = () => {
+const PlaceOrderResultJsx = ({ code }) => {
     const { View, Text } = useComponent();
+    const { paymentImpl } = useOrderResult(code);
     return (_jsx(View, Object.assign({ className: 'placeOrderResult', style: {
-            height: flag ? '100vh' : '600px'
-        } }, { children: _jsxs(View, Object.assign({ className: 'placeOrderResultContent' }, { children: [_jsx(Text, { className: 'icon' }), _jsxs(View, Object.assign({ className: 'tips' }, { children: [_jsx(Text, Object.assign({ className: 'title' }, { children: "\u8BA2\u5355\u652F\u4ED8\u6210\u529F" })), _jsx(Text, Object.assign({ className: 'tip' }, { children: "\u60A8\u7684\u8BA2\u5355\u5C06\u4FDD\u755915\u5206\u949F\uFF0C\u53EF\u70B9\u51FB\u4E0B\u65B9\u201C\u53BB\u652F\u4ED8\u201D\u5B8C\u6210\u8BA2\u5355" }))] })), _jsxs(View, Object.assign({ className: 'placeOrderResultWrap' }, { children: [_jsxs(View, Object.assign({ className: 'placeOrderResultItem' }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u8BA2\u5355\u53F7\uFF1A" })), _jsx(Text, Object.assign({ className: 'value' }, { children: "324324823748237" }))] })), _jsxs(View, Object.assign({ className: 'placeOrderResultItem' }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u5546\u54C1\u6570\u91CF\uFF1A" })), _jsx(Text, Object.assign({ className: 'value' }, { children: "1" }))] })), _jsxs(View, Object.assign({ className: 'placeOrderResultItem' }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u652F\u4ED8\u65B9\u5F0F\uFF1A" })), _jsx(Text, Object.assign({ className: 'value' }, { children: "\u5FAE\u4FE1\u652F\u4ED8" }))] })), _jsxs(View, Object.assign({ className: 'placeOrderResultItem' }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u652F\u4ED8\u91D1\u989D\uFF1A" })), _jsx(Text, Object.assign({ className: 'value' }, { children: "\uFFE5 9999.00" }))] }))] })), _jsxs(View, Object.assign({ className: 'btnGroup' }, { children: [_jsx(View, Object.assign({ className: 'btn black', onClick: () => navigatorImpl(routerMap.orderDetail) }, { children: "\u67E5\u770B\u8BA2\u5355" })), _jsx(View, Object.assign({ className: 'btn white' }, { children: "\u7EE7\u7EED\u8D2D\u7269" }))] }))] })) })));
+            height: flag ? '100vh' : '667px'
+        } }, { children: _jsxs(View, Object.assign({ className: 'placeOrderResultContent' }, { children: [_jsx(Text, { className: 'icon' }), _jsxs(View, Object.assign({ className: 'tips' }, { children: [_jsx(Text, Object.assign({ className: 'title' }, { children: "\u8BA2\u5355\u652F\u4ED8\u6210\u529F" })), _jsx(Text, Object.assign({ className: 'tip' }, { children: "\u60A8\u7684\u8BA2\u5355\u5C06\u4FDD\u755915\u5206\u949F\uFF0C\u53EF\u70B9\u51FB\u4E0B\u65B9\u201C\u53BB\u652F\u4ED8\u201D\u5B8C\u6210\u8BA2\u5355" }))] })), _jsxs(View, Object.assign({ className: 'placeOrderResultWrap' }, { children: [_jsxs(View, Object.assign({ className: 'placeOrderResultItem' }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u8BA2\u5355\u53F7\uFF1A" })), _jsx(Text, Object.assign({ className: 'value' }, { children: "324324823748237" }))] })), _jsxs(View, Object.assign({ className: 'placeOrderResultItem' }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u5546\u54C1\u6570\u91CF\uFF1A" })), _jsx(Text, Object.assign({ className: 'value' }, { children: "1" }))] })), _jsxs(View, Object.assign({ className: 'placeOrderResultItem' }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u652F\u4ED8\u65B9\u5F0F\uFF1A" })), _jsx(Text, Object.assign({ className: 'value' }, { children: "\u5FAE\u4FE1\u652F\u4ED8" }))] })), _jsxs(View, Object.assign({ className: 'placeOrderResultItem' }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u652F\u4ED8\u91D1\u989D\uFF1A" })), _jsx(Text, Object.assign({ className: 'value' }, { children: "\uFFE5 9999.00" }))] }))] })), _jsxs(View, Object.assign({ className: 'btnGroup' }, { children: [_jsx(View, Object.assign({ className: 'btn black', onClick: () => navigatorImpl(routerMap.orderDetail) }, { children: "\u67E5\u770B\u8BA2\u5355" })), _jsx(View, Object.assign({ onClick: paymentImpl, className: 'btn white' }, { children: "\u7EE7\u7EED\u8D2D\u7269" }))] }))] })) })));
 };
 export const PlaceOrderResult = memo(PlaceOrderResultJsx);

package/dist/components/Search/index.js

@@ -1,10 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { memo } from 'react';
-import { useComponent } from '@brushes/qj-simulate-component';
+import { navigatorImpl, useComponent } from '@brushes/qj-simulate-component';
 import { SEARCH } from '../../static';
+import { routerMap } from '../../routerMap';
 const SearchJsx = ({ value, iconShow, fontColor, backgroundColor, borderRadius, paddingTop, paddingBottom, paddingLeft, paddingRight }) => {
     const { View, Image } = useComponent();
-    return (_jsx(View, Object.assign({ style: {
+    return (_jsx(View, Object.assign({ onClick: () => navigatorImpl(routerMap.search), style: {
             paddingTop,
             paddingBottom,
             paddingLeft,

package/dist/components/SearchPage/index.js

@@ -1,19 +1,60 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { memo } from 'react';
-import { navigatorImpl, useComponent } from '@brushes/qj-simulate-component';
+import { memo, useEffect, useState } from 'react';
+import { navigatorImpl, useComponent, navigatorBackImpl } from '@brushes/qj-simulate-component';
 import { SEARCH } from '../../static';
-import { getEnv } from '@brushes/api';
+import { useImmutableCallback, _ } from '@brushes/tools';
+import { getEnv, getTaro } from '@brushes/api';
 import { routerMap } from '../../routerMap';
+import { QjMobileIcon } from '../../common/icon';
 const flag = getEnv();
-const fake = ['衣服', '裤子'];
+const { isEmpty } = _;
 const SearchPageJsx = ({ placeholder, placeholderText, history }) => {
     const { View, Text } = useComponent();
-    const searchGoodsImpl = (e) => {
+    const [historyItem, setHistory] = useState([]);
+    useEffect(() => {
+        (() => __awaiter(void 0, void 0, void 0, function* () {
+            const isTaro = getEnv();
+            if (!isTaro)
+                return;
+            const Taro = yield getTaro();
+            const history = Taro.getStorageSync('history') || [];
+            setHistory(history);
+        }))();
+    }, []);
+    const searchGoodsImpl = useImmutableCallback((e) => __awaiter(void 0, void 0, void 0, function* () {
         console.log(19, e.detail.value);
-        navigatorImpl(`${routerMap.goodList}?searchParam=${e.detail.value}`);
-    };
-    return (_jsxs(View, Object.assign({ className: 'searchPage', style: { height: flag ? '100vh' : '600px' } }, { children: [_jsxs(View, Object.assign({ className: 'search-title' }, { children: [_jsx("img", { src: SEARCH, alt: "" }), _jsx("input", Object.assign({ "confirm-type": "search", type: "text", className: 'content', onConfirm: searchGoodsImpl }, (placeholder ? { placeholder: placeholderText } : {}))), _jsx(Text, Object.assign({ className: 'btn' }, { children: "\u53D6\u6D88" }))] })), history ? (_jsxs(View, Object.assign({ className: 'historyWrap' }, { children: [_jsxs(View, Object.assign({ className: 'title' }, { children: [_jsxs(View, Object.assign({ className: 'label' }, { children: [_jsx(View, { className: 'icon' }), "\u5386\u53F2\u641C\u7D22\u8BB0\u5F55"] })), _jsx(Text, Object.assign({ className: 'clear' }, { children: "\u6E05\u9664" }))] })), _jsx(View, Object.assign({ className: 'content' }, { children: fake.map((item, index) => {
-                            return (_jsx(View, Object.assign({ className: 'historyItem' }, { children: item }), index));
+        const isTaro = getEnv();
+        if (!isTaro)
+            return;
+        const Taro = yield getTaro();
+        setHistory((prevState) => {
+            if (isEmpty(e.detail.value))
+                return prevState;
+            const data = prevState.concat(e.detail.value);
+            Taro.getStorageSync('history', data);
+            return data;
+        });
+        navigatorHandler(e.detail.value);
+    }));
+    const navigatorHandler = useImmutableCallback((value) => {
+        navigatorImpl(`${routerMap.goodList}?searchParam=${value}`);
+    });
+    const removeHistory = () => __awaiter(void 0, void 0, void 0, function* () {
+        const Taro = yield getTaro();
+        Taro.removeStorageSync('history');
+        setHistory([]);
+    });
+    return (_jsxs(View, Object.assign({ className: 'searchPage', style: { height: flag ? '100vh' : '667px' } }, { children: [_jsxs(View, Object.assign({ className: 'search-title' }, { children: [_jsx("img", { src: SEARCH, alt: "" }), _jsx("input", Object.assign({ "confirm-type": "search", type: "text", className: 'content', onConfirm: searchGoodsImpl }, (placeholder ? { placeholder: placeholderText } : {}))), _jsx(Text, Object.assign({ className: 'btn', onClick: () => navigatorBackImpl() }, { children: "\u53D6\u6D88" }))] })), history ? (_jsxs(View, Object.assign({ className: 'historyWrap' }, { children: [_jsxs(View, Object.assign({ className: 'title' }, { children: [_jsxs(View, Object.assign({ className: 'label' }, { children: [_jsx(View, { className: 'icon' }), "\u5386\u53F2\u641C\u7D22\u8BB0\u5F55"] })), _jsx(QjMobileIcon, { onClick: removeHistory, value: 'shanchu', style: { fontSize: 18, color: '#222', lineHeight: '61px', cursor: 'pointer' } })] })), _jsx(View, Object.assign({ className: 'content' }, { children: historyItem.map((item, index) => {
+                            return (_jsx(View, Object.assign({ onClick: () => navigatorHandler(item), className: 'historyItem' }, { children: item }), index));
                         }) }))] }))) : null] })));
 };
 export const SearchPage = memo(SearchPageJsx);

package/dist/components/Service/index.d.ts

@@ -1,2 +1,12 @@
 import React from 'react';
-export declare const Service: React.NamedExoticComponent<{}>;
+interface ServiceType {
+    width: number;
+    height: number;
+    borderRadius: number;
+    top: number;
+    right: number;
+    bottom: number;
+    left: number;
+}
+export declare const Service: React.NamedExoticComponent<ServiceType>;
+export {};

package/dist/components/Service/index.js

@@ -1,7 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { memo } from 'react';
-import { View } from '@brushes/qj-simulate-component';
-const ServiceJsx = () => {
-    return _jsx(View, Object.assign({ className: 'components-service' }, { children: "123" }));
+import { useComponent } from '@brushes/qj-simulate-component';
+const ServiceJsx = ({ width, height, top, right, bottom, left, borderRadius }) => {
+    const { View } = useComponent();
+    return (_jsx(View, { style: { width, height, borderRadius, top, left, right, bottom }, className: 'components-service' }));
 };
 export const Service = memo(ServiceJsx);

package/dist/components/index.d.ts

@@ -26,3 +26,4 @@ export * from './PlaceOrderResult';
 export * from './CouponList';
 export * from './Cart';
 export * from './Mine';
+export * from './PaymentMode';

package/dist/components/index.js

@@ -26,3 +26,4 @@ export * from './PlaceOrderResult';
 export * from './CouponList';
 export * from './Cart';
 export * from './Mine';
+export * from './PaymentMode';

package/dist/options/index.d.ts

@@ -1,2 +0,0 @@
-declare const options: any;
-export default options;

package/dist/options/index.js

@@ -1,31 +1,36 @@
-import provinces from 'china-division/dist/provinces.json';
-import cities from 'china-division/dist/cities.json';
-import areas from 'china-division/dist/areas.json';
-console.log(5, provinces);
-areas.forEach((area) => {
-    const matchCity = cities.filter((city) => city.code === area.cityCode)[0];
-    if (matchCity) {
-        matchCity.children = matchCity.children || [];
-        matchCity.children.push({
-            label: area.name,
-            value: area.code
-        });
-    }
-});
-cities.forEach((city) => {
-    const matchProvince = provinces.filter((province) => province.code === city.provinceCode)[0];
-    if (matchProvince) {
-        matchProvince.children = matchProvince.children || [];
-        matchProvince.children.push({
-            label: city.name,
-            value: city.code,
-            children: city.children
-        });
-    }
-});
-const options = provinces.map((province) => ({
-    label: province.name,
-    value: province.code,
-    children: province.children
-}));
-export default options;
+"use strict";
+// import provinces from 'china-division/dist/provinces.json';
+// import cities from 'china-division/dist/cities.json';
+// import areas from 'china-division/dist/areas.json';
+//
+// console.log(5, provinces);
+// areas.forEach((area) => {
+//     const matchCity = cities.filter((city) => city.code === area.cityCode)[0];
+//     if (matchCity) {
+//         matchCity.children = matchCity.children || [];
+//         matchCity.children.push({
+//             label: area.name,
+//             value: area.code
+//         });
+//     }
+// });
+//
+// cities.forEach((city) => {
+//     const matchProvince = provinces.filter((province) => province.code === city.provinceCode)[0];
+//     if (matchProvince) {
+//         matchProvince.children = matchProvince.children || [];
+//         matchProvince.children.push({
+//             label: city.name,
+//             value: city.code,
+//             children: city.children
+//         });
+//     }
+// });
+//
+// const options = provinces.map((province) => ({
+//     label: province.name,
+//     value: province.code,
+//     children: province.children
+// }));
+//
+// export default options;

package/dist/routerMap/index.d.ts

@@ -6,4 +6,11 @@ export declare const routerMap: {
     result: string;
     rate: string;
     search: string;
+    shopping: string;
+    confirm: string;
+    addressList: string;
+    addressEditor: string;
+    setting: string;
+    couponList: string;
+    paymentMode: string;
 };

package/dist/routerMap/index.js

@@ -5,5 +5,12 @@ export const routerMap = {
     goodDetail: '/subpackage/gooddetail/index',
     result: '/subpackage/result/index',
     rate: '/subpackage/rate/index',
-    search: '/subpackage/search/index'
+    search: '/subpackage/search/index',
+    shopping: '/pages/shopping/index',
+    confirm: '/subpackage/orderconfirm/index',
+    addressList: '/subpackage/addresslist/index',
+    addressEditor: '/subpackage/addresseditor/index',
+    setting: '/subpackage/setting/index',
+    couponList: '/subpackage/couponlist/index',
+    paymentMode: '/subpackage/paymentmode/index'
 };

package/dist/utils/payment.d.ts

@@ -0,0 +1,14 @@
+export { updateShoppingGoodsNum, // 更新购物车数量
+queryShoppingToContract, // 购物车到订单
+saveContract, // 增加订单服务
+syncContractState, // 查询订单是否创建成功 (单条)
+saveOrderToPay, // 获取支付方式
+paymentCommit, // 开始支付
+syncContractPayState, // 查看商品是否支付成功
+calculateFreightFare, // 计算运费
+getFalgSettingForPaydate, //	普通商品查询自动取消订单时间
+queryAddressBymerberCode } from '@brushes/api';
+export declare const checkSkuSpec: (spec: string, goodsCode: string) => Promise<any>;
+export declare const addCardSku: (skuId: string, count: number) => Promise<any>;
+export declare const queryToContractImpl: (skuId?: string, goodsNum?: number | string) => Promise<any>;
+export declare const getTotalDiscountPriceImpl: (payloadNext: any) => Promise<any>;