地图轨迹、标记点、在线更新app

App.vue

@@ -1,15 +1,29 @@
 <script>
+	import {
+		checkUpdateApp
+	} from './common/downApp.js';
 	// 冷链物流移动端
 	export default {
 		onLaunch: function() {
-			console.log('App Launch')
+			// console.log('App Launch')
 		},
 		onShow: function() {
-			console.log('App Show')
+			// #ifdef APP-PLUS 
+			uni.getSystemInfo({
+				success: (res) => {
+					var that = this;
+					//检测当前平台，如果是安卓则启动安卓更新  
+					if (res.platform == "android") {
+						checkUpdateApp();
+					}
+				}
+			})
+			// #endif
+			// console.log('App Show')
 		},
 		onHide: function() {
-			console.log('App Hide')
-		}
+			// console.log('App Hide')
+		},
 	}
 </script>
 

common/downApp.js

@@ -0,0 +1,93 @@
+export function checkUpdateApp() {
+	plus.runtime.getProperty(plus.runtime.appid, function(widgetinfo) {
+		if (widgetinfo.name == '冷链物流') {
+			uni.request({
+				url: 'https://www.pgyer.com/apiv2/app/check',
+				data: {
+					_api_key: '202eadee73f2051186b26106cc8bfed1',
+					appKey: '970036fad7e2118d83dcdc5ac36eabc5'
+				},
+				success: check => {
+					if (check.statusCode == 200 && check.data.code == 0 && check.data.data) {
+						let data = check.data.data;
+						console.log('data', data);
+						let version = widgetinfo.version,
+							appVersion = data.buildVersion,
+							appName = widgetinfo.name,
+							appurl = data.downloadURL,
+							intro = '发现新的《冷链物流》APP,需要更新APP';
+
+						if (data && version < appVersion) {
+							uni.showModal({
+								title: '更新提示',
+								confirmText: '立即升级',
+								content: intro,
+								success: res => {
+									if (res.confirm) {
+										uni.showLoading({
+											title: '正在更新',
+											mask: true
+										});
+										uni.downloadFile({
+											url: appurl,
+											success: download => {
+												if (download.statusCode ==
+													200) {
+													plus.runtime.install(
+														download
+														.tempFilePath, {
+															force: false
+														},
+														() => {
+															uni
+														.hideLoading();
+															plus.runtime
+																.restart(); //更新成功启动
+														},
+														err => {
+															uni
+														.hideLoading();
+															uni.showToast({
+																title: '更新失败，将跳转下载页面',
+																icon: 'none',
+																duration: 2000
+															});
+														}
+													);
+													setTimeout(function() {
+														plus.runtime
+															.openURL(
+																appurl
+																);
+													}, 2000);
+												}
+											}
+										});
+									} else if (res.cancel) {
+										console.log('用户点击取消');
+										uni.showToast({
+											title: '低版本无法继续使用,请先升级',
+											icon: 'none',
+											duration: 2000
+										});
+										//退出app
+										setTimeout(function() {
+											plus.runtime.quit();
+										}, 2000);
+									}
+								},
+								fail: () => {
+									uni.hideLoading();
+								}
+							});
+						} else {
+							console.log('暂无新版本=====')
+						}
+					}
+				}
+			});
+		} else {
+			//非安卓
+		}
+	});
+}

components/x-steps.vue

@@ -1,17 +1,4 @@
 <template>
