更新

manifest.json

@@ -1,137 +1,137 @@
 {
-    "name" : "智运-货主端",
-    "appid" : "__UNI__DCD13AC",
-    "description" : "智运",
-    "versionName" : "1.0.4",
-    "versionCode" : 104,
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {
-            "Maps" : {},
-            "VideoPlayer" : {},
-            "Geolocation" : {},
-            "iBeacon" : {}
-        },
-        /* 应用发布信息 */
-        "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_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
-                    "<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.BLUETOOTH\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* 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" : {}
-    },
-    /* 快应用特有相关 */
-    "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.0.4",
+	"versionCode": 104,
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"Maps": {},
+			"VideoPlayer": {},
+			"Geolocation": {},
+			"iBeacon": {}
+		},
+		/* 应用发布信息 */
+		"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_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
+					"<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.BLUETOOTH\"/>",
+					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {},
+			/* 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": {}
+	},
+	/* 快应用特有相关 */
+	"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"
 }

pages.json

@@ -80,7 +80,7 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		
+
 		// {
 		// 	"path": "pages/goodSource/index",
 		// 	"style": {
@@ -126,14 +126,14 @@
 				"enablePullDownRefresh": false
 			}
 
-		},  {
+		}, {
 			"path": "pages/carSource/driverSee",
 			"style": {
 				"navigationBarTitleText": "司机详情",
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/order/orderDetails",
 			"style": {
 				"navigationStyle": "custom",
@@ -147,8 +147,8 @@
 				"navigationBarTitleText": "确认装车",
 				"enablePullDownRefresh": false
 			}
-		
-		},{
+
+		}, {
 			"path": "pages/order/confirmUnloading",
 			"style": {
 				"navigationBarTitleText": "确认卸车",
@@ -279,7 +279,7 @@
 				"navigationBarTitleText": "账单",
 				"enablePullDownRefresh": false
 			}
-		
+
 		},
 		{
 			"path": "pages/mine/myAccount/withdrawal",
@@ -287,7 +287,7 @@
 				"navigationBarTitleText": "提现",
 				"enablePullDownRefresh": false
 			}
-		
+
 		},
 		{
 			"path": "pages/mine/myAccount/bankList",
@@ -295,7 +295,7 @@
 				"navigationBarTitleText": "收款账户",
 				"enablePullDownRefresh": false
 			}
-		
+
 		},
 		{
 			"path": "pages/mine/myAccount/index",
@@ -307,12 +307,12 @@
 						"buttons": [{
 							"text": "账单",
 							"fontSize": "14",
-							"width":"80rpx"
+							"width": "80rpx"
 						}]
 					}
 				}
 			}
-		
+
 		},
 		{
 			"path": "pages/mine/cargoowner/addEnerprise",
@@ -410,18 +410,18 @@
 
 		}, {
 			"path": "pages/release/release",
-		"style": {
-			"navigationBarTitleText": "发布",
-			"enablePullDownRefresh": false,
-			"app-plus": {
-				"titleNView": {
-					"buttons": [{
-						"text": "记录",
-						"fontSize": "13"
-					}]
+			"style": {
+				"navigationBarTitleText": "发布",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "记录",
+							"fontSize": "13"
+						}]
+					}
 				}
 			}
-		}
 
 		}, {
 			"path": "pages/release/selectAddress",
@@ -558,16 +558,14 @@
 				"enablePullDownRefresh": false
 			}
 
-		}
-        ,{
-            "path" : "pages/mine/driverEvaluation",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "司机评价",
-                "enablePullDownRefresh": false
-            }
-            
-        },
+		}, {
+			"path": "pages/mine/driverEvaluation",
+			"style": {
+				"navigationBarTitleText": "司机评价",
+				"enablePullDownRefresh": false
+			}
+
+		},
 		{
 			"path": "pages/mine/evaluate",
 			"style": {
@@ -575,23 +573,28 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "white"
 			}
-		
+
+		}, {
+			"path": "pages/mine/confirm",
+			"style": {
+				"navigationBarTitleText": "scss",
+				"enablePullDownRefresh": false
+			}
+
 		}
-    ],
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "white",
 		"backgroundColor": "#F8F8F8"
 	},
-	"condition" : { //模式配置，仅开发期间生效
+	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [
-			{
-				"name": "", //模式名称
-				"path": "", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			}
-		]
+		"list": [{
+			"name": "", //模式名称
+			"path": "", //启动页面，必选
+			"query": "" //启动参数，在页面的onLoad函数里面得到
+		}]
 	}
 }

