sov

2022-11-11 19:10:17 +08:00
parent ded95762eb bb64664360
commit 93c25b7b22
21 changed files with 333 additions and 228 deletions
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
    "name" : "海亮铜箔",
    "appid" : "__UNI__22404A1",
    "description" : "海亮铜箔手持系统",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
--- a/pages.json
+++ b/pages.json
@@ -18,6 +18,12 @@
 		    	"navigationStyle": "custom"
 		    }  
 		}
+		,{
+		    "path" : "pages/login/upgrade",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }  
+		}
 		,{
 			"path" : "pages/ProductManage/SboProdProgress",
 			"style": {
@@ -138,21 +144,6 @@
 		    	"navigationStyle": "custom"
 		    }   
 		}
-    ,{
-    "path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
-    "style": {
-        "app-plus": {
-            "animationDuration": 200,
-            "animationType": "fade-in",
-            "background": "transparent",
-            "backgroundColorTop": "transparent",
-            "popGesture": "none",
-            "scrollIndicator": false,
-            "titleNView": false
-        },
-        "disableScroll": true
-    }
-}
    ,{
            "path" : "pages/ProductManage/EmptyPipeOutStore",
            "style" :                                                                                    
--- a/pages/ProductManage/EmptyPipeInStore.vue
+++ b/pages/ProductManage/EmptyPipeInStore.vue
@@ -114,14 +114,14 @@
 				}
 				try {
 					let res = await emptyConfirm(this.pkObj, this.qty, this.val1, '2')
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
 					this.disabled = false
 					this.pkId = ''
 					this.pkObj = {}
 					this._queryMaterialInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled = false
 				}
--- a/pages/ProductManage/EmptyPipeOutStore.vue
+++ b/pages/ProductManage/EmptyPipeOutStore.vue
@@ -114,14 +114,14 @@
 				}
 				try {
 					let res = await emptyConfirm(this.pkObj, this.qty, this.val1, '1')
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
 					this.disabled = false
 					this.pkId = ''
 					this.pkObj = {}
 					this._queryMaterialInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled = false
 				}
--- a/pages/ProductManage/SboProcess.vue
+++ b/pages/ProductManage/SboProcess.vue
@@ -112,14 +112,14 @@
 				}
 				try {
 					let res = await needEmptyAxis(this.pkObj)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
 					this.disabled1 = false
 					this.pkId = ''
 					this.pkObj = {}
 					this._queryRawFoilList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled1 = false
 				}
@@ -132,14 +132,14 @@
 				}
 				try {
 					let res = await confirmBlanking(this.pkObj)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
 					this.disabled2 = false
 					this.pkId = ''
 					this.pkObj = {}
 					this._queryRawFoilList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled2 = false
 				}
--- a/pages/ProductManage/ZjCasing.vue
+++ b/pages/ProductManage/ZjCasing.vue
@@ -156,14 +156,13 @@
 				}
 				try {
 					let res = await casingConfirm(this.checkArr, this.val2)
+					this.disabled = false
+					this.checkArr = []
+					this._queryMaterialInfo()
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
 					})
-					this.disabled = false
-					this.checkArr = []
-					this._queryMaterialInfo()
-					
 				} catch (e) {
 					this.disabled = false
 				}
--- a/pages/ProductManage/ZjDelivery.vue
+++ b/pages/ProductManage/ZjDelivery.vue
@@ -86,7 +86,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || checkArr.length > 1}" :disabled="disabled1" @tap="_needVehicle">呼叫载具</button>
+			<button class="submit-button" :class="{'btn-disabled': checkArr.length === 0 || checkArr.length > 1}" :disabled="disabled1" @tap="_needVehicle">呼叫载具</button>
 			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled4" @tap="_shippingCheck">配送校验</button>
 			<button class="submit-button" :class="{'btn-disabled': !checkArr.length}" :disabled="disabled2" @tap="_shippingConfirm">配送确认</button>
 			<button class="submit-button" :class="{'btn-disabled': !val3}" :disabled="disabled3" @tap="_returnVehicle">载具送回</button>
