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

components/bert-suggest/suggest.vue

@@ -2,14 +2,13 @@
 	<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>
-		
 		<button class="submit-btn" @click="submit">提交</button>
 	</view>
 </template>

pages/mine/company/editcompany.vue

@@ -679,11 +679,8 @@
 						console.log(JSON.stringify(res.tempFilePaths));
 						uploadImage('image', res.tempFilePaths[0], 'appData/',
 							result => {
-								debugger
 								// 上传成功回调函数
 								switch (_this.uploadType) {
-
-
 									// 身份正面
 									case 1:
 										_this.dataDetails.businessLicenseAddressUrl = result

pages/order/map.vue

@@ -54,7 +54,6 @@ export default {
 		}
 	},
 	onLoad(option) {
-		debugger
 		this.id = option.id
 		this.getTrack()		//获取轨迹信息(只做演示，未进行远程请求)
 	},

pages/release/release.vue

@@ -20,6 +20,7 @@
 		</view> -->
 		<view class="content1">
 			<view class="row" @click="selectCargoOwner">
+
 				<view class="left select-sf" :class='dataObj.cargoOwner?"":"select-sf1"'>{{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}</view>
 				<view class="right"><image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image></view>
 			</view>
@@ -73,6 +74,10 @@
 				{{dataObj.distance }}
 				km
 			</view>
+			<view class="row">
+				<view class="left">货物类别</view>
+				<view class="right" @click="goodstypeChange">{{dataObj.goodsType?dataObj.goodsType:"请选择货物类别"}}</view>
+			</view>
 			<view class="row">
 				<view class="left">货名</view>
 				<view class="right"><input type="text" class="input" value="" placeholder="输入货物名称"
@@ -229,6 +234,10 @@
 		<u-picker :show="isShowValidity" ref="uPicker" :columns="validityPeriod" @confirm="confirmValidityPeriod"
 			:closeOnClickOverlay='true' @close='isShowValidity=false' @cancel='isShowValidity=false'>
 		</u-picker>
+		<!-- //货物类别 -->
+		<u-picker :show="isGoodsType" ref="uPicker" :columns="goodsList" keyName="constValue" @confirm="goodsSubmit"
+			:closeOnClickOverlay='true' @close='isGoodsType=false' @cancel='isGoodsType=false'>
+		</u-picker>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='false'
 			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
@@ -334,6 +343,9 @@
 					},
 
 				],
+				// 货物类别
+				isGoodsType:false,
+				goodsList:[]
 			}
 		},
 		onNavigationBarButtonTap(e) {
@@ -374,6 +386,7 @@
 						title: '身份信息审核中',
 						icon: 'none'
 					})
+
 				} else if (_obj.authenticationStatus == '已过期') {
 					this.alertTitle = '身份信息已过期！'
 					this.showCancelButton = false
@@ -425,8 +438,17 @@
 			this.dataObj.loadingDateEnd = '随时'
 			this.dataObj.taskValidity = '长期'
 			this.getSFList()
+			
 		},
 		async onLoad() {
+			//货物类别(默认上一次)
+			this.queryGoodsList() // 查询货物类别
+			let goods = uni.getStorageSync("goodsType")
+			if(goods){
+				this.dataObj.goodsType = goods.name
+				this.dataObj.goodsTypeKey = goods.key
+			}
+			
 
 			// _this = this
 			// // #ifdef APP-PLUS
@@ -452,6 +474,27 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			queryGoodsList(){
+				this.$request.baseRequest('get', '/commonSysParameter/getInfo', {
+						constId: "CON1"
+					}).then(res => {
+						this.goodsList.push(res.data)
+						console.log(this.goodsList)
+					})
+			},
+			goodstypeChange(){
+				this.isGoodsType = true
+			},
+			goodsSubmit(e){
+				this.dataObj.goodsType = e.value[0].constValue
+				this.dataObj.goodsTypeKey = e.value[0].constKey
+				let _obj={
+					name:e.value[0].constValue,
+					key:e.value[0].constKey
+				}
+				uni.setStorageSync("goodsType",_obj)
+				this.isGoodsType = false
+			},
 			getSFList() {
 				this.dataObj.commonId = this.userInfo.id
 				this.$request.baseRequest('get', '/cargoOwnerCompInfo/cargoOwnerList', {
@@ -778,6 +821,7 @@
 								// uni.$u.route("/pages/release/record")
 							}
 						})
+						this.isShowAlert = false
 
 					})
 					.catch(res => {