Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

components/bert-suggest/suggest.vue

@@ -2,11 +2,11 @@
 	<view>
 		<view style='background:#fff;margin:20px 10px 10px;border-radius:10px;'>
 			<uni-card class="box" :isFull="true" title="反馈意见" >
-				<textarea v-model="data.content" placeholder="您的反馈对我们非常重要,请在此输入."></textarea>
+				<textarea v-model="data.content" placeholder="您的反馈对我们非常重要，请在此输入。"></textarea>
 				<view style='position:absolute;right:22px;bottom:16px;font-size:13px;'>{{data.content.length}}/150个字</view>
 			</uni-card>
 			<uni-card class="box contact" :isFull="true" title="联系方式" >
-				<input v-model="data.contact" placeholder="请输入您的手机号,方便我们联系您" />
+				<input v-model="data.contact" placeholder="请输入您的手机号，方便我们联系您" />
 			</uni-card>
 		</view>
 		

pages/goodSource/index.vue

@@ -291,7 +291,6 @@
 			confirmClick() {
 				let item = this.ObjSelect
 				var that=this
-				console.log(this.userInfo.phone)
 				this.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
 					driverPhone: this.userInfo.phone,
 				}).then(res2 => {
@@ -316,7 +315,9 @@
 						cargoOwnerPhone: item.cargoOwnerPhone,
 						id:item.id,
 						billingMethod:item.billingMethod,
-						freightAdvance:item.freightAdvance
+						freightAdvance:item.freightAdvance,
+						goodsType:item.goodsType,
+						goodsTypeKey:item.goodsTypeKey
 					}
 					that.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {
 						if (res.code == 200) {
@@ -330,7 +331,6 @@
 								}
 							})
 						} else {
-							console.log(res)
 							that.$refs.uToast.show({
 								type: 'error',
 								message: res.message,

pages/order/orderDetails.vue

@@ -4,7 +4,7 @@
 		<view class="fixed1"></view>
 		<view class="fixed">
 			<view class='title flex flex-center'>
-				<image class="back"  src="../../static/images/return.png" @click="back" mode=""></image>
+				<image class="back"  src="../../static/images/return.png" @click="back" mode="" style="width: 40rpx; height: 40rpx;"></image>
 <!-- 				<u-icon class="back" name="arrow-left" color="" size="20" ></u-icon> -->
 				<view class="nav-title">订单</view>
 				<image class="search" style='width:18px;height:18px;' src="../../static/images/kefu.png" @click="$helper.contactCustomerService" mode=""></image>