Selaa lähdekoodia

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

achao 1 vuosi sitten
vanhempi
commit
6198c898aa

+ 1 - 1
config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	// baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.changyuntong56.com',
-	baseUrlNew: 'http://192.168.110.82:8099',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
 	// baseUrlNew: 'http://192.168.110.67:8999/',
 	h5Appid: 'wxb66b599f7f61b46f',

+ 171 - 171
manifest.json

@@ -1,173 +1,173 @@
 {
-	"name": "畅运通-货主端",
-	"appid": "__UNI__DCD13AC",
-	"description": "畅运通",
-	"versionName": "1.1.0",
-	"versionCode": 110,
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"compatible": {
-			"ignoreVersion": true
-		},
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {
-			"Maps": {},
-			"Push": {},
-			"Geolocation": {},
-			"Camera": {}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
-					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"]
-			},
-			/* ios打包配置 */
-			"ios": {
-				"dSYMs": false
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"maps": {
-					"amap": {
-						"appkey_ios": "b1ce5ff5cafa861ce00623ac4788a721",
-						"appkey_android": "77d75fbe6f68fc8e415b990bfc70daaa"
-					}
-				},
-				"push": {
-					"unipush": {}
-				},
-				"oauth": {},
-				"ad": {},
-				"geolocation": {
-					"amap": {
-						"__platform__": ["ios", "android"],
-						"appkey_ios": "b1ce5ff5cafa861ce00623ac4788a721",
-						"appkey_android": "77d75fbe6f68fc8e415b990bfc70daaa"
-					}
-				}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png"
-					},
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png"
-					}
-				}
-			}
-		},
-		"nativePlugins": {
-			"AJ-Alert": {
-				"__plugin_info__": {
-					"name": "原生 弹窗 Alert 提示框  dialog 支持苹果安卓",
-					"description": "uni的showModel样式单一,直接写vue弹窗又遮盖不了原生的组件,这是一个优化原生弹窗api",
-					"platforms": "Android,iOS",
-					"url": "https://ext.dcloud.net.cn/plugin?id=1664",
-					"android_package_name": "uni.UNIDCD13AC",
-					"ios_bundle_id": "uni.UNIDCD13AC",
-					"isCloud": true,
-					"bought": 1,
-					"pid": "1664",
-					"parameters": {}
-				}
-			},
-			"KJ-Camera": {
-				"__plugin_info__": {
-					"name": "相机自定义拍照录像,可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏",
-					"description": "相机自定义拍照录像,可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏、相机切换前后摄像头 QQ群:863776189 可接单 离线包:单价*10  源码:单价*15",
-					"platforms": "Android,iOS",
-					"url": "https://ext.dcloud.net.cn/plugin?id=3404",
-					"android_package_name": "uni.UNIDCD13AC",
-					"ios_bundle_id": "uni.UNIDCD13AC",
-					"isCloud": true,
-					"bought": 1,
-					"pid": "3404",
-					"parameters": {}
-				}
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "2"
+    "name" : "畅运通-货主端",
+    "appid" : "__UNI__DCD13AC",
+    "description" : "畅运通",
+    "versionName" : "1.1.3",
+    "versionCode" : 113,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "compatible" : {
+            "ignoreVersion" : true
+        },
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "Maps" : {},
+            "Push" : {},
+            "Geolocation" : {},
+            "Camera" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "b1ce5ff5cafa861ce00623ac4788a721",
+                        "appkey_android" : "77d75fbe6f68fc8e415b990bfc70daaa"
+                    }
+                },
+                "push" : {
+                    "unipush" : {}
+                },
+                "oauth" : {},
+                "ad" : {},
+                "geolocation" : {
+                    "amap" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "b1ce5ff5cafa861ce00623ac4788a721",
+                        "appkey_android" : "77d75fbe6f68fc8e415b990bfc70daaa"
+                    }
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png"
+                    },
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png"
+                    }
+                }
+            }
+        },
+        "nativePlugins" : {
+            "AJ-Alert" : {
+                "__plugin_info__" : {
+                    "name" : "原生 弹窗 Alert 提示框  dialog 支持苹果安卓",
+                    "description" : "uni的showModel样式单一,直接写vue弹窗又遮盖不了原生的组件,这是一个优化原生弹窗api",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=1664",
+                    "android_package_name" : "uni.UNIDCD13AC",
+                    "ios_bundle_id" : "uni.UNIDCD13AC",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "1664",
+                    "parameters" : {}
+                }
+            },
+            "KJ-Camera" : {
+                "__plugin_info__" : {
+                    "name" : "相机自定义拍照录像,可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏",
+                    "description" : "相机自定义拍照录像,可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏、相机切换前后摄像头 QQ群:863776189 可接单 离线包:单价*10  源码:单价*15",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=3404",
+                    "android_package_name" : "uni.UNIDCD13AC",
+                    "ios_bundle_id" : "uni.UNIDCD13AC",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "3404",
+                    "parameters" : {}
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2"
 }

+ 5 - 2
pages.json

@@ -451,9 +451,12 @@
 
 		}, {
 			"path": "pages/order/map",
+			// "style": {
+			// 	"navigationBarTitleText": "运输轨迹",
+			// 	"enablePullDownRefresh": false
+			// }
 			"style": {
-				"navigationBarTitleText": "运输轨迹",
-				"enablePullDownRefresh": false
+				"navigationStyle": "custom"
 			}
 
 		}, {

+ 1 - 1
pages/mine/index.vue

@@ -42,7 +42,7 @@
 			</view>
 
 			<view class='flex operate flex-space-around'>
-				<view style='font-size:14px;' class='flex items-center' @click="toMyRelease">
+				<view style='font-size:14px;' class='flex items-center' @click="goDetailPage('/pages/release/record')">
 					<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true"
 						src="../../static/mine/wodefabu.png" width="42px" height="42px"></u--image>我的发布
 				</view>

+ 2 - 2
pages/mine/myAccount/bill.vue

@@ -39,11 +39,11 @@
 				companyId: "",
 				pageSize: 10,
 				currentPage: 1,
-				data: "2022",
+				data: "2023",
 				dataShow: false,
 				value1: Number(new Date()),
 				columns: [
-					["2022", "2023", "2024", "2025", "2026", "2027", "2028", "2029", "2030", "2031", "2032", "2033",
+					["2023", "2024", "2025", "2026", "2027", "2028", "2029", "2030", "2031", "2032", "2033",
 						"2034", "2035"
 					],
 				],

+ 13 - 16
pages/order/index.vue

@@ -14,7 +14,6 @@
 							}"></u-tabs>
 			</view> -->
 		<view class="top-content">
-
 			<view class="fixed1"></view>
 			<view class="fix-content">
 				<u-search placeholder="搜索订单" v-model="searchKeyWord" bgColor='white' :actionStyle='searchStyle'
@@ -38,7 +37,6 @@
 					</view>
 				</view>
 			</view>
-
 		</view>
 		<view class="all-menu">
 			<u-transition :show="showMenu" mode="fade">
@@ -140,8 +138,9 @@
 						<!-- <image class="jt-icon" src="@/static/images/order/position.png" mode='widthFix'
 								@click.stop="toMap(good)">
 							</image> -->
-						<view v-if="good.cargoOwnerStatus=='运输中'||good.cargoOwnerStatus=='已完结'||good.cargoOwnerStatus=='待收货'||good.cargoOwnerStatus=='已终止'"
-						 style='border:1px solid #2772FB'	class="start normal look-map" @click.stop="toMap(good)">
+						<view
+							v-if="good.cargoOwnerStatus=='运输中'||good.cargoOwnerStatus=='已完结'||good.cargoOwnerStatus=='待收货'"
+							style='border:1px solid #2772FB' class="start normal look-map" @click.stop="toMap(good)">
 							查看轨迹</view>
 						<view class="stop" @click.stop="accept(good,1)" v-if="good.cargoOwnerStatus=='待接单'">接受
 						</view>
@@ -263,7 +262,7 @@
 					margin: '0 20rpx 0 0',
 					"border-radius": '30rpx',
 				},
-				isdblclick:0,
+				isdblclick: 0,
 				upOption: {
 					page: {
 						size: 10 // 每页数据的数量,默认10
@@ -272,8 +271,8 @@
 					empty: {
 						tip: '暂无记录!'
 					},
-					toTop:{
-						src:''
+					toTop: {
+						src: ''
 					}
 				},
 				searchKeyWord: '',
@@ -353,18 +352,18 @@
 		onTabItemTap(e) {
 			this.isdblclick++
 			// tab 点击时执行,此处直接接收单击事件
-			if(this.scrollTop>1200){
-				if(this.isdblclick>1){
+			if (this.scrollTop > 1200) {
+				if (this.isdblclick > 1) {
 					uni.pageScrollTo({
 						scrollTop: 0,
 						duration: 300
 					});
 				}
-				
+
 			}
 		},
-		onHide(){
-			this.isdblclick=0
+		onHide() {
+			this.isdblclick = 0
 		},
 		created() {
 			//#ifdef APP-PLUS
@@ -395,7 +394,7 @@
 
 		},
 		onShow() {
-			let that = this 
+			let that = this
 			if (this.scrollTop > 1200) {
 				uni.setTabBarItem({
 					index: 0,
@@ -457,7 +456,7 @@
 				this.show = false
 			},
 			moveHandle() {
-				this.showMenu=false
+				this.showMenu = false
 				// console.log(1111)
 			},
 			open() {
@@ -518,7 +517,6 @@
 									})
 								}
 							})
-
 						}
 					})
 					.catch(res => {
@@ -549,7 +547,6 @@
 			},
 			radioChange(n) {
 				console.log('radioChange', n);
-
 			},
 			stop(item) {
 				// // 货主接单

+ 368 - 71
pages/order/map.nvue

@@ -1,5 +1,35 @@
 <template>
-	<view>
+	<view class="content">
+		<div class="top_btn">
+			<div class="returnPage">
+				<image class="return-icon" src="@/static/images/order/returnPage.png" mode='widthFix'
+					@click="returnPage">
+				</image>
+			</div>
+			<div class="qiehuan" @click="mapChange">
+				<image class="qiehuan-icon" src="@/static/images/order/qiehuan.png" mode='widthFix'>
+				</image>
+				<text class="tips">{{tips}}</text>
+			</div>
+		</div>
+		<div class="infoBox">
+			<div class="infoBox_left">
+				<text class="title">{{infoData.cargoOwnerStatus}}</text>
+				<text class="address estimate">预计{{infoData.tranEndDate}}送达</text>
+			</div>
+			<div class="infoBox_right">
+				<div class="send">
+					<text class="title">{{infoData.sendCity}}</text>
+					<text class="address">{{infoData.sendArea}}</text>
+				</div>
+				<image class="jt-icon" src="@/static/images/order/jt.png" mode='widthFix'>
+				</image>
+				<div class="end">
+					<text class="title">{{infoData.unloadCity}}</text>
+					<text class="address">{{infoData.unloadArea}}</text>
+				</div>
+			</div>
+		</div>
 		<map v-if="polyline[0].points.length > 0" ref="myMap" id="myMap" :markers="markers" :polyline="polyline"
 			:latitude="polyline[0].points[0].latitude" :longitude="polyline[0].points[0].longitude"
 			style="width: 100%; height: 2000rpx" @updated="test" />
@@ -7,6 +37,12 @@
 			<button v-if="startMove" @click="handleStopMove()">暂停移动</button>
 			<button v-else @click="handleStartMove()">开始移动</button>
 		</view> -->
+		<u-modal :show="show" :title="title" :showCancelButton="true" confirmText="确定支付" @close="show=false"
+			@cancel="show = false" @confirm="payment" :closeOnClickOverlay="true">
+			<div class="slot-content" style="align-items: flex-start;">
+				<text style="width: 270px;">{{content}}</text>
+			</div>
+		</u-modal>
 	</view>
 </template>
 
@@ -41,98 +77,248 @@
 						x: 0.5,
 						y: 1
 					}
-				}]
+				}],
+				infoData: {},
+				tips: "切换北斗轨迹",
+				title: "支付",
+				content: "",
+				show: false,
+				obj: {}
 			}
 		},
 		onLoad(option) {
 			this.id = option.id
-			console.log(this.id)
-			this.getTrack() //获取轨迹信息(只做演示,未进行远程请求)
-
+			this.infoData = option
+			let date = new Date(this.infoData.tranEndDate)
+			if (!this.infoData.lookBeiDouDate) {
+				this.infoData.lookBeiDouDate = ""
+			}
+			let getMonth = date.getMonth() + 1
+			let day = date.getDate()
+			this.infoData.tranEndDate = getMonth + "月" + day + "日"
+			this.getTrack(0) //获取轨迹信息(只做演示,未进行远程请求)
 		},
 		methods: {
-			//模拟获取远程数据
-			getTrack() {
+			returnPage() {
+				// uni.$u.route('/pages/order/index');
+				uni.switchTab({
+					url: '/pages/order/index'
+				});
+			},
+			// isSameDay(date, dateB){
+			// const {
+			// 	getFullYear,
+			// 	getMonth,
+			// 	getDate] = Date.prototypereturn[getFullYear, getMonth, getDate].every(fn =>
+			// 	return fn.call(dateA) === fn.cal1(dateB)
+			// },
+			countDay(d1, d2) {
+				var days = d1 - d2
+				var time = parseInt(days / (1000 * 60 * 60 * 24))
+				time = time ==0?time+1:time//为零代表当天
+				return time 
+			},
+			mapChange() {
+				if (this.tips == "切换北斗轨迹") {
+					if (this.infoData.lookBeiDouDate) { //查看北斗最新时间
+						let date1 = this.infoData.lookBeiDouDate.split(" ")[0]
+						let date2 = new Date()
+						let year = date2.getFullYear();
+						let month = (date2.getMonth() + 1) < 10 ? "0" + (date2.getMonth() + 1) : date2.getMonth() + 1;
+						let day = date2.getDate() < 10 ? "0" + date2.getDate() : date2.getDate();
+						let date3 = year + "-" + month + "-" + day
+						if(this.infoData.cargoOwnerStatus == "已完结"){//如果订单完成 用卸车时间计算天数
+							 date3 = this.infoData.unloadingDate.split(" ")[0]//卸车时间
+						}
+						if (date1 != date3) { //查看北斗更新时间 != 今天
+							// unloadingDate 卸车时间
+							var k1 = new Date(new Date().toLocaleDateString()).getTime() //当前零点时间蹉
+							if(this.infoData.cargoOwnerStatus == "已完结"){
+								k1 = new Date(new Date(this.infoData.unloadingDate).toLocaleDateString()).getTime() //卸车时间
+							}
+							var k2 = new Date(new Date(this.infoData.lookBeiDouDate).toLocaleDateString()).getTime()
+							this.obj.amountMoney = this.countDay(k1, k2)
+							this.content = "本次查看北斗轨迹将从您的账户余额扣除 " + this.obj.amountMoney + " 元,确认支付查看轨迹?"
+							this.show = true
+						} else { ////查看北斗更新时间 == 今天(不需要支付)
+							this.show = false
+							this.getTrack(1) //北斗轨迹
+						}
+					} else { //没有更新时间证明该订单没有查看过北斗轨迹(需支付)
+						let date1 = this.infoData.loadingDate.split(" ")[0]
+						let date2 = new Date()
+						let year = date2.getFullYear();
+						let month = (date2.getMonth() + 1) < 10 ? "0" + (date2.getMonth() + 1) : date2.getMonth() + 1;
+						let day = date2.getDate() < 10 ? "0" + date2.getDate() : date2.getDate();
+						let date3 = year + "-" + month + "-" + day
+						// if(this.infoData.cargoOwnerStatus == "已完结"){//如果订单完成 用卸车时间计算天数
+						// 	 date3 = this.infoData.unloadingDate.split(" ")[0]//卸车时间
+						// }
+						if (date1 == date3) { //装车时间==当前时间
+							this.obj.amountMoney = 1
+							this.content = "本次查看北斗轨迹将从您的账户余额扣除 " + this.obj.amountMoney + " 元,确认支付查看轨迹?"
+							this.show = true
+						} else { //装车时间 != 当前时间  且没有查看过北斗轨迹
+							var k1 = new Date(new Date().toLocaleDateString()).getTime() //当前零点时间蹉
+							var k2 = new Date(new Date(this.infoData.loadingDate).toLocaleDateString()).getTime()
+							if(this.infoData.cargoOwnerStatus == "已完结"){//如果订单完成 用卸车时间计算天数
+								// let date3 = this.infoData.unloadingDate.split(" ")[0]//卸车时间
+								k1 = new Date(new Date(this.infoData.unloadingDate).toLocaleDateString()).getTime()
+							}
+							this.obj.amountMoney = this.countDay(k1, k2)+1//加1算装车当天
+							this.show = true
+							this.content = "本次查看北斗轨迹将从您的账户余额扣除" + this.obj.amountMoney + "元,确认支付查看轨迹?"
+						}
+					}
+				} else {
+					this.tips == "切换北斗轨迹"
+					this.getTrack(0)
+				}
+			},
+			payment() {
+				if (this.infoData.compName != "个人货主") { //查看北斗轨迹 标识(1个人2企业)
+					this.obj.companyId = this.infoData.compId
+					this.obj.flag = 2
+				} else {
+					this.obj.commonId = this.infoData.cargoCommonId
+					this.obj.flag = 1
+				}
+				this.obj.orderId = this.infoData.id
+				this.obj.orderNo = this.infoData.orderNo
 				uni.request({
-					url: baseUrl + '/hyOrderTravelPath/getInfo',
-					data: {
-						orderId: this.id,
-						currentPage: 1,
-						pageSize: 9999
-					},
-					method: 'get',
+					url: baseUrl + '/hyCargoOwnerCapitalInfo/api/lookBeiDou',
+					data: this.obj,
+					method: 'post',
 					header: {
 						'content-type': 'application/json' //'application/x-www-form-urlencoded; charset=UTF-8',
 					},
 					success: (res) => {
+						this.show = false
 						if (res.data.code == 200) {
-							if (res.data.data) {
-								var patharr = []
-								for (let num = 0; num < res.data.data.records.length; num++) {
-									if(res.data.data.records[num].longitudeLatitude){
-										patharr.push(JSON.parse(res.data.data.records[num].longitudeLatitude));
+							this.getTrack(1) //调北斗
+						} else {
+							uni.showToast({
+								title: '支付失败',
+								icon: 'none',
+								duration: 2000
+							})
+							return
+						}
+					}
+				})
+			},
+			// /hyOrderTravelPath/orderPath   
+			//模拟获取远程数据
+			getTrack(num) {
+				if (num == 0) { //平台轨迹
+					uni.request({
+						url: baseUrl + '/hyOrderTravelPath/getInfo',
+						data: {
+							orderId: this.id,
+							currentPage: 1,
+							pageSize: 9999
+						},
+						method: 'get',
+						header: {
+							'content-type': 'application/json' //'application/x-www-form-urlencoded; charset=UTF-8',
+						},
+						success: (res) => {
+							if (res.data.code == 200) {
+								if (res.data.data.records.length >0) {
+									var trajectory = []
+									for (let i = 0; i < res.data.data.records.length; i++) {
+										let maplist = []
+										if (res.data.data.records[i].longitudeLatitude) {
+											maplist = JSON.parse(res.data.data.records[i]
+												.longitudeLatitude)
+											for (let j = 0; j < maplist.length; j++) {
+												trajectory.push({
+													latitude: maplist[j].latitude,
+													longitude: maplist[j].longitude
+												})
+											}
+										}
 									}
-									// for (let i = 0; i < patharr.length; i++) {
-									//   that.path2.push([patharr[i].longitude, patharr[i].latitude]);
-									// }
+									this.polyline[0].points = trajectory
+								} else {
+									uni.showToast({
+										title: '暂无运输轨迹',
+										icon: 'none',
+										duration: 2000
+									})
+									return
 								}
-								this.polyline[0].points = patharr
-								// if (res.data.data.longitudeLatitude) {
-								// 	// console.log(JSON.parse(res.data.data.longitudeLatitude));
-								// 	this.polyline[0].points = JSON.parse(res.data.data.longitudeLatitude)
-								// }
-							} else {
-								uni.showToast({
-									title: '暂无运输轨迹',
-									icon: 'none',
-									duration: 2000
-								})
 							}
 						}
-					}
-				})
+					})
+				} else if (num == 1) {
+					uni.request({
+						url: baseUrl + '/hyOrderTravelPath/orderPath   ',
+						data: {
+							orderId: this.id,
+						},
+						method: 'post',
+						header: {
+							'content-type': 'application/json' //'application/x-www-form-urlencoded; charset=UTF-8',
+						},
+						success: (res) => {
+							if (res.data.code == 200) {
+								this.tips = "切换平台轨迹"
+								if (res.data.data.longitudeLatitude) {
+									var trajectory = []
+									var patharr = JSON.parse(res.data.data.longitudeLatitude)
+									for (let i = 0; i < patharr.length; i++) {
+										trajectory.push({
+											latitude: patharr[i].lat,
+											longitude: patharr[i].lon
+										});
+									}
+									this.polyline[0].points = trajectory
+								} else {
+									uni.showToast({
+										title: '暂无运输轨迹',
+										icon: 'none',
+										duration: 2000
+									})
+								}
+							}
+						}
+					})
+				}
+
 				// this.$request.baseRequest('post', '/hyOrderTravelPath/getInfo', {
 				// 		orderId: this.id,
 				// 	}).then(res => {
 				// 	console.log("res",res)
-				// 	// this.polyline[0].points = [
-				// 	// 	{latitude: 39.997761, longitude: 116.478935},
-				// 	// 	{latitude: 39.997825, longitude: 116.478939},
-				// 	// 	{latitude: 39.998549, longitude: 116.478912},
-				// 	// 	{latitude: 39.998555, longitude: 116.478998},
-				// 	// 	{latitude: 39.998566, longitude: 116.479282},
-				// 	// 	{latitude: 39.998528, longitude: 116.479658},
-				// 	// 	{latitude: 39.998453, longitude: 116.480151},
-				// 	// 	{latitude: 39.998302, longitude: 116.480784},
-				// 	// 	{latitude: 39.998184, longitude: 116.481149},
-				// 	// 	{latitude: 39.997997, longitude: 116.481573},
-				// 	// 	{latitude: 39.997846, longitude: 116.481863},
-				// 	// 	{latitude: 39.997718, longitude: 116.482072},
-				// 	// 	{latitude: 39.997718, longitude: 116.482362},
-				// 	// 	{latitude: 39.998935, longitude: 116.483633},
-				// 	// 	{latitude: 39.998968, longitude: 116.48367},
-				// 	// 	{latitude: 39.999861, longitude: 116.484648}
-				// 	// ]
-				// 	// for(var i =0 ;i<7200;i++){
-				// 	// 	var latitude = this.polyline[0].points[this.polyline[0].points.length -1].latitude + 0.0001
-				// 	// 	var longitude = this.polyline[0].points[this.polyline[0].points.length -1].longitude + 0.0001
-				// 	// 	this.polyline[0].points.push({latitude,longitude})
-				// 	// }
+				// this.polyline[0].points = [
+				// 	{latitude: 39.997761, longitude: 116.478935},
+				// 	{latitude: 39.997825, longitude: 116.478939},
+				// 	{latitude: 39.998549, longitude: 116.478912},
+				// 	{latitude: 39.998555, longitude: 116.478998},
+				// 	{latitude: 39.998566, longitude: 116.479282},
+				// 	{latitude: 39.998528, longitude: 116.479658},
+				// 	{latitude: 39.998453, longitude: 116.480151},
+				// 	{latitude: 39.998302, longitude: 116.480784},
+				// 	{latitude: 39.998184, longitude: 116.481149},
+				// 	{latitude: 39.997997, longitude: 116.481573},
+				// 	{latitude: 39.997846, longitude: 116.481863},
+				// 	{latitude: 39.997718, longitude: 116.482072},
+				// 	{latitude: 39.997718, longitude: 116.482362},
+				// 	{latitude: 39.998935, longitude: 116.483633},
+				// 	{latitude: 39.998968, longitude: 116.48367},
+				// 	{latitude: 39.999861, longitude: 116.484648}
+				// ]
+				// for(var i =0 ;i<7200;i++){
+				// 	var latitude = this.polyline[0].points[this.polyline[0].points.length -1].latitude + 0.0001
+				// 	var longitude = this.polyline[0].points[this.polyline[0].points.length -1].longitude + 0.0001
+				// 	this.polyline[0].points.push({latitude,longitude})
+				// }
 				var that = this
 				setTimeout(() => {
-					that.durationTime = Math.ceil(30000 / that.polyline[0].points.length) //默认播放全程使用30秒,计算相连两点动画时长
+					that.durationTime = Math.ceil(30000 / that.polyline[0].points
+						.length) //默认播放全程使用30秒,计算相连两点动画时长
 					that.initMapData()
 				}, 1000)
-
-				// 	})
-				// 	.catch(res => {
-				// 		uni.hideLoading()
-				// 		uni.showToast({
-				// 			title: res.message,
-				// 			icon: 'none',
-				// 			duration: 2000
-				// 		})
-				// 	});
 			},
 			//设置地图
 			initMapData() {
@@ -147,7 +333,6 @@
 			},
 			//设置位置(从起点开始)
 			initMarkers() {
-				console.log(this.polyline[0])
 				this.markers[0].latitude = this.polyline[0].points[0].latitude
 				this.markers[0].longitude = this.polyline[0].points[0].longitude
 			},
@@ -211,6 +396,118 @@
 		left: 0;
 		bottom: 0;
 		width: 750rpx;
-		position: fixed;
+		// position: fixed;
+	}
+
+	.content {
+		.top_btn {
+			// background-color: red;
+			position: fixed;
+			top: 30rpx;
+			left: 10px;
+			right: 30rpx;
+			flex-direction: row;
+			display: flex;
+			margin-top: 30px;
+			justify-content: space-between;
+
+			.returnPage {
+				flex-direction: row;
+				display: flex;
+
+				.return-icon {
+					width: 90rpx;
+					height: 90rpx;
+				}
+
+			}
+
+			.qiehuan {
+				flex-direction: row;
+				display: flex;
+				// width: 240rpx;
+				height: 90rpx;
+				background-color: #ffffff;
+				border-radius: 50rpx;
+				padding: 0 30rpx;
+
+				.tips {
+					line-height: 90rpx;
+				}
+
+				.qiehuan-icon {
+					width: 30rpx;
+					height: 30rpx;
+					margin-top: 30rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+
+		.infoBox {
+			// width: 90%;
+			height: 260rpx;
+			background-color: #FFFFFF;
+			position: fixed;
+			top: 30rpx;
+			left: 10px;
+			right: 30rpx;
+			border-radius: 40rpx;
+			// padding:50rpx;
+			display: flex;
+			flex-direction: row;
+			margin-top: 100px;
+
+			.infoBox_left {
+				padding-top: 50rpx;
+				width: 250rpx;
+				padding-top: 80rpx;
+				// background-color: #18BC37;
+			}
+
+			.infoBox_right {
+				background-image: linear-gradient(to right, #f9f7f7, #ffffff);
+				display: flex;
+				flex-direction: row;
+				border-bottom-right-radius: 40rpx;
+				border-top-right-radius: 40rpx;
+
+				.jt-icon {
+					position: relative;
+					top: 75rpx;
+					width: 60rpx;
+					margin: auto 10rpx;
+				}
+
+				.send {
+					padding-top: 80rpx;
+					width: 180rpx;
+					// background-color: #0077AA;
+				}
+
+				.end {
+					padding-top: 80rpx;
+					width: 180rpx;
+				}
+			}
+
+			.title {
+				font-size: 44rpx;
+				font-weight: 600;
+				text-align: center;
+			}
+
+			.address {
+				text-align: center;
+				color: #8F8F8F;
+				font-size: 30rpx;
+				margin-top: 15rpx;
+			}
+
+			.estimate {
+				width: 120px;
+				text-align: center;
+			}
+		}
 	}
 </style>

+ 10 - 7
pages/order/map.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="center">
 		<map v-if="polyline[0].points.length > 0" id="myMap" :markers="markers" :polyline="polyline"
 			:include-points="polyline[0].points" :latitude="polyline[0].points[0].latitude"
 			:longitude="polyline[0].points[0].longitude" style="width: 100%; height: calc(100vh - 90px)" />
@@ -39,12 +39,14 @@
 						x: 0.5,
 						y: 1
 					}
-				}]
+				}],
+				// infoData:{}
 			}
 		},
 		onLoad(option) {
 			this.id = option.id
-			console.log(option.id)
+			// this.infoData = option
+			// console.log(option)
 			this.getTrack() //获取轨迹信息(只做演示,未进行远程请求)
 		},
 		methods: {
@@ -55,8 +57,8 @@
 						currentPage: 1,
 						pageSize: 9999
 					}).then(res => {
-						console.log("res", res)
-						// this.polyline[0].points = [
+						// console.log("res", res)
+						// let arr = [
 						// 	{latitude: 39.997761, longitude: 116.478935},
 						// 	{latitude: 39.997825, longitude: 116.478939},
 						// 	{latitude: 39.998549, longitude: 116.478912},
@@ -74,6 +76,7 @@
 						// 	{latitude: 39.998968, longitude: 116.48367},
 						// 	{latitude: 39.999861, longitude: 116.484648}
 						// ]
+						// this.polyline[0].points.push(arr)
 						// this.durationTime = Math.ceil(30000 / this.polyline[0].points.length)	//默认播放全程使用30秒,计算相连两点动画时长
 						// this.initMapData()
 					})
