1.去掉救援

2.首页非遗对接
3.我的页面调整
dev
Tuzki 2 years ago
parent 6cb0796778
commit b1bb5ffc77
  1. 14
      pages.json
  2. 2
      pages/feiyi/feiyilist/feiyilist.vue
  3. 74
      pages/index/index.vue
  4. 485
      pages/jiuyuan/jiuyuan/jiuyuan.vue
  5. 39
      pages/personcenter/personcenter.vue

@ -120,13 +120,6 @@
}
}
}
},
{
"path": "pages/cesuo/cesuo/cesuo",
"style": {
"navigationBarTitleText": "厕所"
}
}
/* , {
"path": "components/uni-popup/uni-popup",
@ -135,12 +128,7 @@
"path": "components/uni-icon/uni-icon",
"style": {}
} */
, {
"path": "pages/jiuyuan/jiuyuan/jiuyuan",
"style": {
"navigationBarTitleText": "救援"
}
}
, {
"path": "pages/scenic/pingjia/pingjia",

@ -245,6 +245,7 @@ export default {
this.get_data();
},
getData: function() {
debugger
var that = this;
var data = {
"key": this.$param.userkey + "_feiyi_list"
@ -430,6 +431,7 @@ export default {
}
},
get_data: function() {
debugger
uni.showLoading({
title: '加载中',
mask: true

@ -114,7 +114,7 @@
<!-- 瀑布流 -->
<view class="amt_30">
<view class="an_pbl dy_fx_row" style="flex-wrap: wrap">
<view class="w_two" v-for="(item, index) in wcList" :key="index" @tap="goToDetail('wenchuang', item.guid)">
<view class="w_two" v-for="(item, index) in feiyiList" :key="index" @tap="goToDetail('wenchuang', item.guid)">
<view class="">
<image :src="item.logo" mode="aspectFill" class="pbl_1_img"></image>
</view>
@ -209,6 +209,7 @@ export default {
videoList: [],
SJZObject: {},
wcList: [],
feiyiList: [],
yzOneList: {},
yzList: [],
lineOneList: {},
@ -341,15 +342,15 @@ export default {
this.videoList.push(item);
}
this.indexNum = viLength;
//
var wcList = initData.wcList;
var wcLength = wcList.length > 4 ? 4 : wcList.length;
//
var feiyiList = initData.feiyiList;
var wcLength = feiyiList.length > 4 ? 4 : feiyiList.length;
for (var i = 0; i < wcLength; i++) {
var item = {
logo: this.$config.ROOTPATH + wcList[i].logo,
guid: wcList[i].guid
logo: this.$config.ROOTPATH + feiyiList[i].logo,
guid: feiyiList[i].guid
};
this.wcList.push(item);
this.feiyiList.push(item);
}
//
@ -472,26 +473,13 @@ export default {
},
getWcList: function () {
this.onc = 'meishi';
var that = this;
var data = {
pageno: '1',
pageSize: '4',
sort: '2',
type: this.$param.wcType,
userkey: this.$param.userkey
key: this.$param.userkey + '_feiyi_list'
};
this.$Request.post(this.$config.getMessageInfoFormFilter, data).then((res) => {
if (res.status == 500) {
uni.showToast({
title: res.msg,
duration: 2000
});
return;
}
var data = res.data;
for (let i = 0; i < data.length; i++) {
data[i].logo = this.$config.ROOTPATH + data[i].logo;
}
this.wcList = data;
that.$Request.post(that.$config.getRedisData, data).then((res) => {
console.log(res);
that.wcList = res.data.feiyiList;
});
},
getDuoCaiSJZ: function () {
@ -560,25 +548,18 @@ export default {
var listDatas = that.listDatas,
dataListLen = res.data.hoteventList.length,
data = res.data.hoteventList;
if (
(dataListLen == 10 ? (this.param.page += 1) : (this.param.page = 1 && 0 == dataListLen ? (this.param.noData = true) : (this.param.finished = true)),
(this.param.loading = false),
dataListLen > 0)
) {
for (var i = 0; i < dataListLen; i++) {
var item = {
id: data[i].guid,
elogo: this.rootPaht + data[i].logo,
ename: data[i].title,
eventdate: data[i].jointime,
eaddress: data[i].address,
ephone: data[i][this.$param.hoteventPhoneKey],
etype: data[i][this.$param.hoteventTypeKey].dicname,
distance: this.$util.formatDistance(data[i].distance)
};
this.listDatas.push(item);
uni.hideLoading();
}
for (var i = 0; i < dataListLen; i++) {
var item = {
id: data[i].guid,
elogo: this.rootPaht + data[i].logo,
ename: data[i].title,
eventdate: data[i].jointime,
eaddress: data[i].address,
ephone: data[i][this.$param.hoteventPhoneKey],
etype: data[i][this.$param.hoteventTypeKey].dicname,
distance: this.$util.formatDistance(data[i].distance)
};
this.listDatas.push(item);
}
});
},
@ -609,7 +590,6 @@ export default {
uni.navigateTo({
url: '/pages/hotevent/hoteventlist/hoteventlist'
});
} else if (type == 'quanjing') {
//720
uni.navigateTo({
@ -625,7 +605,7 @@ export default {
uni.navigateTo({
url: '/pages/traffic/outTraffic'
});
} else if (type == 'shop'){
} else if (type == 'shop') {
uni.navigateToMiniProgram({
appId: 'wx91d27dbf599dff74',
path: 'pages/shopx/pages/index/index?venderId=1000016826&originOpts=%5Bobject%20Object%5D&keywords=%25E8%25A1%25A1%25E6%25B0%25B4%25E8%2580%2581%25E7%2599%25BD%25E5%25B9%25B2%25E5%25AE%2598%25E6%2596%25B9%25E6%2597%2597%25E8%2588%25B0%25E5%25BA%2597%2520%25E4%25BA%25AC%25E4%25B8%259C%25E8%2587%25AA%25E8%2590%25A5&originUrl=%2Fpages%2Fshopx%2Fpages%2Findex%2Findex&shopName=%E8%A1%A1%E6%B0%B4%E8%80%81%E7%99%BD%E5%B9%B2%E4%BA%AC%E4%B8%9C%E8%87%AA%E8%90%A5%E5%AE%98%E6%96%B9%E6%97%97%E8%88%B0%E5%BA%97&skuId=100001725902&originParams=%5Bobject%20Object%5D&navStart=Wed%20Jul%2026%202023%2010%3A56%3A14%20GMT%2B0800%20(%E4%B8%AD%E5%9B%BD%E6%A0%87%E5%87%86%E6%97%B6%E9%97%B4)&referer=http%3A%2F%2Fwq.jd.com%2Fwxapp%2Fpages%2Fsearch%2Flist%2Flist&sceneId=1002',
@ -644,7 +624,7 @@ export default {
});
} else if (type == 'wenchuang') {
uni.navigateTo({
url: '/pages/wenchuang/wendetail/wendetail?guid=' + guid
url: '/pages/feiyi/feiyidetail/feiyidetail?guid='+guid
});
} else if (type == 'line') {
//

@ -1,485 +0,0 @@
<template>
<view class="uni-common-mt">
<view>
<map id="map" @tap="map" scale="14" @markertap="change" show-location="true" :latitude="latitude" :longitude="longitude" :markers="covers" >
</map>
</view>
<view>
<view class="left-choose">
<view class="leftChoose">
<view><image @click="selectIcon('country')" class="cb" :src="country"></image></view>
<view><image @click="selectIcon('pano')" class="cb" :src="pano"></image></view>
</view>
<view>
<view><image @click="mylocation()" class="cb dw" src="" ></image></view>
</view>
</view>
<view class="tan" v-if="isShow">
<view class="title">{{selectData.markerTitle}}</view>
<button disabled="disabled" class="button">{{selectData.distance}}</button>
<view class="address">{{selectData.address}}</view>
<view style="height: 0.5px;width: 100%;background: #F1F1F1;margin-top: 10px;margin-bottom: 2px;"> </view>
<view @click="togglePopup('popup')"><image class="ot" src="../../../static/images/other.png"></image><text class="other">其他</text></view>
<view class="daohang" @click="daohang"><image class="ot" src="../../../static/images/icon_adr.png"></image><text class="dh">导航</text></view>
</view>
<view class="bottomButtom tan2">
<view style="float: left;width: 50%;" @click="call('120')">
<view class="hj">
<image class="img" src="../../../static/images/120_b.png"></image>
</view>
<view class="mes">一键呼救</view>
<view class="con">呼叫120</view>
</view>
<view style="float: left;;width: 50%;" @click="call('110')">
<view class="hj riIcon">
<image class="img" src="../../../static/images/110_b.png"></image>
</view>
<view class="mes">一键呼救</view>
<view class="con">呼叫110</view>
</view>
</view>
<uni-popup ref="popup" :type="type">
<view v-for="(item,index) in oData" :key="index">
<view @click="changeOther(item.index)">
<view class="otitle">{{item.markerTitle}}</view>
<view class="oaddress">{{item.distance}}|{{item.address}}</view>
<view style="height: 1px;width: 100%;background: #F1F1F1;margin-top: 10px;"> </view>
</view>
</view>
</uni-popup>
</view>
</view>
</template>
<script>
import uniPopup from '@/components/uni-popup/uni-popup.vue'
import uniIcon from '@/components/uni-icon/uni-icon.vue'
var that ;
var mapId = 'map';
export default {
components: {
uniPopup,
uniIcon
},
data() {
that = this;
return {
type:"bottom",
height:"600upx",
latitude: this.$param.clat,
longitude: this.$param.clng,
covers: [],
coversOne:{
latitude: this.$param.clat,
longitude: this.$param.clng,
iconPath: '../../../static/images/me.png',
id:0,
markerTitle:"我的位置",
rotate:315
},
selectMarker: 1,
selectedMarker:1,
selectData:{},
isShow:true,
oData:[],
country: "../../../static/images/country_1.png",
pano: "../../../static/images/pano_1.png",
selectDIcon: 'country',
selectUrl: '../../../static/images/country_1.png',
selectedIconPath:"",
iconPath:""
}
},
onLoad() {
uni.showLoading({
title:"加载中",
mask:true
})
var that = this;
this.$util.bindGpsObj(that);
this.requestLocation();
},
methods: {
callGpsSuccess: function(lat, lng){
that.$param.clat = lat;
that.$param.clng = lng;
that.coversOne.latitude = lat;
that.coversOne.longitude = lng;
that.latitude = lat;
that.longitude = lng;
that.getData("医院")
that.country = "../../../static/images/country_1_h.png";
uni.hideLoading();
that.$util.unbindGpsObj();
},
callGpsFail: function(){
// uni.showModal({
// title:"fail:"+lat+","+lng
// })
that.latitude = this.$param.lat;
that.longitude = this.$param.lng;
that.coversOne.latitude = this.$param.lat;
that.coversOne.longitude = this.$param.lng;
that.getData("医院")
that.country = "../../../static/images/country_1_h.png";
uni.hideLoading();
this.$util.unbindGpsObj();
},
requestLocation: function() {
console.log('---requestLocation---');
this.$util.getLocation(
function(res) {
if (that.$wechat.isWechat()) {
that.latitude = res.latitude;
that.longitude = res.longitude;
that.$param.clat = res.latitude;
that.$param.clng = res.longitude;
that.coversOne.latitude = res.latitude;
that.coversOne.longitude = res.longitude;
that.moveTolocation();
that.getData("医院")
that.country = "../../../static/images/country_1_h.png";
}else{
that.getData("医院")
that.country = "../../../static/images/country_1_h.png";
}
uni.hideLoading();
},
function() {
console.log('location error---');
}
);
},
moveTolocation: function() {
var mapCtx = uni.createMapContext(mapId);
mapCtx.moveToLocation();
},
togglePopup(open) {
var data = that.covers;
var oData = [];
for (var i = 0; i < data.length; i++) {
if(i !=0 && i != that.selectMarker){
data[i]["index"] = i;
oData.push(data[i]);
}
}
that.oData = oData;
that.$refs[open].open();
},
mylocation(){
this.covers = [];
uni.showLoading({
title:"定位中",
mask:true
})
var that = this;
this.$util.bindGpsObj(that);
this.requestLocation();
},
call(phone){
uni.makePhoneCall({
phoneNumber: phone
});
},
selectIcon(type){
that.selectMarker = 1;
var icon = that.selectDIcon;
var url = that.selectUrl;
that[icon] = url;
switch (type){
case 'country':
that.country = "../../../static/images/country_1_h.png";
that.selectDIcon = "country";
that.selectUrl = "../../../static/images/country_1.png";
that.getData("医院");
break;
case 'pano':
that.pano = "../../../static/images/pano_1_h.png";
that.selectDIcon = "pano";
that.selectUrl = "../../../static/images/pano_1.png";
that.getData("派出所");
break;
}
},
getData(content){
var that = this;
var selectedIconPath = "";
var iconPath = "";
if(content == "医院"){
that.selectedIconPath = "../../../static/images/map_toilet_7b.png";
that.iconPath = "../../../static/images/map_toilet_7.png";
}else if(content == "派出所"){
that.selectedIconPath = "../../../static/images/map_toilet_8b.png";
that.iconPath = "../../../static/images/map_toilet_8.png";
}
content = encodeURI(content);
var data = {
"keyword" : content,
"lat":that.$param.clat,
"lng":that.$param.clng,
"pageSize" : "30",
"pageno": "1"
}
// data = encodeURI(data);
// console.log(""+data)
that.$Request.get(that.$config.getMapData,data).then(res => {
var data = [];
if(res.status == 0){
data = res.data;
data.sort(function(a,b){
return a._distance-b._distance;
})
var objData = [];
for(var i = 0;i < data.length;i++){
if(i+1 == that.selectMarker){
var item = {
latitude: data[i].location.lat,
longitude: data[i].location.lng,
iconPath: that.selectedIconPath,
id:data[i].id,
markerTitle:data[i].title,
address:data[i].address,
distance:"离我最近",
}
that.latitude = data[i].location.lat;
that.longitude = data[i].location.lng;
that.selectData = item;
}else{
var item = {
latitude: data[i].location.lat,
longitude: data[i].location.lng,
iconPath: that.iconPath,
id:data[i].id,
markerTitle:data[i].title,
address:data[i].address,
distance:"距离"+this.$util.formatDistance(Math.ceil(data[i]._distance))+""
}
}
objData.push(item);
}
objData.unshift(that.coversOne);
that.covers = objData;
// this.togglePopup();
}
})
},
change(e) {
var that = this;
var data = that.covers;
that.selectedMarker = that.selectMarker;
for (let i = 0; i < data.length; i++) {
if(e.detail.markerId == 0){ //
that.selectMarker = 1;
}else if(data[i].id == e.detail.markerId){ //marker
that.selectMarker = i;
}
}
//
that.changeMarker();
},
changeMarker() {
if(that.selectMarker != that.selectedMarker){
var data = [];
var da = this.covers;
for (let i = 0; i < da.length; i++) {
data.push(da[i]);
}
var objData = [];
for(var i = 0;i < data.length;i++){
if(i == that.selectMarker){
var distance = "离我最近";
if(i != 1){
distance = data[i]._distance;
}
var item = {
latitude: data[i].latitude,
longitude: data[i].longitude,
iconPath: that.selectedIconPath,
id:data[i].id,
markerTitle:data[i].markerTitle,
address:data[i].address,
distance:data[i].distance,
}
that.latitude = data[i].latitude;
that.longitude = data[i].longitude;
that.selectData = item;
}else{
if(i == 0){
objData.push(data[0]);
continue;
}
var item = {
latitude: data[i].latitude,
longitude: data[i].longitude,
iconPath: that.iconPath,
id:data[i].id,
markerTitle:data[i].markerTitle,
address:data[i].address,
distance:data[i].distance
}
}
objData.push(item);
}
that.covers = objData;
that.isShow = true;
}else{
if(that.isShow){
that.isShow = false;
}else{
that.isShow = true;
}
}
},
map(){
that.isShow = false;
},
changeOther(index){
that.selectedMarker = that.selectMarker;
that.selectMarker = index;
//
that.changeMarker();
that.$refs["popup"].close();
},
daohang(){
// #ifdef H5
if (this.$wechat.isWechat()) {
var mapParam = {
latitude: that.covers[that.selectMarker].latitude,
longitude: that.covers[that.selectMarker].longitude,
scale: 18,
name: that.covers[that.selectMarker].markerTitle,
address: that.covers[that.selectMarker].address
};
this.$util.openLocation(mapParam);
return;
}
window.location.href = "https://uri.amap.com/navigation?from="+that.$param.clng+","+that.$param.clat+",我的位置&to="+that.covers[that.selectMarker].longitude+","+that.covers[that.selectMarker].latitude+","+that.covers[that.selectMarker].address+"&mode=walk&src=sjz_uniapp&callnative=1"
// #endif
}
}
}
</script>
<style>
map {
width: 100%;
height: 100vh;
}
.left-choose {
float: left;
margin-left: 8px;
margin-bottom: 30px;
position: fixed;
left: 0; right:0; width:45px; z-index: 5;
bottom:30%;
}
.leftChoose {
background: #FFFFFF;
}
.cb {
width: 45px;
height: 45px;
}
.dw {
margin-top: 20px;
}
.tan {
width: 100%;
height: 210px;
background: #FFFFFF;
position: fixed;
left: 0; right:0; width:100%; z-index: 3;
bottom:0px;
}
.tan2 {
width: 100%;
height: 60px;
background: #FFFFFF;
position: fixed;
left: 0; right:0; width:100%; z-index: 3;
bottom:0px;
}
.bottomButtom {
clear: both;
}
.title {
padding: 8px;
margin-left: 2px;
font-weight: 700;
}
.otitle {
font-weight: 500;
font-size: 17px;
}
.button {
width: auto;
height: 25px;
margin-left: 8px;
margin-bottom: 8px;
float: left;
vertical-align: middle;
font-size: 12px;
color: gray;
}
.address{
clear: both;
font-size: 12px;
margin-left: 8px;
color: gray;
}
.oaddress{
clear: both;
font-size: 12px;
margin-top: 8px;
color: gray;
}
.ot {
width: 20px;
height: 20px;
margin-left: 8px;
margin-right: 10px;
margin-top: 10px;
float: left;
}
.other {
font-size: 16px;
float: left;
margin-top: 8px;
}
.daohang {
float: right;
}
.dh {
margin-right: 40px;
font-size: 16px;
margin-top: 8px;
float: left;
}
.bottomButtom {
padding: 10px 0 0 20px;
}
.hj {
float: left;
}
.img {
width: 50px;
height: 50px;
margin-right: 12px;
}
.riIcon {
margin-left: 8px;
}
.mes {
font-size: 16px;
font-weight: 500;
}
.con {
font-size: 13px;
float: left;
margin-left: 8px;
}
</style>

@ -32,22 +32,22 @@
<view class="mode_com">
<text class="tit_com">我的应用</text>
<view class="dly_flex hd_pter mt_hb dzhi_bq2" style="background: #fff; padding-bottom: 40rpx; border-radius: 20rpx">
<view class="w_33" @tap="jump('myComment')">
<view class="w_33" @tap="jump('yuyue')">
<view class=""><image src="../../static/animg/p_wdpj.png" class="kou_top3" mode="aspectFill"></image></view>
<text class="ht_text">我的评价</text>
<text class="ht_text">我的预约</text>
</view>
<view class="w_33" v-if="isFlag">
<view class="w_33" @tap="jump('tousu')">
<view class=""><image src="../../static/animg/p_lyts.png" class="kou_top3" mode="aspectFill"></image></view>
<text class="ht_text">在线投诉</text>
<text class="ht_text">我的投诉</text>
</view>
<view class="w_33" @tap="jump('aboutus')">
<view class=""><image src="../../static/animg/p_gywm.png" class="kou_top3" mode="aspectFill"></image></view>
<text class="ht_text">关于我们</text>
<text class="ht_text">客服电话</text>
</view>
<view class="w_33" @tap="jump('logout')" v-if="isAdminLogin">
<view class="w_33" @tap="jump('logout')" >
<view class=""><image src="../../static/animg/p_tc.png" class="kou_top3" mode="aspectFill"></image></view>
<text class="ht_text">退出登录</text>
</view>
@ -332,17 +332,28 @@ export default {
uni.navigateTo({
url: '/pages/personcenter/aboutus'
});
} else if (obj == 'scenicReserve') {
if (this.$util.isBlack(aes.aesDecrypt(uni.getStorageSync('unionid')))) {
uni.showToast({
title: '请先授权',
icon: 'none'
});
return;
}
} else if (obj == 'yuyue') {
// if (this.$util.isBlack(aes.aesDecrypt(uni.getStorageSync('unionid')))) {
// uni.showToast({
// title: '',
// icon: 'none'
// });
// return;
// }
uni.navigateTo({
url: '/pages/scenic/subscribe/yuyue/yue_list_js'
});
} else if (obj == 'tousu') {
// if (this.$util.isBlack(aes.aesDecrypt(uni.getStorageSync('unionid')))) {
// uni.showToast({
// title: '',
// icon: 'none'
// });
// return;
// }
uni.navigateTo({
url: '/pages/suggest/sug_list'
});
} else if (obj == 'myReserve') {
if (this.$util.isBlack(aes.aesDecrypt(uni.getStorageSync('unionid')))) {
uni.showToast({

Loading…
Cancel
Save