From 65d6737902720715fa71205810da07923806cdb0 Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Fri, 22 Mar 2024 17:16:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(custom):=20=E4=BF=AE=E5=A4=8D=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E7=AC=AC=E4=B8=89=E6=96=B9=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=95=86=E5=AE=B6bid=E9=87=8D=E5=A4=8D=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 20 ++++++++++++++++++++ package.json | 2 +- pnpm-lock.yaml | 8 ++++---- src/components/Pay.vue | 2 +- src/pages/users/order_list/index.vue | 6 ++++-- 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/components.d.ts b/components.d.ts index fafdead..045c0cb 100644 --- a/components.d.ts +++ b/components.d.ts @@ -12,17 +12,37 @@ declare module '@vue/runtime-core' { Cart: typeof import('./src/components/Cart.vue')['default'] MerList: typeof import('./src/components/MerList.vue')['default'] NutAvatar: typeof import('@nutui/nutui-taro')['Avatar'] + NutBacktop: typeof import('@nutui/nutui-taro')['Backtop'] NutButton: typeof import('@nutui/nutui-taro')['Button'] + NutCalendar: typeof import('@nutui/nutui-taro')['Calendar'] NutCell: typeof import('@nutui/nutui-taro')['Cell'] NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup'] + NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox'] + NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup'] + NutDialog: typeof import('@nutui/nutui-taro')['Dialog'] NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis'] NutEmpty: typeof import('@nutui/nutui-taro')['Empty'] + NutForm: typeof import('@nutui/nutui-taro')['Form'] + NutFormItem: typeof import('@nutui/nutui-taro')['FormItem'] NutGrid: typeof import('@nutui/nutui-taro')['Grid'] NutGridItem: typeof import('@nutui/nutui-taro')['GridItem'] + NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview'] + NutInput: typeof import('@nutui/nutui-taro')['Input'] NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber'] + NutOverlay: typeof import('@nutui/nutui-taro')['Overlay'] NutPagination: typeof import('@nutui/nutui-taro')['Pagination'] + NutPicker: typeof import('@nutui/nutui-taro')['Picker'] NutPopup: typeof import('@nutui/nutui-taro')['Popup'] NutPrice: typeof import('@nutui/nutui-taro')['Price'] + NutSearchbar: typeof import('@nutui/nutui-taro')['Searchbar'] + NutSwiper: typeof import('@nutui/nutui-taro')['Swiper'] + NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem'] + NutSwitch: typeof import('@nutui/nutui-taro')['Switch'] + NutTable: typeof import('@nutui/nutui-taro')['Table'] + NutTabPane: typeof import('@nutui/nutui-taro')['TabPane'] + NutTabs: typeof import('@nutui/nutui-taro')['Tabs'] + NutTextarea: typeof import('@nutui/nutui-taro')['Textarea'] + NutUploader: typeof import('@nutui/nutui-taro')['Uploader'] Pay: typeof import('./src/components/Pay.vue')['default'] Popup: typeof import('./src/components/Popup.vue')['default'] RichEditor: typeof import('./src/components/RichEditor.vue')['default'] diff --git a/package.json b/package.json index b36a61d..d3c7ffb 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "dependencies": { "@babel/runtime": "^7.23.5", "@nutui/icons-vue-taro": "^0.0.9", - "@nutui/nutui-taro": "^4.3.1", + "@nutui/nutui-taro": "^4.3.3", "@qiun/vue-ucharts": "2.5.0-20230101", "@tarojs/components": "3.6.25", "@tarojs/helper": "3.6.25", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bd8f766..44d604d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ dependencies: specifier: ^0.0.9 version: 0.0.9 '@nutui/nutui-taro': - specifier: ^4.3.1 - version: 4.3.1(unplugin-vue-components@0.23.0)(vue@3.3.9) + specifier: ^4.3.3 + version: 4.3.3(unplugin-vue-components@0.23.0)(vue@3.3.9) '@qiun/vue-ucharts': specifier: 2.5.0-20230101 version: 2.5.0-20230101 @@ -4047,8 +4047,8 @@ packages: resolution: {integrity: sha512-10VYAtFC+o1X0anGs+y2PgF1NWMeLFz2JVMRw4BWLg6wbtVbYy9wukLxyGhZC6Yf6t39DcwaGVda8paV7K6/Ew==} dev: false - /@nutui/nutui-taro@4.3.1(unplugin-vue-components@0.23.0)(vue@3.3.9): - resolution: {integrity: sha512-pDi9nYmZiuh+0w8IFFBsWFsW7pS8TpSnN/IVAYBMNRVHEMiGmCGtkYO+vxZe28Nd6YPU6ydDO9C4qVGV11oOPA==} + /@nutui/nutui-taro@4.3.3(unplugin-vue-components@0.23.0)(vue@3.3.9): + resolution: {integrity: sha512-uMUsIFHcjlqMJ8K7GeUlhykcDrBpyOtLBl/yD9jx8EvSEtzdriuSzB8DBNkFCHadKKAxWWid8kyLaVM8O5kNFw==} peerDependencies: unplugin-vue-components: '>=0.25.1' vue: ^3.0.0 diff --git a/src/components/Pay.vue b/src/components/Pay.vue index 440fcc2..f55c146 100644 --- a/src/components/Pay.vue +++ b/src/components/Pay.vue @@ -35,7 +35,7 @@ { const openPay = async (item: OrderList) => { isShowPay.value = true; - const mer_info = Taro.getStorageSync("mer_info"); const user_info = Taro.getStorageSync("userInfo"); const data = await getUserPoint({ phone: user_info.data.phone, - bid: mer_info.bid, + bid: item.Store.bid, }); jfInfo.value = { jh_info: data.data,