diff --git a/node_modules/amap-wx/amap-wx.js b/node_modules/amap-wx/amap-wx.js new file mode 100644 index 0000000..eb969c3 --- /dev/null +++ b/node_modules/amap-wx/amap-wx.js @@ -0,0 +1 @@ +function AMapWX(a){this.key=a.key,this.requestConfig={key:a.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"}}AMapWX.prototype.getWxLocation=function(a,b){wx.getLocation({type:"gcj02",success:function(a){var c=a.longitude+","+a.latitude;wx.setStorage({key:"userLocation",data:c}),b(c)},fail:function(c){wx.getStorage({key:"userLocation",success:function(a){a.data&&b(a.data)}}),a.fail({errCode:"0",errMsg:c.errMsg||""})}})},AMapWX.prototype.getRegeo=function(a){function c(c){var d=b.requestConfig;wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:b.key,location:c,extensions:"all",s:d.s,platform:d.platform,appname:b.key,sdkversion:d.sdkversion,logversion:d.logversion},method:"GET",header:{"content-type":"application/json"},success:function(b){var d,e,f,g,h,i,j,k,l;b.data.status&&"1"==b.data.status?(d=b.data.regeocode,e=d.addressComponent,f=[],g="",d&&d.roads[0]&&d.roads[0].name&&(g=d.roads[0].name+"附近"),h=c.split(",")[0],i=c.split(",")[1],d.pois&&d.pois[0]&&(g=d.pois[0].name+"附近",j=d.pois[0].location,j&&(h=parseFloat(j.split(",")[0]),i=parseFloat(j.split(",")[1]))),e.provice&&f.push(e.provice),e.city&&f.push(e.city),e.district&&f.push(e.district),e.streetNumber&&e.streetNumber.street&&e.streetNumber.number?(f.push(e.streetNumber.street),f.push(e.streetNumber.number)):(k="",d&&d.roads[0]&&d.roads[0].name&&(k=d.roads[0].name),f.push(k)),f=f.join(""),l=[{iconPath:a.iconPath,width:a.iconWidth,height:a.iconHeight,name:f,desc:g,longitude:h,latitude:i,id:0,regeocodeData:d}],a.success(l)):a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}var b=this;a.location?c(a.location):b.getWxLocation(a,function(a){c(a)})},AMapWX.prototype.getWeather=function(a){function d(d){var e="base";a.type&&"forecast"==a.type&&(e="all"),wx.request({url:"https://restapi.amap.com/v3/weather/weatherInfo",data:{key:b.key,city:d,extensions:e,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion},method:"GET",header:{"content-type":"application/json"},success:function(b){function c(a){var b={city:{text:"城市",data:a.city},weather:{text:"天气",data:a.weather},temperature:{text:"温度",data:a.temperature},winddirection:{text:"风向",data:a.winddirection+"风"},windpower:{text:"风力",data:a.windpower+"级"},humidity:{text:"湿度",data:a.humidity+"%"}};return b}var d,e;b.data.status&&"1"==b.data.status?b.data.lives?(d=b.data.lives,d&&d.length>0&&(d=d[0],e=c(d),e["liveData"]=d,a.success(e))):b.data.forecasts&&b.data.forecasts[0]&&a.success({forecast:b.data.forecasts[0]}):a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}function e(e){wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:b.key,location:e,extensions:"all",s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion},method:"GET",header:{"content-type":"application/json"},success:function(b){var c,e;b.data.status&&"1"==b.data.status?(e=b.data.regeocode,e.addressComponent?c=e.addressComponent.adcode:e.aois&&e.aois.length>0&&(c=e.aois[0].adcode),d(c)):a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}var b=this,c=b.requestConfig;a.city?d(a.city):b.getWxLocation(a,function(a){e(a)})},AMapWX.prototype.getPoiAround=function(a){function d(d){var e={key:b.key,location:d,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.querytypes&&(e["types"]=a.querytypes),a.querykeywords&&(e["keywords"]=a.querykeywords),wx.request({url:"https://restapi.amap.com/v3/place/around",data:e,method:"GET",header:{"content-type":"application/json"},success:function(b){var c,d,e,f;if(b.data.status&&"1"==b.data.status){if(b=b.data,b&&b.pois){for(c=[],d=0;d + + {{ city }} + {{ time|formatDate('yyyy年MM月dd日') }} + {{ weather }} + @@ -188,6 +193,8 @@ - + diff --git a/pages/traffic/outTraffic.vue b/pages/traffic/outTraffic.vue index ed205b6..68c47cd 100644 --- a/pages/traffic/outTraffic.vue +++ b/pages/traffic/outTraffic.vue @@ -1,6 +1,9 @@ diff --git a/sunPackIndex/scenic/scenicdetial/scenicdetial.vue b/sunPackIndex/scenic/scenicdetial/scenicdetial.vue index f780f72..cc59c02 100644 --- a/sunPackIndex/scenic/scenicdetial/scenicdetial.vue +++ b/sunPackIndex/scenic/scenicdetial/scenicdetial.vue @@ -1,929 +1,958 @@ @@ -934,56 +963,111 @@ export default { @import url('scenicdetial.css'); page { - background: none; + background: none; } .liu_hui { - color: #cbcbcb !important; + color: #cbcbcb !important; } + .liu_green { - color: #07b800 !important; + color: #07b800 !important; } + .liu_red { - color: #ef0a0a !important; + color: #ef0a0a !important; } .slider_sec { - width: 450rpx; - height: 100%; + width: 450 rpx; + height: 100%; } .slider_sec slider { - width: 95%; - margin-left: 2%; - margin-right: 0; - margin-top: 10rpx; - margin-bottom: 0; + width: 95%; + margin-left: 2%; + margin-right: 0; + margin-top: 10 rpx; + margin-bottom: 0; } /* 景区门票 */ .active { - overflow: hidden; - /* height: 100vh !important; */ + overflow: hidden; + /* height: 100vh !important; */ } .dialog-mask { - position: fixed; - top: 0; - left: 0; - z-index: 999; - width: 100%; - height: 100%; - background: rgba(0, 0, 0, 0.4); + position: fixed; + top: 0; + left: 0; + z-index: 999; + width: 100%; + height: 100%; + background: rgba(0, 0, 0, 0.4); +} + +.cur-input { + opacity: 0.99; +} + +.fod_sp_box { + display: flex; + margin-top: 40 rpx; /*border-bottom: 2rpx solid #eee;*/ +} + +.msimg_wrp { + position: relative; +} + +.zsj_jb { + display: inline-block; + padding: 10 rpx 20 rpx; + background: #fec901; + color: #fff; + position: absolute; + left: 0; + top: 0; + font-size: 24 rpx; + border-radius: 10 rpx 0 10 rpx 0; +} + +.pic_shop { + width: 240 rpx; + height: 200 rpx; + box-shadow: rgba(0, 0, 0, .1) 0 0 20 rpx; + border-radius: 10 rpx; +} + +.mssj_box { + flex: 1; + padding-left: 20 rpx; +} + +.mssj_tit { + font-size: 32 rpx; + color: #333; + font-weight: 700; + display: block; + text-overflow: ellipsis; + white-space: pre-wrap; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + display: -webkit-box; + overflow: hidden; } -.cur-input{ - opacity: 0.99; +.mssj_adr { + color: #666; + font-size: 28 rpx; + font-weight: normal; + line-height: 44 rpx; + overflow: hidden; + padding: 10 rpx 30 rpx 0 0; + text-overflow: ellipsis; + white-space: pre-wrap; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + display: -webkit-box; } -.fod_sp_box{ display: flex; margin-top:40rpx; /*border-bottom: 2rpx solid #eee;*/ } -.msimg_wrp{position:relative;} -.zsj_jb{ display: inline-block; padding: 10rpx 20rpx ; background: #fec901; color: #fff; position:absolute;left: 0; top:0; font-size: 24rpx; border-radius:10rpx 0 10rpx 0 ;} -.pic_shop{ width: 240rpx; height: 200rpx; box-shadow: rgba(0,0,0,.1) 0 0 20rpx; border-radius: 10rpx;} -.mssj_box{ flex: 1; padding-left: 20rpx; } -.mssj_tit{ font-size: 32rpx; color: #333; font-weight: 700;display: block;text-overflow: ellipsis;white-space: pre-wrap;-webkit-box-orient: vertical;-webkit-line-clamp: 1;display: -webkit-box;overflow: hidden;} -.mssj_adr{color: #666;font-size: 28rpx; font-weight: normal; line-height: 44rpx;overflow: hidden;padding: 10rpx 30rpx 0 0;text-overflow: ellipsis;white-space: pre-wrap;-webkit-box-orient: vertical;-webkit-line-clamp: 2;display: -webkit-box;}