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

zxl

6 天以前 eabb18cf60273b25471509858b287474cea9b370

 pages/passport/login.vue

@@ -93,7 +93,7 @@
      smsLogin,
      userLogin
   } from "@/api/login";
   import myVerification from "@/pages/subComponents/verification/verification.vue"; //验证码模块
   import myVerification from "@/pages/passport/verification/verification.vue"; //验证码模块
   import uuid from "@/utils/uuid.modified.js"; // uuid
   import verifyCode from "@/pages/passport/verify-code/verify-code";
   import {