merge

App.vue

@@ -9,7 +9,6 @@
                 platform: plus.os.name,
                 version	: plus.runtime.version
             }).then(res => {
-				console.log(res)
                 if (res.update) {
                     uni.showModal({
                         title: "更新提示",

pages/address/edit.vue

@@ -256,7 +256,7 @@
 		margin-bottom: $margin;
 		.item{
 			position: relative;
-			padding: 0 $padding 0 200rpx;
+			padding: $padding $padding $padding 200rpx;
 			border-bottom: solid 1rpx $border-color;
 			min-height: 90rpx;
 			&.remove{
@@ -268,7 +268,7 @@
 			label{
 				position: absolute;
 				left: 0;
-				top: 0;
+				top: $padding;
 				padding-left: $padding;
 				line-height: 90rpx;
 				font-size: $title-size-lg;

pages/store/index.vue

@@ -47,7 +47,7 @@
          		<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-title">{{item.name}}</view>
-         				<view class="card-subtitle"> </view>
+         				<view class="card-subtitle"> 优质店铺 </view>
                         <view class="card-btn">前往体验</view>
          				<image class="card-cover" :src="item.cover" mode="aspectFill" />
          			</view>
@@ -186,7 +186,7 @@
                 white-space: nowrap;
 			}
 			.card-subtitle{
-				font-size: 20rpx;
+				font-size: 22rpx;
 				color: $text-gray;
 				// line-height: 40rpx;
 				min-height: 20rpx;
@@ -295,7 +295,7 @@
             }
         }
         .card-btn{
-            font-size: 20rpx;
+            font-size: 22rpx;
             color: #fff;
             padding: 4rpx 20rpx;
             border-radius: 20rpx;
@@ -312,17 +312,20 @@
             // }
             &-item:nth-child(1){
             	background: #fef2ae;
+                background: rgba($color: #fef2ae, $alpha:.5);
             }
             &-item:nth-child(2){
             	background: #c9ead9;
+                background: rgba($color: #c9ead9, $alpha:.5);
             }
             &-item:nth-child(3){
                 margin-top: $padding - 8;
             	background: #bde0ff;
+                background: rgba($color: #bde0ff, $alpha:.5);
             }
             &-item:nth-child(4){
                 margin-top: $padding - 8;
-            	background: #ffd9e1;
+            	background: rgba($color: #ffd9e1, $alpha:.5);
             }
         }
         .card-cover{