|
|
@@ -79,7 +79,7 @@
|
|
|
<image class="tbg" src="../../static/img/tbg-left.png" mode=""></image>
|
|
|
<view class="shinglemt-center">
|
|
|
<image class="address" src="../../static/img/address.png" mode=""></image>
|
|
|
- <view class="shingle-font">{{list.name}}</view>
|
|
|
+ <view class="shingle-font">{{ list.name || 'null' }}</view>
|
|
|
</view>
|
|
|
<image class="tbg" src="../../static/img/tbg-right.png" mode=""></image>
|
|
|
</view>
|
|
|
@@ -90,7 +90,7 @@
|
|
|
</view>
|
|
|
<view class="shu"></view>
|
|
|
<view class="smmain-item">
|
|
|
- <view class="smitem-top">{{list.nickname}}</view>
|
|
|
+ <view class="smitem-top">{{ list.nickname }}</view>
|
|
|
<view class="smitem-bottom">馆长</view>
|
|
|
</view>
|
|
|
<view class="shu"></view>
|
|
|
@@ -120,12 +120,12 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="serve-main flex">
|
|
|
- <view class="serve-item" @click="nav('/pages/store/store')" v-for="(item, index) in 3" :key="index">
|
|
|
- <image class="serve-price" src="" mode=""></image>
|
|
|
- <view class="clamp serve-title">护肤品套装</view>
|
|
|
+ <view class="serve-item" @click="nav('/pages/store/storeInfo?id?=' + item.id)" v-for="(item, index) in stop" :key="index">
|
|
|
+ <image class="serve-price" :src="item.image" mode=""></image>
|
|
|
+ <view class="clamp serve-title">{{ item.name }}</view>
|
|
|
<view class="serve-address flex">
|
|
|
<image class="saddress-inco" src="../../static/img/address.png" mode=""></image>
|
|
|
- <view class="saddress-font">距离0.3KM</view>
|
|
|
+ <view class="saddress-font">距离{{item.jl}}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -138,8 +138,9 @@
|
|
|
import { tabbar1 } from '@/utils/tabbar.js';
|
|
|
import seckill from '../../components/seckill/seckill.vue';
|
|
|
import { article } from '@/api/user.js'
|
|
|
-import { loadIndexs } from '@/api/index.js';
|
|
|
+import { loadIndexs,store_list } from '@/api/index.js';
|
|
|
import uniCountdowns from '@/components/uni-countdown/uni-countdowns.vue';
|
|
|
+import { openMap } from '@/utils/rocessor.js';
|
|
|
import { auction_gu } from '@/api/hall.js';
|
|
|
export default {
|
|
|
components: {
|
|
|
@@ -153,15 +154,19 @@ export default {
|
|
|
titleNViewBackground: '',
|
|
|
swiperCurrent: 0,
|
|
|
swiperLength: 0,
|
|
|
+ longitude: '', //经度
|
|
|
+ latitude: '', //纬度
|
|
|
dataList: '',
|
|
|
carouselList: [], //轮播图列表
|
|
|
text: [],
|
|
|
article:[],
|
|
|
list:{},
|
|
|
+ stop:[],
|
|
|
};
|
|
|
},
|
|
|
onLoad() {
|
|
|
this.loadData();
|
|
|
+ this.getaddress();
|
|
|
},
|
|
|
methods: {
|
|
|
loadData() {
|
|
|
@@ -184,6 +189,69 @@ export default {
|
|
|
})
|
|
|
.catch(e => {});
|
|
|
},
|
|
|
+ //根据经纬度计算距离
|
|
|
+ getFlatternDistance(lat1, lng1, lat2, lng2){
|
|
|
+ let f = getRad((lat1 + lat2)/2);
|
|
|
+ let g = getRad((lat1 - lat2)/2);
|
|
|
+ let l = getRad((lat1 - lng2)/2);
|
|
|
+ let sg = Math.sin(g);
|
|
|
+ let sl = Math.sin(1);
|
|
|
+ let sf = Math.sin(f);
|
|
|
+ let s,C,W,r ,d,h1,h2;
|
|
|
+ let a = EARTH_RADIUS ;
|
|
|
+ let fl = 1/298.257;
|
|
|
+ sg = sg*sg;
|
|
|
+ s1 = s1*sl;
|
|
|
+ sf = sf*sf;
|
|
|
+ g*(1-s1) + (1-sf)*s1;
|
|
|
+ C = (1-sg)*(1-s1) + sf*sl;
|
|
|
+ N = Math.atan(Math.sqrt(s/c));
|
|
|
+ r = Math.sqrt(s*c)/w;
|
|
|
+ d = 2*w*a;
|
|
|
+ h1 = (3*r -1)/2/c;
|
|
|
+ h2 = (3*r +1)/2/s;
|
|
|
+ return d*(1 + fl*(h1*sf*(1-sg) - h2*(1-sf)*sg));
|
|
|
+ },
|
|
|
+ getaddress() {
|
|
|
+ let obj = this;
|
|
|
+ store_list({
|
|
|
+ page:1,
|
|
|
+ limit:3,
|
|
|
+ // latitude:res.latitude,
|
|
|
+ // longitude: res.longitude,
|
|
|
+ }).then(e =>{
|
|
|
+ obj.stop = e.data.list
|
|
|
+ console.log(e);
|
|
|
+ })
|
|
|
+ // uni.getLocation({
|
|
|
+ // type: 'gcj02',
|
|
|
+ // success: res => {
|
|
|
+ // console.log('dizhi+++++++++++');
|
|
|
+ // this.longitude = res.longitude //经度
|
|
|
+ // this.latitude = res.latitude //纬度
|
|
|
+ // store_list({
|
|
|
+ // page:1,
|
|
|
+ // limit:3,
|
|
|
+ // latitude:res.latitude,
|
|
|
+ // longitude: res.longitude,
|
|
|
+ // }).then(e =>{
|
|
|
+ // if(e.data.length != 0){
|
|
|
+ // e.data.list.forEach(e =>{
|
|
|
+ // e.jl = this.getFlatternDistance(this.latitude,this.longitude,e.latitude,e.longitude)
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // obj.stop = e.data.list
|
|
|
+ // console.log(e);
|
|
|
+ // })
|
|
|
+ // },
|
|
|
+ // fail: err => {
|
|
|
+ // console.log(err);
|
|
|
+ // openMap().then(e => {
|
|
|
+ // this.getaddress();
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ },
|
|
|
goDetails(e) {
|
|
|
uni.navigateTo({
|
|
|
url: '/pages/index/messageInfo?id=' + this.article[e].id
|
|
|
@@ -415,7 +483,7 @@ page,
|
|
|
.shinglemt-center {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
- background: rgba(220,38,43,0.66);
|
|
|
+ background: rgba(220, 38, 43, 0.66);
|
|
|
}
|
|
|
.address {
|
|
|
width: 28rpx;
|