pages/carSource/driverSee.vue

@@ -110,7 +110,8 @@
 				<view v-if="tabIndex==1&&index==1" v-for="(items,index) in dataObj.driverCarInfoList" :key="index">
 					<view class="">
 						<view>{{items.carNumber}}</view>
-						<view class="flex align-center">{{items.carType}} | 车长{{items.carLong/1000}}米 | 载重{{items.carApprovedWeight/1000}}吨</view>
+						<view class="flex align-center">{{items.carType}} | 车长{{items.carLong/1000}}米 |
+							载重{{items.carApprovedWeight/1000}}吨</view>
 					</view>
 				</view>
 				<view class="carInfo" v-if="tabIndex==2&index==1">
@@ -166,6 +167,7 @@
 			this.show = true
 		},
 		onLoad(options) {
+			debugger
 			this.commonId = options.commonId
 			console.log(this.dataObj)
 			that = this
@@ -207,8 +209,8 @@
 			btnChange(num) {
 				this.btnData = num
 				this.upCallback({
-					size:10,
-					num:1,
+					size: 10,
+					num: 1,
 				})
 			},
 			upCallback(page) {
@@ -218,7 +220,7 @@
 					pageSize: page.size,
 					// 1好2差
 					haoType: 1,
-					searchType:1,
+					searchType: 1,
 					currentPage: page.num
 				}).then(res => {
 					if (page.num == 1) that.list3 = [];
@@ -229,7 +231,7 @@
 					flag: 2,
 					pageSize: page.size,
 					haoType: 2,
-					searchType:1,
+					searchType: 1,
 					currentPage: page.num
 				}).then(res => {
 					if (page.num == 1) that.list4 = [];
@@ -238,7 +240,7 @@
 				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
 						evaluatoredId: this.dataObj.id,
 						flag: 2,
-						searchType:1,
+						searchType: 1,
 						pageSize: page.size,
 						currentPage: page.num
 					}).then(res => {

pages/carSource/index.vue

@@ -22,7 +22,8 @@
 					{{title2 ? title2 : "请选择地址"}}
 				</view>
 				<!-- :wholeCountry="true" -->
-				<itmisterAddressPickerOther ref="addressEltwo" @confirmChange="confirmChangeTwo"></itmisterAddressPickerOther>
+				<itmisterAddressPickerOther ref="addressEltwo" @confirmChange="confirmChangeTwo">
+				</itmisterAddressPickerOther>
 			</view>
 			<view class="route">
 				<view v-for="(item,index) in routeData">
@@ -41,7 +42,7 @@
 											style="width: 26rpx;height: 26rpx;margin-rigth:10rpx;"></image>邀请
 									</view>
 								</view> -->
-							
+
 								<u-picker :show="fleetShow" :columns="columns" @cancel="fleetClose"
 									@confirm="invitationCheng">
 								</u-picker>
@@ -59,8 +60,9 @@
 					</view>
 				</view>
 				<view v-if='status=="nomore"' style='text-align:center;'>
-					<image style='width:140px;height:140px;' src="../../static/images/carSource/mescroll-empty.png" mode=""></image>
-					<u-loadmore :status="status"  :nomore-text="nomoreText" />
+					<image style='width:140px;height:140px;' src="../../static/images/carSource/mescroll-empty.png"
+						mode=""></image>
+					<u-loadmore :status="status" :nomore-text="nomoreText" />
 				</view>
 			</view>
 			<!-- <view v-if="routeData.length == 0" style="background: #FFFFFF;text-align: center;">
@@ -91,13 +93,13 @@
 										style="width: 18rpx;height: 20rpx;margin-top:14rpx;"></image>
 								</view>
 							</view>
-							<view class="fleet_invite"  @click="driverLook(item)">队长</view>
+							<view class="fleet_invite" @click="driverLook(item)">队长</view>
 							<!-- <view class="fleet_invite" v-else>{{item.fleetMemberStatus}}</view> -->
 						</view>
 
 						<view class="fleet_introduce">
 							<u-read-more ref="uReadMore" :toggle="true" :shadowStyle="shadowStyle" closeText="查看全部"
-								:showHeight="20">
+								:showHeight="70">
 								<rich-text :nodes="item.fleetProfile"></rich-text>
 							</u-read-more>
 
@@ -114,13 +116,14 @@
 					</view>
 				</view>
 				<view v-if='status=="nomore"' style='text-align:center;'>
-					<image style='width:140px;height:140px;' src="../../static/images/carSource/mescroll-empty.png" mode=""></image>
-					<u-loadmore :status="status"  :nomore-text="nomoreText" />
+					<image style='width:140px;height:140px;' src="../../static/images/carSource/mescroll-empty.png"
+						mode=""></image>
+					<u-loadmore :status="status" :nomore-text="nomoreText" />
 				</view>
-				
+
 			</view>
 
-		<!-- 	<view v-if="formData.length == 0" style="background: #FFFFFF;text-align: center;">
+			<!-- 	<view v-if="formData.length == 0" style="background: #FFFFFF;text-align: center;">
 				暂无数据
 			</view> -->
 		</view>
@@ -178,7 +181,7 @@
 					paddingTop: "0",
 				},
 				status: 'loadmore',
-				 nomoreText: '~ 空空如也 ~'
+				nomoreText: '~ 空空如也 ~'
 			}
 		},
 		created() {},