@@ -108,6 +108,7 @@
 			return {
 				val1: '',
 				val2: '',
+				val3: '',
 				options: [],
 				index: '',
 				qty: '',
@@ -151,19 +152,19 @@
 			/** 呼叫载具 */
 			async _needVehicle () {
 				this.disabled1 = true
-				if (!this.checkArr.length || this.checkArr.length > 1) {
+				if (this.checkArr.length === 0 || this.checkArr.length > 1) {
 					this.disabled1 = false
 					return
 				}
 				try {
 					let res = await needVehicle(this.checkArr[0])
+					this.disabled1 = false
+					this.checkArr = []
+					this._queryMaterialInfo()
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
 					})
-					this.disabled1 = false
-					this.checkArr = []
-					this._queryMaterialInfo()
 				} catch (e) {
 					this.disabled1 = false
 				}
@@ -177,13 +178,13 @@
 				}
 				try {
 					let res = await shippingConfirm(this.checkArr, this.val3)
+					this.disabled2 = false
+					this.checkArr = []
+					this._queryMaterialInfo()
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
 					})
-					this.disabled2 = false
-					this.checkArr = []
-					this._queryMaterialInfo()
 				} catch (e) {
 					this.disabled2 = false
 				}
--- a/pages/ProductManage/ZjInStore.vue
+++ b/pages/ProductManage/ZjInStore.vue
@@ -138,14 +138,14 @@
 				}
 				try {
 					let res = await inConfirm(this.index1, this.pkObj)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
 					this.disabled = false
 					this.pkId = ''
 					this.pkObj = {}
 					this._queryMaterialInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled = false
 				}
--- a/pages/ProductManage/ZjOutStore.vue
+++ b/pages/ProductManage/ZjOutStore.vue
@@ -200,14 +200,14 @@
 				}
 				try {
 					let res = await outConfirm(this.index1, this.checkArr, this.isV)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
 					this.disabled1 = false
 					this.checkArr = []
 					this.isV = '0'
 					this._queryMaterialInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled1 = false
 				}
@@ -245,14 +245,14 @@
 				}
 				try {
 					let res = await conveyConfirm(this.index4)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
 					this.disabled2 = false
 					this.index3 = ''
 					this.index4 = ''
 					this.active = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled2 = false
 					this.index3 = ''
--- a/pages/WarehouseManage/InStoreConfirm.vue
+++ b/pages/WarehouseManage/InStoreConfirm.vue
@@ -47,8 +47,8 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_SN === pkId}">
-								<td>{{e.package_box_SN}}</td>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{package_box_sn}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.product_name}}</td>
 								<td>{{e.product_description}}</td>
@@ -60,8 +60,8 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_stPrint">补码</button>
+			<button class="submit-button" :class="{'btn-disabled': dataList.length === 0}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
+			<button class="submit-button" :class="{'btn-disabled': dataList.length === 0}" :disabled="disabled1" @tap="_stPrint">补码</button>
 			<button class="submit-button" @tap="_boxQuery(val1)">查询</button>
 		</view>
 	</view>
@@ -82,8 +82,6 @@
 				val2: '',
 				isV: '0',
 				dataList: [],
-				pkId: '',
-				pkObj: {},
 				disabled: false,
 				disabled1: false
 			};
@@ -104,21 +102,18 @@
 			/** 确认 */
 			async _stConfirm () {
 				this.disabled = true
-				if (!this.pkId) {
+				if (this.dataList.length === 0) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await stConfirm(this.pkObj, this.val2, '2', this.isV)
+					let res = await stConfirm(this.dataList, this.val2, '2', this.isV)
+					this.disabled = false
+					this._boxQuery(this.val1)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
 					})
