|
|
@@ -85,7 +85,6 @@
|
|
|
总监：{{ guData.nickname }}
|
|
|
</text>
|
|
|
</view>
|
|
|
-
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -93,10 +92,9 @@
|
|
|
<view class="goods">
|
|
|
<view class="top">
|
|
|
<image class="topBgImg" src="@/static/img/index_item_bg.png" mode="widthFix"></image>
|
|
|
- <view class="goodsTitle">
|
|
|
- <image class="icon" src="/static/img/goods-icon.png"></image>
|
|
|
+ <image class="icon" src="/static/img/goods-icon.png"></image>
|
|
|
+ <view class="topTitle">
|
|
|
<text class="label">货款提货</text>
|
|
|
- <view class="fx-g1"></view>
|
|
|
<view class="more" @tap="tapOpen" data-url="../goods/list">
|
|
|
<text class="text">查看更多></text>
|
|
|
</view>
|
|
|
@@ -111,7 +109,7 @@
|
|
|
</text>
|
|
|
<view class="iview">
|
|
|
<view class="score">
|
|
|
- <text>
|
|
|
+ <text class='goods-name'>
|
|
|
{{ item.commission }}
|
|
|
</text>
|
|
|
<text class="tag" v-if="sysData.is_audit == 0">积分</text>
|
|
|
@@ -126,25 +124,25 @@
|
|
|
<!--最新门店-->
|
|
|
<view class="shop" v-if="sysData.is_audit == 0">
|
|
|
<view class="top">
|
|
|
+ <image class="topBgImg" src="@/static/img/index_item_bg.png" mode="widthFix"></image>
|
|
|
<image class="icon" src="/static/img/shop-icon.png"></image>
|
|
|
- <text class="label">易趣C果园({{merchantCount}}家)</text>
|
|
|
- <view class="fx-g1"></view>
|
|
|
- <view class="more" @tap="tapOpen" data-url="../merchant/list">
|
|
|
- <text class="text">查看更多></text>
|
|
|
- <image class="prv" src="/static/img/ic-pev.png"></image>
|
|
|
+ <view class="topTitle">
|
|
|
+ <text class="label">易趣C果园({{merchantCount}}家)</text>
|
|
|
+ <view class="more" @tap="tapOpen" data-url="../merchant/list">
|
|
|
+ <text class="text">查看更多></text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="shop-items">
|
|
|
- <view class="item fx-r" @tap="tapOpen" :data-url="'../merchant/index?id=' + item.id"
|
|
|
+ <view class="item" @tap="tapOpen" :data-url="'../merchant/index?id=' + item.id"
|
|
|
v-for="item in merchantData">
|
|
|
<image :src="item.logo" class="img" mode="aspectFill"></image>
|
|
|
<view class="info">
|
|
|
- <view class="iview-top fx-r">
|
|
|
+ <view class="iview-top">
|
|
|
<text class="title">{{ item.name }}</text>
|
|
|
- <view class="fx-g1"></view>
|
|
|
<view class="ii">
|
|
|
- <image src="/static/img/shop-small-location.png"></image>
|
|
|
- <text>
|
|
|
+ <image class="shopTipIcon" src="/static/img/shop-small-location.png"></image>
|
|
|
+ <text class="iiText">
|
|
|
距离{{ item.dis_km }}
|
|
|
</text>
|
|
|
</view>
|
|
|
@@ -158,18 +156,19 @@
|
|
|
<image src="/static/img/tel-shop.png" class="icon"></image>
|
|
|
<text class="value">{{ item.tel }}</text>
|
|
|
</view>
|
|
|
-
|
|
|
<view class="business">
|
|
|
- 营业时间: {{ item.business }}
|
|
|
+ <text class='businessText'>
|
|
|
+ 营业时间: {{ item.business }}
|
|
|
+ </text>
|
|
|
</view>
|
|
|
|
|
|
<view class="wiget">
|
|
|
<view class="witem" @tap.stop="tapTel(item)">
|
|
|
- <image src="/static/img/shop-tel.png"></image>
|
|
|
+ <image class="witeIcon" src="/static/img/shop-tel.png"></image>
|
|
|
<text class="text">电话</text>
|
|
|
</view>
|
|
|
<view class="witem" @tap.stop="tapLbs(item)">
|
|
|
- <image src="/static/img/shop-location.png"></image>
|
|
|
+ <image class="witeIcon" src="/static/img/shop-location.png"></image>
|
|
|
<text class="text">导航</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -373,7 +372,7 @@
|
|
|
if (res.code == 200) {
|
|
|
this.title = res.data.title;
|
|
|
this.content = res.data.content;
|
|
|
- console.log(this.content, 'this.content')
|
|
|
+ // console.log(this.content, 'this.content')
|
|
|
this.isGg = true;
|
|
|
|
|
|
}
|
|
|
@@ -701,7 +700,7 @@
|
|
|
|
|
|
//抢货通道
|
|
|
.team-buy {
|
|
|
- margin: 15rpx 10rpx 20rpx 30rpx;
|
|
|
+ margin: 15rpx 10rpx 0rpx 30rpx;
|
|
|
height: 240rpx;
|
|
|
width: 690rpx;
|
|
|
|
|
|
@@ -712,13 +711,13 @@
|
|
|
|
|
|
.team-show {
|
|
|
color: #fff;
|
|
|
- padding-top: 70rpx;
|
|
|
- margin-top: -240rpx;
|
|
|
+ padding-top: 40rpx;
|
|
|
+ margin-top: -200rpx;
|
|
|
align-items: center;
|
|
|
justify-content: center;
|
|
|
|
|
|
.labelBox {
|
|
|
- padding-top: 30rpx;
|
|
|
+ padding-top: 20rpx;
|
|
|
|
|
|
.label {
|
|
|
line-height: 45rpx;
|
|
|
@@ -746,98 +745,103 @@
|
|
|
|
|
|
}
|
|
|
|
|
|
- //产品中心
|
|
|
- .goods {
|
|
|
- padding: 20rpx 30rpx;
|
|
|
-
|
|
|
- .goodsTitle {
|
|
|
- margin-top: -60rpx;
|
|
|
- flex:1;
|
|
|
- position: relative;
|
|
|
- flex-direction: row;
|
|
|
- padding-left: 86rpx;
|
|
|
- padding-right: 50rpx;
|
|
|
- }
|
|
|
+ .top {
|
|
|
+ padding-top: 30rpx;
|
|
|
+ position: relative;
|
|
|
+ height: 123rpx;
|
|
|
|
|
|
.topBgImg {
|
|
|
width: 690rpx;
|
|
|
height: 74rpx;
|
|
|
}
|
|
|
|
|
|
- .top {
|
|
|
- height: 74rpx;
|
|
|
- .icon {
|
|
|
- width: 96rpx;
|
|
|
- height: 123rpx;
|
|
|
- position: absolute;
|
|
|
- top: -24rpx;
|
|
|
- left: 0;
|
|
|
- }
|
|
|
+ .icon {
|
|
|
+ width: 96rpx;
|
|
|
+ height: 110rpx;
|
|
|
+ position: absolute;
|
|
|
+ top: 0rpx;
|
|
|
+ left: 0;
|
|
|
+ z-index: 999;
|
|
|
+ }
|
|
|
+
|
|
|
+ .topTitle {
|
|
|
+ margin-top: -60rpx;
|
|
|
+ flex: 1;
|
|
|
+ position: relative;
|
|
|
+ flex-direction: row;
|
|
|
+ padding-left: 86rpx;
|
|
|
+ padding-right: 50rpx;
|
|
|
+ justify-content: space-between;
|
|
|
|
|
|
.label {
|
|
|
color: #fff;
|
|
|
font-weight: bold;
|
|
|
font-size: 34rpx;
|
|
|
margin-left: 12rpx;
|
|
|
- align-self: self-start;
|
|
|
- padding-top: 16rpx;
|
|
|
+ padding-top: 10rpx;
|
|
|
}
|
|
|
|
|
|
.more {
|
|
|
- align-self: self-start;
|
|
|
- padding-top: 30rpx;
|
|
|
+ padding-top: 20rpx;
|
|
|
|
|
|
.text {
|
|
|
color: #FFF;
|
|
|
font-size: 24rpx;
|
|
|
}
|
|
|
-
|
|
|
- .prv {
|
|
|
- width: 10rpx;
|
|
|
- height: 20rpx;
|
|
|
- margin-left: 8rpx;
|
|
|
- }
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
+ }
|
|
|
+
|
|
|
+ //产品中心
|
|
|
+ .goods {
|
|
|
+ padding: 0rpx 30rpx 30rpx;
|
|
|
|
|
|
.goods-items {
|
|
|
border: 2px solid rgba(255, 51, 44, 1);
|
|
|
border-bottom-left-radius: 20rpx;
|
|
|
border-bottom-right-radius: 20rpx;
|
|
|
padding: 20rpx;
|
|
|
+ margin-top: -24rpx;
|
|
|
+ flex-direction: row;
|
|
|
+ flex-wrap: wrap;
|
|
|
+ justify-content: space-between;
|
|
|
|
|
|
.item {
|
|
|
- // width: calc(50% - 10rpx);
|
|
|
- margin-right: 10rpx;
|
|
|
+ width: 310rpx;
|
|
|
margin-bottom: 20rpx;
|
|
|
box-shadow: 0px 0px 20px 0px rgba(50, 50, 52, 0.1);
|
|
|
border-radius: 20rpx;
|
|
|
background-color: #FFF;
|
|
|
|
|
|
.nimg {
|
|
|
- // width: 100%;
|
|
|
- // height: calc(50vw - 20rpx - 10rpx);
|
|
|
+ flex: 1;
|
|
|
+ height: 310rpx;
|
|
|
border-radius: 20rpx 20rpx 0 0;
|
|
|
}
|
|
|
|
|
|
.title {
|
|
|
- padding: 20rpx;
|
|
|
- height: 80rpx;
|
|
|
+ padding: 20rpx 20rpx 0;
|
|
|
text-overflow: ellipsis;
|
|
|
- lines: 1;
|
|
|
+ lines: 2;
|
|
|
color: #333333;
|
|
|
font-weight: bold;
|
|
|
font-size: 30rpx;
|
|
|
}
|
|
|
|
|
|
.iview {
|
|
|
- padding: 20rpx;
|
|
|
+ padding: 20rpx 20rpx;
|
|
|
+ flex-direction: row;
|
|
|
+ justify-content: space-between;
|
|
|
|
|
|
.score {
|
|
|
- color: #FF4C4C;
|
|
|
- font-weight: bold;
|
|
|
- font-size: 36rpx;
|
|
|
+ flex-direction: row;
|
|
|
+ align-items: flex-end;
|
|
|
+
|
|
|
+ .goods-name {
|
|
|
+ color: #FF4C4C;
|
|
|
+ font-weight: bold;
|
|
|
+ font-size: 36rpx;
|
|
|
+ }
|
|
|
|
|
|
.tag {
|
|
|
font-weight: bold;
|
|
|
@@ -862,47 +866,6 @@
|
|
|
.shop {
|
|
|
padding: 20rpx 30rpx;
|
|
|
|
|
|
- .top {
|
|
|
- height: 74rpx;
|
|
|
- padding-left: 86rpx;
|
|
|
- padding-right: 50rpx;
|
|
|
-
|
|
|
-
|
|
|
- .icon {
|
|
|
- width: 96rpx;
|
|
|
- height: 123rpx;
|
|
|
- position: absolute;
|
|
|
- top: -24rpx;
|
|
|
- left: 0;
|
|
|
- }
|
|
|
-
|
|
|
- .label {
|
|
|
- color: #fff;
|
|
|
- font-weight: bold;
|
|
|
- font-size: 34rpx;
|
|
|
- margin-left: 12rpx;
|
|
|
- align-self: self-start;
|
|
|
- padding-top: 16rpx;
|
|
|
- }
|
|
|
-
|
|
|
- .more {
|
|
|
- align-self: self-start;
|
|
|
- padding-top: 30rpx;
|
|
|
-
|
|
|
- .text {
|
|
|
- color: #FFF;
|
|
|
- font-size: 24rpx;
|
|
|
- }
|
|
|
-
|
|
|
- .prv {
|
|
|
- width: 10rpx;
|
|
|
- height: 20rpx;
|
|
|
- margin-left: 8rpx;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
.shop-items {
|
|
|
border: 2px solid rgba(255, 51, 44, 1);
|
|
|
border-bottom-left-radius: 20rpx;
|
|
|
@@ -911,6 +874,7 @@
|
|
|
|
|
|
.item {
|
|
|
margin-top: 30rpx;
|
|
|
+ flex-direction: row;
|
|
|
|
|
|
.img {
|
|
|
width: 180rpx;
|
|
|
@@ -921,48 +885,60 @@
|
|
|
.info {
|
|
|
position: relative;
|
|
|
margin-left: 20rpx;
|
|
|
- // width: calc(100% - 200rpx);
|
|
|
+ width: 440rpx;
|
|
|
border-bottom: 1px solid #F8F8F8;
|
|
|
+ align-items: flex-start;
|
|
|
+ .iview-top {
|
|
|
+ flex-direction: row;
|
|
|
+ justify-content: space-between;
|
|
|
+ align-items: center;
|
|
|
+ .title {
|
|
|
+ font-weight: bold;
|
|
|
+ font-size: 34rpx;
|
|
|
+ color: #333333;
|
|
|
+ width: 300rpx;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+ lines: 1;
|
|
|
+ }
|
|
|
|
|
|
- .title {
|
|
|
- font-weight: bold;
|
|
|
- font-size: 34rpx;
|
|
|
- color: #333333;
|
|
|
- // width: calc(60%);
|
|
|
- text-overflow: ellipsis;
|
|
|
- lines: 1;
|
|
|
- }
|
|
|
-
|
|
|
- .ii {
|
|
|
- // image {
|
|
|
- // width: 20rpx;
|
|
|
- // height: 28rpx;
|
|
|
- // margin-right: 8rpx
|
|
|
- // }
|
|
|
-
|
|
|
- font-weight: 400;
|
|
|
- font-size: 22rpx;
|
|
|
- color: #666666;
|
|
|
+ .ii {
|
|
|
+ flex-direction: row;
|
|
|
+ .shopTipIcon {
|
|
|
+ width: 20rpx;
|
|
|
+ height: 28rpx;
|
|
|
+ margin-right: 8rpx
|
|
|
+ }
|
|
|
|
|
|
+ .iiText {
|
|
|
+ font-weight: 400;
|
|
|
+ font-size: 22rpx;
|
|
|
+ color: #666666;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.address {
|
|
|
+ flex-direction: row;
|
|
|
+ margin-top: 20rpx;
|
|
|
.icon {
|
|
|
width: 28rpx;
|
|
|
height: 28rpx;
|
|
|
}
|
|
|
|
|
|
.value {
|
|
|
+ width: 400rpx;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+ lines: 1;
|
|
|
font-size: 22rpx;
|
|
|
color: #666666;
|
|
|
opacity: 0.5;
|
|
|
- margin-left: 10rpx;
|
|
|
+ padding-left: 10rpx;
|
|
|
}
|
|
|
|
|
|
- margin-top: 20rpx;
|
|
|
}
|
|
|
|
|
|
.tel {
|
|
|
+ flex-direction: row;
|
|
|
margin-top: 16rpx;
|
|
|
|
|
|
.icon {
|
|
|
@@ -979,20 +955,25 @@
|
|
|
}
|
|
|
|
|
|
.business {
|
|
|
- font-weight: bold;
|
|
|
- font-size: 24rpx;
|
|
|
- color: #FF6F0F;
|
|
|
background: rgba(252, 243, 240, 0.8);
|
|
|
border-radius: 16rpx 16rpx 16rpx 0px;
|
|
|
padding: 10rpx 10rpx;
|
|
|
margin-bottom: 20rpx;
|
|
|
+
|
|
|
+ .businessText {
|
|
|
+ font-weight: bold;
|
|
|
+ font-size: 24rpx;
|
|
|
+ color: #FF6F0F;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.wiget {
|
|
|
position: absolute;
|
|
|
+ flex-direction: row;
|
|
|
+ justify-content: space-between;
|
|
|
right: 0;
|
|
|
bottom: 20rpx;
|
|
|
-
|
|
|
+ width: 120rpx;
|
|
|
.wline {
|
|
|
margin: 0px 24rpx;
|
|
|
height: 40rpx;
|
|
|
@@ -1002,13 +983,14 @@
|
|
|
}
|
|
|
|
|
|
.witem {
|
|
|
- // image {
|
|
|
- // width: 46rpx;
|
|
|
- // height: 46rpx;
|
|
|
- // }
|
|
|
+ align-items: center;
|
|
|
+ .witeIcon {
|
|
|
+ width: 46rpx;
|
|
|
+ height: 46rpx;
|
|
|
+ }
|
|
|
|
|
|
.text {
|
|
|
- font-size: 14px;
|
|
|
+ font-size: 28rpx;
|
|
|
color: #666666;
|
|
|
margin-top: 8rpx;
|
|
|
}
|
|
|
@@ -1018,7 +1000,6 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
|
