diff --git a/gasStation-uni/config.js b/gasStation-uni/config.js index 893e93e32..e9d1a5d78 100644 --- a/gasStation-uni/config.js +++ b/gasStation-uni/config.js @@ -5,7 +5,7 @@ module.exports = { // baseUrl: 'http://192.168.0.196:8081/', // baseUrl: 'http://192.168.1.4:8080/', - baseUrl: 'http://192.168.0.178:8008/', + baseUrl: 'http://192.168.0.121:8080/', diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue index dce772d72..66336f54c 100644 --- a/gasStation-uni/pages/index/index.vue +++ b/gasStation-uni/pages/index/index.vue @@ -445,7 +445,7 @@ import { callWithErrorHandling } from "vue" _this.list3.push(_this.baseUrl + item) }) } - + _this.getIndexBanner() }) @@ -539,7 +539,7 @@ import { callWithErrorHandling } from "vue" address, latitude, longitude - }) => { // 选择位置完成后的处理 + }) => { // 选择位置完成后的处理 // this.addressName = address; console.log(name, address, latitude, longitude); this.longitude = longitude; @@ -851,4 +851,4 @@ import { callWithErrorHandling } from "vue" color: white; margin: 0 auto; } - \ No newline at end of file + diff --git a/gasStation-uni/pagesLogin/login/login.vue b/gasStation-uni/pagesLogin/login/login.vue index 328654f29..0380fcd65 100644 --- a/gasStation-uni/pagesLogin/login/login.vue +++ b/gasStation-uni/pagesLogin/login/login.vue @@ -14,7 +14,7 @@ - @@ -23,9 +23,9 @@ 请仔细阅读 - 《用户协议》 + 《用户协议》 - 《隐私政策》 + 《隐私政策》 @@ -48,6 +48,12 @@ }, components: {}, methods: { + gopv() { + uni.navigateTo({ + url: '/pagesLogin/login/webview' + }) + + }, // 获取支付宝userid getUserLogin(e) { // if (this.qindex == false) { @@ -61,7 +67,7 @@ console.log(e) let _this = this; - + my.getPhoneNumber({ scopes: 'auth_base', success: res1 => { @@ -83,15 +89,16 @@ storeId: 0, staffId: "", phone: "18457621459", - encryptedData:encryptedData, + encryptedData: encryptedData, }, }).then((resp) => { console.log(resp) if (resp.code == 200) { - + uni.setStorageSync('App-Token', resp.data.token); - uni.setStorageSync('chainStoreId', resp.data.chainStoreId); - + uni.setStorageSync('chainStoreId', resp.data + .chainStoreId); + uni.navigateTo({ url: '/pages/index/index' }) @@ -104,8 +111,8 @@ console.log('my.getAuthCode 调用失败', err) } }); - - + + }, fail: err => { console.log('my.getAuthCode 调用失败', err) @@ -366,4 +373,4 @@ border: 1px solid #0078FF; color: white; } - + \ No newline at end of file