-					this.pkId = ''
-					this.pkObj = {}
-					this.disabled = false
-					this._boxQuery(this.val1)
-					
 				} catch (e) {
 					this.disabled = false
 				}
@@ -126,28 +121,21 @@
 			/** 补码 */
 			async _stPrint () {
 				this.disabled1 = true
-				if (!this.pkId) {
+				if (this.dataList.length === 0) {
 					this.disabled1 = false
 					return
 				}
 				try {
-					let res = await stPrint(this.pkObj)
+					let res = await stPrint(this.dataList)
+					this.disabled1 = false
+					this._boxQuery()
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
 					})
-					this.pkId = ''
-					this.pkObj = {}
-					this.disabled1 = false
-					this._boxQuery()
-					
 				} catch (e) {
 					this.disabled1 = false
 				}
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.package_box_SN ? '' : e.package_box_SN
-				this.pkObj = this.pkId === e.package_box_SN ? e : {}
 			}
 		}
 	}
--- a/pages/WarehouseManage/ProdDeliveryConfirm.vue
+++ b/pages/WarehouseManage/ProdDeliveryConfirm.vue
@@ -91,14 +91,14 @@
 				this.disabled1 = true
 				try {
 					let res = await stoutConfirm(this.dataList, this.val1)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
 					this.disabled1 = false
 					this.pkId = ''
 					this.pkObj = {}
 					this._stivtQuery()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled1 = false
 				}
@@ -111,14 +111,14 @@
 				}
 				try {
 					let res = await stoutPrint(this.pkObj)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
 					this.disabled1 = false
 					this.pkId = ''
 					this.pkObj = {}
 					this._stivtQuery()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled1 = false
 				}
--- a/pages/WarehouseManage/ReturngoodsInStore.vue
+++ b/pages/WarehouseManage/ReturngoodsInStore.vue
@@ -115,15 +115,14 @@
 				}
 				try {
 					let res = await stConfirm(this.pkObj, this.val2, '3', this.isV, this.val3)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
 					this.pkId = ''
 					this.pkObj = {}
 					this.disabled = false
 					this._boxQuery(this.val1)
-					
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled = false
 				}
--- a/pages/WarehouseManage/ScrapInStore.vue
+++ b/pages/WarehouseManage/ScrapInStore.vue
@@ -108,15 +108,14 @@
 				}
 				try {
 					let res = await stConfirm(this.pkObj, this.val2, '1', this.isV)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
 					this.pkId = ''
 					this.pkObj = {}
 					this.disabled = false
 					this._boxQuery(this.val1)
-					
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled = false
 				}
--- a/pages/WarehouseManage/SemifinishedInStore.vue
+++ b/pages/WarehouseManage/SemifinishedInStore.vue
@@ -119,15 +119,14 @@
 				}
 				try {
 					let res = await confirmInstor(this.pkObj, this.val1, this.index)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
 					this.disabled = false
 					this.pkId = ''
 					this.pkObj = {}
 					this._coolIOQuery()
-					
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled = false
 				}
--- a/pages/WarehouseManage/SemifinishedOutStore.vue
+++ b/pages/WarehouseManage/SemifinishedOutStore.vue
@@ -116,15 +116,14 @@
 				}
 				try {
 					let res = await outconfirmInstor(this.pkObj, this.val1)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
 					this.disabled = false
 					this.pkId = ''
 					this.pkObj = {}
 					this._outcoolIOQuery()
-					
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled = false
 				}
--- a/pages/WarehouseManage/XuniDeliveryConfirm.vue
+++ b/pages/WarehouseManage/XuniDeliveryConfirm.vue
@@ -93,12 +93,12 @@
 				this.disabled1 = true
 				try {
 					let res = await virtualoutConfirm(this.dataList, this.val1)
+					this.disabled1 = false
+					this._virtualivtQuery()
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
 					})