-	<!-- 获取一个数组，结构为
-  [{
-    nodeName:"流程发起"
-    isAudit:false
-    time:"2024-02-04 14:27:35"
-    otherData:{
-      assignee:{
-      userId:"465"
-      name:"XXX"
-      company:"测试产业单位1"
-      tenantId:"140"
-    }
-  }] -->
 	<view class="bg">
 		<view class="steps">
 			<view class="steps_item" v-for="(i, index) in infoList" :key="index">
@@ -25,13 +12,13 @@
 					<view class="info_item">
 						<!-- 真是节点名称、时间 -->
 						<view class="top_info">
-							<view class="title">{{ i.text }}
-								<view v-if="i.phone">
+							<text class="title_scacm">{{ i.text }}
+								<span v-if="i.phone">
 									联系电话:<span style="color: #f29100;margin-right: 15rpx;">{{i.phone}}</span>
-								</view>
+								</span>
 								{{ i.text1 }}
-							</view>
-							<view class="date">{{ i.createdAt || '测试产业单位'}}</view>
+							</text>
+							<text class="date">{{ i.createdAt || ''}}</text>
 						</view>
 					</view>
 				</view>
@@ -124,7 +111,7 @@
 
 				.info_item {
 					background-color: #ffffff;
-					margin-right: 30rpx;
+					margin-right: 10rpx;
 					border-radius: 10rpx;
 					display: flex;
 					flex-direction: column;
@@ -136,20 +123,9 @@
 					}
 
 					text {
-						font-size: 24rpx;
-						font-weight: 500;
-						color: rgba(51, 51, 51, 1);
-					}
-
-					.title {
-						width: 100%;
 						font-size: 28rpx;
 						font-weight: 500;
-						color: rgba(102, 102, 102, 1);
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						flex-direction: column;
+						color: rgba(51, 51, 51, 1);
 					}
 
 					.date {
@@ -165,6 +141,15 @@
 		}
 	}
 
+	.title_scacm {
+		display: -webkit-box !important;
+		width: 100%;
+		font-size: 32rpx;
+		font-weight: 500;
+		color: rgba(102, 102, 102, 1);
+		word-break: break-all;
+	}
+
 	.ml5 {
 		margin-left: 10rpx;
 	}

index.html

@@ -9,6 +9,7 @@
         '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
         (coverSupport ? ', viewport-fit=cover' : '') + '" />')
     </script>
+	<script src="https://webapi.amap.com/maps?v=1.4.15&key=042f12d3f6f07494669e8eef6ebd301a"></script> <!-- 引入高德地图SDK -->
     <title></title>
     <!--preload-links-->
     <!--app-context-->

manifest.json

@@ -2,8 +2,8 @@
     "name" : "冷链物流",
     "appid" : "__UNI__92DFF97",
     "description" : "",
-    "versionName" : "1.0.6",
-    "versionCode" : 502,
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

node_modules/.package-lock.json

