diff --git a/app.js b/app.js index c413b36..1413cdd 100644 --- a/app.js +++ b/app.js @@ -10,7 +10,6 @@ App({ wx.login({ success: res => { console.log(res); -<<<<<<< HEAD // wx.request({ // url: 'https://www.umayle.com/weixin_api/API/Wx/User/GetUserInfo.ashx?appName=Inland&code='+res.code, // method: 'POST', @@ -33,32 +32,6 @@ App({ // // url:'/pages/register/register' // }) // }, 2000); -======= - wx.request({ - // url: 'https://www.umayle.com/weixin_api/API/Wx/User/GetUserInfo.ashx?appName=Inland&code='+res.code, - url: ''+res.code, - method: 'POST', - success:(_res)=>{ - console.log(_res); - let openId = _res.data.openid; - this.globalData.openId = openId - console.log('openid',openId); - wx.request({ - // url: 'https://www.umayle.com/inland/Api/GetUserInfo.ashx?openId='+openId, - url: ''+openId, - method: 'POST', - success:(_res_)=>{ - console.log(_res_,',,,res'); - this.globalData.userInfo = _res_.data.data - if(_res_.data.code == 0 && _res_.data.message == '获取成功'){ - //跳转到列表页面 - setTimeout(() => { - wx.redirectTo({ - url:'/pages/list/list' - // url:'/pages/register/register' - }) - }, 2000); ->>>>>>> cdc45140f836a5564ba6d4f94c3e4d7e23d3df72 // }else{ // //跳转到注册页面 diff --git a/app.json b/app.json index 02e178d..f07d9ae 100644 --- a/app.json +++ b/app.json @@ -1,21 +1,10 @@ { "pages": [ -<<<<<<< HEAD "pages/map/map", - "pages/start/start", - "pages/index/index", - "pages/list/list" - -======= "pages/list/list", "pages/item/item", "pages/start/start", "pages/index/index" - - - - ->>>>>>> cdc45140f836a5564ba6d4f94c3e4d7e23d3df72 ], "plugins": { "routePlan": { diff --git a/pages/index/index.js b/pages/index/index.js index e597af8..d5d00de 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -22,7 +22,6 @@ Page({ }, onLoad(options) { if (wx.getUserProfile) { -<<<<<<< HEAD // let url = 'https://www.umayle.com/inland/dist/index.html?openId='+options.openId+'&page='+options.page; // console.log(url); // this.setData({ @@ -31,19 +30,6 @@ Page({ // url: url, // canIUseGetUserProfile: true // }) -======= - //https://download-1300932214.cos.ap-nanjing.myqcloud.com/inlandVessel/dist/index.html - //let url = 'https://download-1300932214.cos.ap-nanjing.myqcloud.com/inlandVessel/dist/index.html?openId='+options.openId+'&page='+options.page; - // let url = 'https://www.umayle.com/inland/dist/index.html?openId='+options.openId+'&page='+options.page; - let url = ''+options.openId+'&page='+options.page; - console.log(url); - this.setData({ - openId: options.openId, - page: options.page, - url: url, - canIUseGetUserProfile: true - }) ->>>>>>> cdc45140f836a5564ba6d4f94c3e4d7e23d3df72 } }, getUserProfile(e) { diff --git a/pages/list/list.js b/pages/list/list.js index 2dff754..146e5af 100644 --- a/pages/list/list.js +++ b/pages/list/list.js @@ -30,13 +30,13 @@ Page({ page: a, }) }, - // changeNext:function () { - // setTimeout(() => { - // wx.redirectTo({ - // url:'/pages/item/item' - // }) - // }, 2000); - // }, + changeNext:function () { + setTimeout(() => { + wx.redirectTo({ + url:'/pages/item/item' + }) + }, 2000); + }, onLoad: function (options) { // options 为 board页传来的参数 const _this = this; // 拼接请求url diff --git a/pages/map/images/icon1.png b/pages/map/images/icon1.png new file mode 100644 index 0000000..4ef3628 Binary files /dev/null and b/pages/map/images/icon1.png differ diff --git a/pages/map/images/qiao.png b/pages/map/images/qiao.png new file mode 100644 index 0000000..cb4260b Binary files /dev/null and b/pages/map/images/qiao.png differ diff --git a/pages/map/map.js b/pages/map/map.js index 417933f..9fc4bdd 100644 --- a/pages/map/map.js +++ b/pages/map/map.js @@ -50,7 +50,14 @@ Page({ } }); }, - + // 跳转列表 + handleRouter(){ + console.log('aaaa'); + wx.redirectTo({ + url:'/pages/list/list' + }) + + }, /** * 生命周期函数--监听页面加载 */ @@ -60,7 +67,7 @@ Page({ type: 'wgs84', altitude: false, success: (result) => { - // that.getOnlineDistrict(result.latitude, result.longitude) + that.getOnlineDistrict(result.latitude, result.longitude) var obj = { latitude:result.latitude,longitude:result.longitude } @@ -82,9 +89,9 @@ Page({ }, success: function (res) { that.setData({ - district:res.result.address_component.city + // district:res.result.address_component.city }) - console.log(this.district,'asda'); + console.log(res,'asda'); } }) }, diff --git a/pages/map/map.wxml b/pages/map/map.wxml index 42db13d..03a21f2 100644 --- a/pages/map/map.wxml +++ b/pages/map/map.wxml @@ -3,18 +3,8 @@ - - - - - - - {{item.title}} - - {{item.addr}} - - - + + - + 董滨枢纽小桥 - + 详情 @@ -50,4 +40,18 @@ 最大预警级别：红色预警。 + + + + + + + + + + {{item.title}} + + {{item.addr}} + + diff --git a/pages/map/map.wxss b/pages/map/map.wxss index fa0399d..91c614b 100644 --- a/pages/map/map.wxss +++ b/pages/map/map.wxss @@ -88,4 +88,12 @@ height: 40rpx; line-height: 40rpx; /* width: calc(fit-content + 10rpx) ; */ +} +.listPos{ + width: 100%; + height: auto; + position: fixed; + top: 100rpx; + left: 0; + background-color: #ffffff; } \ No newline at end of file diff --git a/project.config.json b/project.config.json index c529eb8..3593f17 100644 --- a/project.config.json +++ b/project.config.json @@ -56,11 +56,7 @@ "compileType": "miniprogram", "libVersion": "2.19.4", "appid": "wxa9783cf92ee95a72", -<<<<<<< HEAD "projectname": "bridgespace-app", -======= - "projectname": "inlandVessel-app", ->>>>>>> cdc45140f836a5564ba6d4f94c3e4d7e23d3df72 "condition": {}, "editorSetting": { "tabIndent": "insertSpaces",