s-material-react 0.1.18 → 0.1.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/css/pages/goodsDetail.scss +3 -2
- package/dist/common/addressItem/index.js +1 -0
- package/dist/common/icon/index.js +1 -0
- package/dist/components/AddressDetail/components/index.d.ts +1 -0
- package/dist/components/AddressDetail/components/index.js +1 -1
- package/dist/components/AddressDetail/config.js +1 -0
- package/dist/components/AddressDetail/index.js +3 -2
- package/dist/components/AddressList/index.js +1 -1
- package/dist/components/Cart/components/cartItem.js +2 -2
- package/dist/components/Cart/components/index.d.ts +1 -0
- package/dist/components/Cart/components/index.js +1 -0
- package/dist/components/Cart/index.js +3 -3
- package/dist/components/ClassifyNav/index.js +4 -14
- package/dist/components/CouponList/components/index.d.ts +4 -0
- package/dist/components/CouponList/components/index.js +4 -0
- package/dist/components/CouponList/components/overdue.d.ts +5 -0
- package/dist/components/CouponList/components/overdue.js +6 -0
- package/dist/components/CouponList/components/skull.d.ts +2 -0
- package/dist/components/CouponList/components/skull.js +9 -0
- package/dist/components/CouponList/components/unUsed.d.ts +5 -0
- package/dist/components/CouponList/components/unUsed.js +6 -0
- package/dist/components/CouponList/components/used.d.ts +5 -0
- package/dist/components/CouponList/components/used.js +6 -0
- package/dist/components/CouponList/index.js +12 -18
- package/dist/components/Cube/index.js +4 -14
- package/dist/components/Goods/index.js +1 -0
- package/dist/components/GoodsClassify/components/index.d.ts +2 -0
- package/dist/components/GoodsClassify/components/index.js +2 -0
- package/dist/components/GoodsClassify/index.js +1 -1
- package/dist/components/GoodsDetail/components/goodsDetailCollection.d.ts +1 -2
- package/dist/components/GoodsDetail/components/goodsDetailCollection.js +1 -2
- package/dist/components/GoodsDetail/components/goodsDetailCoupon.d.ts +1 -2
- package/dist/components/GoodsDetail/components/goodsDetailCoupon.js +4 -3
- package/dist/components/GoodsDetail/components/goodsDetailEvaluate.d.ts +1 -2
- package/dist/components/GoodsDetail/components/goodsDetailEvaluate.js +2 -3
- package/dist/components/GoodsDetail/components/goodsDetailHandleBar.d.ts +1 -2
- package/dist/components/GoodsDetail/components/goodsDetailHandleBar.js +3 -4
- package/dist/components/GoodsDetail/components/goodsDetailInfo.d.ts +1 -2
- package/dist/components/GoodsDetail/components/goodsDetailInfo.js +1 -2
- package/dist/components/GoodsDetail/components/goodsDetailPopup.d.ts +1 -2
- package/dist/components/GoodsDetail/components/goodsDetailPopup.js +3 -4
- package/dist/components/GoodsDetail/components/goodsDetailPromotion.d.ts +1 -2
- package/dist/components/GoodsDetail/components/goodsDetailPromotion.js +2 -2
- package/dist/components/GoodsDetail/components/goodsDetailSize.d.ts +1 -2
- package/dist/components/GoodsDetail/components/goodsDetailSize.js +4 -4
- package/dist/components/GoodsDetail/components/index.d.ts +9 -0
- package/dist/components/GoodsDetail/components/index.js +9 -0
- package/dist/components/GoodsDetail/index.js +4 -9
- package/dist/components/GoodsGroup/index.js +1 -0
- package/dist/components/GoodsList/components/index.d.ts +1 -0
- package/dist/components/GoodsList/components/index.js +1 -0
- package/dist/components/GoodsList/index.js +3 -2
- package/dist/components/Mine/components/index.d.ts +2 -0
- package/dist/components/Mine/components/index.js +2 -0
- package/dist/components/Mine/index.js +3 -3
- package/dist/components/OrderDetail/index.js +1 -0
- package/dist/components/OrderList/components/index.d.ts +3 -0
- package/dist/components/OrderList/components/index.js +3 -0
- package/dist/components/OrderList/components/{OrderListItem.d.ts → orderListItem.d.ts} +0 -0
- package/dist/components/OrderList/components/{OrderListItem.js → orderListItem.js} +1 -1
- package/dist/components/OrderList/index.js +1 -1
- package/dist/components/PaymentMode/hooks/useOrderResult.js +1 -2
- package/dist/components/PaymentMode/index.js +2 -1
- package/dist/components/PlaceOrder/components/index.d.ts +3 -0
- package/dist/components/PlaceOrder/components/index.js +3 -0
- package/dist/components/PlaceOrder/components/orderPrice.d.ts +2 -2
- package/dist/components/PlaceOrder/components/orderPrice.js +1 -2
- package/dist/components/PlaceOrder/components/shop.d.ts +1 -2
- package/dist/components/PlaceOrder/components/shop.js +1 -2
- package/dist/components/PlaceOrder/index.js +2 -4
- package/dist/components/PlaceOrderResult/index.js +7 -4
- package/dist/components/Search/index.js +1 -0
- package/dist/components/SearchPage/index.js +1 -1
- package/dist/components/Slider/index.js +3 -14
- package/dist/components/Slider/item.js +1 -0
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.js +1 -1
- package/dist/utils/serviceActionSheet.d.ts +1 -0
- package/dist/utils/serviceActionSheet.js +31 -0
- package/package.json +13 -12
- package/dist/components/AddressDetail/hooks/index.d.ts +0 -1
- package/dist/components/AddressDetail/hooks/index.js +0 -1
- package/dist/components/AddressDetail/hooks/useAddAddress.d.ts +0 -26
- package/dist/components/AddressDetail/hooks/useAddAddress.js +0 -80
- package/dist/components/AddressList/hooks/index.d.ts +0 -1
- package/dist/components/AddressList/hooks/index.js +0 -1
- package/dist/components/AddressList/hooks/useAddressList.d.ts +0 -6
- package/dist/components/AddressList/hooks/useAddressList.js +0 -74
- package/dist/components/Cart/hooks/index.d.ts +0 -19
- package/dist/components/Cart/hooks/index.js +0 -90
- package/dist/components/Cart/store/index.d.ts +0 -10
- package/dist/components/Cart/store/index.js +0 -23
- package/dist/components/GoodsDetail/hooks/index.d.ts +0 -2
- package/dist/components/GoodsDetail/hooks/index.js +0 -2
- package/dist/components/GoodsDetail/hooks/useAddShopping.d.ts +0 -10
- package/dist/components/GoodsDetail/hooks/useAddShopping.js +0 -74
- package/dist/components/GoodsDetail/hooks/useGoodsDetailImpl.d.ts +0 -13
- package/dist/components/GoodsDetail/hooks/useGoodsDetailImpl.js +0 -85
- package/dist/components/GoodsDetail/store/index.d.ts +0 -10
- package/dist/components/GoodsDetail/store/index.js +0 -34
- package/dist/components/GoodsList/hooks/useGoodsList.d.ts +0 -12
- package/dist/components/GoodsList/hooks/useGoodsList.js +0 -54
- package/dist/components/PlaceOrder/hooks/usePlaceOrder.d.ts +0 -18
- package/dist/components/PlaceOrder/hooks/usePlaceOrder.js +0 -234
- package/dist/components/PlaceOrderResult/hooks/useOrderResult.d.ts +0 -3
- package/dist/components/PlaceOrderResult/hooks/useOrderResult.js +0 -93
|
@@ -1,93 +0,0 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
|
-
import { useEffect, useRef } from 'react';
|
|
11
|
-
import { saveOrderToPay, syncContractState, paymentCommit } from '../../../utils/payment';
|
|
12
|
-
import { _ } from '@brushes/tools';
|
|
13
|
-
const { get } = _;
|
|
14
|
-
export function useOrderResult(code) {
|
|
15
|
-
const result = useRef({});
|
|
16
|
-
const amount = useRef(0);
|
|
17
|
-
useEffect(() => {
|
|
18
|
-
(() => __awaiter(this, void 0, void 0, function* () {
|
|
19
|
-
try {
|
|
20
|
-
const data = yield syncContractState({
|
|
21
|
-
contractBillcode: code
|
|
22
|
-
});
|
|
23
|
-
amount.current = get(data, 'dataObj.dataBmoney', 0);
|
|
24
|
-
const contractBillcode = get(data, 'dataObj.contractBillcode', '');
|
|
25
|
-
result.current = yield saveOrderToPay({
|
|
26
|
-
contractBillcode
|
|
27
|
-
});
|
|
28
|
-
console.log(result);
|
|
29
|
-
}
|
|
30
|
-
catch (err) {
|
|
31
|
-
console.log(err);
|
|
32
|
-
}
|
|
33
|
-
}))();
|
|
34
|
-
}, []);
|
|
35
|
-
const paymentImpl = () => __awaiter(this, void 0, void 0, function* () {
|
|
36
|
-
const { ptradeSeqno, contractBlance, payChannelList } = result.current;
|
|
37
|
-
// 模拟微信支付场景
|
|
38
|
-
const pyJsons = [
|
|
39
|
-
{
|
|
40
|
-
faccountIdType: 'ACCOUNT',
|
|
41
|
-
fchannelCode: payChannelList[1].fchannelCode,
|
|
42
|
-
orderAmount: amount.current,
|
|
43
|
-
faccountId: payChannelList[1].faccountOuterNo || ''
|
|
44
|
-
}
|
|
45
|
-
];
|
|
46
|
-
try {
|
|
47
|
-
const res = yield paymentCommit({
|
|
48
|
-
ptradeSeqno,
|
|
49
|
-
payCommitStr: JSON.stringify(pyJsons),
|
|
50
|
-
contractBlance
|
|
51
|
-
});
|
|
52
|
-
console.log(51, res);
|
|
53
|
-
let data = res.dataObj.requestData;
|
|
54
|
-
console.log(data);
|
|
55
|
-
wx.requestPayment({
|
|
56
|
-
timeStamp: data.timeStamp,
|
|
57
|
-
nonceStr: data.nonceStr,
|
|
58
|
-
package: data.package,
|
|
59
|
-
signType: data.signType,
|
|
60
|
-
paySign: data.paySign,
|
|
61
|
-
success: function (res) {
|
|
62
|
-
console.log(64, res);
|
|
63
|
-
// http.post(syncContractPayState, {
|
|
64
|
-
// contractBillcode: $storage.get('contractBillcode')
|
|
65
|
-
// })
|
|
66
|
-
// .then(res => {
|
|
67
|
-
// if (res.success) {
|
|
68
|
-
// $router.replace('pay/paySuccess', {
|
|
69
|
-
// contractBillcode: $storage.get('contractBillcode')
|
|
70
|
-
// });
|
|
71
|
-
// } else {
|
|
72
|
-
// $router.replace('pay/payFail', {
|
|
73
|
-
// contractBillcode: $storage.get('contractBillcode')
|
|
74
|
-
// });
|
|
75
|
-
// }
|
|
76
|
-
// })
|
|
77
|
-
// .catch(err => {
|
|
78
|
-
// $message.alert('支付失败!');
|
|
79
|
-
// });
|
|
80
|
-
},
|
|
81
|
-
fail: function (res) {
|
|
82
|
-
console.log(res, '失败参数');
|
|
83
|
-
//$router.replace('pay/payFail')
|
|
84
|
-
},
|
|
85
|
-
complete: function (res) { }
|
|
86
|
-
});
|
|
87
|
-
}
|
|
88
|
-
catch (err) { }
|
|
89
|
-
});
|
|
90
|
-
return {
|
|
91
|
-
paymentImpl
|
|
92
|
-
};
|
|
93
|
-
}
|