Merge branch 'master' of ssh://git.9026.com:2212/xiansin/sange-bridge

.gitignore

@@ -1,3 +1,3 @@
 /.idea
 /.hbuilderx
-/unpackage
+/unpackage

pages/my/member.vue

@@ -17,14 +17,18 @@
 						<view class="origin">¥{{setting.origin_member_price}}</view>
 						<view class="desc">永久使用</view>
 					</view>
-					<u-button shape="circle"
+					<u-button 
+							  class="u_button"
+							  shape="circle"
 							  type="success"
 							  hover-class="none"
 							  :custom-style="btnStyle"
 							  @click="handleBuy"
 							  v-if="vuex_user_data.is_vip == 0"
 					>立即开通</u-button>
-					<u-button shape="circle"
+					<u-button 
+							  class="u_button"
+							  shape="circle"
 							  type="success"
 							  hover-class="none"
 							  :custom-style="btnStyle"
@@ -222,6 +226,10 @@
 					font-weight: 600;
 					color: #4e5958;
 				}
+				/deep/ .u_button{
+					position: absolute;
+					bottom: 40rpx;
+				}
 			}
 			.price{
 				border: 4rpx solid #C49244;