@@ -3,6 +3,11 @@
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
+    "node_modules/@types/amap-js-api": {
+      "version": "1.4.16",
+      "resolved": "https://registry.npmmirror.com/@types/amap-js-api/-/amap-js-api-1.4.16.tgz",
+      "integrity": "sha512-gfcEswuU4GNRdGAh74FhxfLlU6qxmVIJYPf3HV0uKucCWQ9iSr8TonDhqBvHVmmQEY60K+UAeIh0YLwKo/jpFQ=="
+    },
     "node_modules/array-parallel": {
       "version": "0.1.3",
       "resolved": "https://registry.npmmirror.com/array-parallel/-/array-parallel-0.1.3.tgz",

package-lock.json

@@ -5,10 +5,16 @@
   "packages": {
     "": {
       "dependencies": {
+        "@types/amap-js-api": "^1.4.16",
         "barcode": "^0.1.0",
         "jsbarcode": "^3.11.6"
       }
     },
+    "node_modules/@types/amap-js-api": {
+      "version": "1.4.16",
+      "resolved": "https://registry.npmmirror.com/@types/amap-js-api/-/amap-js-api-1.4.16.tgz",
+      "integrity": "sha512-gfcEswuU4GNRdGAh74FhxfLlU6qxmVIJYPf3HV0uKucCWQ9iSr8TonDhqBvHVmmQEY60K+UAeIh0YLwKo/jpFQ=="
+    },
     "node_modules/array-parallel": {
       "version": "0.1.3",
       "resolved": "https://registry.npmmirror.com/array-parallel/-/array-parallel-0.1.3.tgz",
@@ -70,6 +76,11 @@
     }
   },
   "dependencies": {
+    "@types/amap-js-api": {
+      "version": "1.4.16",
+      "resolved": "https://registry.npmmirror.com/@types/amap-js-api/-/amap-js-api-1.4.16.tgz",
+      "integrity": "sha512-gfcEswuU4GNRdGAh74FhxfLlU6qxmVIJYPf3HV0uKucCWQ9iSr8TonDhqBvHVmmQEY60K+UAeIh0YLwKo/jpFQ=="
+    },
     "array-parallel": {
       "version": "0.1.3",
       "resolved": "https://registry.npmmirror.com/array-parallel/-/array-parallel-0.1.3.tgz",

pages/mine/index.vue

@@ -56,6 +56,17 @@
 				</view>
 			</view>
 			<!-- <view class="card_system">
+				<view class="space_between" @click="handleCheckVersion">
+					<view style="display: flex;align-items: center;">
+						<view class="card_icon_set center_in violet">
+							<u-icon name="info" size="20" color="#ffffff"></u-icon>
+						</view>
+						<view class="option_title">版本更新</view>
+					</view>
+					<u-icon name="arrow-right" size="20"></u-icon>
+				</view>
+			</view> -->
+			<!-- <view class="card_system">
 			<view class="space_between" @click="bluetoothPrinting">
 				<view style="display: flex;align-items: center;">
 					<view class="card_edit_icon center_in">
@@ -73,6 +84,7 @@
 </template>
 
 <script>
+	const ENV = require('../../.env.js')
 	export default {
 		props: {
 			token: {
@@ -160,7 +172,10 @@
 				}],
 				logoutShow: false,
 				title: '确定退出？',
-				content: '退出登录后将无法查看运单，重新登录后即可查看'
+				content: '退出登录后将无法查看运单，重新登录后即可查看',
+				innerVer: null,
+				version: null,
+				isCheckVersion: false
 			}
 		},
 		created() {
@@ -211,6 +226,88 @@
 					uni.$u.toast('请先登录')
 				}
 			},
+			// 版本更新
+			versionUpdating() {
+				// https: //coldlogistics.coldbaozhida.com/smartAppversion.json
+			},
+			handleCheckVersion() {
+				let _this = this;
+				// #ifdef APP-PLUS 
+				_this.isCheckVersion = true;
+				plus.screen.lockOrientation('portrait-primary') // 竖屏锁定
+				plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
+					_this.innerVer = widgetInfo.version;
+					_this.version = widgetInfo.versionCode;
+					uni.request({
+						url: ENV.APP_LINK_URL + '/smartAppversion.json?_t=' + new Date()
+							.getTime(), //版本检测
+						method: 'GET',
+						header: {},
+						success: (result) => {
+							console.log(result.data.code,14)
+							if (result.data.code === 0) {
+								setTimeout(() => {
+									_this.isCheckVersion = false;
+								}, 100);
+								if (result.data.version - _this.version > 0) { // 如果最新版本大于现在已经安装的App的版本
+									uni.showModal({
+										title: "更新提示",
+										content: "发现新版本,请确认下载更新?",
+										success: (res) => {
+											if (res.confirm) {
+												uni.showLoading({
+													title: '下载更新包中...'
+												});
+												uni.downloadFile({
+													url: result.data.url,
+													success: (downloadResult) => {
+														uni.hideLoading();
+														if (downloadResult
+															.statusCode === 200
+															) {
+															plus.runtime
+																.install(
+																	downloadResult
+																	.tempFilePath, {
+																		force: true
+																	},
+																	function() {
+																		console
+																			.log(
+																				'App安装成功！'
+																				);
+																		uni.showModal({
+																			title: 'App安装成功!',
+																			showCancel: false
+																		})
+																		plus.runtime
+																			.restart();
+																	},
+																	function(
+																	e) {
+																		console
+																			.log(
+																				'App安装失败！'
+																				);
+																	})
+														}
+													}
+												});
+											}
+										}
+									})
+								} else {
+									uni.showModal({
+										title: '当前已是最新版本',
+										showCancel: false
+									})
+								}
+							}
+						}
+					})
+				})
+				// #endif
+			},
 			// 蓝牙打印
 			bluetoothPrinting() {
 				uni.navigateTo({
@@ -374,4 +471,8 @@
 			font-size: 40rpx;
 		}
 	}
+
+	.violet {
+		background-color: #fe654a !important;
+	}
 </style>

pages/order/delivery.vue

@@ -16,6 +16,10 @@
 						</template>
 					</u-input>
 				</view>
+				<view class="deleteCurrent" @click="removeWaybill(frequencyCoding)">
+					<u-icon class="icon_current" name="backspace" height="10" size="20"></u-icon>
+					<view class="title_nape">删除</view>
+				</view>
 			</view>
 			<view v-if="selectiveType != 'signfor'">
 				<view class="card_frequency">
@@ -25,7 +29,9 @@
 					</view>
 					<view style="width: 100%;" v-if="list.length > 0">
 						<view class="item_coding" v-for="(item,index) in list" :key="index">
-							{{item}}
+							<view class="title_coding">{{item}}</view>
+							<u-icon name="close-circle-fill" color="#c0c4cc" size="20"
+								@click="removeWaybill(item)"></u-icon>
 						</view>
 					</view>
 					<view class="card_empty" v-else>
@@ -86,15 +92,17 @@
 		},
 		computed: {
 			jurisdiction() {
-				if (this.fileList1.length > 0 && this.fileList2.length > 0 && this.fileList3.length > 0) {
-					if (this.fileList1[0].message == '成功' && this.fileList2[0].message == '成功' && this.fileList3[0]
-						.message == '成功') {
-						return false
+				if (this.selectiveType == 'signfor') {
+					if (this.fileList1.length > 0 && this.fileList2.length > 0 && this.fileList3.length > 0) {
+						if (this.fileList1[0].message == '成功' && this.fileList2[0].message == '成功' && this.fileList3[0]
+							.message == '成功') {
+							return false
+						} else {
+							return true
+						}
 					} else {
 						return true
 					}
-				} else {
-					return true
 				}
 			}
 		},
@@ -221,6 +229,18 @@
 					}
 				})
 			},