-					this.disabled1 = false
-					this._virtualivtQuery()
 				} catch (e) {
 					this.disabled1 = false
 				}
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -15,6 +15,7 @@
 				<text class="radio-label">记住用户名</text>
 			</view>
 			<text class="setup-text" @tap="setup">设置</text>
+			<text class="setup-text" @tap="isUpdate">升级版本</text>
 		</view>
 		<button class="login-btn" :disabled="disabled" @tap="toLogin">确认登录</button>
 		<!-- <button class="login-btn" @tap="test">打印</button> -->
@@ -25,132 +26,23 @@
 	import {getCLodop, getPrinterList} from "@/utils/CLodopfuncs.js"
 	import { RSAencrypt } from '@/utils/jsencrypt.js'
 	import {handLogin} from '@/utils/getData2.js'
-	import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update'
-	export default {
+	export default {
 		data() {
 			return {
 				user: this.$store.getters.loginName ? this.$store.getters.loginName : '',
 				password: '',
 				showPassword: false,
 				saveUser: this.$store.getters.loginName ? true : false,
-				disabled: false,
-				version: '',
-				versionCode: ''
+				disabled: false
 			}
 		},
 		created () {
-			//#ifdef APP-PLUS
-			// 获取本地应用资源版本号
-			plus.runtime.getProperty(plus.runtime.appid, (info) => {
-				this.version = info.version;
-				this.versionCode = info.versionCode ;
-				if (Number(this.versionCode) < 103) {
-					checkUpdate();
-				}
-			}) 
-			//#endif
 		},
 		methods: {
-			// 检测版本更新
-			async checkUpdates() {
-				// #ifdef APP-PLUS
-				//调用接口获取后台版本信息，检查是否需要更新
-				let versionInfo = await this.$api.login.getAppInfo();
-				console.log('获取后台版本信息', versionInfo);
-				// 待更新版本
-				const currentVersion = versionInfo.versionName;
-				console.log('后台需要更新版本', currentVersion);
-				// 更新地址
-				let androidUrl = versionInfo.url;
-				// 是否强制更新 isMust 0.否 1.强制更新
-				let showCancel = versionInfo.isMust ? true : false;
-				//  比较版本是否不同 当前版本：plus.runtime.version
-				const localVersion = plus.runtime.version.split('.');
-				let current = currentVersion.split('.');
-				// 默认是同一个版本，不需要更新
-				let flag = false;
-				current.forEach((item, i) => {
-					if (item !== localVersion[i]) {
-						// 检测到版本不同，需要更新
-						flag = true;
-					}
-				});
-	
-				if (flag) {
-					uni.showModal({
-						// 更新提醒
-						title: '发现新版本，是否更新',
-						content: '待更新版本号：' + currentVersion ,
-						// showCancel: showCancel,
-						success: res => {
-							if (res.confirm) {
-								this.doUpData(androidUrl);
-								this.showdownLine = true;
-								// plus.runtime.openURL(androidUrl)
-							} else if (res.cancel) {
-								// 不更新强制退出app
-								if (showCancel) {
-									console.log('不更新强制退出app');
-									plus.runtime.quit();
-								}
-							}
-						}
-					});
-				} else {
-					this.$myToast('无更新', 'none');
-				}
-				// #endif
-			},
-			doUpData(Url) {
-				uni.showLoading({
-					title: '更新中……'
-				});
-				const downloadTask = uni.downloadFile({
-					//执行下载
-					url: Url, //下载地址
-					timeout: 1000 * 30, //30秒超时时间
-					success: downloadResult => {
-						//下载成功
-						console.log(downloadResult);
-						this.showdownLine = false;
-						uni.hideLoading();
-						if (downloadResult.statusCode == 200) {
-							plus.runtime.install(
-								//安装软件
-								downloadResult.tempFilePath,
-								{
-									force: true
-								},
-								function(res) {
-									plus.runtime.restart();
-								}
-							);
-						}
-					},
-					fail: err => {
-						uni.hideLoading();
-						this.showdownLine = false;
-						this.$u.toast(err.errMsg);
-						console.log(err);
-					},
-					complete: com => {
-						console.log(com);
-					}
-				});
-	
-				// 下载进度
-				downloadTask.onProgressUpdate(res => {
-					// this.$u.toast(res.progress)
-					this.downloadNum = res.progress;
-					// console.log('下载进度' + res.progress);
-					// console.log('已经下载的数据长度' + res.totalBytesWritten);
-					// console.log('预期需要下载的数据总长度' + res.totalBytesExpectedToWrite);
-	
-					// 满足测试条件，取消下载任务。
-					// if (res.progress > 50) {
-					// 	downloadTask.abort();
-					// }
-				});
+			isUpdate () {
+				uni.navigateTo({
+					url: `/pages/login/upgrade`
+				})
 			},
 			test() {
 				let LODOP = getCLodop();
@@ -239,13 +131,15 @@
 	margin: 25rpx 0 70rpx 0
 	height: 34rpx
 .radio-wrap
-	_fj()
+	_fj(flex-start)
 	height: 34rpx
+	flex: 2
 .radio-label
 	_font(28rpx, 28rpx,#333)
 	padding-left: 10rpx
 .setup-text
 	_font(28rpx, 28rpx,$red,,right)
+	padding-left 25rpx
 .bg
 	background-color: #fff;
 	_bis('../../static/image/login_bg.png', 100%,,bottom)
--- a/pages/login/upgrade.vue
+++ b/pages/login/upgrade.vue
@@ -0,0 +1,226 @@
+<template>
+	<view class="mask flex-center">
+		<view class="content botton-radius">
+			<view class="content-top">
+				<text class="content-top-text">升级版本</text>
+				<image class="content-top" style="top: 0;" width="100%" height="100%" src="../../static/image/bg_top.png">
+				</image>
+			</view>
+			<view class="content-header"></view>
+			<view class="content-body">
+				<view class="title">
+					<text>是否升级到最新版本</text>
+				</view>
+				<view class="footer flex-center">
+					<template>
+						<template v-if="!downloadSuccess">
+							<view class="progress-box flex-column" v-if="downloading">
+								<progress class="progress" border-radius="35" :percent="downLoadPercent" activeColor="#3DA7FF" show-info stroke-width="10" />
+								<view style="width:100%;font-size: 28rpx;display: flex;justify-content: space-around;">
+									<text>安装包下载中，请稍后</text>
+									<text>({{downloadedSize}}/{{packageFileSize}}M)</text>
+								</view>
+							</view>
+							<button v-else class="content-button" style="border: none;color: #fff;" plain @click="updateApp">立即下载更新</button>
+						</template>
+					</template>
+				</view>
+			</view>
+			<image v-if="is_mandatory" class="close-img" src="../../static/image/app_update_close.png" @click.stop="closeUpdate"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data () {
+			return {
+				downloadSuccess: false,
+				downloading: false,
+				downLoadPercent: 0,
+				downloadedSize: 0,
+				packageFileSize: 0,
+				is_mandatory: true
+			}
+		},
+		methods: {
+			updateApp() {
+				this.is_mandatory = false
+				this.downloading = true
+				let androidUrl = `http://192.168.81.187:8012/file/其他/hht-tongbo.apk`
+				this.doUpData(androidUrl);
+			},
+			doUpData(Url) {
+				const downloadTask = uni.downloadFile({
+					url: Url,
+					success: downloadResult => {
+						if (downloadResult.statusCode == 200) {
+							this.downloadSuccess = true;
+							plus.runtime.install(
+								//安装软件
+								downloadResult.tempFilePath,
+								{
+									force: true
+								},
+								function(res) {
+									plus.runtime.restart();
+								}
+							);
+						}
+					},
+					complete: () => {
+						this.downloading = false;
+						this.downLoadPercent = 0
+						this.downloadedSize = 0
+						this.packageFileSize = 0
+					}
+				});
+				// 下载进度
+				downloadTask.onProgressUpdate(res => {
+					this.downLoadPercent = res.progress;
+					this.downloadedSize = (res.totalBytesWritten / Math.pow(1024, 2)).toFixed(2);
+					this.packageFileSize = (res.totalBytesExpectedToWrite / Math.pow(1024, 2)).toFixed(2);
+				});
+			},
+			closeUpdate () {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background: transparent;
+	}
+
+	.flex-center {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+
+	.mask {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, .65);
+	}
+
+	.botton-radius {
+		border-bottom-left-radius: 30rpx;
+		border-bottom-right-radius: 30rpx;
+	}
+
+	.content {
+		position: relative;
+		top: 0;
+		width: 600rpx;
+		background-color: #fff;
+		box-sizing: border-box;
+		padding: 0 50rpx;
+		font-family: Source Han Sans CN;
+	}
+
+	.text {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		line-height: 200px;
+		text-align: center;
+		color: #FFFFFF;
+	}
+
+	.content-top {
+		position: absolute;
+		top: -195rpx;
+		left: 0;
+		width: 600rpx;
+		height: 270rpx;
+	}
+
+	.content-top-text {
+		font-size: 45rpx;
+		font-weight: bold;
+		color: #F8F8FA;
+		position: absolute;
+		top: 120rpx;
+		left: 50rpx;
+		z-index: 1;
+	}
+
+	.content-header {
+		height: 70rpx;
+	}
+
+	.title {
+		font-size: 33rpx;
+		font-weight: bold;
+		color: #3DA7FF;
+		line-height: 38px;
+	}
+
+	.footer {
+		height: 150rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+	}
+
+	.box-des-scroll {
+		box-sizing: border-box;
+		padding: 0 40rpx;
+		height: 50rpx;
+		text-align: left;
+	}
+
+	.box-des {
+		font-size: 26rpx;
+		color: #000000;
+		line-height: 50rpx;
+	}
+
+	.progress-box {
+		width: 100%;
+	}
+
+	.progress {
+		width: 90%;
+		height: 40rpx;
+		border-radius: 35px;
+	}
+
+	.close-img {
+		width: 70rpx;
+		height: 70rpx;
+		z-index: 1000;
+		position: absolute;
+		bottom: -120rpx;
+		left: calc(50% - 70rpx / 2);
+	}
+
+	.content-button {
+		text-align: center;
+		flex: 1;
+		font-size: 30rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		border-radius: 40rpx;
+		margin: 0 18rpx;
+
+		height: 80rpx;
+		line-height: 80rpx;
+
+		background: linear-gradient(to right, #1785ff, #3DA7FF);
+	}
+
+	.flex-column {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+</style>
--- a/static/image/app_update_close.png
+++ b/static/image/app_update_close.png
--- a/static/image/bg_top.png
+++ b/static/image/bg_top.png
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -1,5 +1,14 @@
 import request from './request.js'

+// 版本更新测试
+// export const getAppInfo = () => {
+// 	let res = {
+// 		versionName: '1.0.2',
+// 		url: ''
+// 	}
+// 	return res
+// }
+
 // 登录
 export const handLogin = (user, password) => request({
 	url:'mobile/auth/login',
@@ -91,6 +100,7 @@ export const needVehicle = (code) => request({
 		cut_jo: code
 	}
 })
+
 // 1.3配送确认
 export const shippingConfirm = (rows, code) => request({
 	url:'api/pda/shipping/confirm',
@@ -100,7 +110,7 @@ export const shippingConfirm = (rows, code) => request({
 	}
 })
 // 1.4载具送回
-export const returnVehicle = (rows, code) => request({
+export const returnVehicle = (code) => request({
 	url:'api/pda/shipping/returnVehicle',
 	data: {
 		point_code: code