@@ -210,12 +213,12 @@
 		},
 		onLoad() {},
 		methods: {
-			driverLook(item){
-				this.$u.route("/pages/carSource/driverSee",{
-					commonId:item.commonId
+			driverLook(item) {
+				this.$u.route("/pages/carSource/driverSee", {
+					commonId: item.commonId
 				})
 			},
-			checking(){
+			checking() {
 				this.statusVal = uni.getStorageSync("firstAuthentication").authenticationStatus
 				// if (uni.getStorageSync("firstAuthentication")) {
 				// 	if(this.statusVal != "已认证" && this.statusVal != "已过期"){
@@ -365,9 +368,9 @@
 					this.title2 = address.province + address.city
 					this.unloadInfo.unloadArea = ""
 				} else {
-					if(address.province == '全国'){
+					if (address.province == '全国') {
 						this.title2 = address.province
-					}else{
+					} else {
 						this.title2 = address.province + address.city + address.area;
 					}
 				}
@@ -449,9 +452,9 @@
 										this.routeData[i].endAdress = this.routeData[i].endAdress.split(",")
 									}
 								}
-								if(res.data.total == 0){
+								if (res.data.total == 0) {
 									this.status = 'nomore'
-								}else{
+								} else {
 									this.status = 'loadmore'
 								}
 							}
@@ -482,9 +485,9 @@
 									}
 								}
 							}
-							if(res.data.total == 0){
+							if (res.data.total == 0) {
 								this.status = 'nomore'
-							}else{
+							} else {
 								this.status = 'loadmore'
 							}
 						})
@@ -590,7 +593,8 @@
 				color: #333333;
 				font-size: 30rpx;
 			}
