Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user
This commit is contained in:
commit
db263cb08b
|
@ -21,8 +21,8 @@
|
||||||
window._AMapSecurityConfig = {
|
window._AMapSecurityConfig = {
|
||||||
//securityJsCode: "js秘钥",
|
//securityJsCode: "js秘钥",
|
||||||
// serviceHost: 'https://wx.sjajk.com/_AMapService',
|
// serviceHost: 'https://wx.sjajk.com/_AMapService',
|
||||||
// serviceHost: 'http://120.46.52.165/_AMapService',
|
serviceHost: 'http://120.46.52.165/_AMapService',
|
||||||
serviceHost: 'http://192.168.2.222:8187/_AMapService',
|
// serviceHost: 'http://192.168.2.222:8187/_AMapService',
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<!-- 高德 -->
|
<!-- 高德 -->
|
||||||
|
|
|
@ -83,6 +83,7 @@
|
||||||
"ad" : {},
|
"ad" : {},
|
||||||
"maps" : {
|
"maps" : {
|
||||||
"amap" : {
|
"amap" : {
|
||||||
|
"name" : "amapljwK72nl",
|
||||||
"appkey_ios" : "eb38bf53409f58cbf43f383cb5733747",
|
"appkey_ios" : "eb38bf53409f58cbf43f383cb5733747",
|
||||||
"appkey_android" : "305e629f46669724c6184a187b279fec"
|
"appkey_android" : "305e629f46669724c6184a187b279fec"
|
||||||
}
|
}
|
||||||
|
@ -183,9 +184,7 @@
|
||||||
"amap" : {
|
"amap" : {
|
||||||
"key" : "2acf1b8c3d1aaf0070472dec19018d96",
|
"key" : "2acf1b8c3d1aaf0070472dec19018d96",
|
||||||
"securityJsCode" : "2b07c8496878c327a8ae7a19de33e2a7",
|
"securityJsCode" : "2b07c8496878c327a8ae7a19de33e2a7",
|
||||||
// "serviceHost" : "http://wx.sjajk.com/_AMapService"//生产需替换
|
"serviceHost" : "http://192.168.2.222:8187/_AMapService"
|
||||||
// "serviceHost" : "http://120.46.52.165/_AMapService",
|
|
||||||
"serviceHost" : "http://192.168.2.222:8187/_AMapService"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -158,7 +158,7 @@
|
||||||
this.getVipList()
|
this.getVipList()
|
||||||
this.getMemberList()
|
this.getMemberList()
|
||||||
this.getMoney()
|
this.getMoney()
|
||||||
// this.getIsVip()
|
this.getIsVip()
|
||||||
this.vipData=this.$queue.getData('isVIP')
|
this.vipData=this.$queue.getData('isVIP')
|
||||||
console.log("isVIP------------------->",this.vipData)
|
console.log("isVIP------------------->",this.vipData)
|
||||||
if(this.vipData.isVip=='1'){
|
if(this.vipData.isVip=='1'){
|
||||||
|
|
|
@ -379,8 +379,8 @@
|
||||||
})
|
})
|
||||||
console.log(11)
|
console.log(11)
|
||||||
uni.getLocation({
|
uni.getLocation({
|
||||||
type: 'gcj02',
|
type: 'wgs84',
|
||||||
geocode: true, //设置该参数为true可直接获取经纬度及城市信息
|
// geocode: true, //设置该参数为true可直接获取经纬度及城市信息
|
||||||
success: function(res) {
|
success: function(res) {
|
||||||
console.log(res, '地理位置')
|
console.log(res, '地理位置')
|
||||||
that.latitude = res.latitude
|
that.latitude = res.latitude
|
||||||
|
|
|
@ -107,6 +107,8 @@
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
this.tabList=res.data;
|
this.tabList=res.data;
|
||||||
this.classifyId=res.data[0].id;
|
this.classifyId=res.data[0].id;
|
||||||
|
this.page = 1;
|
||||||
|
this.dataList = []
|
||||||
this.getData()
|
this.getData()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -141,6 +143,8 @@
|
||||||
changeClick(index,item){
|
changeClick(index,item){
|
||||||
this.classifyId=item.id
|
this.classifyId=item.id
|
||||||
this.searchValue=''
|
this.searchValue=''
|
||||||
|
this.page = 1;
|
||||||
|
this.dataList = []
|
||||||
this.getData()
|
this.getData()
|
||||||
},
|
},
|
||||||
backImg(){//返回上一页
|
backImg(){//返回上一页
|
||||||
|
@ -175,7 +179,7 @@
|
||||||
.content-view{
|
.content-view{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
overflow: auto;
|
overflow: hidden;
|
||||||
background-color: #f7f7f7;
|
background-color: #f7f7f7;
|
||||||
}
|
}
|
||||||
.item-view-bottom-btn{
|
.item-view-bottom-btn{
|
||||||
|
|
Loading…
Reference in New Issue