更新

pageA/pages/account.vue

@@ -115,6 +115,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal
@@ -326,11 +329,6 @@
 			boxNoInput(e){
 				this.boxNo = e.detail.value
 			},
-			numFilter (value) {
-				// 截取当前数据到小数点后两位
-				let realVal = parseFloat(value).toFixed(2)
-				return realVal
-			},
 			carInput(item,e){
 				if(item.count>item.tranCount){
 					uni.showToast({

pageA/pages/deliver_goods.vue

@@ -40,6 +40,12 @@
 							 <image class='poundimg' :src="item.poundImg" mode="aspectFit"></image>
 						</view>
 					</view>
+					<view v-if="contractType =='采购合同'&&item.poundImg " class='flex justify-between'>
+						<view class="poundtital">发货磅单</view>
+							<view class="grid col-2 grid-square bg-img" v-if="item.poundImg != ''" @tap="ViewImage" :data-url="item.poundImg">
+							 <image class='poundimg' :src="item.poundImg" mode="aspectFit"></image>
+						</view>
+					</view>
 					<view v-if="item.taskStatus==4 && contractType =='销售合同'" class="padding flex flex-direction">
 						<button class="cu-btn bg-orange margin-tb-sm" @click="commit">确认卸货</button>
 					</view>
@@ -59,7 +65,7 @@
 			boxshadow="0 0 6rpx rgba(36, 90, 141, 0.5)"
 			@btnClick="deliver"
 			/>
-			<block v-if="tradeStatus!='3' && tradeStatus!='4'">
+			<!-- <block v-if="tradeStatus!='3' && tradeStatus!='4'">
 			<drag-button
 				:isDock="true"
 				:existTabBar="true"
@@ -69,7 +75,7 @@
 				boxshadow='0 0 6rpx rgba(36, 90, 141, 0.5)'
 				@btnClick="price"
 			/>
-			</block>
+			</block> -->
 		
 		<!-- <view v-show='showPopup' class="popupItem">
 			<view class='wrap'>

pageA/pages/task.vue

@@ -475,6 +475,9 @@
 				this.boxNo = e.detail.value
 			},
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

pageA/pages/task_detail.vue

@@ -371,6 +371,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

pageA/pages/task_detail_ck.vue

@@ -13,6 +13,24 @@
 						{{userName}}
 					</view>
 				</view>
+				<view class="c-row b-b">
+					<text class="tit">车牌号</text>
+					<view class="con-list">
+						<text>{{carNo}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">箱号</text>
+					<view class="con-list">
+						<text>{{boxNo}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">封号</text>
+					<view class="con-list">
+						<text>{{titleNo}}</text>
+					</view>
+				</view>
 		<!-- 		<view class="c-row b-b">
 					<text class="tit">目的地</text>
 					<view class="con-list">
@@ -82,12 +100,6 @@
 						<input placeholder="请填写件数" name="input" v-model="memo" ></input>
 					</view>
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">车牌号</text>
-					<view class="con-list">
-						<input placeholder="请填写车牌号" name="input" v-model="carNo" ></input>
-					</view>
-				</view>
 				<view class="cu-form-group margin-top">
 					<view class="title">出库方式</view>
 					<picker @change="OutModeChange" :value="outModeeIndex" :range="outMode">
@@ -210,12 +222,14 @@
 				waterContent:'',
                 warehouse:'',
 				warehouses:[],
-				outMode: ['散装', '大袋(50kg)', '小袋(25kg)'],
+				outMode: ['散装', '袋装'],
 				outModeIndex:0,
 				price:'',
 				address:'',
 				memo:'',
-				showPopup:false
+				showPopup:false,
+				boxNo:'',
+				titleNo:''
 			};
 		},
 		computed: {
@@ -248,11 +262,12 @@
 					that.warehouses=that.carInfo.warehouse.split(',')
 				}
 				that.waterContent=that.carInfo.waterContent
-				
+				that.titleNo = that.carInfo.titleNo
 				that.companyName=that.carInfo.companyName
 				that.companyPhone=that.carInfo.companyPhone
 				that.userName=that.carInfo.userName
 				that.carNo=that.carInfo.carNo
+				that.boxNo = that.carInfo.boxNo
 				that.count=that.carInfo.count
 				that.alreadyCount=that.carInfo.alreadyCount
 				that.notCount=that.carInfo.notCount
@@ -266,6 +281,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal
@@ -427,6 +445,7 @@
 					address:!that.address?'':that.address,
 					outMode:!that.outMode1?'':that.outMode1,
 					memo:!that.memo?'':that.memo,
+					titleNo:!that.titleNo?'':that.titleNo,
 				}, failres => {
 					that.$api.msg(failres.errmsg)
 					uni.hideLoading()
@@ -493,6 +512,7 @@
 					address:!that.address?'':that.address,
 					outMode:!that.outMode1?'':that.outMode1,
 					memo:!that.memo?'':that.memo,
+					titleNo:!that.titleNo?'':that.titleNo,
 					nextUserId:item.id
 				}, failres => {
 					that.$api.msg(failres.errmsg)
@@ -514,7 +534,7 @@
 					this.$api.msg('请填写皮重');
 					return;
 				}
-				if(!that.poundImg){
+				if(this.outMode[this.outModeIndex] == "散装" && !that.poundImg){
 					this.$api.msg('请上传磅单照片');
 					return;
 				}
@@ -562,6 +582,7 @@
 					address:!that.address?'':that.address,
 					outMode:!that.outMode1?'':that.outMode1,
 					memo:!that.memo?'':that.memo,
+					titleNo:!that.titleNo?'':that.titleNo,
 					nextUserId:-1
 				}, failres => {
 					that.$api.msg(failres.errmsg)

pageA/pages/task_detail_jy.vue

@@ -199,6 +199,9 @@
 				this.boxNo = e.detail.value
 			},
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

pageA/pages/task_detail_ys.vue

@@ -159,6 +159,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

pageA/product/detail.vue

@@ -186,7 +186,7 @@
 			<view class="action-btn-group">
 				<button type="primary" class=" action-btn no-border buy-now-btn" @click="contactUs">联系我们</button>
 				<button v-if="goods.status == 1" type="primary" class=" action-btn no-border add-cart-btn" >交易结束</button>
-				<button v-else type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">立即交易</button>
+				<button v-else type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">我要买粮</button>
 			</view>
 		</view>
 	</view>
@@ -267,6 +267,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

pageA/product/detail_buy.vue

@@ -152,7 +152,7 @@
 		<view class="page-bottom">
 			<view class="action-btn-group">
 				<button type="primary" class=" action-btn no-border buy-now-btn" @click="contactUs">联系我们</button>
-				<button v-if="goods.status == 20" type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">立即交易</button>
+				<button v-if="goods.status == 20" type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">我要卖粮</button>
 				<button v-else type="primary" class=" action-btn no-border add-cart-btn" >交易结束</button>
 			</view>
 		</view>

pageA/product/list.vue

@@ -290,6 +290,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

pageA/product/trade.vue

@@ -128,11 +128,12 @@
 			<view class="title">{{unitPrice*count}}元</view>
 		</view>
 		<view v-if="companyId==2" class="cu-form-group align-start">
-			<view class="title">结算价格=点价+基差+发票+包装费</view>
+			<!-- <view class="title">结算价格=点价+基差+发票+包装费</view> -->
+			<view class="title">最终以纸质合同为准</view>
 		</view>
-		<view v-else class="cu-form-group align-start">
+		<view class="cu-form-group align-start">
 			<view class="title">备注</view>
-			<textarea maxlength="-1" :disabled="modalName!=null" @input="textareaInput" placeholder="备注"></textarea>
+			<textarea maxlength="-1" :disabled="modalName!=null" @input="textareaInput" placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包"></textarea>
 		</view>
 		<view class="padding flex flex-direction">
 			<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
@@ -169,7 +170,7 @@
 					priceTypeIndex:0,
 					bankNameIndex:0,
 					packingIndex:0,
-					packingType: ['散装', '大袋(50kg)', '小袋(25kg)'],
+					packingType: ['散装', '袋装'],
 					invoiceType: ['不开发票', '普通发票', '增值税发票'],
 					invoiceType1: ['不开发票','增值税发票'],
 					acceptType: ['第三方检验（国家检验资质）', '交收地库或港出具的检验', '现场看货','其他'],

pageA/product/trade_buy.vue

@@ -116,9 +116,10 @@
 			<view class="title">{{unitPrice*count}}元</view>
 		</view>
 		<view v-if="companyId==2" class="cu-form-group align-start">
-			<view class="title">结算价格=点价+基差+发票+卸车费</view>
+			<!-- <view class="title">结算价格=点价+基差+发票+卸车费</view> -->
+			<view class="title">最终以纸质合同为准</view>
 		</view>
-		<view v-else class="cu-form-group align-start">
+		<view  class="cu-form-group align-start">
 			<view class="title">备注</view>
 			<textarea maxlength="-1" :disabled="modalName!=null" @input="textareaInput" placeholder="备注"></textarea>
 		</view>

pageB/contract/look.vue

@@ -132,6 +132,9 @@
 			
 			methods: {
 				numFilter (value) {
+					if(!value){
+						return 0
+					}
 					// 截取当前数据到小数点后两位
 					let realVal = parseFloat(value).toFixed(2)
 					return realVal

pages/home/home.vue

@@ -59,7 +59,7 @@
 			</view>
 			</u-navbar>
 			<!-- #endif -->
-			<u-cell-group>
+			<u-cell-group v-if="isShowFlag">
 				<u-cell-item  title="粮友圈" :title-style="{marginLeft:'30rpx',fontWeight:'800'}" @tap="linkToMoment">
 					<u-icon slot="icon" name="moments" color="#409eff" size="40"></u-icon> 
 				</u-cell-item>
@@ -204,7 +204,8 @@ export default {
 				}
 			],
 			$url:'',
-			userInfo:[]
+			userInfo:[],
+			isShowFlag:false
 		}
 	},
 	watch:{
@@ -297,7 +298,19 @@ export default {
 			}else if(this.PageCur=='contract'){
 			 	this.getFriends(false)
 			}else if(this.PageCur=='find'){
-				this.querylinkItem(false)
+				const that = this
+				that.$api.request('user', 'test', failres => {
+					that.$api.msg(failres.errmsg)
+					uni.hideLoading()
+				}).then(res => {
+					console.log("res === ",res)
+					if(res.data){
+						that.isShowFlag = true
+					}
+					this.querylinkItem(false)
+					uni.hideLoading()
+				})
+				
 			}
 		},
 		linkTochat(item){
@@ -444,6 +457,7 @@ export default {
 			});
 		},
 		linkToMoment(){
+			
 			this.$u.route({
 				url:'pageC/firendCircle/firendCircle'
 			})

pages/tran/my_car_detail.vue

@@ -447,6 +447,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

pages/tran/tran.vue

@@ -147,6 +147,9 @@
 			},
 			methods: {
 				numFilter (value) {
+					if(!value){
+						return 0
+					}
 					// 截取当前数据到小数点后两位
 					let realVal = parseFloat(value).toFixed(2)
 					return realVal

pages/tran/tran_detail.vue

@@ -317,6 +317,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

pages/user/task.vue

@@ -9,57 +9,35 @@
 				 @touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd" :data-target="'move-box-' + index"
 			>
 			<view class='wrap' >
-				<view   class="flex justify-between padding-xs">
-				  <view class=" padding-xs">
-					  <view v-if="item.taskStatus == 1" class="cu-capsule radius">
-					  	<view class="cu-tag bg-green">
-					  		{{item.taskType}}
-					  	</view>
-					  	<view class="cu-tag line-green">
-					  		{{item.gmtUpdate}}
-					  	</view>
-					  </view>
-					  <view  v-else class="cu-capsule radius">
-					  	<view class="cu-tag bg-gray">
-					  		{{item.taskType}}
-					  	</view>
-					  	<view class="cu-tag line-gray">
-					  		{{item.gmtUpdate}}
-					  	</view>
-					  </view>
-				  </view>
-				  <view class=" padding-xs">
-						<view v-if="item.taskStatus == 1" class="cu-tag line-green">
-							未完成
+				<view  style='align-items: center;' class="flex justify-between padding">
+					<view class=" padding-xs">
+						<view class="radius">
+							<view v-if="item.taskStatus != 1 " class="text-gray">
+								<view style='font-weight: 600;font-size: 16px;margin-bottom: 5px;'>{{item.taskType}}<text v-if='item.carNo'>({{item.carNo}})</text></view>
+							</view>
+							<view v-else-if="item.taskType == '出库任务'" class="text-red">
+								<view style='font-weight: 600;font-size: 16px;margin-bottom: 5px;'>{{item.taskType}}<text v-if='item.carNo'>({{item.carNo}})</text></view>
+							</view>
+							<view v-else-if="item.taskType == '入库任务'" class="text-green">
+								<view style='font-weight: 600;font-size: 16px;margin-bottom: 5px;'>{{item.taskType}}<text v-if='item.carNo'>({{item.carNo}})</text></view>
+							</view>
+							<view v-else>
+								<view style='font-weight: 600;font-size: 16px;margin-bottom: 5px;'>{{item.taskType}}<text v-if='item.carNo'>({{item.carNo}})</text></view>
+							</view>
+							<view style='color:#ccc;'>{{item.customer}}</view>
+							<view style='color:#ccc;'>{{item.gmtUpdate}}</view>
 						</view>
-						<view  v-if="item.taskStatus == 2" class="cu-tag line-gray">
-							已完成
-						</view>
-						<view  v-if="item.taskStatus == 3" class="cu-tag line-red">
-							已改派
-						</view>
-				  </view>
-				</view>
-				<view v-if="item.carNo" class="flex justify-between padding-xs ">
-				  <view class=" padding-xs">
-					  <view v-if="item.taskStatus == 1" class="cu-capsule radius">
-					  	<view class="cu-tag bg-orange">
-					  		{{item.carNo}}
-					  	</view>
-					  </view>
-					  <view  v-else-if="item.carNo" class="cu-capsule radius">
-					  	<view class="cu-tag bg-gray">
-					  		{{item.carNo}}
-					  	</view>
-					  </view>
-				  </view>
-				  <view v-if="item.carStatus &&item.companyId !=2" class=" padding-xs">	
-					  <view  class="cu-tag line-green">
-						{{item.carStatus}}
-					  </view>
-				  </view>
+					</view>
+					<view v-if="item.taskStatus == 1" class="tag-green line-green">
+						执行中
+					</view>
+					<view  v-if="item.taskStatus == 2" class="tag-gray line-gray">
+						已完成
+					</view>
+					<view  v-if="item.taskStatus == 3" class="tag-red line-red">
+						已改派
+					</view>
 				</view>
-				
 			</view>
 			<view v-if="item.companyId != 2" class="move" v-show='item.show==true' @click.stop="hided(item,$event)">
 				<view class="bg-red">删除</view>
@@ -1041,6 +1019,25 @@
 	.wrap{
 		width:100%;
 	}
+	.tag-green{
+		border: 1px solid #39b54a;
+		padding: 4px 13px;
+		border-radius: 5px;
+		height:30px;
+	}
+	.tag-gray{
+		border: 1px solid #aaaaaa;
+		padding: 4px 13px;
+		border-radius: 5px;
+		height:30px;
+	}
+	.tag-red{
+		border: 1px solid #e54d42;
+		padding: 4px 13px;
+		border-radius: 5px;
+		height:30px;
+	}
+	
 	.cu-list>.cu-item .move{
 		width: 110px;
 	}

pages/user/task_arrive.vue

@@ -257,6 +257,9 @@
 				this.boxNo = e.detail.value
 			},
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

pages/user/task_detail_buy.vue

@@ -484,6 +484,9 @@
 				}
 			},
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