-			.driver_invite{
+
+			.driver_invite {
 				display: flex;
 				width: 50%;
 				justify-content: flex-end;

pages/mine/confirm.vue

@@ -0,0 +1,62 @@
+<template>
+	<view>
+		<view class="username">{{username}}</view>
+		<view v-if="msg==''">
+			<button @click="mobileOkPcLogin()">确认登录</button>
+		</view>
+		<view class="msg" v-else>
+			{{msg}}
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				sessionId: '',
+				token: '',
+				httpUrl: '',
+				username: '',
+				msg: ''
+			}
+		},
+		onLoad(option) {
+			this.sessionId = option.sessionId;
+			this.token = option.token;
+			this.httpUrl = option.httpUrl;
+			this.username = option.username;
+			console.log(option);
+		},
+		methods: {
+			mobileOkPcLogin() {
+				this.$request.baseRequest('post', '/user/mobileOkPcLogin', {
+						sessionId: this.sessionId,
+						token: this.token
+					}).then(res => {
+						let resultData = res.data;
+						_this.msg = resultData.msg;
+						console.log(resultData);
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+
+			}
+		}
+	}
+</script>
+
+<style>
+	.username {
+		text-align: center;
+		font-size: 32rpx;
+		line-height: 50rpx;
+	}
+
+	.msg {
+		text-align: center;
+		font-size: 30rpx;
+		margin-top: 10rpx;
+	}
+</style>

pages/mine/index.vue

@@ -5,7 +5,7 @@
 			<view class="head">
 				<view style='margin-bottom:14px;' class="row flex flex-end">
 					<u--image class='image' :showLoading="true" src="../../static/mine/saoma.png" width="20px"
-						height="20px"></u--image>
+						height="20px" @click="scanCode()"></u--image>
 					<u--image @click="goDetailPage('/pages/mine/set')" style='margin-right:0;' class='image'
 						:showLoading="true" src="../../static/mine/shezhi.png" width="20px" height="20px"></u--image>
 				</view>
@@ -15,7 +15,7 @@
 						height="56px" shape='circle'></u--image>
 					<view class='information' v-if='hasLogin'>
 						<view class='flex items-center'>
-							<view class='username'>{{userName}}  {{cargoCall}}</view>
+							<view class='username'>{{userName}} {{cargoCall}}</view>
 							<view v-if='status' class='currectstatus'>已认证</view>
 							<view v-if='!status' class='currectstatus1'>未认证</view>
 						</view>
@@ -149,7 +149,7 @@
 				phone: '',
 				status: false,
 				alertContent: '您尚未登录，是否立即登录？',
-				cargoCall:"",
+				cargoCall: "",
 			};
 		},
 		onShow() {
@@ -184,21 +184,21 @@
 				this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
 					phone: this.userInfo.phone
 				}).then(res => {
-					uni.setStorageSync("firstAuthentication",res.data)
-					if(res.data){
+					uni.setStorageSync("firstAuthentication", res.data)
+					if (res.data) {
 						this.userName = res.data.call
-						if(res.data.sex == '男'){
+						if (res.data.sex == '男') {
 							this.cargoCall = "先生"
-						}else{
+						} else {
 							this.cargoCall = "女士"
 						}
 					}
-						
+
 				})
 				this.phone = this.userInfo.phone ? this.userInfo.phone.replace(this.userInfo.phone.substring(3, 7),
 					"****") : ''
-				if(!this.cargoCall){
-					this.userName=this.userInfo.userName
+				if (!this.cargoCall) {
+					this.userName = this.userInfo.userName
 				}
 				if (!this.hasLogin) {
 					this.isShowAlert = true
@@ -211,7 +211,7 @@
 
 		},
 		computed: {
-			...mapState(['hasLogin', 'userInfo',"firstAuthentication"]),
+			...mapState(['hasLogin', 'userInfo', "firstAuthentication"]),
 			// 手机号中间4位加*
 			// starUserphone() {
 			// 	let reg = /^(\d{3})\d{4}(\d{4})$/;
@@ -221,6 +221,58 @@
 			// }
 		},
 		methods: {
+			scanCode() {
+				let _this = this;
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: function(res) {
+						console.log('条码类型：' + res.scanType);
+						console.log('条码内容：' + res.result);
+						_this.sessionId = res.result;
+						uni.getStorage({
+							key: 'info',
+							success: (resStore) => {
+								let infoJson = JSON.parse(resStore.data);
+								console.log(infoJson);
+								_this.token = infoJson.token;
+								_this.httpUrl = infoJson.httpUrl;
+								console.log(_this.token, _this.httpUrl);
+								_this.mobileScanOk();
+							}
+						});
+					}
+				});
+			},
+			mobileScanOk() {
+				this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+					sessionId: this.sessionId,
+					token: this.token
+				}).then(res => {
+					let resultData = res.data;
+					console.log(resultData);
+					if (resultData.code == 0) {
+
+						let status = resultData.data.status;
+						if (status == 1) { //登录成功
+							this.username = resultData.data.username;
+							uni.navigateTo({
+								url: `./confirm?token=${this.token}&sessionId=${this.sessionId}&httpUrl=${this.httpUrl}&username=${this.username}`
+							});
+						} else {
+							uni.showToast({
+								title: resultData.msg,
+								duration: 2000
+							});
+						}
+					} else {
+						uni.showToast({
+							title: resultData.msg,
+							duration: 2000
+						});
+					}
+
+				})
+			},
 			confirmClick() {
 				// #ifdef APP-PLUS
 				if (this.alertTitle == '账号审核中') {
@@ -255,7 +307,7 @@
 				// 	this.feild = "nickname"
 				// 	this.inputContent = ''
 				// }
-			},
+			}
 		}
 	}
 </script>

pages/order/orderDetails.vue

@@ -24,19 +24,20 @@
 				</u-button>
 				<u-button class="btn" text="终止" @click="stop()" v-if="dataObj.cargoOwnerStatus=='未装车'">
 				</u-button>
