Merge remote-tracking branch 'refs/remotes/yudao/master'

# Conflicts: # pages/order/confirm.vue
2024-08-06 18:16:10 +08:00
parent 44052b22c3 d1681ec2d5
commit aaad12c50e
11 changed files with 46 additions and 52 deletions
@@ -130,7 +130,7 @@
  import TradeConfigApi from '@/sheep/api/trade/config';
  import { fen2yuan } from '@/sheep/hooks/useGoods';
  import AfterSaleApi from '@/sheep/api/trade/afterSale';
-  import { SubscribeTemplate } from '@/sheep/util/const';
+  import { WxaSubscribeTemplate } from '@/sheep/util/const';

  const form = ref(null);
  const state = reactive({