+			// 移除错误运单号
+			removeWaybill(value) {
+				if (this.frequencyCoding == value) {
+					this.frequencyCoding = ''
+				}
+				const arr = deleteElementById(this.list, value)
+				this.list = arr
+
+				function deleteElementById(arr, key) {
+					return arr.filter((item) => item !== key);
+				}
+			},
 			// 新增图片
 			async afterRead(event) {
 				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
@@ -407,12 +427,19 @@
 	}
 
 	.item_coding {
-		margin-top: 26rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
 		width: 100%;
-		padding-bottom: 15rpx;
+		margin-top: 10px;
+		padding: 25rpx 0rpx;
 		border-bottom: 2rpx solid #dfdfdf;
 	}
 
+	.title_coding {
+		font-size: 30rpx;
+	}
+
 	.card_empty {
 		width: 100%;
 		margin-top: 50rpx;
@@ -433,4 +460,33 @@
 		padding-bottom: constant(safe-area-inset-bottom); //兼容 IOS<11.2
 		padding-bottom: env(safe-area-inset-bottom); //兼容 IOS>11.2
 	}
+
+	.deleteCurrent {
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		justify-content: center;
+		border: 1px solid #e5e5e5;
+		padding: 5rpx 0rpx 5rpx 5rpx;
+		margin-left: 10rpx;
+		border-radius: 8rpx;
+		height: 66rpx;
+
+		.icon_current {
+			height: 15px;
+		}
+
+		.title_nape {
+			margin: 0rpx 10rpx;
+			display: flex;
+			font-size: 20rpx;
+			width: 40rpx;
+		}
+	}
+
+	::v-deep .u-border {
+		border-width: 1px !important;
+		border-color: #e5e5e5 !important;
+		border-style: solid;
+	}
 </style>

