diff --git a/manifest.json b/manifest.json index d843a22..a21c9c4 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "盛安到家", - "appid" : "__UNI__807ED4C", + "appid" : "__UNI__0A81F4F", "description" : "", "versionName" : "1.0.1", "versionCode" : 101, diff --git a/pages.json b/pages.json index 7f20640..136fffc 100644 --- a/pages.json +++ b/pages.json @@ -54,6 +54,18 @@ } } }, + { + "path": "pages/index/searchAddress", + "style": { + "navigationBarTitleText": "地址列表", + "enablePullDownRefresh": false, + "onReachBottomDistance":200, + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, { "path": "pages/videoCircle/index", "style": { diff --git a/pages/index/index.vue b/pages/index/index.vue index 9385074..273e62a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -645,15 +645,18 @@ }, goCity(){ var that = this - uni.chooseLocation({ - success: function(res) { - console.log('经度:' + res); - that.detailaddress = res.name - that.latitude = res.latitude - that.longitude = res.longitude - that.selectCity(res.longitude, res.latitude); - } - }); + uni.navigateTo({ + url:'/pages/index/searchAddress' + }) + // uni.chooseLocation({ + // success: function(res) { + // console.log('经度:' + res); + // that.detailaddress = res.name + // that.latitude = res.latitude + // that.longitude = res.longitude + // that.selectCity(res.longitude, res.latitude); + // } + // }); }, selectCity(longitude, latitude) { diff --git a/pages/index/searchAddress.vue b/pages/index/searchAddress.vue new file mode 100644 index 0000000..e27681c --- /dev/null +++ b/pages/index/searchAddress.vue @@ -0,0 +1,153 @@ + + + + + \ No newline at end of file diff --git a/pages/msg/im.vue b/pages/msg/im.vue index c0a76f3..999d4a7 100644 --- a/pages/msg/im.vue +++ b/pages/msg/im.vue @@ -245,6 +245,8 @@ uni.showLoading({ title: '连接中...' }) + // wss://sausers.blxinchuang.com/wss/chatSocket/ + // websocketUtils.getWsBaseUrl() uni.connectSocket({ url: websocketUtils.getWsBaseUrl() + userId, data() { @@ -299,6 +301,30 @@ that.startRecive = false that.msg = false console.log('onClose', res) + uni.showLoading({ + title: '连接中...' + }) + uni.connectSocket({ + url: websocketUtils.getWsBaseUrl() + userId, + data() { + return { + msg: 'Hello' + } + }, + header: { + 'content-type': 'application/json' + }, + method: 'GET', + success(res) { + uni.hideLoading(); + that.getTimeOrListItem1(); + // 这里是接口调用成功的回调,不是连接成功的回调,请注意 + }, + fail(err) { + // 这里是接口调用失败的回调,不是连接失败的回调,请注意 + console.log("--------------"+JSON.stringify(err)) + } + }); }); }, close() { @@ -392,6 +418,7 @@ }, 50); }, fail(err) { + that.connect() console.log(err); } }) @@ -545,6 +572,9 @@ + \ No newline at end of file