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

my/address/Endaddress.vue

@@ -29,7 +29,7 @@
 		</view>
 		<!-- #endif -->
 		<!-- <view style="margin-top: 20upx;background-color: #FFFFFF;height: max-content;padding: 20upx 20upx 20upx 35upx;">
-			<input type="text" placeholder="收货人" style="height: 80upx;color: #000000;font-size: 30upx;" v-model="consignee" />
+			<input type="text" placeholder="联系人" style="height: 80upx;color: #000000;font-size: 30upx;" v-model="consignee" />
 			<input type="number" placeholder="手机号码" maxlength="11" style="height: 80upx;margin-top: 20upx;color: #000000;font-size: 30upx;"
 			 v-model="mobile" />
 			<view style="height: 1upx;margin-top: 50upx;"></view>
@@ -40,11 +40,11 @@
 		<view class="part1">
 			<view class="part1-top">
 				<view class="name">
-					<u-field v-model="name" placeholder="请填写收货人姓名" label="收货人">
+					<u-field v-model="name" placeholder="请填写联系人姓名" label="联系人">
 					</u-field>
 				</view>
 				<view class="mobile">
-					<u-field v-model="mobile" placeholder="请填写收货人手机号" label="手机号码" maxlength="11">
+					<u-field v-model="mobile" placeholder="请填写联系人手机号" label="手机号码" maxlength="11">
 					</u-field>
 				</view>
 			</view>

my/address/address.vue

@@ -33,7 +33,7 @@
 		</view>
 		<view style="position: fixed;bottom: 0rpx;left: 0;right: 0;background: #FFFFFF;height: 110rpx;line-height: 110rpx;z-index: 999;">
 			<button class="shouhuo" @tap="goAddress('')">
-				新增收货地址
+				新增地址
 			</button>
 		</view>
 		<empty v-if="list.length == 0" :noneData="noneData"></empty>

my/vip/index.vue

@@ -84,7 +84,7 @@
 							</view>
 							<radio-group name="openWay" style="margin-left: 45upx;" @tap='selectWay(item.id)'>
 								<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>
@@ -693,7 +693,7 @@
 		width: 90%;
 		margin: 0 auto;
 		text-align: center;
-		background: linear-gradient(to right, #223845, #00a85b);
+		background: linear-gradient(to right, #019c88, #2ebe93);
 		height: 80upx;
 		border-radius: 60rpx;
 		color: #ffffff;

my/wallet/index.vue

@@ -29,15 +29,15 @@
 				</view>
 				<view class="coupon-level" v-for="(item,index) in wallet" :key='index'@click="active(item)" :class="{active:item.isSelect}">
 					<view class="r-amount">
-						<span>充¥{{item.price}}</span>
-						<span>赠¥{{item.sumMoney}}</span>
+						<span>¥{{item.price}}</span>
+						<span>到账¥{{item.sumMoney}}</span>
 					</view>
 					<view class="bo-amount">
 						<view class="amount-balance">
 							<view>
-								<span>赠送</span>
+								<span>实得</span>
 								<span>{{item.money}}</span>
-								<span>余额</span>
+								<span>金额</span>
 							</view>
 						</view>
 						<view class="amount-block">
@@ -1234,6 +1234,7 @@
 		flex-direction: row;
 		justify-content: space-between;
 		align-items: center;
+		margin-top: 15rpx;
 	}
 	.bgimg {
 		background: url(../../static/wallet/reduce.png);
@@ -1352,7 +1353,7 @@
 	}
 	.amount-balance span:nth-child(2){
 		font-weight: bold;
-		font-size: 36rpx;
+		font-size: 40rpx;
 		color:#333;
 	}
 	.amount-block{

pages/index/index.vue

@@ -120,9 +120,8 @@
 				<view class="fujin-view" v-for="(item,index) in nearbyTechnician" :key="index" @click="goOrder(item)">
 					<view class="index-fujin-view">
 						<image class="index-fujin-view-img" :src="item.artificerImg" mode=""></image>
-						<view class="index-fujin-view-text
-						">
-							<image src="../../static/orderDetail/dingwei.png" mode="w"></image>
+						<view class="index-fujin-view-text">
+							<image src="../../static/fujin-dingwei.png" mode="w"></image>
 							<span>{{item.dingwei}}km</span>
 						</view>
 					</view>

pages/therapist/orderDetail.vue

@@ -15,7 +15,7 @@
 			<view class="view-head">
 				<view class="jian-view">
 					<view class="jian-view-left">
-						<span>22{{order.artificerName}}</span>
+						<span>{{order.artificerName}}</span>
 					</view>
 					<view class="jian-view-right">
 						<view class="oder-mian-right">