gjy 3 лет назад
Родитель
Сommit
69e97737d2
3 измененных файлов с 20 добавлено и 11 удалено
  1. 2 1
      config/index.js
  2. 15 8
      pageD/identity/driverIdentityTwo.vue
  3. 3 2
      pages/task/my_task.vue

+ 2 - 1
config/index.js

@@ -1,6 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	baseUrlNew: 'http://192.168.1.117:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

+ 15 - 8
pageD/identity/driverIdentityTwo.vue

@@ -39,14 +39,16 @@
 				<picker v-if="carchength" @change="carLongChange($event,index)" :value="carLongIndex"
 					:range="carLongType" class="con-list">
 					<view class="picker" v-model="item.carLength">
-						{{item.carLength?item.carLength:'请选择车长'}}
+						{{item.carLength?item.carLength:'请选择车长 >'}}
 					</view>
 				</picker>
 				<view v-else class="con-list">
 					<input placeholder="请填写车长(米)" name="input" v-model="item.carLength"></input>
 				</view>
-				<button v-if="carchength" class='cu-btn bg-green shadow' @click="changeCarChength">填写</button>
-				<button v-else class='cu-btn bg-green shadow' @click="changeCarChength">选择</button>
+				<view v-if="carchength" @click="changeCarChength">手动填写<u-icon  name="edit-pen-fill"></u-icon></view>
+				<view v-else @click="changeCarChength">自动获取<u-icon  name="edit-pen-fill"></u-icon></view>
+				<!-- <image  src='' >填写</image> -->
+				<!-- <button v-else class='cu-btn bg-green shadow' @click="changeCarChength">选择</button> -->
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">载重(吨)</text>
@@ -129,8 +131,8 @@
 				<view v-else class="con-list">
 					<input placeholder="请填写开户支行"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="items.bankDepositBranch"></input>
 				</view>
-				<button v-if="subBranch" class='cu-btn bg-green shadow' @click="subBranchChength">填写</button>
-				<button v-else class='cu-btn bg-green shadow' @click="subBranchChength">识别</button>
+				<view v-if="subBranch" @click="subBranchChength">手动填写<u-icon  name="edit-pen-fill"></u-icon></view>
+				<view v-else @click="subBranchChength">自动识别<u-icon  name="edit-pen-fill"></u-icon></view>
 			</view>
 			<view class="c-row b-b" v-if="items.accountType == '个人账户'"> 
 				<text class="tit">收款人姓名</text>
@@ -508,7 +510,7 @@
 		height: 20rpx;
 		position: absolute;
 		right: 20px;
-		margin-top: -10px;
+		margin-top: -5px;
 	}
 
 	.information {
@@ -516,13 +518,13 @@
 		width: 100%;
 		height: 56px;
 		background-color: #FFFFFF;
-		border-radius: 16px;
+		border-radius: 10px;
 	}
 
 	.informations {
 		margin-top: 10px;
 		background-color: #FFFFFF;
-		border-radius: 20px;
+		border-radius: 10px;
 	}
 
 	.btn {
@@ -537,6 +539,11 @@
 		background-color: #FFFFFF;
 		color:#00C265;
 		border: none;
+		border-radius:30px;
+	}
+	.btnAdd:after{
+		border: none;
+		
 	}
 	.btns {
 		background-color: #22C572;

+ 3 - 2
pages/task/my_task.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="content1-top">
 			<view class="search-form round">
-				<u-search placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
+				<u-search placeholder-color='#AFB3BF' search-icon-color='#AFB3BF' bg-color='#F5F6F9' placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
 					@custom="searchKeyWord()"></u-search>
 			</view>
 			<view class="top2">
@@ -667,7 +667,7 @@
 
 	.content1-top {
 		background: white;
-		padding: 20rpx;
+		padding: 20rpx 20rpx 0 20rpx;
 		border-radius: 0 0 30rpx 30rpx;
 	}
 
@@ -677,6 +677,7 @@
 
 	.title-row1 {
 		font-size: 34rpx;
+		font-weight:600;
 	}
 
 	.row2 {