-				<u-button class="btn" text="查看合同" @click="lookContract" v-if="dataObj.cargoOwnerContract=='1'"></u-button>
+				<u-button class="btn" text="查看合同" @click="lookContract" v-if="dataObj.cargoOwnerContract=='1'">
+				</u-button>
 				<u-button class="btn" text="签订合同" @click="signContract"
 					v-if="dataObj.cargoOwnerStatus=='待确认装车'&&dataObj.cargoOwnerContract!='1'">
 				</u-button>
 
 				<u-button class="btn" text="驳回装车信息" @click="confirmLoading()" v-if="dataObj.cargoOwnerStatus=='待确认装车'">
 				</u-button>
-		<!-- 		<u-button class="btn" text="确认装车" @click="confirmLoading(3)"
+				<!-- 		<u-button class="btn" text="确认装车" @click="confirmLoading(3)"
 					v-if="dataObj.cargoOwnerStatus=='待确认装车'&&dataObj.cargoOwnerContract=='1'">
 				</u-button> -->
 				<u-button class="btn" text="确认装车" @click="confirmLoading(3)" v-if="dataObj.cargoOwnerStatus=='待确认装车'">
 				</u-button>
-				
+
 				<u-button class="btn" text="驳回卸车信息" @click="confirmUnLoading" v-if="dataObj.cargoOwnerStatus=='待收货'">
 				</u-button>
 				<u-button class="btn" text="确认卸车" @click="confirmUnLoading" v-if="dataObj.cargoOwnerStatus=='待收货'">
@@ -50,7 +51,8 @@
 			</view>
 			<view class="item3 flex flex-space-between align-center">
 				<view class="left flex align-center" @click="goTodriverDetail">
-					<u--image :showLoading="true" :src="dataObj.driverPortrait" width="44px" height="44px" @click="" shape='circle'>
+					<u--image :showLoading="true" :src="dataObj.driverPortrait" width="44px" height="44px" @click=""
+						shape='circle'>
 					</u--image>
 					<view class="name">{{dataObj.driverName}}</view>
 					<view class="flex align-center">
@@ -175,12 +177,14 @@
 				<view class="row-left-text gray">装车照片</view>
 				<view class="flex">
 					<u--image :showLoading="true" :src="item" width="40px" height="40px"
-						v-for="(item,index) in zcImgList" :key='index'></u--image>
+						v-for="(item,index) in zcImgList" :key='index' @click='ylImg(item)'></u--image>
 				</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">合计应付运费</view>
-				<view class="row-right-text">{{dataObj.hyCarrierInfo.totalFreight}}{{dataObj.hyCarrierInfo.totalFreight?"元":""}}</view>
+				<view class="row-right-text">
+					{{dataObj.hyCarrierInfo.totalFreight}}{{dataObj.hyCarrierInfo.totalFreight?"元":""}}
+				</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">卸车时间</view>
@@ -206,7 +210,9 @@
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">运费尾款</view>
-				<view class="row-right-text">{{dataObj.freightInfo.freightBalance?dataObj.freightInfo.freightBalance:"未支付"}}</view>
+				<view class="row-right-text">
+					{{dataObj.freightInfo.freightBalance?dataObj.freightInfo.freightBalance:"未支付"}}
+				</view>
 			</view>
 			<view class='flex flex-end'>
 				<view class="row-right-text">{{dataObj.freightInfo.freightBalanceDate}}</view>
