Merge branch 'master' of http://39.98.150.180/frontend-uniapp/Civil-Affairs-Bureau-WeChar

李宇
2 parents d7d4c017 07e4a13a
Showing 3 changed files with 5 additions and 5 deletions
.DS_Store
pages/hcxx/hcxx.vue
pages/my/my.vue
@@ -5,7 +5,7 @@
 		<view class="content">
 		<view class="order-tab">
 			<view class="tab" :class="{'action':OrderType==0}" @click="onOrderTab(0)">
-				<text>派遣中</text>
+				<text>接运中</text>
 				<text class="line"></text>
 			</view>
 			<view class="tab" :class="{'action':OrderType==1}" @click="onOrderTab(1)">
@@ -61,7 +61,7 @@
 			return {
 				OrderType: 0,
 				nvConfig:{
-					title:"调度信息",
+					title:"接运信息",
 					bgColor:"#ffffff",
 					color:"#000000",
 					fixedAssist:{
@@ -10,7 +10,7 @@
 			<view class="my-top">
 				<view class="user-info">
 					<view class="portrait" @click="tzmy">
-						<image :src="Baseapi + user.avatar"></image>
+						<image :src="user.avatar"></image>
 					</view>
 					<view class="info">
 						<view class="nickname">
@@ -80,7 +80,7 @@
 						</view>
 						<view class="data">
 							<view class="title">
-								<text>司机消息</text>
+								<text>消息</text>
 							</view>
 						</view>
 					</view>
@@ -95,7 +95,7 @@
 						</view>
 						<view class="data">
 							<view class="title">
-								<text>收敛工消息</text>
+								<text>消息</text>
 							</view>
 						</view>
 					</view>