訂單

App.vue

@@ -39,7 +39,7 @@
 			    })
 			uni.onTabBarMidButtonTap(()=>{
 				uni.navigateTo({
-					url: '/pages/card/card'
+					url: '/pages/release/release'
 			    });
 			})
 			// #ifdef APP-PLUS

common/helper.js

@@ -14,7 +14,7 @@ const imgTypeList = [{
 		name: '拍照',
 	}
 ]
-const makeValidityPeriod = function(type,endyear) {
+const makeValidityPeriod = function(type) {
 	//获取当前年
 	let nowDate = new Date();
 	let year = nowDate.getFullYear()
@@ -27,7 +27,7 @@ const makeValidityPeriod = function(type,endyear) {
 		"31"
 	]
 	let _ValidityPeriod = []
-	for (let i = 0; i < endyear; i++) {
+	for (let i = 0; i < 30; i++) {
 		_list1.push(year + i)
 	}
 	if (type == 0) {
@@ -98,7 +98,79 @@ const contactCustomerService = (item) => {
 	uni.makePhoneCall({
 		phoneNumber: '114' //仅为示例
 	});
-
+}
+//获取省份简称
+const getProvinceAbbreviation = (province) => {
+	console.log(province)
+	    if(province == "北京市"||province == "北京")
+	        return "京";
+	    else if(province == "天津市"||province == "天津")
+	        return "津";
+	    else if(province == "重庆市"||province == "重庆")
+	        return "渝";
+	    else if(province == "上海市"||province == "上海")
+	        return "沪";
+	    else if(province == "河北省"||province == "河北")
+	        return "冀";
+	    else if(province == "山西省"||province == "山西")
+	        return "晋";
+	    else if(province == "辽宁省"||province == "辽宁")
+	        return "辽";
+	    else if(province == "吉林省"||province == "吉林")
+	        return "吉";
+	    else if(province == "黑龙江省"||province == "黑龙江")
+	        return "黑";
+	    else if(province == "江苏省"||province == "江苏")
+	        return "苏";
+	    else if(province == "浙江省"||province == "浙江")
+	        return "浙";
+	    else if(province == "安徽省"||province == "安徽")
+	        return "皖";
+	    else if(province == "福建省"||province == "福建")
+	        return "闽";
+	    else if(province == "江西省"||province == "江西")
+	        return "赣";
+	    else if(province == "山东省"||province == "山东")
+	        return "鲁";
+	    else if(province == "河南省"||province == "河南")
+	        return "豫";
+	    else if(province == "湖北省"||province == "湖北")
+	        return "鄂";
+	    else if(province == "湖南省"||province == "湖南")
+	        return "湘";
+	    else if(province == "广东省"||province == "广东")
+	        return "粤";
+	    else if(province == "海南省"||province == "海南")
+	        return "琼";
+	    else if(province == "四川省"||province == "四川")
+	        return "川";
+	    else if(province == "贵州省"||province == "贵州")
+	        return "贵";
+	    else if(province == "云南省"||province == "云南")
+	        return "云";
+	    else if(province == "陕西省"||province == "陕西")
+	        return "陕";
+	    else if(province == "甘肃省"||province == "甘肃")
+	        return "甘";
+	    else if(province == "青海省"||province == "青海")
+	        return "青";
+	    else if(province == "台湾省"||province == "台湾")
+	        return "台";
+	    else if(province == "内蒙古自治区"||province == "内蒙古")
+	        return "蒙";
+	    else if(province == "广西壮族自治区"||province == "广西")
+	        return "桂";
+	    else if(province == "宁夏回族自治区"||province == "宁夏")
+	        return "宁";
+	    else if(province == "新疆维吾尔自治区"||province == "新疆")
+	        return "新";
+	    else if(province == "西藏自治区"||province == "西藏")
+	        return "藏";
+	    else if(province == "香港特别行政区"||province == "香港")
+	        return "港";
+	    else if(province == "澳门特别行政区"||province == "澳门")
+	        return "澳";
+	
 }
 export default {
 	getListByUserId,
@@ -108,5 +180,6 @@ export default {
 	chooseImage,
 	imgType,
 	imgTypeList,
-	makeValidityPeriod
+	makeValidityPeriod,
+	getProvinceAbbreviation
 }

config/index.js

@@ -1,5 +1,5 @@
 const dev = {
-	baseUrlNew: 'http://192.168.1.121:8090',
+	baseUrlNew: 'http://192.168.0.17:8090',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages.json

@@ -6,13 +6,14 @@
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"list": [{
-				"pagePath": "pages/goodSource/index",
+				"pagePath": "pages/order/index",
 				"iconPath": "static/mine/huoyuan.png",
 				"selectedIconPath": "static/mine/huoyuan_check.png",
 				"text": "订单"
 			},
 			{
-				"pagePath": "pages/order/index",
+				"pagePath": "pages/goodSource/index",
+
 				"iconPath": "static/mine/zhaoche.png",
 				"selectedIconPath": "static/mine/zhaoche_check.png",
 				"text": "找车"
@@ -37,24 +38,23 @@
 			}
 		],
 		"midButton": {
-					"width": "63px",
-					"height": "63px",
-					"iconPath": "static/mine/fabu.png",
-					"iconWidth": "55px"
-					// "backgroundImage":"static/images/tabbar/plus.png"
-				}
+			"width": "63px",
+			"height": "63px",
+			"iconPath": "static/mine/fabu.png",
+			"iconWidth": "55px"
+			// "backgroundImage":"static/images/tabbar/plus.png"
+		}
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/goodSource/index",
 			"style": {
-				"navigationBarTitleText": "粮运天下"
+				"navigationBarTitleText": "开发中"
 			}
 		}, {
 			"path": "pages/order/index",
 			"style": {
-				"navigationBarTitleText": "订单",
-				"enablePullDownRefresh": false
+				  "navigationStyle": "custom"
 			}
 
 		}
@@ -80,12 +80,11 @@
 			}
 		},
 		{
-		    "path" : "pages/public/loginOther",
-		    "style" :                                                                                    
-		    {
-		      "navigationStyle": "custom"
-		    }
-		    
+			"path": "pages/public/loginOther",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
 		},
 		{
 			"path": "pages/public/register",
@@ -104,8 +103,8 @@
 		}, {
 			"path": "pages/order/orderDetails",
 			"style": {
-				"navigationBarTitleText": "订单详情",
-				"enablePullDownRefresh": false
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
 			}
 
 		}, {
@@ -123,7 +122,7 @@
 			}
 
 		}, {
-		 "path": "pages/mine/driverCertificationNext",
+			"path": "pages/mine/driverCertificationNext",
 			"style": {
 				"navigationBarTitleText": "司机认证",
 				"enablePullDownRefresh": false
@@ -143,15 +142,15 @@
 				"navigationBarTitleText": "我的公司",
 				"enablePullDownRefresh": false
 			}
-		
+
 		},
 		{
 			"path": "pages/mine/company/addcompany",
 			"style": {
 				"navigationStyle": "custom"
 			}
-		
-		},{
+
+		}, {
 			"path": "pages/mine/manageVehicles/index",
 			"style": {
 				"navigationBarTitleText": "管理车辆",
@@ -208,135 +207,120 @@
 				"backgroundColor": "#000000"
 			}
 
-		}
-	    ,{
-            "path" : "pages/mine/agency/agency",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/mine/cargoowner/cargoowner",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "货主认证",
-                "enablePullDownRefresh": false
-            }
-            
-        },
+		}, {
+			"path": "pages/mine/agency/agency",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/mine/cargoowner/cargoowner",
+			"style": {
+				"navigationBarTitleText": "货主认证",
+				"enablePullDownRefresh": false
+			}
+
+		},
 		{
-		    "path" : "pages/mine/cargoowner/addEnerprise",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "企业认证",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/mine/cargoowner/editpersonalinformation",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "身份认证",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		,{
-            "path" : "pages/mine/settings/editAvatar",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "修改头像",
-                "enablePullDownRefresh": false
-            }
-            
-        },
+			"path": "pages/mine/cargoowner/addEnerprise",
+			"style": {
+				"navigationBarTitleText": "企业认证",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/mine/cargoowner/editpersonalinformation",
+			"style": {
+				"navigationBarTitleText": "身份认证",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/mine/settings/editAvatar",
+			"style": {
+				"navigationBarTitleText": "修改头像",
+				"enablePullDownRefresh": false
+			}
+
+		},
 		{
-		    "path" : "pages/mine/settings/editPhone",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "修改账号",
-		        "enablePullDownRefresh": false
-		    }
-		    
+			"path": "pages/mine/settings/editPhone",
+			"style": {
+				"navigationBarTitleText": "修改账号",
+				"enablePullDownRefresh": false
+			}
+
 		},
 		{
-		    "path" : "pages/mine/settings/editPassword",
-		    "style" :                                                                                    
-		    {
-		        "navigationStyle": "custom"
-		    }
-		    
+			"path": "pages/mine/settings/editPassword",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/mine/settings/feedback",
+			"style": {
+				"navigationBarTitleText": "意见反馈",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/mine/company/addcompanytwo",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/mine/company/addcompanythree",
+			"style": {
+				"navigationBarTitleText": "视频认证",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/mine/company/companyvideo",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/mine/company/editcompany",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/mine/company/editcompanytwo",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/mine/company/editcompanythree",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/mine/company/editcompanyvideo",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/mine/cargoowner/selectcompany",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
 		}
-        ,{
-            "path" : "pages/mine/settings/feedback",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "意见反馈",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/mine/company/addcompanytwo",                                                                                  
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/mine/company/addcompanythree",
-            "style" :
-            {
-                "navigationBarTitleText": "视频认证",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/mine/company/companyvideo",
+	    ,{
+            "path" : "pages/release/release",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/mine/company/editcompany",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/mine/company/editcompanytwo",
-            "style" :{
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/mine/company/editcompanythree",
-            "style" :{
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/mine/company/editcompanyvideo",
-            "style" :{
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/mine/cargoowner/selectcompany",
-            "style" :                                                                                    {
-                "navigationStyle": "custom"
+               "navigationStyle": "custom"
             }
             
         }

pages/goodSource/index.vue

@@ -1,26 +1,7 @@
 <!-- 货源 -->
 <template>
 	<view class="content">
-		<view class="head flex flex-space-evenly">
-			<view class="flex">
-				<view>装</view>
-				<view @click="changeCity(0)">营口</view>
-				<view>></view>
-			</view>
-			<view>-------></view>
-			<view class="flex">
-				<view>卸</view>
-				<view @click="changeCity(1)">全国</view>
-				<view>></view>
-			</view>
-		</view>
-		<me-tabs v-model="tabIndex" :tabs="tabs" class="m-topr20"></me-tabs>
-		<swiper :style="{height: height}" :current="tabIndex" @change="swiperChange">
-			<swiper-item v-for="(tab,i) in tabs" :key="i">
-				<mescroll-item ref="mescrollItem" :i="i" :index="tabIndex" :tabs="tabs" :height="height">
-				</mescroll-item>
-			</swiper-item>
-		</swiper>
+
 	</view>
 </template>
 

pages/order/index.vue

@@ -1,72 +1,661 @@
 <!-- 货源 -->
 <template>
 	<view class="content">
-		<view class="head flex">
-			<u-search placeholder="日照香炉生紫烟" v-model="keyword"></u-search>
+		<view class="fixed1"></view>
+		<view v-if="!isSearch">
+			<view class="fixed">
+				<view class='title flex flex-center'>
+					<view>订单</view>
+					<u-icon class="search" name="search" color="" size="28" @click="search"></u-icon>
+				</view>
+				<u-tabs :list="tabList" @click="clickTab" lineColor='#2772FB' :current='tabIndex' :activeStyle="{
+								color: '#2772FB',
+								fontWeight: 'bold',
+								transform: 'scale(1.05)'
+							}"></u-tabs>
+			</view>
+			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+				class="mescroll">
+				<view :id="'good'+good.id" class="good-list" v-for="good in goods" :key="good.id"
+					@click="toDetail(good.id)">
+					<view style="padding: 0 35rpx 20rpx 35rpx;">
+						<view class="flex flex-space-between row1">
+							<view class="item1">
+								{{good.orderNo}} {{good.goodsName}}
+							</view>
+							<view class="item2">
+								{{good.orderStatus}}
+							</view>
+						</view>
+						<view class="flex row2">
+							<view class="left flex flex-space-between">
+								<view class="ssx">{{$helper.getProvinceAbbreviation(good.sendPrivate)}}</view>
+								<view class="level2-title">{{good.sendCity}} {{good.sendArea}}</view>
+								<view>
+									<image class="jt-icon" src="@/static/images/goodSource/jt.png" mode='widthFix'>
+									</image>
+								</view>
+								<view class="ssx">
+									{{$helper.getProvinceAbbreviation(good.unloadPrivate)}}
+								</view>
+								<view class="level2-title">{{good.unloadCity}} {{good.unloadArea}}</view>
+							</view>
+						</view>
+						<view class="flex row3">
+							<view class="left">
+								<image class="hz" src="@/static/images/news/sj.png"></image>
+							</view>
+							<view class="right">
+								<view class="flex fontsize-26 row">
+									<view>{{good.compName}}</view>
+									<view class="sline"></view>
+									<view>{{good.cargoOwner}}</view>
+								</view>
+								<view class="flex align-center">
+									<view class="fontsize-26 ">运距 {{good.distance}}km</view>
+								</view>
+							</view>
+						</view>
+						<view class="row4 flex flex-end align-center">
+							<view class="time">{{good.updateDate}}</view>
+							<view class="car">{{good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}</view>
+						</view>
+						<view class="row5 flex flex-end">
+							<view class="stop active" @click.stop="accept(good,1)" v-if="good.orderStatus=='待接单'">接受</view>
+							<!-- <view class="stop active" @click.stop="accept(good,1)">接受</view> -->
+							<view class="stop active" @click.stop="accept(good,2)" v-if="good.orderStatus=='待接单'">拒绝</view>
+							<view class="stop active" @click.stop="stop(good)" v-if="good.orderStatus=='未装车'">终止</view>
+							<!-- <view class="stop active" @click.stop="stop(good)">终止</view> -->
+							<view class="start normal" @click.stop="confirmLoading(good,1)" v-if="good.orderStatus=='待确认装车'">确认装车</view>
+							<!-- <view class="start normal" @click.stop="confirmLoading(good,1)">确认装车</view> -->
+							<view class="start normal" v-if="good.orderStatus!='待接单'&&good.orderStatus!='未装车'">联系客服</view>
+							<view class="start normal" @click.stop="confirmLoading(good,2)" v-if="good.orderStatus=='待收货'">确认卸车</view>
+							<!-- <view class="start normal" @click.stop="confirmLoading(good,2)">确认卸车</view> -->
+					<view class="stop active" @click.stop="stop(good)" v-if="good.orderStatus=='已结算'">付款</view>
+					<view class="stop active" @click.stop="stop(good)" v-if="good.orderStatus=='待还款'||good.orderStatus=='已还款'">还款</view>
+					
+							<!-- <view class="start normal" @click.stop="closed(good)" v-if="good.orderStatus=='结算中'">完结</view> -->
+						</view>
+					</view>
+				</view>
+			</mescroll-body>
 		</view>
-		<me-tabs v-model="tabIndex" :tabs="tabs" class="m-topr20"></me-tabs>
-		<swiper :style="{height: height}" :current="tabIndex" @change="swiperChange">
-			<swiper-item v-for="(tab,i) in tabs" :key="i">
-				<mescroll-item ref="mescrollItem" :i="i" :index="tabIndex" :tabs="tabs" :height="height">
-				</mescroll-item>
-			</swiper-item>
-		</swiper>
+		<view v-else class="search-view">
+			<view class="flex">
+				<u-icon name="arrow-left" color="" size="20" class="back-icon" @click="back()"></u-icon>
+				<u-search placeholder="可按编号、货主、收发地查找" placeholderColor="#AFB3BF" :actionStyle="textColor"
+					bgColor="#F5F6FA" v-model="searchKeyWord" actionText='取消' @custom="cancel" @search="getSearch">
+				</u-search>
+			</view>
+			<view class="near-search">
+				<view class="flex flex-space-between">
+					<view class="near-search-text">最近搜索</view>
+					<u-icon name="trash-fill" color="#AFB3BF" size="20" class="back-icon" @click="del"></u-icon>
+				</view>
+				<view class="">
+					<view v-for="(item,index) in useSearchList" :key="index" class="item-style inline-block">
+						{{item}}
+					</view>
+				</view>
+
+			</view>
+		</view>
+		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
+			:closeOnClickOverlay='true' :showCancelButton='true' @confirm="confirmClick" @close="cancelClick"
+			@cancel="cancelClick" class="modal">
+			<u-radio-group v-model="radiovalue1" placement="" v-if='isShowTerminationReason' class='row'>
+				<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
+					:label="item.name" :name="item.name" @change="radioChange">
+				</u-radio>
+			</u-radio-group>
+			<u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
+				v-if='isShowTerminationReason'>
+			</u--textarea>
+		</u-modal>
+
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
 <script>
-	import MescrollItem from "./mescroll-swiper-item.vue";
+	var that
+	import {
+		mapState
+	} from 'vuex';
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	import {
+		apiGoods
+	} from "@/api/mock.js"
 	export default {
-		components: {
-			MescrollItem
-		},
+		mixins: [MescrollMixin], // 使用mixin
 		data() {
 			return {
-				keyword:'',
+				// isShowStopBtn: false,
+				// isConfirmLoadingBtn:false,
+				// isShowCustomerServiceBtn:false,
+				// isConfirmUnLoadingBtn:false,
+				// isClosedBtn:false,
+				searchKeyWord: '',
+				useSearchList: [],
+				mescroll: null,
+				isShowTerminationReason: false,
+				id: '',
+				value2: '',
+				radiolist1: [{
+						name: '已与货主协商',
+						disabled: false
+					},
+					{
+						name: '货主原因终止',
+						disabled: false
+					},
+					{
+						name: '司机个人原因终止',
+						disabled: false
+					}, {
+						name: '其他',
+						disabled: false
+					}
+				],
+				radiovalue1: '已与货主协商',
+				confirmText: '终止',
+				alertTitle: '确定终止订单？',
+				alertContent: "",
+				isShowAlert: false,
+				textColor: {
+					"color": "#AFB3BF"
+				},
+				isSearch: false,
+				startPlace: '齐齐哈尔齐齐哈尔',
+				endPlace: '全国',
+				goods: [], // 数据列表
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
 				height: "", // 需要固定swiper的高度
-				tabs: [{
-					name: '全部'
-				}, {
-					name: '未发运'
-				}, {
-					name: '运输中'
-				}, {
-					name: '代收货'
-				},
-				{
-					name: '评价'
-				},
-				{
-					name: '待结算'
-				},
-				{
-					name: '已完结'
-				},
-				
-				
+				tabList: [{
+						name: '全部'
+					}, {
+						name: '待接单'
+					}, {
+						name: '未发运'
+					}, {
+						name: '运输中'
+					}, {
+						name: '待收货'
+					},
+					{
+						name: '待结算'
+					},
+					{
+						name: '已结算'
+					},
+					{
+						name: '待还款'
+					},
+					{
+						name: '已还款'
+					},
+					{
+						name: '已完结'
+					},
+					// {
+					// 	name: '评价'
+					// },
+					
 				],
-				tabIndex: 0 // 当前tab的下标
-
+				tabIndex: 0,
+				scrollTop: 0
 			}
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
+		},
+		onTabItemTap(e) {
+			// tab 点击时执行，此处直接接收单击事件
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 300
+			});
+		},
+		created() {
+			//#ifdef APP-PLUS
+			// this.getLngLat();
+			//#endif
+		},
 		onLoad() {
-			let _isHave = this.$utils.getRoles('aaa')
-			console.log(_isHave)
-			// 需要固定swiper的高度 (需减去悬浮tabs的高度64rpx)
-			this.height = uni.getSystemInfoSync().windowHeight - uni.upx2px(64) + 'px'
+			// let _isHave = this.$utils.getRoles('aaa')
+			// console.log(_isHave)
+			that = this
+		},
+		onShow() {
+			this.upCallback({
+				size: 10,
+				num: 1
+			})
 		},
+		// onPageScroll(res) {
+		// 	this.scrollTop = res.scrollTop
+		// 	console.log("页面滚动了", res.scrollTop)
+		// 	if (this.scrollTop > 1200) {
+		// 		uni.setTabBarItem({
+		// 			index: 1,
+		// 			text: '返回顶部',
+		// 			iconPath: 'static/images/common/top@2x.png',
+		// 			selectedIconPath: 'static/images/common/top@2x.png'
+		// 		})
+		// 	} else {
+		// 		uni.setTabBarItem({
+		// 			index: 1,
+		// 			text: '订单',
+		// 			iconPath: 'static/images/common/dingdan@2x(1).png',
+		// 			selectedIconPath: 'static/images/common/dingdan@2x.png'
+		// 		})
+		// 	}
+
+		// },
 		methods: {
-			changeCity(type) {
-				console.log(type)
+			accept(item,type){
+				this.$request.baseRequest('post', '/orderInfo/api/orderReceiving', {
+						id: item.id,
+						flag:type
+					}).then(res => {debugger
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "提交成功",
+								complete() {
+									that.upCallback({
+										size: 10,
+										num: 1
+									})
+								}
+							})
+				
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			// 完结
+			closed(item) {
+				let that = this
+				this.$request.baseRequest('post', '/orderInfo/api/editEnd', {
+						id: item.id,
+					}).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "提交成功",
+								complete() {
+									that.upCallback({
+										size: 10,
+										num: 1
+									})
+								}
+							})
+
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			confirmLoading(item,type) {
+				this.$request.baseRequest('post', '//carrierInfo/cargoOwnerLoadingAdd', {
+						id: item.id,
+						loadingFlag:type,
+						flag:1
+					}).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "提交成功",
+								complete() {
+									that.upCallback({
+										size: 10,
+										num: 1
+									})
+								}
+							})
+				
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+				// uni.$u.route('/pages/order/confirmLoading', item);
+			},
+			// confirmUnLoading(item) {
+			// 	uni.$u.route('/pages/order/confirmUnloading', item);
+			// },
+			back() {
+				uni.navigateBack(-1)
+			},
+			mescrollInit(mescroll) {
+				this.mescroll = mescroll;
+			},
+			radioChange(n) {
+				console.log('radioChange', n);
+
+			},
+			stop(item) {
+				// // 货主接单
+				// if (item.orderStatusKey == 1) {
+				// 	this.isShowTerminationReason = false
+				// } else {
+				// 	this.isShowTerminationReason = true
+				// }
+				this.id = item.id
+				this.isShowAlert = true
+			},
+			init() {
+
 			},
-			swiperChange(e) {
-				this.tabIndex = e.detail.current
+			del() {
+				this.isShowAlert = true
+			},
+			confirmClick() {
+				console.log('终止')
+		
+				this.$request.baseRequest('post', '/orderInfo/api/end', {
+						id: this.id,
+						terminator: 2,
+					}).then(res => {
+						console.log(res)
+						this.isShowAlert = false
+						this.mescroll.resetUpScroll()
+
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			},
+			getSearch(e) {
+				// = uni.getStorageSync('useSearchList')
+
+				this.useSearchList.unshift(e)
+				uni.setStorageSync("useSearchList", this.useSearchList)
+				console.log("点击搜索", e)
+				this.upCallback({
+					size: 10,
+					num: 1
+				})
+			},
+			cancel() {
+				this.isSearch = false
+			},
+			toDetail(id) {
+				uni.$u.route('/pages/order/orderDetails', {
+					id: id,
+				});
+			},
+			upCallback(page) {
+
+				this.$request.baseRequest('get', '/orderInfo/selectCargoOwnerOrder', {
+						cargoCommonId: this.userInfo.id,
+						searchKeyWord: this.searchKeyWord,
+						searchType: this.searchType,
+						pageSize: page.size,
+						currentPage: page.num
+					}).then(res => {
+						this.isSearch = false
+						if (page.num == 1) this.goods = []; //如果是第一页需手动制空列表
+						this.goods = this.goods.concat(res.data.records); //追加新数据
+						this.mescroll.endBySize(res.data.records.length, res.data.total);
+						
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			clickTab(val) {
+				console.log(val)
+				this.searchType = val.index
+				this.upCallback({
+					size: 10,
+					num: 1
+				})
+			},
+			search() {
+				this.isSearch = true
+				//获取缓存搜索数据
+				this.useSearchList = uni.getStorageSync('useSearchList')
+				if (!this.useSearchList) this.useSearchList = [];
 			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
+	.banner {
+		width: 100%;
+		position: relative;
+	}
+
+	.fixed,
+	.fixed1 {
+		background: white;
+		position: fixed;
+		top: var(--status-bar-height);
+		z-index: 999;
+		width: 100%;
+	}
+
+	.fixed {
+		.title {
+			background: white;
+			position: relative;
+			font-size: 36rpx;
+			font-weight: 500;
+			color: rgba(0, 0, 0, 0.85);
 
+			.search {
+				position: absolute;
+				right: 20rpx;
+			}
+		}
+	}
+
+	.fixed1 {
+		top: 0;
+		height: var(--status-bar-height);
+		background: white;
+	}
+
+	.banner-img {
+		width: 100%;
+	}
+
+	.head {
+		position: absolute;
+		width: calc(100% - 108rpx);
+		bottom: 0;
+		background: white;
+		margin: 0 20rpx;
+		border-radius: 20rpx;
+
+		.item1,
+		.item3 {
+			width: 40%;
+
+			.text {
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
+			}
+
+		}
+
+		.item1 .text {
+			text-align: left;
+		}
+
+		.item3 .text {
+			text-align: right;
+		}
+	}
+
+	.change-btn {
+		width: 86rpx;
+		height: 86rpx;
+	}
+
+	.good-list {
+		background-color: white;
+		margin: 20rpx;
+		padding: 20rpx 0rpx 0 0;
+		border-radius: 20rpx;
+
+		.row1 {
+			font-size: 26rpx;
+
+			.item1 {
+
+				color: #333333;
+			}
+
+			.item2 {
+				color: #FE6300;
+			}
+		}
+
+		.row2 {
+			margin: 30rpx 0;
+		}
+
+		.row3 {
+			background: #F5F6FA;
+			padding: 20rpx;
+			border-radius: 10rpx;
+			color: #333333;
+
+			.hz {
+				width: 74rpx;
+				height: 74rpx;
+				margin-right: 30rpx;
+			}
+		}
+
+		.row4 {
+			margin: 20rpx 0;
+
+			.time {
+				font-size: 26rpx;
+				color: #999999;
+				margin-right: 20rpx;
+			}
+
+			.car {
+				font-size: 28rpx;
+				color: #000000;
+			}
+		}
+
+		.row5 {
+			margin: 20rpx 0;
+			font-size: 28rpx;
+
+			.stop {
+				border-radius: 33px;
+				border: 1px solid #FE6300;
+				padding: 13rpx 31rpx;
+				margin-right: 20rpx;
+				color: #FE6300;
+			}
+
+			.normal {
+				border: 1px solid #CDCDCD;
+				border-radius: 33px;
+				padding: 13rpx 31rpx;
+			}
+		}
+	}
+
+	.jt-icon {
+		position: relative;
+		top: 6rpx;
+		width: 60rpx;
+		margin: 0 20rpx;
+
+	}
+
+	.row {
+		margin: 10rpx 0;
+		align-items: center;
+	}
+
+	// .item-bottom {
+	// 	background: #F0F5FF;
+	// 	padding: 0 30rpx;
+
+	// 	.name {
+	// 		font-size: 26rpx;
+	// 		font-weight: 700;
+	// 		color: #000000;
+	// 		margin-left: 30rpx;
+	// 	}
+
+	// 	.hp {
+	// 		margin: 30rpx;
+	// 	}
+
+	// 	.number-color {
+	// 		margin: 0 10rpx;
+	// 	}
+
+	// 	.qd {
+	// 		background: linear-gradient(97deg, #4FABFD 0%, #2772FB 100%);
+	// 		border-radius: 13px;
+	// 		font-size: 29rpx;
+	// 		font-weight: 400;
+	// 		color: #FFFFFF;
+	// 		padding: 10rpx 35rpx;
+	// 	}
+	// }
+
+	.dw {
+		align-items: center;
+	}
+
+	.mescroll {
+		margin-top: calc(var(--status-bar-height) + 140rpx);
+	}
+
+	.sline {
+		height: 28rpx;
+		width: 1px;
+		background: black;
+		margin: 0 20rpx;
+	}
+
+	.search-view {
+		margin-top: var(--status-bar-height);
+		background: white;
+		padding: 0 20rpx;
+	}
+
+	.back-icon {
+		margin-right: 20rpx;
+	}
+
+	.near-search-text {
+		margin: 20rpx 0;
+	}
+
+	.item-style {
+
+		background: #F5F6FA;
+		padding: 11rpx 24rpx;
+		margin-right: 20rpx;
+		border-radius: 10px;
+		font-size: 26rpx;
+		color: #333333;
+	}
+
+	/deep/.u-modal__content {
+		flex-direction: column;
+	}
 </style>

pages/order/orderDetails.vue

@@ -1,9 +1,51 @@
 <!-- 订单详情-->
 <template>
 	<view class="content">
-		<u-divider text="基本信息"></u-divider>
+		<view class="fixed1"></view>
+		<view class="fixed">
+			<view class='title flex flex-center'>
+				<u-icon class="back" name="arrow-left" color="" size="20" @click="back"></u-icon>
+				<view class="nav-title">订单详情</view>
+				<u-icon class="search" name="server-fill" color="" size="28" @click="$helper.contactCustomerService"></u-icon>
+			</view>
+		</view>
 		<view class="content1">
-			<view class='row-between'>
+			<view class="item1">
+				<view class="status">{{dataObj.orderStatus}}</view>
+
+			</view>
+			<!-- flex flex-space-between -->
+			<view class="item2">
+				<u-button class="btn" text="驳回" @click="stop"  v-if="dataObj.orderStatus=='待接单'"></u-button>
+				<u-button class="btn" text="接受" @click="stop"  v-if="dataObj.orderStatus=='待接单'"></u-button>
+				<u-button class="btn" text="终止" @click="stop"  v-if="dataObj.orderStatus=='未装车'"></u-button>
+				<u-button class="btn" text="签订合同" @click="stop"  v-if="dataObj.orderStatus=='待确认装车'"></u-button>
+				<u-button class="btn" text="驳回装车信息" @click="stop"  v-if="dataObj.orderStatus=='待确认装车'"></u-button>
+				<u-button class="btn" text="确认装车" @click="confirmLoading" v-if="dataObj.orderStatus=='待确认装车'"></u-button>
+				<u-button class="btn" text="驳回卸车信息" @click="stop"  v-if="dataObj.orderStatus=='待收货'"></u-button>
+				<u-button class="btn" text="确认卸车" @click="confirmUnLoading" v-if="dataObj.orderStatus=='待收货'"></u-button>
+				<u-button class="btn" text="付款" @click="closed" v-if="dataObj.orderStatus=='待结算'||dataObj.orderStatus=='已结算'"></u-button>
+				<u-button class="btn" text="还款" @click="stop"  v-if="dataObj.orderStatus=='待还款'"></u-button>
+			</view>
+			<view class="item3 flex flex-space-between align-center">
+				<view class="left flex align-center">
+					<u--image :showLoading="true" :src="src" width="44px" height="44px" @click="" shape='circle'>
+					</u--image>
+					<view class="name">{{dataObj.cargoOwner}}</view>
+					<view class="flex align-center">
+						<!-- <view class="number">4.98</view> -->
+						<!-- <u-icon class="star" name="star-fill" color="#FEC823" size="20" @click="back"></u-icon> -->
+					</view>
+				</view>
+				<view class="right flex s-row align-center phone">
+					<view class="bgc">
+						<u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="toPhone"></u-icon>
+					</view>
+
+					<view class="hz-name">联系司机</view>
+				</view>
+			</view>
+			<!-- <view class='row-between'>
 				<view class="">货主</view>
 				<view>张三</view>
 			</view>
@@ -26,86 +68,154 @@
 			<view class='row-between'>
 				<view class="">货运费</view>
 				<view>100元/吨</view>
-			</view>
+			</view> -->
 		</view>
-		<u-divider text="承运信息"></u-divider>
+
 		<view class="content2">
+			<view class="flex flex-space-between border">
+				<view class="flex s-row item1">
+					<view class="fontsize-46 fontweight-500 text">{{dataObj.sendCity}}</view>
+
+					<view class="fontsize-28 gray">发货地</view>
+				</view>
+				<image class="change-btn" src="@/static/images/common/jt.png" mode='widthFix'></image>
+				<view class="flex s-row item2">
+
+					<view class="fontsize-46 fontweight-500 text" @click="">{{dataObj.unloadCity}}</view>
+					<view class="fontsize-28 gray text-align-right">卸货地</view>
+				</view>
+			</view>
+			<view class="level2-title">基本信息</view>
 			<view class='row-between'>
-				<view class="">合同编号</view>
-				<view>待签订 ></view>
+				<view class="row-left-text gray">订单编号</view>
+				<view class="row-right-text">{{dataObj.orderNo}}</view>
 			</view>
+		<!-- 	<view class='row-between'>
+				<view class="row-left-text gray">货主</view>
+				<view class="row-right-text">{{dataObj.cargoOwner}}</view>
+			</view> -->
 			<view class='row-between'>
-				<view class="">订单编号</view>
-				<view>CY20220210666666</view>
+				<view class="row-left-text gray">发货单位</view>
+				<view class="row-right-text">{{dataObj.compName?dataObj.compName:'个人货主'}}</view>
 			</view>
 			<view class='row-between'>
-				<view class="">装车反馈</view>
-				<view>未装车</view>
+				<view class="row-left-text gray">发货地</view>
+				<view class="row-right-text place">{{dataObj.sendPrivate}}{{dataObj.sendCity}}{{dataObj.sendArea}}{{dataObj.sendDetailedAddress}}</view>
 			</view>
 			<view class='row-between'>
-				<view class="">车牌号</view>
-				<view>辽H12345</view>
+				<view class="row-left-text gray">卸货地</view>
+				<view class="row-right-text place">{{dataObj.unloadPrivate}}{{dataObj.unloadCity}}{{dataObj.unloadArea}}{{dataObj.unloadDetailedAddress}}</view>
 			</view>
 			<view class='row-between'>
-				<view class="">装车净重</view>
-				<view>10吨</view>
+				<view class="row-left-text gray">货名</view>
+				<view class="row-right-text">{{dataObj.goodsName}}</view>
 			</view>
 			<view class='row-between'>
-				<view class="">装车时间</view>
-				<view>2022-02-10 16:13:15</view>
+				<view class="row-left-text gray">距离</view>
+				<view class="row-right-text">约{{dataObj.distance}}公里</view>
 			</view>
 			<view class='row-between'>
-				<view class="">装车照片</view>
-				<view class="flex">
-					<u--image :showLoading="true" :src="src" width="40px" height="40px"></u--image>
-					<u--image :showLoading="true" :src="src" width="40px" height="40px"></u--image>
-				</view>
+				<view class="row-left-text gray">运费</view>
+				<view class="row-right-text">{{dataObj.freight}}{{dataObj.illingMethod==0?'元/吨':'元/车'}}</view>
+			</view>
+
+		</view>
+		<view class="content3" v-if="status1">
+			<view class="level2-title">承运信息</view>
+			<view class='row-between'>
+				<view class="row-left-text gray">合同编号</view>
+				<view class="row-right-text">{{dataObj.contractNo}}</view>
+			</view>
+			<view class='row-between'>
+				<view class="row-left-text gray">车牌号</view>
+				<view class="row-right-text">{{dataObj.carrierInfo.carNo}}</view>
 			</view>
 			<view class='row-between'>
-				<view class="">卸车反馈</view>
+				<view class="row-left-text gray">预计运费</view>
+				<view class="row-right-text">{{dataObj.carrierInfo.estimatedFreight}}元</view>
+			</view>
+			<view class='row-between'>
+				<view class="row-left-text gray">装车时间</view>
+				<view class="row-right-text gray">{{dataObj.carrierInfo.loadingDate}}</view>
+			</view>
+			<view class='row-between'>
+				<view class="row-left-text gray">装车照片</view>
 				<view class="flex">
-					<view>已卸车</view>
-					<view>未确认</view>
+					<u--image :showLoading="true" :src="dataObj.carrierInfo.loadingDate" width="40px" height="40px"></u--image>
 				</view>
 			</view>
 			<view class='row-between'>
-				<view class="">卸车净重</view>
-				<view>100吨</view>
+				<view class="row-left-text gray">合计应付运费</view>
+				<view class="row-right-text">{{dataObj.carrierInfo.totalFreight}}元</view>
 			</view>
 			<view class='row-between'>
-				<view class="">卸车时间</view>
-				<view>2022-02-10 16:13:15</view>
+				<view class="row-left-text gray">卸车时间</view>
+				<view class="row-right-text gray">{{dataObj.carrierInfo.loadingDate}}</view>
 			</view>
 			<view class='row-between'>
-				<view class="">卸车照片</view>
+				<view class="row-left-text gray">卸车照片</view>
 				<view class="flex">
-					<u--image :showLoading="true" :src="src" width="40px" height="40px"></u--image>
-					<u--image :showLoading="true" :src="src" width="40px" height="40px"></u--image>
+					<u--image :showLoading="true" :src="dataObj.carrierInfo.unloadingImg" width="40px" height="40px"></u--image>
 				</view>
 			</view>
 		</view>
-		<u-divider text="运费信息"></u-divider>
-		<view class="content3">
+		<!-- v-if="status2 -->
+		<view class="content4">
+			<view class="level2-title gray">运费信息（单位：元）</view>
+			<view class='row-between'>
+				<view class="row-left-text gray">预付运费</view>
+				<view class="row-right-text">{{dataObj.freightInfo.prepaidFreight}}</view>
+			</view>
+			<view class='flex flex-end'>
+				<view class="gray row-right-text">{{dataObj.freightInfo.prepaidFreightDate}}</view>
+			</view>
+			<view class='row-between'>
+				<view class="row-left-text gray">运费尾款</view>
+				<view class="row-right-text">{{dataObj.freightInfo.freightBalance}}</view>
+			</view>
+			<view class='row-between mx row-left-text gray'>
+				明细：预付{{dataObj.freightInfo.freightBalance}}元，扣款{{dataObj.freightInfo.deduction}}元，服务费{{dataObj.freightInfo.serviceCharge}}元，尾款{{dataObj.freightInfo.freightBalance}}元，合计收款{{dataObj.freightInfo.totalCollection}}元。
+			</view>
+		</view>
+		<view class="content4">
+			<view class="level2-title gray">还款信息</view>
 			<view class='row-between'>
-				<view class="">预付运费</view>
-				<view>2000</view>
+				<view class="row-left-text gray">运费</view>
+				<view class="row-right-text">{{dataObj.freightInfo.totalRepayable}}</view>
+			</view>
+			<view class='flex flex-end'>
+				<view class="gray row-right-text">{{dataObj.freightInfo.prepaidFreightDate}}</view>
 			</view>
 			<view class='row-between'>
-				<view class="">2022-02-11 15:15:15</view>
+				<view class="row-left-text gray">超期费（每天3%）</view>
+				<view class="row-right-text">{{dataObj.freightInfo.overdueFee}}</view>
 			</view>
 			<view class='row-between'>
-				<view class="">运费尾款</view>
-				<view>2000</view>
+				<view class="row-left-text gray">合计应还</view>
+				<view class="row-right-text">{{dataObj.freightInfo.totalRepayable}}</view>
 			</view>
 			<view class='row-between'>
-				<view class="">2022-02-11 15:15:15</view>
+				<view class="row-left-text gray">还款（尾号{{dataObj.freightInfo.repaymentBank}}）</view>
+				<view class="row-right-text">{{dataObj.freightInfo.repaymentConfirm}}</view>
 			</view>
 			<view class='row-between'>
-				明细：预付2000元，扣款200元，服务费150元，尾款2000元，合计收款4000元。
+				<view class="row-left-text gray">{{dataObj.freightInfo.updateDate}}</view>
+				<!-- <view class="row-right-text">{{dataObj.freightInfo.freightBalance}}</view> -->
 			</view>
 		</view>
-		<u-button text="确认装车" type="primary" @click="goConfirmLoading()"></u-button>
-		<u-button text="联系客服" type="primary" @click="$helper.contactCustomerService"></u-button>
+		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
+			:closeOnClickOverlay='true' :showCancelButton='true' @confirm="confirmClick" @close="cancelClick"
+			@cancel="cancelClick" class="modal">
+			<u-radio-group v-model="radiovalue1" placement="" v-if='isShowTerminationReason' class='row'>
+				<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
+					:label="item.name" :name="item.name" @change="radioChange">
+				</u-radio>
+			</u-radio-group>
+			<u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
+				v-if='isShowTerminationReason'>
+			</u--textarea>
+		</u-modal>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -115,12 +225,160 @@
 			return {
 				cyinfoStatus: '未装车',
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
-				id: 1
+				isShowTerminationReason: false,
+				id: "",
+				dataObj:{},
+				status1:false,
+				status2:false,
+				id: '',
+				value2: '',
+				radiolist1: [{
+						name: '已与货主协商',
+						disabled: false
+					},
+					{
+						name: '货主原因终止',
+						disabled: false
+					},
+					{
+						name: '司机个人原因终止',
+						disabled: false
+					}, {
+						name: '其他',
+						disabled: false
+					}
+				],
+				radiovalue1: '已与货主协商',
+				confirmText: '终止',
+				alertTitle: '确定终止订单？',
+				alertContent: "",
+				isShowAlert: false,
 			}
 
 		},
+		onLoad(options) {
+			this.id = options.id
+		},
+		onShow() {
+			this.getList()
+		},
 		methods: {
+			// 完结
+			closed() {
+				let item = this.dataDetails
+				let that = this
+				this.$request.baseRequest('post', '/orderInfo/api/editEnd', {
+						id: item.id,
+					}).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "提交成功",
+								complete() {
+									that.upCallback({
+										size: 10,
+										num: 1
+									})
+								}
+							})
+			
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			confirmLoading() {
+				let item = this.dataDetails
+				uni.$u.route('/pages/order/confirmLoading', item);
+			},
+			confirmUnLoading() {
+				let item = this.dataDetails
+				uni.$u.route('/pages/order/confirmUnloading', item);
+			},
+			confirmClick() {
+				let  that = this
+				console.log('终止')
+				if (this.radiovalue1 == '其他' && !this.value2) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请填写终止原因描述!",
+					})
+					return
+				}
+				let _terminationReason = ''
+				if (this.radiovalue1 == '已与货主协商') {
+					_terminationReason = 1
+				} else if (this.radiovalue1 == '货主原因终止') {
+					_terminationReason = 2
+				} else if (this.radiovalue1 == '司机个人原因终止') {
+					_terminationReason = 3
+				} else if (this.radiovalue1 == '其他') {
+					_terminationReason = 4
+				}
+				this.$request.baseRequest('post', '/orderInfo/api/end', {
+						id: this.id,
+						terminationReason: _terminationReason,
+						terminationReasonDescription: this.value2,
+						terminator:1
+					}).then(res => {
+						console.log(res) 
+						this.isShowAlert = false
+						// this.mescroll.resetUpScroll()
+						this.$refs.uToast.show({
+							type: 'success',
+							message: "提交成功！",
+							complete() {
+								that.getList()
+							}
+						})
+			
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			},
+			stop() {
+				let item = this.dataObj
+				// 货主接单
+				if (item.orderStatusKey == 1) {
+					this.isShowTerminationReason = false
+				} else {
+					this.isShowTerminationReason = true
+				}
+				this.id = item.id
+				this.isShowAlert = true
+			},
+			toPhone(){
+				uni.makePhoneCall({
+				    phoneNumber: this.dataObj.cargoOwnerPhone
+				});
+			},
+			back() {
+				uni.navigateBack()
+			},
+			getList(){
+				this.$request.baseRequest('get', '//orderInfo/getOrderInfo', {
+						id: this.id,
+						
+					}).then(res => {
+						if(res.code==200){
+							this.dataObj = res.data
+							if(res.data.orderStatus!="待接单"&&res.data.orderStatus!="未装车"&&res.data.orderStatus!="已终止"){
+								this.status1 = true
+							}
+							if(res.data.orderStatus!="待接单"&&res.data.orderStatus!="未装车"&&res.data.orderStatus!="待确认装车"&&res.data.orderStatus!="已驳回装车信息"&&res.data.orderStatus!="待平台确认装车"&&res.data.orderStatus!="平台驳回装车信息"&&res.data.orderStatus!="运输中"&&res.data.orderStatus!="待结算"&&res.data.orderStatus!="已终止"){
+								this.status2 = true
+							}
+						}
+						
+					})
+			},
 			goConfirmLoading(id) {
+				
 				console.log('点击详情id：', id)
 				uni.$u.route('/pages/order/confirmLoading', {
 					id: this.id,
@@ -131,5 +389,185 @@
 </script>
 
 <style lang="scss">
+	.fixed,
+	.fixed1 {
+		background: white;
+		position: fixed;
+		top: var(--status-bar-height);
+		z-index: 999;
+		width: 100%;
+	}
+
+	.fixed {
+		padding-bottom: 10rpx;
+
+		.title {
+			background: white;
+			position: relative;
+			font-size: 36rpx;
+			color: rgba(0, 0, 0, 0.85);
+
+			.search {
+				position: absolute;
+				right: 20rpx;
+			}
+
+			.back {
+				position: absolute;
+				left: 20rpx;
 
+			}
+		}
+	}
+
+	.fixed1 {
+		top: 0;
+		height: var(--status-bar-height);
+		background: white;
+	}
+.row-between{
+	margin-bottom: 10rpx;
+}
+	.content1 {
+		background: white;
+		margin: calc(var(--status-bar-height) + 80rpx) 20rpx 0 20rpx;
+		border-radius: 20rpx;
+		padding: 40rpx 0rpx 0 0;
+		box-sizing: border-box;
+
+		.status {
+			display: flex;
+			justify-content: center;
+			margin-bottom: 40rpx;
+			font-size: 36rpx;
+			color: #333333;
+			font-weight: 700;
+		}
+
+		.btn {
+			width: 40%;
+		}
+
+		.item2 {
+			padding-bottom: 40rpx;
+		}
+
+		.item3 {
+			padding: 20rpx;
+			background: linear-gradient(180deg, #F7F7F9 0%, #FFFFFF 100%);
+			border-radius: 0 0 20rpx 20rpx;
+
+			.name {
+				margin-left: 10rpx;
+				margin-right: 20rpx;
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #333333;
+			}
+
+			.number {
+				font-size: 26rpx;
+				color: #878787;
+			}
+
+			.star {
+				margin-left: 10rpx;
+			}
+
+			.phone {
+				.bgc {
+					background: #E5F0FE;
+					width: 58rpx;
+					height: 58rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					border-radius: 50%;
+				}
+
+				.hz-name {
+					font-size: 26rpx;
+					color: #2772FB;
+				}
+
+			}
+		}
+	}
+
+	.level2-title {
+		margin: 20rpx 0 20rpx 0;
+	}
+
+	.content2 {
+		background: white;
+		margin: 20rpx;
+		border-radius: 20rpx;
+		padding: 20rpx;
+
+		.change-btn {
+			width: 86rpx;
+			height: 86rpx;
+			position: relative;
+			top: -20rpx;
+		}
+
+		.item1,
+		.item2 {
+			width: 40%;
+
+			.text {
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
+			}
+
+			.gray {
+				text-align: center;
+			}
+
+		}
+
+		.item1 .text {
+			text-align: center;
+		}
+
+		.item2 .text {
+			text-align: center;
+		}
+
+		.border {
+			border-bottom: 1px solid #EEEEEE;
+			padding-bottom: 33rpx;
+		}
+
+
+
+		.place {
+			width: 80%;
+			text-align: right;
+		}
+	}
+
+	.content3,
+	.content4 {
+		background: white;
+		margin: 20rpx;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	}
+
+	.content4 {
+		.time{
+			text-align: right;
+		}
+		.mx {
+		
+			background: #F7F8FA;
+			padding: 10rpx;
+			margin: 10rpx 0;
+		}
+	}
+	/deep/.u-modal__content {
+		flex-direction: column;
+	}
 </style>

pages/public/login.vue

@@ -78,7 +78,7 @@
 			this.$refs.loginForm.setRules(this.rules)
 		},
 		onLoad() {
-			var _this = this
+			 _this = this
 		},
 		methods: {
 			gonumber(){
@@ -140,7 +140,7 @@
 									_this.$store.commit('login', res.data)
 									// that.liangxinLogin()
 									uni.switchTab({
-										url: '/pages/goodSource/index'
+										url: '/pages/order/index'
 									});
 									_this.isLoading = false
 

pages/release/release.vue

@@ -0,0 +1,291 @@
+<template>
+	<view class="content">
+		<view class="fixed1"></view>
+		<view class="fixed">
+			<view class='title flex flex-center'>
+				<u-icon class="back" name="arrow-left" color="" size="20" @click="back"></u-icon>
+				<view class="nav-title">发布</view>
+				<view class="search">
+					<u-icon class="" name="order" color="" size="28" @click="goToRecord"></u-icon>
+					<view class="">
+						记录
+					</view>
+				</view>
+
+			</view>
+		</view>
+		<view class="content1">
+			<view class="row">
+				<view class="left">选择货主身份</view>
+				<view class="right">></view>
+			</view>
+		</view>
+		<view class="content2">
+			<view class="row1">
+				<view class="left">
+					<view class="top">
+						<view>寄</view>
+						<view>选择发货地区</view>
+					</view>
+					<view class="bottom">
+						<input type="text" value="" placeholder="输入详细地址" />
+					</view>
+				</view>
+				<view class="right">
+					<view class="right">></view>
+				</view>
+			</view>
+			<view class="row1">
+				<view class="left">
+					<view class="top">
+						<view>收</view>
+						<view>选择收货地区</view>
+					</view>
+					<view class="bottom">
+						<input type="text" value="" placeholder="输入详细地址" />
+					</view>
+				</view>
+				<view class="right">
+					<view class="right">></view>
+				</view>
+			</view>
+		</view>
+		<view class="content3">
+			<view class="row">
+				<view class="left">运输距离</view>
+				<view class="right">自动计算</view>
+			</view>
+			<view class="row">
+				<view class="left">货名</view>
+				<view class="right"><input type="text" value="" placeholder="输入货物名称，不超过6个字" /></view>
+			</view>
+			<view class="flex row">
+				<view class="left-text">运费计算方式</view>
+				<!-- <u-radio-group v-model="dataDetails.driverSex" placement="row"> -->
+				<u-radio-group placement="row" v-model="dataDetails.type" class="select-type">
+					<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
+						:label="item.name" :name="item.name" @change="radioChange">
+					</u-radio>
+				</u-radio-group>
+			</view>
+			<view class="row">
+				<view class="left">运费单价</view>
+				<view class="right"><input type="text" value="" placeholder="输入运费单价" class="input"/></view>
+			</view>
+			<view class="row">
+				<view class="left">该任务申请运费垫付</view>
+				<view class="right"><u-switch v-model="value" @change="change" size="20"></u-switch></view>
+			</view>
+		</view>
+		<view class="content4 flex">
+			<view class="mr20">以下为附加信息</view>
+			<view class="btn-text">选填</view>
+		</view>
+		<view class="content5">
+			<view class="row">
+				<view class="left">发货联系人</view>
+				<view class="right flex">
+					<input type="text" value="" placeholder="输入发货联系人姓名" class="input"/>
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">发货联系人电话</view>
+				<view class="right flex">
+					<input type="text" value="" placeholder="输入发货联系人手机号" class="input"/>
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">收货联系人</view>
+				<view class="right flex">
+					<input type="text" value="" placeholder="输入收货联系人姓名" class="input"/>
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">收货联系人电话</view>
+				<view class="right flex">
+					<input type="text" value="" placeholder="输入收货联系人手机号" class="input"/>
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">重量（吨）</view>
+				<view class="right flex">
+					<input type="text" value="" placeholder="输入预计发运重量" class="input"/>
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">预计装车日期起</view>
+				<view class="right flex">
+					<!-- <input type="text" value="" placeholder="输入发货联系人姓名" class="input"/> -->
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">预计装车日期止</view>
+				<view class="right flex">
+					<!-- <input type="text" value="" placeholder="输入发货联系人姓名" class="input"/> -->
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">车长要求（米）</view>
+				<view class="right flex">
+					<!-- <input type="text" value="" placeholder="输入发货联系人姓名" class="input"/> -->
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">载重要求（吨）</view>
+				<view class="right flex">
+					<!-- <input type="text" value="" placeholder="输入发货联系人姓名" class="input"/> -->
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">车型要求</view>
+				<view class="right flex">
+					<!-- <input type="text" value="" placeholder="输入发货联系人姓名" class="input"/> -->
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">任务描述</view>
+				<view class="right flex">
+					<!-- <input type="text" value="" placeholder="输入发货联系人姓名" class="input"/> -->
+				</view>
+			</view><view class="row">
+				<view class="left">任务有效期</view>
+				<view class="right flex">
+					<!-- <input type="text" value="" placeholder="输入发货联系人姓名" class="input"/>  -->
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				value:true,
+				dataDetails: {
+					type: '元/车'
+				},
+				radiolist1: [{
+						name: '元/吨',
+						disabled: false
+					},
+					{
+						name: '元/车',
+						disabled: false
+					},
+
+				],
+			}
+		},
+		methods: {
+			change(e) {
+				console.log('change', e);
+			},
+			back() {
+				uni.navigateBack()
+			},
+			goToRecord() {
+
+			},
+			radioChange(n) {
+				console.log('radioChange', n);
+				this.dataDetails.type = n
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.input{
+		text-align: right;
+	}
+	.fixed {
+		background: white;
+		// position: fixed;
+		// top: var(--status-bar-height);
+		// z-index: 999;
+		// padding-bottom: 10rpx;
+		width: 100%;
+	}
+
+	.fixed {
+
+
+		.nav-title {
+			font-weight: 700;
+		}
+
+		.title {
+			background: white;
+			position: relative;
+			font-size: 36rpx;
+			color: rgba(0, 0, 0, 0.85);
+
+			.search {
+				position: absolute;
+				right: 20rpx;
+				display: flex;
+			}
+
+			.back {
+				position: absolute;
+				left: 20rpx;
+
+			}
+		}
+	}
+
+	.fixed1 {
+		top: 0;
+		height: var(--status-bar-height);
+		background: white;
+	}
+
+	.row {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.content1 {
+		background: white;
+		margin: var(--status-bar-height) 20rpx 0 20rpx;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	}
+
+	.content2,
+	.content3,.content5 {
+		box-sizing: border-box;
+		background: white;
+		border-radius: 20rpx;
+		padding: 20rpx;
+		margin: 20rpx;
+
+		.row1 {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.left .top {
+				display: flex;
+			}
+		}
+	}
+	.select-type{
+		display: flex;
+		justify-content: flex-end;
+	}
+	.content4{
+		margin: 20rpx;
+		.mr20{
+			color: #999999;
+		}
+		.btn-text{
+			color: #2772FB;
+			border: 1px solid #2772FB;
+			border-radius: 20rpx;
+			padding: 0rpx 10rpx;
+			box-sizing: border-box;
+		}
+	}
+</style>

static/css/common.scss

@@ -1,8 +1,9 @@
 // 全局公共样式
 .content{
 	background: $ac-bgc;
-	padding:$uni-spacing-row-base;
+	// padding:$uni-spacing-row-base;
 	overflow: hidden;
+	position: relative;
 	
 }
 // 常用公共样式
@@ -10,6 +11,9 @@
 .flex{
 	display: flex;
 }
+.align-center{
+	align-items: center;
+}
 .inline-block{
 	display: inline-block;
 }
@@ -37,18 +41,18 @@
 .flex-end{
 	    justify-content: flex-end;
 }
-.items-center{
-	    align-items: center;
-}
 .flex-start{
 	    justify-content: flex-start;
 }
-.m-topr20{
+.m-top20{
 	margin-top: 20rpx;
 }
 .paddingr20{
 	padding:20rpx;
 }
+.paddingr35{
+	padding:35rpx;
+}
 .lr-paddingr20{
 	padding: 0 20rpx;
 }
@@ -67,16 +71,20 @@
 .width100{
 	width: 100%;
 }
-.wrap{
-	background:#fff;
-	padding:10px 15px;
-	border-radius:5px;
+.mr20{
+	margin-right: 20rpx;
 }
-
-// 文字相关end
-// 边线相关start
-.noborder{
-	border-bottom: none!important;
+.ml20{
+	margin-left: 20rpx;
+}
+.msx20{
+	margin:20rpx 0;
+}
+.mt20{
+	margin-top:20rpx;
+}
+.text-align-right{
+	text-align: right;
 }
 // 布局相关 end
 
@@ -86,18 +94,116 @@
 	padding-bottom: 10rpx;
 }
 // 边线相关end
+
+
+// 颜色相关start
 .red{
 	background: red;
 }
 .yellow{
 	background:yellow;
 }
-
+.btn-color{
+	background: #2772FB!important;
+	color: white!important;
+}
+.h-color{
+	color: #FE6300;
+}
+.number-color{
+	color:#2772FB;
+}
+// 颜色相关end
 // 文字相关start
-.level1-title{
-	
+.level2-title{
+font-size: 32rpx;
+font-weight: 700;
+color: #000000;
+}
+.fontsize-24{
+	font-size: 24rpx;
+}
+.fontsize-25{
+	font-size: 25rpx;
+}
+.fontsize-26{
+	font-size: 26rpx;
+}
+.fontsize-28{
+	font-size: 28rpx;
+}
+.fontsize-36{
+	font-size: 36rpx!important;
+}
+.fontsize-46{
+	font-size: 46rpx;
+}
+.gray{
+	color: #BBBBBB;
+}
+.fontweight-500{
+	font-weight: 500;
+}
+.point{
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+}
+.row-left-text{
+	font-size:28rpx;
+	// color: #8F8F8F;
+}
+.row-right-text{
+	font-size:28rpx;
 }
 // 文字相关end
 // 边线相关start
+.noborder{
+	border-bottom: none!important;
+}
 // 边线相关start
 
+// other
+.ssx{
+	width: 40rpx;
+	height: 40rpx;
+	background: linear-gradient(180deg, #C8D7E5 0%, #AFC1D6 100%);
+	font-size: 26rpx;
+	font-family: PingFangSC-Medium, PingFang SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	border-radius: 50%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	margin-right: 10rpx;
+}
+.row-tips{
+font-size: 26rpx;
+font-weight: 400;
+color: #FE7F1A;
+background: #FFEEE1;
+padding: 4rpx 11rpx;
+border-radius: 4px;
+}
+.xj-image{
+	width:46rpx;
+	height: 46rpx;
+}
+/deep/.u-modal__content__text{
+	text-align: center;
+}
+.preview-img{
+	margin-top: 20rpx;
+	width: 212rpx;
+	height: 212rpx;
+	border-radius: 10rpx;
+}
+.uview-upload{
+	margin-top: 20rpx;
+}
+.card-img{
+	width: 100%;
+	height: 440rpx;
+	
+}

unpackage/dist/dev/app-plus/static/css/common.scss

@@ -1,8 +1,9 @@
 // 全局公共样式
 .content{
 	background: $ac-bgc;
-	padding:$uni-spacing-row-base;
+	// padding:$uni-spacing-row-base;
 	overflow: hidden;
+	position: relative;
 	
 }
 // 常用公共样式
@@ -10,6 +11,9 @@
 .flex{
 	display: flex;
 }
+.align-center{
+	align-items: center;
+}
 .inline-block{
 	display: inline-block;
 }
@@ -40,12 +44,15 @@
 .flex-start{
 	    justify-content: flex-start;
 }
-.m-topr20{
+.m-top20{
 	margin-top: 20rpx;
 }
 .paddingr20{
 	padding:20rpx;
 }
+.paddingr35{
+	padding:35rpx;
+}
 .lr-paddingr20{
 	padding: 0 20rpx;
 }
@@ -64,6 +71,21 @@
 .width100{
 	width: 100%;
 }
+.mr20{
+	margin-right: 20rpx;
+}
+.ml20{
+	margin-left: 20rpx;
+}
+.msx20{
+	margin:20rpx 0;
+}
+.mt20{
+	margin-top:20rpx;
+}
+.text-align-right{
+	text-align: right;
+}
 // 布局相关 end
 
 // 边线相关start
@@ -72,18 +94,116 @@
 	padding-bottom: 10rpx;
 }
 // 边线相关end
+
+
+// 颜色相关start
 .red{
 	background: red;
 }
 .yellow{
 	background:yellow;
 }
-
+.btn-color{
+	background: #2772FB!important;
+	color: white!important;
+}
+.h-color{
+	color: #FE6300;
+}
+.number-color{
+	color:#2772FB;
+}
+// 颜色相关end
 // 文字相关start
-.level1-title{
-	
+.level2-title{
+font-size: 32rpx;
+font-weight: 700;
+color: #000000;
+}
+.fontsize-24{
+	font-size: 24rpx;
+}
+.fontsize-25{
+	font-size: 25rpx;
+}
+.fontsize-26{
+	font-size: 26rpx;
+}
+.fontsize-28{
+	font-size: 28rpx;
+}
+.fontsize-36{
+	font-size: 36rpx!important;
+}
+.fontsize-46{
+	font-size: 46rpx;
+}
+.gray{
+	color: #BBBBBB;
+}
+.fontweight-500{
+	font-weight: 500;
+}
+.point{
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+}
+.row-left-text{
+	font-size:28rpx;
+	// color: #8F8F8F;
+}
+.row-right-text{
+	font-size:28rpx;
 }
 // 文字相关end
 // 边线相关start
+.noborder{
+	border-bottom: none!important;
+}
 // 边线相关start
 
+// other
+.ssx{
+	width: 40rpx;
+	height: 40rpx;
+	background: linear-gradient(180deg, #C8D7E5 0%, #AFC1D6 100%);
+	font-size: 26rpx;
+	font-family: PingFangSC-Medium, PingFang SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	border-radius: 50%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	margin-right: 10rpx;
+}
+.row-tips{
+font-size: 26rpx;
+font-weight: 400;
+color: #FE7F1A;
+background: #FFEEE1;
+padding: 4rpx 11rpx;
+border-radius: 4px;
+}
+.xj-image{
+	width:46rpx;
+	height: 46rpx;
+}
+/deep/.u-modal__content__text{
+	text-align: center;
+}
+.preview-img{
+	margin-top: 20rpx;
+	width: 212rpx;
+	height: 212rpx;
+	border-radius: 10rpx;
+}
+.uview-upload{
+	margin-top: 20rpx;
+}
+.card-img{
+	width: 100%;
+	height: 440rpx;
+	
+}