Merge branch 'fix/policy_add' into 'master'

Fix/policy add

See merge request !211

src/service/http copy.js

-//引入axios
-import store from "@/store";
-import router from "@/router";
-import axios from "axios";
-import cherry from "@qg/cherry-ui";
-import config from "../config";
-import localStorage from "./localStorage";
-
-const ERR_MESSAGE_MAP = {
-  status: {
-    400: "错误请求",
-    401: "未授权，请重新登录",
-    403: "拒绝访问",
-    404: "请求错误,未找到该资源",
-    405: "请求方法未允许",
-    408: "请求超时",
-    500: "服务器端出错",
-    501: "网络未实现",
-    502: "网络错误",
-    503: "服务不可用",
-    504: "网络超时",
-    505: "http版本不支持该请求"
-  }
-};
-const { Notify } = cherry;
-const CancelToken = axios.CancelToken;
-let pending = {};
-let reqNum = 0;
-axios.defaults.baseURL = config.basicHost;
-axios.defaults.timeout = 30000;
-
-const wait = async seconds => new Promise(resolve => setTimeout(resolve, seconds));
-
-function beforeRequest() {
-  reqNum++;
-  store.dispatch("setIsLoading", true);
-}
-
-function afterRequest() {
-  setTimeout(clearRequest, 300);
-}
-
-function clearRequest() {
-  reqNum--;
-  if (reqNum <= 0) {
-    store.dispatch("setIsLoading", false);
-  }
-}
-
-// 请求拦截器
-axios.interceptors.request.use(
-  config => {
-    beforeRequest();
-
-    // 发起请求时，取消掉当前正在进行的相同请求
-    if (pending[config.url]) {
-      pending[config.url]("取消重复请求");
-    }
-    config.cancelToken = new CancelToken(c => (pending[config.url] = c));
-    // ! 上线需要删掉
-    // eslint-disable-next-line
-    config.baseURL = baseUrl || config.baseURL;
-    // 添加token
-    const token = localStorage.get("mongoToken");
-    if (token) {
-      config.headers["x-auth-token"] = token;
-    }
-
-    return config;
-  },
-  error => {
-    return Promise.reject(error);
-  }
-);
-
-// 响应拦截器即异常处理
-axios.interceptors.response.use(
-  response => {
-    afterRequest();
-
-    delete pending[response.config.url];
-    if (response.data.code === "0") return response.data.data;
-    // 特殊处理，下单已存在时，跳转到保单列表
-    if (response.config.url === "policy_order" && response.data.code === "40601") {
-      setTimeout(() => {
-        router.push("/policy");
-      }, 1000);
-    }
-    Notify({ type: "danger", message: response.data.msg || "后端服务异常" });
-    return Promise.reject(response.data);
-  },
-  async err => {
-    afterRequest();
-    // 判断是否取消请求
-    if (err?.message === "取消重复请求") {
-      const res = {
-        status: 409,
-        data: {}
-      };
-      return Promise.resolve(res);
-    }
-
-    // 提示网络错误时尝试重试
-    if (
-      err.message === "Network Error" &&
-      (!err.config?.retryCount || err.config?.retryCount <= 3)
-    ) {
-      if (!err.config?.retryCount) err.config.retryCount = 1;
-      err.config.retryCount++;
-      await wait(3000);
-      return axios.request(err.config);
-    }
-
-    // 错误提示
-    if (err.response) {
-      err.message = ERR_MESSAGE_MAP.status[err.response.status] || `连接错误${err.response.status}`;
-    } else {
-      err.message = "连接到服务器失败";
-    }
-    Notify({ type: "danger", message: err.message });
-
-    return Promise.reject(err.response);
-  }
-);
-
-export default axios;

src/views/Goods/Detail/modules/detailPay.mixin.js

@@ -23,9 +23,8 @@ export default {
     this.tradeType = this.customTradeType ?? (isXyqb ? "MWEB" : isWeixinBrower ? "JSAPI" : "MWEB");
   },
   methods: {
-    ...mapActions(["setIsLoading", "setIsShowOpenBrower"]),
+    ...mapActions(["setIsShowOpenBrower"]),
     async generateOrder(detailType) {
-      this.setIsLoading(true);
       const res = await placeOrder.create({
         ...this.subFormData
       });
@@ -39,7 +38,6 @@ export default {
       }
     },
     async goPay() {
-      this.setIsLoading(false);
       const { tradeType, orderInfo } = this;
       const { payOrderNo, payType } = orderInfo;
       if (!payOrderNo) {

src/views/Policy/Add/index.less

@@ -79,6 +79,14 @@
         left: 0;
       }
     }
+    @{deep} .cr-field--control-in {
+      &:focus {
+        transform: translateY(0%);
+      }
+      &:active {
+        transform: translateY(0%);
+      }
+    }
   }
 }
 .form-unit {

src/views/Policy/Add/index.vue

@@ -591,7 +591,7 @@ export default {
       pact: false,
       formData: {
         insuredUserInfo: {
-          relation: "",
+          relation: "1",
           longTerm: "1"
         },
         holderUserInfo: {

yarn.lock

@@ -3827,6 +3827,11 @@ file-loader@^4.2.0:
     loader-utils "^1.2.3"
     schema-utils "^2.5.0"
 
+file-saver@^2.0.2:
+  version "2.0.2"
+  resolved "http://npmprivate.quantgroups.com/file-saver/-/file-saver-2.0.2.tgz#06d6e728a9ea2df2cce2f8d9e84dfcdc338ec17a"
+  integrity sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw==
+
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "http://npmprivate.quantgroups.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"