Merge remote-tracking branch 'origin/dev' into dev

app/pages.json

@@ -159,28 +159,32 @@
 		{
 			"path": "pages/declare/add",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationStyle":"custom"
 			}
 		
 		},
 		{
 			"path": "pages/declare/addDeclareSuccess",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationStyle":"custom"
 			}
 		
 		},
 		{
 			"path": "pages/disinfect/addDisinfect",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationStyle":"custom"
 			}
 		
 		},
 		{
 			"path": "pages/disinfect/addDisinfectSuccess",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationStyle":"custom"
 			}
 		
 		},

app/pages/disinfect/addDisinfect.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="box">
 			<view class="top">
-				<text class="title">申报单录入</text>
+				<text class="title">消毒申报单录入</text>
 			</view>
 			<view class="item">
 				<view class="l"><text style="color: red;">*</text>申报人：</view>
@@ -14,7 +14,7 @@
 			<view class="item">
 				<view class="l"><text style="color: red;">*</text>申报电话：</view>
 				<view class="r">
-					<u-input placeholder="申报电话" @input="handler()" v-model="form.declarePhone">
+					<u-input type="number" placeholder="申报电话" @input="handler()" v-model="form.declarePhone">
 					</u-input>
 				</view>
 			</view>
@@ -56,14 +56,14 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">发货人名称：</view>
+				<view class="l"  style="flex: 6;">发货人名称：</view>
 				<view class="r">
 					<u-input placeholder="发货人名称" @input="handler()" v-model="form.sendPeople">
 					</u-input>
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">收货人名称：</view>
+				<view class="l"  style="flex: 6;">收货人名称：</view>
 				<view class="r">
 					<u-input placeholder="收货人名称" @input="handler()" v-model="form.receivePeople">
 					</u-input>
@@ -94,7 +94,7 @@
 			<view class="item">
 				<view class="l">号码：</view>
 				<view class="r">
-					<u-input placeholder="号码" @input="handler()" v-model="form.phone" />
+					<u-input type="number" placeholder="号码" @input="handler()" v-model="form.phone" />
 				</view>
 			</view>
 			<view class="item">
@@ -122,7 +122,7 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">国内运输工具：</view>
+				<view class="l" style="flex: 6;">国内运输工具：</view>
 				<view class="r">
 					<u-input placeholder="国内运输工具" @input="handler()" v-model="form.chinaCarName" />
 				</view>

sp-admin/sa-view/tb-business/tb-business-info.html

@@ -72,7 +72,7 @@
 										<sa-td name="车辆规格" prop="carSize"></sa-td>
 										<sa-td width="130" name="支付状态" prop="pay" type="enum" :jv="{0: '未支付[#ff0000]', 1: '已支付[#005500]'}">
 										</sa-td>
-										<sa-td width="120" name="支付状态" prop="isLock" type="enum" :jv="{1: '锁定[#ff0000]', 0: '正常[#005500]'}">
+										<sa-td width="120" name="车辆状态" prop="isLock" type="enum" :jv="{1: '锁定[#ff0000]', 0: '正常[#005500]'}">
 										</sa-td>
 										<sa-td name="联系人" prop="driverName"></sa-td>
 										<sa-td name="联系号码" prop="driverPhone"></sa-td>