fix(custom): 修复订单列表第三方支付商家bid重复的问题

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']

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",

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

src/components/Pay.vue

@@ -35,7 +35,7 @@
           </template>
         </nut-cell>
         <nut-cell
-          title="聚合积分支付"
+          title="天才小猪积分支付"
           :desc="`剩余积分:${jfInfo.jh_info?.integral || 0}`"
           is-link
           @click="goPay(3)"

src/pages/users/order_list/index.vue

@@ -44,6 +44,9 @@ interface OrderList {
   oid: string;
   add_time: string;
   status: number;
+  Store: {
+    bid: string;
+  };
   OrderGoods: GoodsItem[];
   count: number;
   number: number;
@@ -97,11 +100,10 @@ const tabChange = (index: number) => {
 
 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,