@@ -356,9 +362,24 @@
 			this.getList()
 		},
 		methods: {
-			goTodriverDetail(){
-				uni.$u.route('/pages/order/driverDetail',{
-					driver:JSON.stringify(this.dataObj)
+			ylImg(src) {
+				debugger
+				uni.previewImage({
+					urls: [src],
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			},
+			goTodriverDetail() {
+				uni.$u.route('/pages/order/driverDetail', {
+					driver: JSON.stringify(this.dataObj)
 				});
 			},
 			lookContract() {
@@ -367,10 +388,10 @@
 					success: function(res) {
 						var filePath = res.tempFilePath;
 						uni.openDocument({
-				 		filePath: filePath,
-				  	showMenu: true,
-				  	success: function(res) {
-				  		console.log('打开文档成功');
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
 							}
 						});
 					}
@@ -378,7 +399,9 @@
 			},
 			signContract() {
 				// this.lookAlert = true
-				uni.$u.route('/pages/order/signContract',{obj:JSON.stringify(this.dataObj)});
+				uni.$u.route('/pages/order/signContract', {
+					obj: JSON.stringify(this.dataObj)
+				});
 
 			},
 			// 完结
@@ -421,18 +444,20 @@
 				this.isShowAlert = true
 			},
 			confirmLoading(type) {
-				if(this.dataObj.cargoOwnerContract!='1'){
+				if (this.dataObj.cargoOwnerContract != '1') {
 					uni.showToast({
-						title:'请先签订合同',
-						icon:'none'
+						title: '请先签订合同',
+						icon: 'none'
 					})
 					return
 				}
 				this.type = type
 				if (type == 3) {
 					uni.$u.route("/pages/order/confirmLoading", {
-					obj: JSON.stringify({id:this.id}),
-				})
+						obj: JSON.stringify({
+							id: this.id
+						}),
+					})
 					// this.alertTitle = '确认装车？'
 					// this.confirmText = '确定'
 				} else if (type == 4) {
@@ -589,7 +614,8 @@
 						// 运费信息
 						if (res.data.cargoOwnerStatus != "待接单" && res.data.cargoOwnerStatus != "未装车" && res.data
 							.cargoOwnerStatus != "待确认装车" && res.data.cargoOwnerStatus != "已驳回装车信息" && res.data
-							.cargoOwnerStatus != "待平台确认装车" && res.data.cargoOwnerStatus != "平台驳回装车信息"  && res.data.cargoOwnerStatus != "待结算" && res.data
+							.cargoOwnerStatus != "待平台确认装车" && res.data.cargoOwnerStatus != "平台驳回装车信息" && res.data
+							.cargoOwnerStatus != "待结算" && res.data
 							.cargoOwnerStatus != "已终止") {
 							this.status2 = true
 						}

pages/release/addAddress.vue

@@ -25,7 +25,8 @@
 						<u--input v-model="addressInfo.contacts" border="none" placeholder="联系人">></u--input>
 					</u-form-item>
 					<u-form-item label="联系电话" prop="addressInfo.contactPhone" ref="item1">
-						<u--input v-model="addressInfo.contactPhone" border="none" placeholder="联系电话" maxlength="11">></u--input>
+						<u--input v-model="addressInfo.contactPhone" border="none" placeholder="联系电话" maxlength="11">>
+						</u--input>
 					</u-form-item>
 				</u--form>
 			</view>
@@ -88,7 +89,7 @@
 									complete() {
 										// uni.$u.route('/pages/release/selectAddress');
 										uni.navigateBack({
-											delta:1
+											delta: 1
 										})
 									}
 								})
@@ -117,21 +118,27 @@
 				uni.chooseLocation({
 					success: function(res) {
 						console.log(res);
-						// console.log('位置名称：' + res.name);
-						// console.log('详细地址：' + res.address);
-						// console.log('纬度：' + res.latitude);
-						// console.log('经度：' + res.longitude);
-						let _address = that.$helper.formatLocation(res.address)
-						console.log('----------------------------')
-						console.log(_address)
-						that.addressInfo.latitude = res.latitude
-						that.addressInfo.longitude = res.longitude
-						that.addressInfo.detailedAddress = _address.Village
-						that.addressInfo.province = _address.Province
-						that.addressInfo.city = _address.City
-						that.addressInfo.area = _address.Country
-						that.addressInfo.commonId = that.userInfo.id
-						that.$forceUpdate()
+						console.log('位置名称：' + res.name);
+						console.log('详细地址：' + res.address);
+						console.log('纬度：' + res.latitude);
+						console.log('经度：' + res.longitude);
+						// let _address = that.$helper.formatLocation(res.address)
+						// console.log('----------------------------')
+						// console.log(_address)
+						// that.addressInfo.latitude = res.latitude
+						// that.addressInfo.longitude = res.longitude
+						// that.addressInfo.detailedAddress = _address.Village
+						// that.addressInfo.province = _address.Province
+						// that.addressInfo.city = _address.City
+						// that.addressInfo.area = _address.Country
+						// that.addressInfo.commonId = that.userInfo.id
+						// that.$forceUpdate()
+					},
+					fail(err) {
+						console.log(err)
+					},
+					complete(res1) {
+						console.log(res1)
 					}
 				});
 				// console.log(123)
@@ -148,22 +155,26 @@
 </script>
 
 <style lang="scss" scoped>
-	.select-color{
+	.select-color {
 		color: #C6CBD5;
 	}
-	.content{
+
+	.content {
 		background: white;
 		height: calc(100vh - 90rpx);
 	}
+
 	.content1 {
 		padding: 40rpx;
+
 		.top {
 			font-size: 42rpx;
 			font-weight: 700;
 			color: rgba(0, 0, 0, 0.85);
 		}
 	}
-	.submit{
+
+	.submit {
 		position: absolute;
 		bottom: 40rpx;
 		display: flex;