diff --git a/api/baseurl.js b/api/baseurl.js index d4ecd69..2ceff93 100644 --- a/api/baseurl.js +++ b/api/baseurl.js @@ -1,4 +1,4 @@ -var baseurl = "http://192.168.16.62:8080"; +var baseurl = "http://192.168.16.81:8080"; export default baseurl \ No newline at end of file diff --git a/api/index/index.js b/api/index/index.js index 475e01e..cdba916 100644 --- a/api/index/index.js +++ b/api/index/index.js @@ -1,8 +1,8 @@ import request from "../request.js" -export function getPreOrderById(data) { +export function getPreOrderById(data,data2) { return request({ - url: `/kindergarten/applet/appletLogin?code=${data}`, + url: `/kindergarten/applet/appletLogin?loginCode=${data}&phoneCode=${data2}`, method: 'GET' }) } @@ -21,6 +21,17 @@ export function bindParent(data) { data }) } + + + +export function getInfoByPhone(data) { + return request({ + url: `/kindergarten/applet/getInfoByPhone?phone=${data}`, + method: 'GET' + }) +} + + // export function addConfirmOrder(data) { //     return request({ //         url: ``, diff --git a/manifest.json b/manifest.json index 5022000..2a548f3 100644 --- a/manifest.json +++ b/manifest.json @@ -50,13 +50,19 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wxe56d6caefbdda1d3", + "appid" : "wxdec3416aa3d60cab", "setting" : { "urlCheck" : false, "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "unipush" : { + "enable" : true + }, + "uniStatistics" : { + "enable" : false + } }, "mp-alipay" : { "usingComponents" : true @@ -68,7 +74,8 @@ "usingComponents" : true }, "uniStatistics" : { - "enable" : false + "enable" : false, + "version" : "2" }, "vueVersion" : "2" } diff --git a/pages/home/home.vue b/pages/home/home.vue index 23b667d..b5a4b11 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -127,6 +127,7 @@ border-bottom: lightsteelblue 2rpx solid; text-align: center; padding-left: 40rpx; + } .time { height: 100rpx; diff --git a/pages/index/index2.vue b/pages/index/index2.vue deleted file mode 100644 index e894b9d..0000000 --- a/pages/index/index2.vue +++ /dev/null @@ -1,231 +0,0 @@ - - - - - diff --git a/pages/index/index3.vue b/pages/index/index3.vue deleted file mode 100644 index 7bf1b0b..0000000 --- a/pages/index/index3.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - - diff --git a/pages/phone/phone.vue b/pages/phone/phone.vue index 721e3a7..ca11252 100644 --- a/pages/phone/phone.vue +++ b/pages/phone/phone.vue @@ -1,7 +1,7 @@