diff --git a/js/app.js b/js/app.js index d36c855..9e8575e 100644 --- a/js/app.js +++ b/js/app.js @@ -1,17 +1,17 @@ window.app = { /* 开发环境 */ - // serverUrl: "http://localhost:8088", // 接口服务接口地址 - // paymentServerUrl: "http://192.168.1.3:8089", // 支付中心服务地址 - // shopServerUrl: "http://localhost:8080/foodie-shop/", // 门户网站地址 - // centerServerUrl: "http://localhost:8080/foodie-center/", // 用户中心地址 - // cookieDomain: "", // cookie 域 + serverUrl: "http://localhost:8088", // 接口服务接口地址 + paymentServerUrl: "http://192.168.1.3:8089", // 支付中心服务地址 + shopServerUrl: "http://localhost:8080/foodie-shop/", // 门户网站地址 + centerServerUrl: "http://localhost:8080/foodie-center/", // 用户中心地址 + cookieDomain: "", // cookie 域 /* 生产环境 */ - serverUrl: "http://api.z.mukewang.com:8088/foodie-dev-api", // 接口服务接口地址 - paymentServerUrl: "http://payment.t.mukewang.com/foodie-payment", // 支付中心服务地址 - shopServerUrl: "http://shop.z.mukewang.com:8080/foodie-shop/", // 门户网站地址 - centerServerUrl: "http://center.z.mukewang.com:8080/foodie-center/", // 用户中心地址 - cookieDomain: ".z.mukewang.com;", // cookie 域 + //serverUrl: "http://api.z.mukewang.com:8088/foodie-dev-api", // 接口服务接口地址 + //paymentServerUrl: "http://payment.t.mukewang.com/foodie-payment", // 支付中心服务地址 + //shopServerUrl: "http://shop.z.mukewang.com:8080/foodie-shop/", // 门户网站地址 + //centerServerUrl: "http://center.z.mukewang.com:8080/foodie-center/", // 用户中心地址 + //cookieDomain: ".z.mukewang.com;", // cookie 域 ctx: "/foodie-shop", @@ -35,7 +35,7 @@ window.app = { setCookie: function(name, value) { var Days = 365; - var exp = new Date(); + var exp = new Date(); exp.setTime(exp.getTime() + Days*24*60*60*1000); var cookieContent = name + "="+ encodeURIComponent (value) + ";path=/;"; if (this.cookieDomain != null && this.cookieDomain != undefined && this.cookieDomain != '') { @@ -99,7 +99,7 @@ window.app = { // 删除主图在数组中的位置 foodieShopcart.splice(i, 1, tmpItem); } - } + } if (!isHavingItem) { foodieShopcart.push(pendingItem); } diff --git a/login.html b/login.html index 3d8b7bf..a49d95e 100644 --- a/login.html +++ b/login.html @@ -87,7 +87,7 @@ returnUrl: "" }, created() { - + // 登录成功后会跳原来页面 var returnUrl = app.getUrlParam("returnUrl"); if (returnUrl != null && returnUrl != undefined && returnUrl != '') { @@ -97,7 +97,7 @@ methods: { getRequest() { }, - postRequest() { + postRequest() { }, doLogin() { @@ -130,7 +130,7 @@ var user = res.data; // console.log(user); - // window.location.href = app.ctx + "/index.html"; + //window.location.href = app.ctx + "/index.html"; if (returnUrl != null && returnUrl != undefined && returnUrl != '') { window.location.href = returnUrl; } else { @@ -148,4 +148,4 @@ - \ No newline at end of file + diff --git a/register.html b/register.html index 91708e7..a3ca9fb 100644 --- a/register.html +++ b/register.html @@ -10,7 +10,7 @@ - + @@ -42,23 +42,23 @@
- +
{{errUsername}} -
+
-
+
- + - + - \ No newline at end of file +