Merge branch 'develop' of https://gitee.com/yudaocode/yudao-mall-uniapp

# Conflicts: # pages/goods/index.vue # pages/order/confirm.vue # pages/order/detail.vue
2024-08-07 23:37:38 +08:00
parent c7ea2f97ac e635b91bb5
commit 1aa944e18c
38 changed files with 2360 additions and 2014 deletions
@@ -63,7 +63,7 @@
  import SpuApi from '@/sheep/api/product/spu';
  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
  import { computed, reactive } from 'vue';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
  import { handleTree } from '@/sheep/util';

  const state = reactive({