营地2.0-修改message->msg

644d4426 · wuwangwolihui · f0ddcdbf · 644d4426 · 644d4426 · 644d4426
Commit 644d4426 authored Sep 26, 2023 by wuwangwolihui
22 changed files
--- a/src/components/index/SignUp/ConfirmSignUp.vue
+++ b/src/components/index/SignUp/ConfirmSignUp.vue
@@ -78,7 +78,7 @@
            return this.cancelBtn();
          }
          this.isShowqr = 2;
-          this.message = res.message;
+          this.message = res.msg;
          return;
        }
        this.isShowqr = 1;
@@ -131,7 +131,7 @@
          }
          //code=200,跳到支付成功页面
          this.isSuccess = 1
-          this.$message.success(res.data.message);
+          this.$message.success(res.data.msg);
          this.cancelBtn()
        });
      },

--- a/src/components/index/SignUp/confirm.vue
+++ b/src/components/index/SignUp/confirm.vue
@@ -93,9 +93,9 @@
          //是否选择活动形式
          obj.multiform_id = _this.referForm.multiform;
          setSignShould(obj).then((res) => {
-            if (res.data.code !== 200) return this.$message.error(res.data.message);
+            if (res.data.code !== 200) return this.$message.error(res.data.msg);
            this.$emit("getstatus", res.data.status);
-            this.$message.success(res.data.message);
+            this.$message.success(res.data.msg);
          });
        }

