Merge branch 'master' of http://49.4.49.126:3000/Gyee_web/sisMobilePhone

components/bracelet/braceletHistoryCurve.vue

@@ -4,7 +4,7 @@
 		<view @tap="closeFrame">
 			<cu-custom bgColor="bg-gradual-sisBlack" :isBack="true">
 				<block slot="backText">
-					<view style="height: 80rpx;line-height: 80rpx;color: silver;">返回</view>
+					<view style="height: 80rpx;line-height: 80rpx;color: silver;" >返回</view>
 				</block>
 				<block slot="content">
 					<view style="color: silver;">手环历史曲线</view>
@@ -1284,8 +1284,10 @@
 		position: absolute;
 		top: 13%;
 		left: 1.5%;
-		width: 300upx;
-		height: 200upx;
+		/* width: 300upx;
+		height: 200upx; */
+		height: 48%;
+		width: 97%;
 		margin-top: 13%;
 	}
 	.line{

components/mine/addressBook/addressBook.vue

@@ -16,7 +16,7 @@
 			</block>
 			<block slot="content">通讯录</block>
 			<block slot="right">
-				<view class="plus" @tap="" data-target="viewModal"></view>
+				<view class="plus" @tap="" data-target="viewModal">+</view>
 			</block>
 		</cu-custom>
 

pages/mine/Mine.vue

@@ -16,7 +16,7 @@
 			</block>
 		    <block slot="content">{{address}}</block>
 			<block slot="right">
-				<view class="plus" @tap="showModal" data-target="viewModal">+</view>
+				<view class="plus" @tap="" data-target="viewModal">+</view>
 			</block>
 		</cu-custom>
 		<!-- 抽屉组件 -->