pages/user/task_detail_hy.vue

@@ -318,6 +318,9 @@
 				this.boxNo = e.detail.value
 			},
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

pages/user/task_detail_hyrk.vue

@@ -190,6 +190,9 @@
 				this.inOtherFee = e.detail.value
 			},
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

pages/user/task_detail_kn.vue

@@ -162,7 +162,14 @@
 		},
 		
 		methods: {
-			
+			numFilter (value) {
+				if(!value){
+					return 0
+				}
+				// 截取当前数据到小数点后两位
+				let realVal = parseFloat(value).toFixed(2)
+				return realVal
+			},
 			hideModal(e) {
 				this.modalName = null
 			},

pages/user/task_detail_wai.vue

@@ -239,6 +239,9 @@
 		},
 		methods: {
 			numFilter (value) {
+				if(!value){
+					return 0
+				}
 				// 截取当前数据到小数点后两位
 				let realVal = parseFloat(value).toFixed(2)
 				return realVal

pages/user/task_detail_zx.vue

@@ -222,6 +222,14 @@
 		},
 		
 		methods: {
+			numFilter (value) {
+				if(!value){
+					return 0
+				}
+				// 截取当前数据到小数点后两位
+				let realVal = parseFloat(value).toFixed(2)
+				return realVal
+			},
 			ChooseImageBox() {
 				var that = this
 				uni.chooseImage({