Merge remote-tracking branch 'origin/user_action' into send_coupon

zxl

2025-09-12 2eb21bfe2f40630a46e675211f23b5f240e395a4

 pages/promotion/joinGroup.vue

@@ -33,7 +33,7 @@
   import '@/components/uview-components/uview-ui'
   import * as API_Promotions from "@/api/promotions";
   import * as API_Goods from "@/api/goods";
   import goodsTemplate from '@/pages/subComponents/m-goods-list/promotion.vue'
   import goodsTemplate from '@/pages/promotion/m-goods-list/promotion.vue'
   export default {
      components: {
         goodsTemplate