merge
This commit is contained in:
1
App.vue
1
App.vue
@@ -9,7 +9,6 @@
|
|||||||
platform: plus.os.name,
|
platform: plus.os.name,
|
||||||
version : plus.runtime.version
|
version : plus.runtime.version
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
console.log(res)
|
|
||||||
if (res.update) {
|
if (res.update) {
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title: "更新提示",
|
title: "更新提示",
|
||||||
|
|||||||
@@ -256,7 +256,7 @@
|
|||||||
margin-bottom: $margin;
|
margin-bottom: $margin;
|
||||||
.item{
|
.item{
|
||||||
position: relative;
|
position: relative;
|
||||||
padding: 0 $padding 0 200rpx;
|
padding: $padding $padding $padding 200rpx;
|
||||||
border-bottom: solid 1rpx $border-color;
|
border-bottom: solid 1rpx $border-color;
|
||||||
min-height: 90rpx;
|
min-height: 90rpx;
|
||||||
&.remove{
|
&.remove{
|
||||||
@@ -268,7 +268,7 @@
|
|||||||
label{
|
label{
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0;
|
left: 0;
|
||||||
top: 0;
|
top: $padding;
|
||||||
padding-left: $padding;
|
padding-left: $padding;
|
||||||
line-height: 90rpx;
|
line-height: 90rpx;
|
||||||
font-size: $title-size-lg;
|
font-size: $title-size-lg;
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
<block v-for="(item, index) in shops" :key="index">
|
<block v-for="(item, index) in shops" :key="index">
|
||||||
<view class="card-box-item" style="{'backgrond': #FFF}" v-if="index < 4" @click="$Router.push({name: 'ShopDetail', params: {ShopId: item.shop_id}})">
|
<view class="card-box-item" style="{'backgrond': #FFF}" v-if="index < 4" @click="$Router.push({name: 'ShopDetail', params: {ShopId: item.shop_id}})">
|
||||||
<view class="card-title">{{item.name}}</view>
|
<view class="card-title">{{item.name}}</view>
|
||||||
<view class="card-subtitle"> </view>
|
<view class="card-subtitle"> 优质店铺 </view>
|
||||||
<view class="card-btn">前往体验</view>
|
<view class="card-btn">前往体验</view>
|
||||||
<image class="card-cover" :src="item.cover" mode="aspectFill" />
|
<image class="card-cover" :src="item.cover" mode="aspectFill" />
|
||||||
</view>
|
</view>
|
||||||
@@ -186,7 +186,7 @@
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
.card-subtitle{
|
.card-subtitle{
|
||||||
font-size: 20rpx;
|
font-size: 22rpx;
|
||||||
color: $text-gray;
|
color: $text-gray;
|
||||||
// line-height: 40rpx;
|
// line-height: 40rpx;
|
||||||
min-height: 20rpx;
|
min-height: 20rpx;
|
||||||
@@ -295,7 +295,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.card-btn{
|
.card-btn{
|
||||||
font-size: 20rpx;
|
font-size: 22rpx;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
padding: 4rpx 20rpx;
|
padding: 4rpx 20rpx;
|
||||||
border-radius: 20rpx;
|
border-radius: 20rpx;
|
||||||
@@ -312,17 +312,20 @@
|
|||||||
// }
|
// }
|
||||||
&-item:nth-child(1){
|
&-item:nth-child(1){
|
||||||
background: #fef2ae;
|
background: #fef2ae;
|
||||||
|
background: rgba($color: #fef2ae, $alpha:.5);
|
||||||
}
|
}
|
||||||
&-item:nth-child(2){
|
&-item:nth-child(2){
|
||||||
background: #c9ead9;
|
background: #c9ead9;
|
||||||
|
background: rgba($color: #c9ead9, $alpha:.5);
|
||||||
}
|
}
|
||||||
&-item:nth-child(3){
|
&-item:nth-child(3){
|
||||||
margin-top: $padding - 8;
|
margin-top: $padding - 8;
|
||||||
background: #bde0ff;
|
background: #bde0ff;
|
||||||
|
background: rgba($color: #bde0ff, $alpha:.5);
|
||||||
}
|
}
|
||||||
&-item:nth-child(4){
|
&-item:nth-child(4){
|
||||||
margin-top: $padding - 8;
|
margin-top: $padding - 8;
|
||||||
background: #ffd9e1;
|
background: rgba($color: #ffd9e1, $alpha:.5);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.card-cover{
|
.card-cover{
|
||||||
|
|||||||
6514
unpackage/dist/dev/app-plus/app-service.js
vendored
6514
unpackage/dist/dev/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
12
unpackage/dist/dev/app-plus/app-view.js
vendored
12
unpackage/dist/dev/app-plus/app-view.js
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user