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

# Conflicts: # pages/goods/index.vue # pages/order/addressSelection.vue # pages/order/confirm.vue # sheep/components/s-goods-column/s-goods-column.vue
2024-09-16 08:24:54 +08:00
parent 5a66e71809 4a8a92f323
commit f03fcf1373
72 changed files with 3179 additions and 1995 deletions
@@ -14,7 +14,7 @@ export function showAuthModal(type = 'smsLogin') {
      modal.$patch((state) => {
        state.auth = type;
      });
-    }, 200);
+    }, 500);
    closeAuthModal();
  } else {
    modal.$patch((state) => {