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

my/order/pay.vue

@@ -495,7 +495,7 @@
 							</view>
 							<radio-group name="openWay" style="margin-left: 45upx;" @tap='selectWay(item)'>
 								<label class="tui-radio">
-									<radio color="#096f4b" :checked="openWay === item.id ? true : false" />
+									<radio color="#019c88" :checked="openWay === item.id ? true : false" />
 								</label>
 							</radio-group>
 						</view>
@@ -2225,11 +2225,12 @@
 		width: 90%;
 		margin: 0 auto;
 		text-align: center;
-		background: linear-gradient(to right, #223845, #00a85b);
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
 		height: 80rpx;
 		border-radius: 60rpx;
 		color: #ffffff;
 		line-height: 80rpx;
+		font-size: 36rpx;
 	}
 
 	.serverAddress {

my/order/paydingTc.vue

@@ -26,7 +26,7 @@
 								<view class="money-pay" style="width: 100%;justify-content: space-between;">
 									<view class="money-pay-zhen">
 										<span>￥</span>
-										<span>{{order.sumMoney}}{{orderXm.type=='104'?'套':orderXm.type=='105'?'次':'次'}}</span>
+										<span>{{order.sumMoney}}{{orderXm.type=='104'?'/套':orderXm.type=='105'?'次':'次'}}</span>
 									</view>
 									<view>
 										<uni-number-box :disabled="true" :value="order.ordersPackageList[0].num" :width='27' :min="1" @change="changeValue" />

pages/my/index.vue

@@ -3,17 +3,22 @@
 		<view class="my-head">
 			<view class="my-head-top back-width">
 				<view class="u-m-r-10" style="position: relative;">
-					<image :src="avatar" style="width: 100rpx;height: 100rpx;border-radius: 50%; margin-left: 10rpx; border:#fff 1px solid;"
+					 <image :src="avatar" style="width: 100rpx;height: 100rpx;border-radius: 50%; margin-left: 10rpx; border:#fff 1px solid;"
 						@click="goNav('/pages/my/userinfo')"></image>
 				</view>
 				<view class="my-head-top-view" v-if="!isLogin">
 					<view class="my-head-top-text">
 						<span>{{userName}}</span>
-						<span>ID:{{invitationCode}}</span>
+						<view class="my-head-top-id">
+							<image class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vipster.png"></image>
+							<span>月会员</span>
+						</view>
+						
 					</view>
-					<view class="my-head-top-id">
+					<view class="my-head-texa">
 						<span>{{phone}}</span>
-						<image class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vipster.png"></image>
+						<span style="font-size: 30rpx;font-weight: bold; padding: 0 10rpx;">·</span>
+						<span>ID:{{invitationCode}}</span>
 					</view>
 				</view>
 				<view v-else class="text-xl" @click="goLogin('/pages/public/login')">
@@ -755,9 +760,9 @@
 		border-radius: 21rpx;
 	}
 	.my-head-top-id{
-		width: 35%;
+		width: 26%;
-		font-size: 23rpx;
+		padding: 3rpx 5rpx 6rpx 22rpx;
-		padding: 10rpx 20rpx;
+		text-align: center;
 		background:linear-gradient(to right,#ff996b,#ff9966,#ff5e62);
 		border-radius: 0 30rpx 30rpx 0 ;
 		color: #fff;
@@ -765,12 +770,17 @@
 	}
 	.my-head-top-id span:nth-child(1){
 		margin-left: 20rpx;
+		font-size: 18rpx;
+	}
+	.my-head-texa{
+		font-size: 26rpx;
+		color: #788298;
 	}
 	.my-head-vip{
-		width: 26rpx;
+		width: 28rpx;
-		height: 26rpx;
+		height: 28rpx;
 		position: absolute;
-		left:-18rpx;
+		left:-20rpx;
 		top:-10rpx
 	}
 	.my-head-top-text{
@@ -778,7 +788,7 @@
 		flex-direction: row;
 		justify-content: space-between;
 		align-items: center;
-		color: #000000;
+		color: #3a3f4f;
 		margin-bottom: 8rpx;
 	}
 	.my-head-top-text span:nth-child(1){