From 5866ab9c00675c8d8b92dadc6aaf3f692d18e0af Mon Sep 17 00:00:00 2001
From: ChuShiZ <slw0830@163.com>
Date: Sat, 31 Aug 2024 01:22:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                  |  8 ++++----
 pages/index/index.vue          |  9 +++++----
 pages/message/message.vue      | 10 +++++++++-
 pages/orderDetails/details.vue | 25 ++++++++++++++-----------
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/manifest.json b/manifest.json
index d39e1e1..de142d3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "蓝安救援-司机端",
-    // "appid" : "__UNI__D743A11",
+    "appid" : "__UNI__D743A11",
     "description" : "",
     "versionName" : "1.0.1",
     "versionCode" : 101,
@@ -21,7 +21,8 @@
             "Maps" : {},
             "Geolocation" : {},
             "Camera" : {},
-            "Barcode" : {}
+            "Barcode" : {},
+            "Push" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -200,8 +201,7 @@
                 }
             }
         }
-    },
-    "appid" : "__UNI__DA2C94E"
+    }
 }
 // "push" : {
 //     "unipush" : {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 02bc272..69c72c3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -203,7 +203,7 @@
 				</view>
 			</view>
 		</u-popup>
-		<u-picker :show="show3" :columns="columns" keyName="dictLabel" @cancel="cancels()"
+		<u-picker :show="show3" :columns="columns" keyName="label" @cancel="cancels()"
 			@confirm="confirms"></u-picker>
 
 		<tabBar :msg="msg "></tabBar>
@@ -434,8 +434,8 @@
 				this.show3 = true
 			},
 			confirms(e) {
-				this.dictValue = e.value[0].dictValue
-				this.dictLabel = e.value[0].dictLabel
+				this.dictValue = e.value[0].value
+				this.dictLabel = e.value[0].label
 				// console.log(zhi);
 
 				this.show3 = false
@@ -696,6 +696,7 @@
 					console.log(res);
 					this.getList()
 					this.$refs.inputDialog.close()
+					this.getthreelist()
 
 				})
 
@@ -760,7 +761,7 @@
 			},
 			uploadFilePromise(url) {
 				upload({
-					url: '/common/upload',
+					url: '/infra/file/upload',
 					filePath: url,
 				}).then((res) => {
 					console.log('images', res.fileName);
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 9f32ec9..4d0267a 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -19,7 +19,7 @@
 				<view class="you">
 					<view class="box-top">
 						<text class="numone">{{item.title || ''}}</text>
-						<text class="numthree">{{item.createTime ? (item.createTime.slice(0, -3) || '') : ''}}</text>
+						<text class="numthree">{{item.createTime}}</text>
 					</view>
 					<view class="numtwo">{{item.content || ''}}</view>
 				</view>
@@ -34,6 +34,7 @@
 <script>
 	import request from '../../utils/request';
 	import tabBar from '../../components/tabBar/tabBar.vue'
+		import dayjs from '../../uni_modules/uview-ui/libs/util/dayjs';
 	const innerAudioContext = uni.createInnerAudioContext();
 	export default {
 
@@ -88,6 +89,13 @@
 					params: data
 				}).then((res) => {
 					if (res.code == 200) {
+						if (res.rows && res.rows.length > 0) {
+							res.rows.forEach(item => {
+								if (item.createTime) {
+									item.createTime = dayjs(item.createTime).format('MM-DD HH:mm')
+								}
+							})
+						}
 						if (this.pageNum != 1) {
 							this.listArr = this.listArr.concat(res.rows)
 						} else {
diff --git a/pages/orderDetails/details.vue b/pages/orderDetails/details.vue
index fc981a3..adc2fab 100644
--- a/pages/orderDetails/details.vue
+++ b/pages/orderDetails/details.vue
@@ -105,11 +105,6 @@
 						<view style="width: 158px;display: flex;align-items: center;"><u--input type="number"
 								style="height: 15px; " placeholder="请输入公里数" border="surround"
 								v-model="detailsData.emptyNum" clearable></u--input> <text>KM</text></view>
-
-
-
-
-
 					</view>
 					<view class="dix">
 						<text class="huiy">过关费:</text>
@@ -137,16 +132,16 @@
 						<text class="huiy">车辆类型:</text>
 						<text v-if="detailsData.rescueStatus != '救援中'">{{detailsData.carTypeStr || ''}}</text>
 						<view class="ribox" v-if="detailsData.rescueStatus == '救援中'"
-							:class="{'actbox' : carindex == item.dictValue}" v-for="(item,index) in carList"
-							:key="index" @click="getcarindex(item.dictValue)">{{item.dictLabel}}</view>
+							:class="{'actbox' : carindex == item.value}" v-for="(item,index) in carList"
+							:key="index" @click="getcarindex(item.value)">{{item.label}}</view>
 					</view>
 
 					<view class="dix">
 						<text class="huiy">收款类型:</text>
 						<text v-if="detailsData.rescueStatus != '救援中'">{{detailsData.feeTypeStr || ''}}</text>
 						<view class="ribox" v-if="detailsData.rescueStatus == '救援中'"
-							:class="{'actbox' : skindex == item.dictValue}" v-for="(item,index) in qdList" :key="index"
-							@click="getskindex(item.dictValue)">{{item.dictLabel}}</view>
+							:class="{'actbox' : skindex == item.value}" v-for="(item,index) in qdList" :key="index"
+							@click="getskindex(item.value)">{{item.label}}</view>
 					</view>
 					<view class="dix" v-if="detailsData.kcPosition" @click="getmap1">
 						<text class="huiy">扣车地点:</text>
@@ -236,7 +231,7 @@
 		</u-popup>
 
 		<u-picker :show="roadShow" @cancel="roadShow = false" @close="roadShow = false" @confirm="chooseRoad"
-			:columns="[roadList]" keyName="dictValue"></u-picker>
+			:columns="[roadList]" keyName="label"></u-picker>
 	</view>
 </template>
 
@@ -244,6 +239,7 @@
 	import request from '../../utils/request';
 	import tabBar from '../../components/tabBar/tabBar.vue'
 	import drawQrcode from 'weapp-qrcode';
+	import dayjs from '../../uni_modules/uview-ui/libs/util/dayjs';
 	export default {
 		data() {
 			return {
@@ -293,7 +289,7 @@
 		methods: {
 			chooseRoad(data) {
 				console.log(data);
-				this.detailsData.sectionRoad = data.value[0].dictValue
+				this.detailsData.sectionRoad = data.value[0].id
 				this.roadShow = false
 			},
 			chooseCar(data) {
@@ -518,6 +514,13 @@
 					this.carindex = res.data.rescueInfo.carType // 回显车型
 					this.skindex = res.data.rescueInfo.feeType
 					this.detailList = res.data.detailList
+					if (this.detailList && this.detailList.length > 0) {
+						this.detailList.forEach(item => {
+							if (item.createTime) {
+								item.createTime = dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss')
+							}
+						})
+					}
 					uni.hideLoading();
 				})
 			},