Merge remote-tracking branch 'origin/dev' into dev

zxl

2025-07-15 723389702b9ce28e8fb282f265fbf2e8e4faf13a

 components/m-goods-list/promotion.vue

@@ -44,7 +44,7 @@
</template>

<script>
   import '@/uview-components/uview-ui'
   import '@/components/uview-components/uview-ui'
   import commonTpl from '@/components/m-goods-list/common'
   export default {
      data() {