pages/order/logisticsDetails.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 物流详情 -->
-	<view>
+	<view class="card_logist">
 		<u-navbar title="物流详情" autoBack placeholder></u-navbar>
 		<view style="width: 100%;">
 			<map style="width: 100%;height: 500rpx;" id="container" :latitude="latitude" :longitude="longitude"
@@ -124,7 +124,7 @@
 						})
 
 						let polyline = [{
-							width: 10,
+							width: 30,
 							points: arrList,
 							color: '#3591FC',
 							arrowLine: true,
@@ -136,48 +136,36 @@
 							longitude: arrList[0].longitude,
 							id: 0,
 							iconPath: '/static/task/startpoint.png',
-							width: 40,
-							height: 43
+							width: 20,
+							height: 23
 						}
 						const markers1 = {
-							latitude: arrList[length].latitude,
-							longitude: arrList[length].longitude,
+							latitude: arrList[arrList.length - 1].latitude,
+							longitude: arrList[arrList.length - 1].longitude,
 							id: 1,
 							iconPath: '/static/task/endpoint.png',
-							width: 40,
-							height: 43
+							width: 20,
+							height: 23
 						}
 						this.markersList[0] = markers0
 						this.markersList[1] = markers1
-						this.latitude = arrList[length].latitude
-						this.longitude = arrList[length].longitude
+						this.latitude = arrList[arrList.length - 1].latitude
+						this.longitude = arrList[arrList.length - 1].longitude
 						// console.log(this.polylineList, this.markersList, 266)
 						this.$forceUpdate()
 					}
 				})
 			},
-			reverseGeocode(longitude, latitude) {
-				return new Promise((resolve, reject) => {
-					new AMap.plugin("AMap.Geocoder", () => {
-						let position = [longitude, latitude] //位置的经纬度 
-						const geocoder = new AMap.Geocoder({
-							// city: "0851" ,
-							cityCode: '0851',
-						});
-						geocoder.getAddress(position, (status, result) => {
-							if (status === "complete" && result.info === "OK") {
-								const title = result.regeocode.addressComponent.city
-								resolve(title)
-							}
-						});
-					});
-				})
-			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	#map {
+		width: 100%;
+		height: 500rpx;
+	}
+
 	.loading-icon {
 		color: #333;
 		font-size: 28rpx;
@@ -187,8 +175,8 @@
 		text-align: center;
 	}
 
-	::v-deep .u-navbar__content {
-		z-index: 9999999;
+	.card_logist ::v-deep .u-navbar__content {
+		z-index: 2024;
 	}
 
 	.card_logistics {

smartAppversion.json

@@ -0,0 +1,6 @@
+{
+	"code": 0,
+	"msg": "success",
+	"version": "505", // 线上版本号
+	"url": "https://coldlogistics.coldbaozhida.com/冷链物流.apk" // 更新下载地址
+}

unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,7 +1,7 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/indexRouter","pages/login","pages/codeLogin","pages/register","pages/home/particulars","pages/order/index","pages/order/delivery","pages/order/orderDetails","pages/order/quantum","pages/order/addWaybill","pages/mine/password","pages/order/logisticsDetails","pages/order/humiture"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"宝智达冷链物流","compilerVersion":"4.08","entryPagePath":"pages/indexRouter","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniConfig = {"pages":["pages/indexRouter","pages/login","pages/codeLogin","pages/register","pages/home/particulars","pages/order/index","pages/order/delivery","pages/order/orderDetails","pages/order/quantum","pages/order/addWaybill","pages/mine/password","pages/order/logisticsDetails","pages/order/humiture"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"冷链物流","compilerVersion":"4.08","entryPagePath":"pages/indexRouter","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
 var __uniRoutes = [{"path":"/pages/indexRouter","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/login","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/codeLogin","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/register","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/particulars","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/delivery","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/orderDetails","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/quantum","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/addWaybill","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/mine/password","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/logisticsDetails","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/humiture","meta":{},"window":{"navigationStyle":"custom"}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});