代码合并

src/utils/httpRequest.js

@@ -15,7 +15,9 @@ const http = axios.create({
 
 // const requestURl = "http://localhost:8100/czg/";
 // const requestURl = "https://web-api.hnsiyao.cn/czg/";//测试
-const requestURl = "https://web.hnsiyao.cn/czg/";//正式
+// const requestURl = "https://web.hnsiyao.cn/czg/";//正式
+// const requestURl = "http://192.168.1.31:8080/admin/";//php本地
+const requestURl = "https://playlet.test.sxczgkj.com/admin/";//php测试服
 
 /**
  * 请求拦截
@@ -38,6 +40,7 @@ http.interceptors.response.use(response => {
   }
   return response
 }, error => {
+	console.log(error)
   return Promise.reject(error)
 })
 

src/views/campus/coupon.vue

@@ -750,6 +750,7 @@
 						'startTime': this.startTime,
 						'sysUserName':this.sysUserNameT,
 						'sysUserId':this.sysUserId,
+						'userId':this.sysUserId,
 					})
 				}).then(({
 					data

src/views/common/login.vue

@@ -187,9 +187,13 @@ export default {
       this.$http({
         // url: this.$http.adornUrl('app/Login/sendMsg/'+this.tableData.mobile+'/regis'),
         url: this.$http.adornUrl(
-          "app/Login/sendMsg/" + this.dataForm.mobile + "/regis"
+          "Login/sendMsg/" + this.dataForm.mobile + "/regis"
         ),
         method: "get",
+		params:{
+			phone: this.dataForm.mobile,
+			event:'regis'
+		}
       }).then((res) => {
         console.log(res);
         if (res.data.code == 0) {
@@ -251,7 +255,7 @@ export default {
               // this.$router.replace({ name: "home" });
             } else {
               // this.getCaptcha();
-              this.$message.error(data.msg);
+              this.$message.error(data.message);
             }
           });
         }
@@ -277,18 +281,27 @@ export default {
               this.$router.replace({ name: "home" });
             } else {
               this.getCaptcha();
-              this.$message.error(data.msg);
+              this.$message.error(data.message);
             }
           });
         }
       });
     },
     // 获取验证码
-    getCaptcha() {
+    async getCaptcha() {
       this.dataForm.uuid = getUUID();
-      this.captchaPath = this.$http.adornUrl(
+	  const res =await this.$http({
-        `/captcha.jpg?uuid=${this.dataForm.uuid}`
+		url: this.$http.adornUrl("indetcode/getCode"),
-      );
+			method:'get',
+			params:{
+				uuid:this.dataForm.uuid
+			}
+		})
+		console.log(res);
+		this.captchaPath=res.data.data.img
+    //   this.captchaPath = this.$http.adornUrl(
+    //     `/captcha.jpg?uuid=${this.dataForm.uuid}`
+    //   );
     },
   },
 };

src/views/finance/storeincome.vue

@@ -955,9 +955,13 @@ export default {
       this.$http({
         // url: this.$http.adornUrl('app/Login/sendMsg/'+this.tableData.mobile+'/regis'),
         url: this.$http.adornUrl(
-          "app/Login/sendMsg/" + this.tableData.mobile + "/regis"
+          "Login/sendMsg/" + this.tableData.mobile + "/regis"
         ),
         method: "get",
+		params:{
+			phone: this.tableData.mobile,
+			event:'regis'
+		}
       }).then((res) => {
         console.log(res);
         if (res.data.code == 0) {
@@ -1414,7 +1418,7 @@ export default {
         });
         return;
       }
-      // this.tableDataLoading1 = true
+      this.tableDataLoading1 = true
       let userId = this.$cookie.get("userId");
       this.$http({
         // url: this.$http.adornUrl('cash/cashMoney'),