@@ -85,12 +88,11 @@
 							duration: 2000
 						})
 					});
-
 			},
 			//设置地图
 			initMapData() {
 				this.initMarkers()
-				this.mapContext = uni.createMapContext('myMap', this)
+				this.mapContext = uni.createMapContext('myMap',this)
 			},
 			//设置位置(从起点开始)
 			initMarkers() {
@@ -160,4 +162,5 @@
 		width: 750rpx;
 		position: fixed;
 	}
+	
 </style>

+ 0 - 4
pages/order/signContract.vue

@@ -174,15 +174,12 @@
 										src: res.data.signImg,
 										success(res) {
 											var ctx = uni.createCanvasContext('handWriting')
-											console.log(res.width);
-											console.log(res.height);
 											ctx.drawImage(res.path, 0, 0)
 											// ctx.drawImage(res.path, 0, 0, 330, 244)
 											ctx.save()
 											ctx.draw()
 										},
 										fail(res) {
-											console.log("fail -> res", res)
 											uni.showToast({
 												title: "图片下载异常",
 												duration: 2000,
@@ -252,7 +249,6 @@
 					destWidth: 330,
 					destHeight: 244,
 					success(res) {
-						console.log(res.tempFilePath, 'canvas生成图片地址');
 						uploadImage('image', res.tempFilePath, 'appData/',
 							result => {
 								// 上传成功

+ 2 - 1
pages/release/release.vue

@@ -541,6 +541,7 @@
 					constId: "CON1"
 				}).then(res => {
 					this.dataObj.goodsType = res.data[0].constValue
+					this.dataObj.goodsTypeKey = res.data[0].constKey
 					this.goodsList.push(res.data)
 				})
 			},
@@ -549,6 +550,7 @@
 					constId: "BUS1"
 				}).then(res => {
 					this.dataObj.businessType = res.data[0].constValue
+					this.dataObj.businessTypeKey = res.data[0].constKey
 					this.businessList.push(res.data)
 				})
 			},