@@ -103,7 +103,7 @@
      getCams() {
        getCam(this.$store.state.indexIdentity).then((res) => {
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          this.info = res.data;
        });

--- a/src/components/index/SignUp/deliveryAddress.vue
+++ b/src/components/index/SignUp/deliveryAddress.vue
@@ -185,7 +185,7 @@
        getAddress({}).then((res) => {
          // console.log(res, "getAddress");
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          if (res.data.info == null) {
            return;
@@ -217,7 +217,7 @@
        getProAndCity({}).then((res) => {
          // console.log(res, "getProAndCity");
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          this.selectProvince = res.data.province_list;
          this.CityName = res.data.city_list;
@@ -254,7 +254,7 @@
                }
                return currentCity;
              } else {
-                this.$message.error(res.data.message);
+                this.$message.error(res.data.msg);
              }
            })
            .catch((err) => {
@@ -284,9 +284,9 @@
        setAddress(this.addressForm).then((res) => {
          // console.log(res, "setAddress");
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
-          this.$message.success(res.data.message);
+          this.$message.success(res.data.msg);
          this.dialogVisible = false;
        });
      },

--- a/src/components/index/SignUp/invitation.vue
+++ b/src/components/index/SignUp/invitation.vue
@@ -232,11 +232,11 @@
        setInviteCode({code: code}).then((res) => {
          // console.log(res, "code");
          if (res.data.code !== 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          if (res.data.code == 4000346 || res.data.code == 4000347) {
            this.dialogVisible = true;
-            this.msg = res.data.message
+            this.msg = res.data.msg
            return;
          }
          this.$emit("getstatus", res.data.status);

--- a/src/components/index/SignUp/pass.vue
+++ b/src/components/index/SignUp/pass.vue
@@ -53,11 +53,11 @@
      Lasting() {
        signBack({}).then((res) => {
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          this.signBackStatus = res.data.status;
          this.$emit("getstatus", res.data.status);
-          this.$message.success(res.data.message);
+          this.$message.success(res.data.msg);
        });
      },
      paying() {
@@ -71,7 +71,7 @@
              this.status = 6;
              this.type = "success";
            }
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          this.status = res.data.status;
          // 点击下一步传值给status,更新

--- a/src/components/index/SignUp/paying.vue
+++ b/src/components/index/SignUp/paying.vue
@@ -328,7 +328,7 @@
        }).then((res) => {
          console.log(res, "getWxConfig");
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          /* 此处form就是后台返回接收到的数据 */
          let form = res.data.data;
@@ -360,7 +360,7 @@
          // getWxConfig({pay_type: 3}).then((res) => {
          //   console.log(res, "signUpInit");
          //   if (res.data.code != 200) {
-          //     return this.$message.error(res.data.message);
+          //     return this.$message.error(res.data.msg);
          //   }
          //   this.$message.success(res.data.err_msg);
          // });
@@ -382,7 +382,7 @@
        signUpInit({}).then((res) => {
          console.log(res, "signUpInit");
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          this.status = res.data.status;
          // return;
@@ -403,7 +403,7 @@
              getWxConfig({pay_type: 3}).then((res) => {
                console.log(res, "signUpInit");
                if (res.data.code != 200) {
-                  return this.$message.error(res.data.message);
+                  return this.$message.error(res.data.msg);
                }
                this.$message.success(res.data.err_msg);
              });
@@ -437,7 +437,7 @@
        getAccount({}).then((res) => {
          // console.log(res, "getAccount");
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          this.personalInfo = res.data.info;
          // this.personalInfo.create_time = parseTime(res.data.info.create_time);
@@ -550,7 +550,7 @@
                }
              );
            } else {
-              this.$message.error(resData.message);
+              this.$message.error(resData.msg);
            }
          })
          .catch((err) => {
@@ -599,7 +599,7 @@
      //             console.log(555555555);
      //             console.log(ress, "ress");
      //             if (ress.data.code != 200) {
-      //               return this.$message.error(ress.data.message);
+      //               return this.$message.error(ress.data.msg);
      //             }
      //             this.resultPicture = filename + "?t=" + Date.parse(new Date());
      //             // this.$forceUpdate();
@@ -622,7 +622,7 @@
      //             this.$message.error(err);
      //           });
      //       } else {
-      //         this.$message.error(res.data.message);
+      //         this.$message.error(res.data.msg);
      //       }
      //     })
      //     .catch((err) => {
@@ -651,7 +651,7 @@
            let savefile = str[1];
            delPayingPic({object: savefile}).then((res) => {
              if (res.data.code != 200) {
-                return this.$message.error(res.data.message);
+                return this.$message.error(res.data.msg);
              }
              this.fileList.forEach((item, idx) => {
                if (item.url == file.url) {

--- a/src/components/index/SignUp/referInfo.vue
+++ b/src/components/index/SignUp/referInfo.vue
@@ -1492,7 +1492,7 @@
        getAccount({}).then((res) => {
          // console.log(res, "getAccount");
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          let info = res.data.info;
          info['code'] = null
@@ -1676,7 +1676,7 @@
      //   getSchool({}).then((res) => {
      //     // console.log(res, "getSchool");
      //     if (res.data.code != 200) {
-      //       return this.$message.error(res.data.message);
+      //       return this.$message.error(res.data.msg);
      //     }
      //     this.schoolName = res.data.school_list;
      //   });
@@ -1898,7 +1898,7 @@
      //           .then((ress) => {
      //             // console.log(ress, "ress");
      //             if (ress.data.code != 200) {
-      //               return this.$message.error(ress.data.message);
+      //               return this.$message.error(ress.data.msg);
      //             }
      //             this.resultPicture = filename + "?t=" + Date.parse(new Date());
      //             this.$forceUpdate();
@@ -1919,7 +1919,7 @@
      //             this.$message.error(err);
      //           });
      //       } else {
-      //         this.$message.error(res.data.message);
+      //         this.$message.error(res.data.msg);
      //       }
      //     })
      //     .catch((err) => {

--- a/src/components/index/SignUp/success.vue
+++ b/src/components/index/SignUp/success.vue
@@ -83,7 +83,7 @@ export default {
    handleDownload() {
      signUpInit({}).then((res) => {
        if (res.data.code != 200) {
-          return this.$message.error(res.data.message);
+          return this.$message.error(res.data.msg);
        }
        if (res.data.is_dowload == 1) {
          window.location.href = res.data.dowload_url;

--- a/src/config/area.js
+++ b/src/config/area.js
 export default {
-
-
-
  country: [{
      value: 'Angola',
      label: '安哥拉'

--- a/src/request/base/network.js
+++ b/src/request/base/network.js
@@ -105,7 +105,7 @@ export function request(config) {
        return false;
      }
      if (axios.isCancel(error)) {
-        console.log(error.message)
+        console.log(error.msg)
      } else {
        // 增加延迟，相同请求不得在短时间内重复发送
        setTimeout(() => {

--- a/src/request/index/network.js
+++ b/src/request/index/network.js
@@ -176,7 +176,7 @@ export function request(config) {
          path: '/' + store.state.indexIdentity,
        })
        Notification({
-          message: res.data.message,
+          message: res.data.msg,
          duration: 1000,
        });
        return
@@ -190,7 +190,7 @@ export function request(config) {
        })
        if (!isLogout) {
          Notification({
-            message: res.data.message,
+            message: res.data.msg,
            duration: 3000,
          });
        }
@@ -215,7 +215,7 @@ export function request(config) {
    (error) => {
      console.log(error, 'err')
      Message.closeAll()
-      if (error.message == '请登录！') {
+      if (error.msg == '请登录！') {
        router.push({
          path: "/login?code=" + store.state.indexIdentity,
        })
@@ -227,7 +227,7 @@ export function request(config) {
        });
      }
      if (axios.isCancel(error)) {
-        console.log(error.message)
+        console.log(error.msg)
      } else {
        // 增加延迟，相同请求不得在短时间内重复发送
        setTimeout(() => {

--- a/src/request/network.js
+++ b/src/request/network.js
@@ -131,12 +131,6 @@ export function request(config) {
      if (token) {
        config.headers.token = token;
      } else {
-        // router.push({
-        //   path: '/login',
-        //   query: {
-        //     redirect: router.currentRoute.fullPath
-        //   } // 从哪个页面跳转
-        // })
        router.push({
          path: '/' + store.state.indexIdentity,
        })
@@ -186,7 +180,7 @@ export function request(config) {
          path: '/' + store.state.indexIdentity,
        })
        Notification({
-          message: res.data.message,
+          message: res.data.msg,
          duration: 1000,
        });
        return false;
@@ -200,7 +194,7 @@ export function request(config) {
        })
        if (!isLogout) {
          Notification({
-            message: res.data.message,
+            message: res.data.msg,
            duration: 3000,
          });
        }
@@ -209,12 +203,6 @@ export function request(config) {
      if (res.data.code == 400003 || res.data.code == 401) {
        // 清除本地缓存 除了特殊缓存
        store.commit('removeLocalStorage');
-        // router.push({
-        //   path: '/login',
-        //   query: {
-        //     redirect: router.currentRoute.fullPath
-        //   } // 从哪个页面跳转
-        // })
        router.push({
          path: '/' + store.state.indexIdentity,
        })
@@ -227,10 +215,7 @@ export function request(config) {
    },
    (error) => {
      Message.closeAll();
-      if (error.message == '请登录！') {
-        // router.push({
-        //   path: "/login?code=" + store.state.indexIdentity,
-        // })
+      if (error.msg == '请登录！') {
        router.push({
          path: '/' + store.state.indexIdentity,
        })
@@ -242,7 +227,7 @@ export function request(config) {
        });
      }
      if (axios.isCancel(error)) {
-        console.log(error.message)
+        console.log(error.msg)
      } else {
        // 增加延迟，相同请求不得在短时间内重复发送
        setTimeout(() => {

--- a/src/views/base/login/Login.vue
+++ b/src/views/base/login/Login.vue
@@ -245,9 +245,9 @@
        }).then((res) => {
          console.log(res, "passwordCode");
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
-          this.$message.success(res.data.message);
+          this.$message.success(res.data.msg);

          this.codeTime = res.data.expire_time;
          window.localStorage.setItem("login_code_time", res.data.expire_time);
@@ -296,9 +296,9 @@
          login(obj).then((res) => {
            console.log(res, "login");
            if (res.data.code != 200) {
-              return this.$message.error(res.data.message);
+              return this.$message.error(res.data.msg);
            }
-            this.$message.success(res.data.message);
+            this.$message.success(res.data.msg);
            this.$store.commit('login', res.data.token);
            window.localStorage.setItem("index-phone-all", this.loginForm.phone);
            window.localStorage.setItem("index-email-all", res.data.email);

--- a/src/views/base/login/Register.vue
+++ b/src/views/base/login/Register.vue
@@ -141,7 +141,7 @@
        registerRules: {
          // 对手机号进行校验
          phone: [
-            {required: true, message: "请输入手机号", trigger: "blur"},
+            {required: true, msg: "请输入手机号", trigger: "blur"},
            {
              validator: function (rule, value, callback) {
                if (mobileCheck(value) === false) {
@@ -275,9 +275,9 @@
        }).then((res) => {
          console.log(res, "passwordCode");
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
-          this.$message.success(res.data.message);
+          this.$message.success(res.data.msg);

          this.codeTime = res.data.expire_time;
          window.localStorage.setItem("register_code_time", res.data.expire_time);
@@ -297,9 +297,9 @@
          }).then((res) => {
            console.log(res);
            if (res.data.code != 200) {
-              return this.$message.error(res.data.message);
+              return this.$message.error(res.data.msg);
            }
-            this.$message.success(res.data.message);
+            this.$message.success(res.data.msg);
            // token存储
            this.$store.commit('login', res.data.token);
            window.localStorage.setItem("index-phone-all", this.registerForm.phone);

--- a/src/views/base/login/Reset.vue
+++ b/src/views/base/login/Reset.vue
@@ -272,9 +272,9 @@
        }).then((res) => {
          console.log(res, "passwordCode");
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
-          this.$message.success(res.data.message);
+          this.$message.success(res.data.msg);

          this.codeTime = res.data.expire_time;
          window.localStorage.setItem("reset_code_time", res.data.expire_time);
@@ -295,9 +295,9 @@
          }).then((res) => {
            console.log(res);
            if (res.data.code != 200) {
-              return this.$message.error(res.data.message);
+              return this.$message.error(res.data.msg);
            }
-            this.$message.success(res.data.message);
+            this.$message.success(res.data.msg);
            // token存储
            window.localStorage.setItem("login_code_phone", this.resetForm.phone);
            // 跳转到登录

--- a/src/views/index/Info/personalInfo.vue
+++ b/src/views/index/Info/personalInfo.vue
@@ -610,7 +610,7 @@ export default {
      getAddress({}).then((res) => {
        // console.log(res, "getAddress");
        if (res.data.code != 200) {
-          return this.$message.error(res.data.message);
+          return this.$message.error(res.data.msg);
        }
        this.addressForm.certificate_name = res.data.info.certificate_name;
        this.addressForm.certificate_phone = res.data.info.certificate_phone;
@@ -652,7 +652,7 @@ export default {
      getAccountInfo({}).then((res) => {
        console.log(res, "getAccountInfo");
        if (res.data.code != 200) {
-          return this.$message.error(res.data.message);
+          return this.$message.error(res.data.msg);
        }
        this.referForm = res.data.info;
        if (res.data.info.jiguan_province && res.data.info.jiguan_city) {
@@ -685,7 +685,7 @@ export default {
      getProAndCity({}).then((res) => {
        // console.log(res, "getProAndCity");
        if (res.data.code != 200) {
-          return this.$message.error(res.data.message);
+          return this.$message.error(res.data.msg);
        }
        this.selectProvince = res.data.province_list;
        // this.CityName = res.data.city_list;
@@ -736,7 +736,7 @@ export default {
              }
              return currentCity;
            } else {
-              this.$message.error(res.data.message);
+              this.$message.error(res.data.msg);
            }
          })
          .catch((err) => {
@@ -761,7 +761,7 @@ export default {
      getSchool({}).then((res) => {
        // console.log(res, "getSchool");
        if (res.data.code != 200) {
-          return this.$message.error(res.data.message);
+          return this.$message.error(res.data.msg);
        }
        this.schoolName = res.data.school_list;
      });
@@ -800,7 +800,7 @@ export default {
              }
              return currentSchool;
            } else {
-              this.$message.error(res.data.message);
+              this.$message.error(res.data.msg);
            }
          })
          .catch((err) => {
@@ -861,13 +861,13 @@ export default {
          if (res.data.code != 200) {
            if (res.data.code == 400068) {
              this.$parent.statuss();
-              return this.$message.error(res.data.message);
+              return this.$message.error(res.data.msg);
            }
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          // console.log(3333);
          this.$emit("getstatus", res.data.status);
-          this.$message.success(res.data.message);
+          this.$message.success(res.data.msg);
          // let code = this.$store.state.indexIdentity;
          // this.$router.push("/signUp/check?code=" + code);
          this.referForm = res.data.data;

--- a/src/views/index/camp/Homework.vue
+++ b/src/views/index/camp/Homework.vue
@@ -163,11 +163,11 @@
          // console.log(res, "getTeacherWork");
          if (res.data.code == 400001) {
            this.isShowinfo = false;
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          if (res.data.code != 200) {
            this.isShowinfo = true;
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          this.homeworkList = res.data.data.list;
          this.homeworkList.forEach((item) => {
@@ -181,7 +181,7 @@
          });
          this.isShowinfo = true;
          this.total = res.data.data.count;
-          // this.$message.success(res.data.message);
+          // this.$message.success(res.data.msg);
        });
      },
    },

--- a/src/views/index/camp/SignUp.vue
+++ b/src/views/index/camp/SignUp.vue
@@ -242,11 +242,11 @@
      lasStep() {
        signBack({}).then((res) => {
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          this.signBackStatus = res.data.status;
          this.signUpInit(this.signBackStatus);
-          this.$message.success(res.data.message);
+          this.$message.success(res.data.msg);
        });
      },
      is_nextevent(val) {
@@ -262,7 +262,7 @@
      signUpInit(status_val = null) {
        signUpInit({}).then((res) => {
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
          // 点击下一步传值给status,更新
          if (status_val && status_val != null && status_val != "") {

--- a/src/views/index/camp/homework/refer.vue
+++ b/src/views/index/camp/homework/refer.vue
@@ -611,7 +611,7 @@
      //             console.log(ress, "ress");
      //             if (ress.data.code != 200) {
      //               this.isUploading = false;
-      //               return this.$message.error(ress.data.message);
+      //               return this.$message.error(ress.data.msg);
      //             }
      //             this.resultPicture = filename + "?t=" + Date.parse(new Date());
      //             this.$forceUpdate();
@@ -643,7 +643,7 @@
      //           });
      //       } else {
      //         this.isUploading = false;
-      //         this.$message.error(res.data.message);
+      //         this.$message.error(res.data.msg);
      //       }
      //     })
      //     .catch((err) => {

--- a/src/views/index/login/Login.vue
+++ b/src/views/index/login/Login.vue
@@ -247,9 +247,9 @@
        }).then((res) => {
          console.log(res, "passwordCode");
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
-          this.$message.success(res.data.message);
+          this.$message.success(res.data.msg);
          this.codeTime = res.data.expire_time;
          window.localStorage.setItem("login_code_time", res.data.expire_time);
          window.localStorage.setItem("login_code_phone", this.loginForm.phone);
@@ -301,9 +301,9 @@
          login(obj).then((res) => {
            console.log(res, "login");
            if (res.data.code != 200) {
-              return this.$message.error(res.data.message);
+              return this.$message.error(res.data.msg);
            }
-            this.$message.success(res.data.message);
+            this.$message.success(res.data.msg);
            // 跳转到报名
            const code = this.$store.state.indexIdentity;
            // token存储

--- a/src/views/index/login/Register.vue
+++ b/src/views/index/login/Register.vue
@@ -283,9 +283,9 @@
        }).then((res) => {
          console.log(res, "passwordCode");
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
-          this.$message.success(res.data.message);
+          this.$message.success(res.data.msg);
          this.codeTime = res.data.expire_time;
          window.localStorage.setItem("register_code_time", res.data.expire_time);
          window.localStorage.setItem("register_code_phone", this.registerForm.phone);
@@ -304,9 +304,9 @@
          }).then((res) => {
            console.log(res);
            if (res.data.code != 200) {
-              return this.$message.error(res.data.message);
+              return this.$message.error(res.data.msg);
            }
-            this.$message.success(res.data.message);
+            this.$message.success(res.data.msg);
            let code = this.$store.state.indexIdentity;
            // token存储
            this.$store.commit('login', res.data.token);

--- a/src/views/index/login/Reset.vue
+++ b/src/views/index/login/Reset.vue
@@ -273,9 +273,9 @@
        }).then((res) => {
          console.log(res, "passwordCode");
          if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
          }
-          this.$message.success(res.data.message);
+          this.$message.success(res.data.msg);

          this.codeTime = res.data.expire_time;
          window.localStorage.setItem("reset_code_time", res.data.expire_time);
@@ -296,9 +296,9 @@
          }).then((res) => {
            console.log(res);
            if (res.data.code != 200) {
-              return this.$message.error(res.data.message);
+              return this.$message.error(res.data.msg);
            }
-            this.$message.success(res.data.message);
+            this.$message.success(res.data.msg);
            // token存储
            let code = this.$store.state.indexIdentity;
            window.localStorage.setItem("login_code_phone", this.resetForm.phone);