Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

my/order/payModify.vue

@@ -143,7 +143,7 @@
 
 
 			
-			<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
+			<view class="pay_btn" style="margin-top: 20px;" @click="openpay()">去支付</view>
 		
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->

my/order/payModifyJsDetail.vue

@@ -143,7 +143,7 @@
 
 
 			
-			<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
+			<view class="pay_btn" style="margin-top: 10px;" @click="openpay()">去支付</view>
 		
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
@@ -1979,8 +1979,8 @@
 	}
 
 	.pay_btn {
-		width: 90%;
+		width: 96%;
-		margin: 0 auto;
+		margin-left:2%;
 		text-align: center;
 		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
 		height:80rpx;
@@ -1988,6 +1988,7 @@
 		color: #ffffff;
 		line-height: 80rpx;
 		font-size: 32rpx;
+		position: fixed;
 	}
 
 	.serverAddress {

pages/my/index.vue

@@ -9,9 +9,12 @@
 				<view class="my-head-top-view" v-if="!isLogin">
 					<view class="my-head-top-text">
 						<span>{{userName}}</span>
-						<span>{{phone}}</span>
+						<span>ID:{{invitationCode}}</span>
+					</view>
+					<view class="my-head-top-id">
+						<span>{{phone}}</span>
+						<image class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vipster.png"></image>
 					</view>
-					<view class="my-head-top-id">ID:{{invitationCode}}</view>
 				</view>
 				<view v-else class="text-xl" @click="goLogin('/pages/public/login')">
 					登录
@@ -743,23 +746,43 @@
 		border-radius: 21rpx;
 	}
 	.my-head-top-id{
-		margin-top: 10px;
+		width: 35%;
 		font-size: 23rpx;
-		color: #666;
+		padding: 10rpx 20rpx;
+		background:linear-gradient(to right,#ff996b,#ff9966,#ff5e62);
+		border-radius: 0 30rpx 30rpx 0 ;
+		color: #fff;
+		position: relative;
+	}
+	.my-head-top-id span:nth-child(1){
+		margin-left: 20rpx;
+	}
+	.my-head-vip{
+		width: 26rpx;
+		height: 26rpx;
+		position: absolute;
+		left:-18rpx;
+		top:-10rpx
 	}
 	.my-head-top-text{
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
 		align-items: center;
-		font-weight: bold;
-		font-size: 33rpx;
 		color: #000000;
+		margin-bottom: 8rpx;
+	}
+	.my-head-top-text span:nth-child(1){
+		font-size: 32rpx;
+		font-weight: bold;
+	}
+	.my-head-top-text span:nth-child(2){
+		font-size: 26rpx;
 	}
 	.my-head-top-view{
 		display: flex;
 		flex-direction: column;
-		width: 80%;
+		width: 82%;
 	}
 	.my-head-top image{
 		width: 106rpx;