@@ -858,7 +860,6 @@
 				uni.$u.throttle(this.requestdata, 500)
 			},
 			requestdata() {
-				console.log(this.dataObj)
 				// // #ifdef APP-PLUS
 				// if (this.alertTitle == '账号审核中') {
 				// 	if (uni.getSystemInfoSync().platform == 'ios') {

+ 0 - 4
pages/release/selectAddress.vue

@@ -169,7 +169,6 @@
 										/(\d{3})(\d{4})(\d{4})/, "$1****$3")
 								}
 							}
-							console.log(res.data.records)
 							this.dataList = res.data.records
 							this.$forceUpdate()
 							for (let i = 0; i < this.dataList.length; i++) {
@@ -195,8 +194,6 @@
 					});
 			},
 			radioChange(n, val) {
-				console.log('radioChange', n);
-				console.log('radioChange', val);
 				for (var i = 0; i < this.dataList.length; i++) {
 					if (this.dataList[i].defaultShipment == 1 && n == '默认装货') {
 						this.dataList[i].radiovalue = ''
@@ -269,7 +266,6 @@
 			selectAddress(type) {
 				// 0临时地址 1 新增地址
 				if (type == 0) {
-					console.log(111111111)
 					let that = this
 					uni.chooseLocation({
 						success: function(res) {

BIN
static/images/order/qiehuan.png


BIN
static/images/order/returnPage.png


BIN
unpackage/res/icons/1024x1024.png


BIN
unpackage/res/icons/120x120.png


BIN
unpackage/res/icons/144x144.png


BIN
unpackage/res/icons/152x152.png


BIN
unpackage/res/icons/167x167.png


BIN
unpackage/res/icons/180x180.png


BIN
unpackage/res/icons/192x192.png


BIN
unpackage/res/icons/20x20.png


BIN
unpackage/res/icons/29x29.png


BIN
unpackage/res/icons/40x40.png


BIN
unpackage/res/icons/58x58.png


BIN
unpackage/res/icons/60x60.png


BIN
unpackage/res/icons/72x72.png


BIN
unpackage/res/icons/76x76.png


BIN
unpackage/res/icons/80x80.png


BIN
unpackage/res/icons/87x87.png


BIN
unpackage/res/icons/96x96.png