Skip to content

G
gxpt_wechat
Commit e30975ac by zhangzhen
Options

首页和订单页面修改

parent 823765af
Showing with 24 additions and 37 deletions
pages/index/index.vue
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
</view> </view>
</view> </view>
<view class="flex-row part-right"> <view class="flex-row part-right">
<image :src="assetsPath +'/map_icon.png'" mode="heightFix" @tap="onNavToMap"></image> <image :src="assetsPath +'/map_icon.png'" mode="scaleToFill" @tap="onNavToMap"></image>
<image :src="assetsPath +'/phone_icon.png'" mode="heightFix" @tap="onOpenTelphone"> <image :src="assetsPath +'/phone_icon.png'" mode="scaleToFill" @tap="onOpenTelphone">
</image> </image>
</view> </view>
</view> </view>
...@@ -269,18 +269,17 @@ ...@@ -269,18 +269,17 @@
}, },
onGetDicts() { onGetDicts() {
let dicts = [] let dicts = []
if (uni.getStorageSync('dicts')) { // if (uni.getStorageSync('dicts')) {
dicts = JSON.parse(uni.getStorageSync('dicts')) // dicts = JSON.parse(uni.getStorageSync('dicts'))
this.facilitieList = getDictItem(dicts, "indoor_facilities"); // this.facilitieList = getDictItem(dicts, "indoor_facilities");
this.onLoading() // this.onLoading()
} else { // } else {
dictList().then(res => { dictList().then(res => {
dicts = res.data.data; dicts = res.data.data;
uni.setStorageSync('dicts', JSON.stringify(res.data.data)) uni.setStorageSync('dicts', JSON.stringify(res.data.data))
this.facilitieList = getDictItem(dicts, "indoor_facilities"); this.facilitieList = getDictItem(dicts, "indoor_facilities");
this.onLoading()
}) })
} // }
}, },
onCheckUserLogin(){ onCheckUserLogin(){
wx.login({ wx.login({
...@@ -318,7 +317,6 @@ ...@@ -318,7 +317,6 @@
uni.getLocation({ uni.getLocation({
type: "gcj02", type: "gcj02",
complete: (res) => { complete: (res) => {
console.log(res,909090)
if(res.errMsg == 'getLocation:ok' ){ if(res.errMsg == 'getLocation:ok' ){
this.latitude = res.latitude; this.latitude = res.latitude;
this.longitude = res.longitude; this.longitude = res.longitude;
...@@ -345,6 +343,7 @@ ...@@ -345,6 +343,7 @@
nowLongitude: this.longitude||'' nowLongitude: this.longitude||''
}).then(res => { }).then(res => {
if (res.data.code == 200 && res.data.data.length) { if (res.data.code == 200 && res.data.data.length) {
uni.hideLoading()
this.storeList = res.data.data; this.storeList = res.data.data;
let obj = {} let obj = {}
obj = res.data.data[0]; obj = res.data.data[0];
...@@ -360,7 +359,6 @@ ...@@ -360,7 +359,6 @@
} }
}) })
} }
uni.hideLoading()
} }
}) })
}, },
...@@ -617,10 +615,10 @@ ...@@ -617,10 +615,10 @@
margin-right: 12upx; margin-right: 12upx;
height: 100%; height: 100%;
image { image {
height: 70%; width: 38px;
margin: 0 12upx; height: 38px;
max-width: 100upx;
border-radius: 50%; border-radius: 50%;
margin: 0 15upx;
} }
} }
} }
...@@ -683,18 +681,6 @@ ...@@ -683,18 +681,6 @@
border: 2upx solid #DBA556; border: 2upx solid #DBA556;
.part-top { .part-top {
position: relative; position: relative;
width: 620upx;
height: 300upx;
z-index: 10;
background-color: #FFFFFF;
border-radius: 36upx 36upx 36upx 36upx;
box-shadow: 0 0 4upx rgba(0, 0, 0, 0.3);
overflow: hidden;
.room-img {
height: 100%;
border-radius: 36upx 36upx 36upx 36upx;
}
.part-top-content { .part-top-content {
.flex-between { .flex-between {
padding: 12upx 4upx; padding: 12upx 4upx;
...@@ -855,17 +841,17 @@ ...@@ -855,17 +841,17 @@
padding: 20upx 0; padding: 20upx 0;
// 容器 // 容器
.part-top{ .part-top{
position: initial; display: flex;
width: 260rpx !important; justify-content: center;
height: 220rpx !important; align-items: center;
z-index: 10; width: 260rpx;
background-color: #FFFFFF; height: 280upx;
border-radius: 12rpx !important;
box-shadow: 0 !important;
overflow: hidden; overflow: hidden;
.room-img{ .room-img{
height: 100%; height: 100%;
border-radius: 0 !important; border-radius: 0 !important;
max-height: 240upx;
border-radius: 12rpx !important;
} }
} }
.part-bottom{ .part-bottom{
...@@ -890,10 +876,11 @@ ...@@ -890,10 +876,11 @@
} }
// 标签 // 标签
.facilitie-box{ .facilitie-box{
padding: 20rpx 0 16rpx 0 !important; padding: 8rpx 0 ;
.bg-brown{ .bg-brown{
color: #c98d35; color: #c98d35;
background-color: #f8eddd; background-color: #f8eddd;
margin: 8upx;
} }
} }
// 价格 // 价格
...@@ -972,7 +959,7 @@ ...@@ -972,7 +959,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 100%; height: 100%;
padding: 10upx; padding: 8upx;
background: #fc3f21; background: #fc3f21;
text{ text{
color: #ffffff; color: #ffffff;
...@@ -983,7 +970,7 @@ ...@@ -983,7 +970,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 100%; height: 100%;
padding: 10upx; padding: 8upx;
border-right: 2upx solid #fc3f21; border-right: 2upx solid #fc3f21;
} }
.part-3{ .part-3{
...@@ -991,7 +978,7 @@ ...@@ -991,7 +978,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 100%; height: 100%;
padding: 10upx; padding: 8upx;
} }
text { text {
font-size: 25upx; font-size: 25upx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment