都能运app

.hbuilderx/launch.json

@@ -1,16 +1,20 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

common/libs/request.js

@@ -1,5 +1,5 @@
-const devBaseUrl = "http://192.168.1.44:39520";
-const proBaseUrl = "http://192.168.1.44:39520";
+const devBaseUrl = "http://192.168.1.24:51106";
+const proBaseUrl = "http://192.168.1.24:51106";
 //const proBaseUrl = "http://61.163.210.202:39510";
 // const devBaseUrl = "http://218.3.230.230:39510";
 // const proBaseUrl = "http://218.3.230.230:39510"; 

manifest.json

@@ -74,7 +74,7 @@
             "port" : 39520,
             "proxy" : {
                 "/apis" : {
-                    "target" : "http://192.168.1.44:51106",
+                    "target" : "http://192.168.1.24:51106",
                     "changeOrigin" : true, //是否跨域
                     "secure" : false, // 设置支持https协议的代理
                     "pathRewrite" : {

pages.json

@@ -29,7 +29,7 @@
 			"path" : "pages/feedback/scanOrderCode",
 			"style" :                                                                                    
 			{
-				"navigationBarTitleText": "连续扫码装车",
+				"navigationBarTitleText": "扫码装车",
 				"enablePullDownRefresh": false
 			}
 			
@@ -44,6 +44,15 @@
 			
 		},
 		{
+			"path" : "pages/feedback/scancodeCar",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "扫码装车",
+				"enablePullDownRefresh": false
+			}
+			
+		},
+		{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "都能运"

pages/feedback/print.vue

@@ -55,7 +55,7 @@
 <!-- 		<view v-show="isLoadMore">
 			<uni-load-more :status="loadStatus" showIcon @clickLoadMore="loadMoreBill()"></uni-load-more>
 		</view> -->
-		
+
 		<u-popup :show="feedBackPopupShow" :overlay="true" mode="bottom" :closeable="true" :closeOnClickOverlay="true"
 			@close="feedBackPopupClose">
 			<view class="u-popup-slot">
@@ -88,7 +88,7 @@
 			</view>
 			<view @click="confirmOrderCodes">确认交接</view>
 		</view>
-		
+
 		<uni-fab style="bottom: 100rpx;" ref="fab" :pattern="fabPattern" icon="scan" :popMenu="false" horizontal="right" vertical="bottom"
 			@fabClick="scanFabClick" />
 	</view>
@@ -133,10 +133,10 @@
 		},
 		methods: {
 			confirmOrderCodes(){
-				
+
 			},
 			searchPrintBreed() {
-				
+
 			},
 			scanFabClick() {
 				let _that = this;
@@ -149,7 +149,7 @@
 							_that.idMachineInfo = idMachine;
 							_that.fillBreedTaskByMachine(idMachine, 1);
 						} else if (res.result.match(new RegExp("^printbill.*$"))) {
-							
+
 						}
 					}
 				})
@@ -167,8 +167,8 @@
 						pageSize: 20
 					})
 				}
-				
-				request.httpPost("/apis/printbill/queryBreedTasksToFeedback", listData, true).then(res => {
+
+				request.httpPost("/printbill/queryBreedTasksToFeedback", listData, true).then(res => {
 					if (res.httpCode == 200) {
 						res.data.forEach(item => {
 							item.showMore = false
@@ -217,7 +217,7 @@
 										memo: ""
 					            	})
 					            }
-					            request.httpPost("/apis/printbill/feedbackTask", postData, true).then(resFeedBack => {
+					            request.httpPost("/printbill/feedbackTask", postData, true).then(resFeedBack => {
 					            	if (resFeedBack.httpCode == 200) {
 										task.taskStatus = 1;
 					            		uni.showToast({
@@ -258,7 +258,7 @@
 						memo: _that.feedBackData.feedBackMemo
 					})
 				}
-				request.httpPost("/apis/printbill/feedbackTask", postData, true).then(resFeedBack => {
+				request.httpPost("/printbill/feedbackTask", postData, true).then(resFeedBack => {
 					if (resFeedBack.httpCode == 200) {
 						_that.focuseTask.taskStatus = 1;
 						uni.showToast({
@@ -292,7 +292,7 @@
 	/deep/ .uni-list-item__container {
 		padding: 0rpx;
 	}
-	
+
 	.card-actions {
 		display: flex;
 		flex-direction: row;
@@ -301,19 +301,19 @@
 		height: 45px;
 		border-top: 1px #eee solid;
 	}
-	
+
 	.card-actions-item {
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 	}
-	
+
 	.card-actions-item-text {
 		font-size: 12px;
 		color: #666;
 		margin-left: 5px;
 	}
-	
+
 	.textTitle {
 		border-left: 0px solid #007AFF;
 		display: inline-block;
@@ -322,7 +322,7 @@
 		margin-bottom: 5px;
 		color: #8799a3;
 	}
-	
+
 	.u-popup-slot {
 		width: 750rpx;
 		height: 400px;
@@ -341,7 +341,7 @@
 		height: 108rpx;
 		background: #FFFFFF;
 		border-top: 1px solid #E8E8E8;
-	
+
 		>view {
 			width: 50%;
 			height: 100%;
@@ -350,29 +350,29 @@
 			display: flex;
 			justify-content: center;
 			align-items: center;
-	
+
 			&:active {
 				opacity: 0.8;
 			}
-	
+
 			.cart {
 				width: 67rpx;
 				height: 67rpx;
 				margin-top: 10rpx;
 				margin-right: 25rpx;
 			}
-	
+
 			.amout {
 				font-size: 34rpx;
-	
+
 				>text {
 					font-size: 20rpx;
 				}
 			}
-	
+
 			.badge {
 				position: relative;
-	
+
 				>text {
 					position: absolute;
 					top: 2rpx;
@@ -386,7 +386,7 @@
 				}
 			}
 		}
-	
+
 		>view:last-child {
 			background: #FFD202;
 		}

pages/feedback/scanOrderCode.vue

@@ -26,6 +26,7 @@
 
 <script>
 	import appScan from "../../components/app-continue-scancode/app-continue-scancode.vue"
+	import request from '@/common/libs/request.js';
 	export default {
 		components: {
 			appScan
@@ -40,14 +41,16 @@
 			scanHitERPCode(e) {
 				let _that = this;
 				console.log(e.code);
-				if (e.code.match(new RegExp("^printorder.*$"))) {
+				if (e.code.match(new RegExp("^sendOrder.*$"))) {
 					let ids = e.code.split("-");
+					console.log(ids);
 					if (!_that.checkCodeExists(ids[2])) {
 						_that.hitOrders.push({
 							id: ids[2],
 							orderCode: ids[1]
 						})
-						this.totalCount++
+						console.log(ids)
+						// this.totalCount++
 					}
 				}
 			},

pages/feedback/scancodeCar.vue

@@ -0,0 +1,388 @@
+<template>
+	<view>
+		<uni-list :border="false">
+			<uni-list-item v-for="(item,index) in breedTaskList" :key="item.id" :index="index" :threshold="0">
+				<template slot="body">
+					<uni-card>
+						<u-row>
+							<u-col span="10">
+								<view class="demo-layout">
+									<view>{{item.branchLineName}}<span>{{item.shipmentPackageCount}}</span>{{item.shipmentUnit}}</view>
+									<view>{{item.shipmentName}}</view>
+								</view>
+							</u-col>
+							<u-col span="2">
+								<u-button @click="deleteBtn(index)" size="small" type="warning" text="移除"></u-button>
+							</u-col>
+						</u-row>
+					</uni-card>
+				</template>
+			</uni-list-item>
+		</uni-list>
+		<view class="footer">
+			<view>
+				<view>
+					<text style="margin-top: -10rpx;" class="footer-text">包数：<span>{{totalUnit}}</span></text>
+				</view>
+			</view>
+			<view @click="confirmOrderCodes">确认装车</view>
+		</view>
+
+		<uni-fab style="bottom: 100rpx;" ref="fab" :pattern="fabPattern" icon="color" :popMenu="false" horizontal="right" vertical="bottom"
+			@fabClick="scanFabClick" />
+			<u-notify ref="uNotify"></u-notify>
+	</view>
+</template>
+
+<script>
+	import request from '@/common/libs/request.js';
+	export default {
+		data() {
+			return {
+				token:"",
+				totalUnit:0,
+				hitOrders:[],
+				fabPattern: {
+					color: '#7A7E83',
+					backgroundColor: '#fff',
+					selectedColor: '#007AFF',
+					buttonColor: '#007AFF',
+					iconColor: '#fff'
+				},
+				idMachineInfo: 0,
+				breedTaskList: [],
+				feedBackPopupShow: false,
+				focuseTask: {
+					printBill:{},
+					printBreed:{}
+				},
+				feedBackData: {
+					feedBackCount: 0,
+					feedBackComplete:[1],
+					feedBackMemo: ''
+				},
+				feedBackCompleteStatus:[
+					{
+						text: '任务已完成',
+						value: 1
+					}
+				]
+			}
+		},
+		onLoad() {
+			// if (process.env.NODE_ENV === 'development') {
+			// 	this.fillBreedTaskByMachine(2, 1);
+			// }
+		},
+		mounted() {
+			this.initData()
+		},
+		methods: {
+			confirmOrderCodes(){
+				let _that = this;
+				var ids = [];
+				if(_that.breedTaskList.length<=0){
+					uni.showToast({
+						title: "请先扫码",
+						icon: 'none'
+					})
+				}
+				for (let i = 0; i < _that.breedTaskList.length; i++) {
+					ids.push(_that.breedTaskList[i].id)
+				}
+				let parms = {
+					idBillItems: ids.join(','),
+					token: _that.token
+				}
+				console.log(parms);
+				request.httpPost("/dnyDriver/truckUp", parms, true).then(res => {
+					console.log(res);
+					_that.initData()
+					if (res.httpCode == 200) {
+					_that.hitOrders = [];
+					_that.breedTaskList = [];
+					_that.totalUnit=0;
+					uni.showToast({
+						title: "装车成功",
+					})
+					}else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							mask: true,
+							duration: 3000,
+						})
+					}
+				});
+			},
+			searchPrintBreed() {
+
+			},
+			initData(){
+				let _that = this;
+				request.httpPost("/dnyDriver/driverFormToken", {},true).then(tokenRes => {
+					console.log(tokenRes)
+					_that.token = tokenRes.data
+				})
+			},
+			scanFabClick() {
+				let _that = this;
+				uni.scanCode({
+					onlyFromCamera: true,
+					scanType: ['barCode', 'qrCode'],
+					success: function(res) {
+						if (res.result.match(new RegExp("^sendOrder.*$"))) {
+							console.log(res.result)
+							let idOrder = res.result.split("-")[2];
+							console.log(idOrder)
+							console.log(_that.hitOrders)
+							if(_that.hitOrders.indexOf(idOrder)==-1){
+								_that.hitOrders.push(idOrder)
+								_that.getShipDetails(idOrder)
+							}else {
+								uni.showToast({
+									title: "此单已扫码",
+									icon: 'none'
+								})
+							}
+						}
+					}
+				})
+			},
+			getShipDetails(idOrder) {
+				let _that = this;
+				let parms = {
+					idOrder: idOrder
+				}
+				console.log(parms);
+				request.httpPost("/dnyDriver/scanOrderCode", parms, true).then(res => {
+					console.log(res);
+					if (res.httpCode == 200) {
+						console.log(res.data);
+						var datas = res.data;
+						var itemData = {
+							'branchLineName':datas.branchLineName,
+							'shipmentName':datas.shipmentName,
+							'shipmentPackageCount':datas.shipmentPackageCount,
+							'shipmentUnit':datas.shipmentUnit,
+							'id':datas.id
+						}
+						_that.totalUnit+=datas.shipmentPackageCount
+						_that.breedTaskList.push(itemData)
+						console.log(_that.breedTaskList);
+					}else {
+						if(_that.hitOrders.length>0){
+							_that.hitOrders.pop()
+						}else {
+							_that.hitOrders = [];
+						}
+						
+						_that.$refs.uNotify.warning(res.msg)
+					}
+				});
+			},
+			parseBreedTaskStatus(task) {
+				if (task.pauseStatus == 0) {
+					if (task.taskStatus == 0) {
+						return "未开始";
+					} else if (task.taskStatus == 1) {
+						return "生产中";
+					} else if (task.taskStatus == 2) {
+						return "终止";
+					} else if (task.taskStatus == 5) {
+						return "完成";
+					} else if (task.taskStatus == 10) {
+						return "已完成";
+					}
+				} else {
+					return "暂停";
+				}
+			},
+			viewBreedTaskMore(task) {
+				task.showMore = !task.showMore
+			},
+			
+			deleteBtn(index){
+				this.totalUnit = this.totalUnit-this.breedTaskList[index].shipmentPackageCount
+				this.breedTaskList.splice(index, 1)
+				this.hitOrders.splice(index, 1)
+				
+				
+			},
+			feedBackPopupClose() {
+				this.feedBackPopupShow = false;
+				console.log(JSON.stringify(this.feedBackData));
+			},
+			submitFeedBackForm(ref) {
+				let _that = this;
+				let isComplete = true;
+				if (_that.feedBackData.feedBackComplete.length == 0) {
+					isComplete = false
+				}
+				let postData = {
+					item: JSON.stringify({
+						idTask: _that.focuseTask.id,
+						taskStatus: 1,
+						isComplete: isComplete,
+						feedbackCount:_that.feedBackData.feedBackCount,
+						memo: _that.feedBackData.feedBackMemo
+					})
+				}
+				request.httpPost("/printbill/feedbackTask", postData, true).then(resFeedBack => {
+					if (resFeedBack.httpCode == 200) {
+						_that.focuseTask.taskStatus = 1;
+						uni.showToast({
+							title:"反馈成功"
+						})
+					} else {
+						uni.showToast({
+							title: resFeedBack.msg
+						})
+					}
+				});
+			},
+			viewBreedTaskDetail(task) {
+				uni.navigateTo({
+					url: "../printbill/detail?id=" + task.idPrintBill + "&billCode=" + task.printBill.billCode,
+					animationType: 'pop-in'
+				})
+			},
+			viewBreedTaskStep(task) {
+				uni.navigateTo({
+					url: "../printbill/step?id=" + task.idPrintBill + "&billCode=" + task.printBill.billCode,
+					animationType: 'pop-in'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.footer-text span{
+		font-weight: bold;
+		color: #e4493c;
+		padding: 0 10rpx;
+	}
+	.demo-layout span{
+		font-weight: bold;
+		color: #e4493c;
+		padding: 0 10rpx;
+	}
+	.span-txt{
+		font-weight: bold;
+		color: #e4493c;
+	}
+	.demo-layout{
+		font-size: 36rpx;
+	}
+/deep/ .uni-card .uni-card__header{
+	border-bottom: none !important;
+}
+	/deep/ .uni-list-item__container {
+		padding: 0rpx;
+	}
+		/deep/ .fab{
+			.uniui-plusempty:before {
+				//content: "\e67b";
+				content: '\e654' !important;
+			}
+		}
+		.card-actions {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-around;
+		align-items: center;
+		height: 45px;
+		border-top: 1px #eee solid;
+	}
+
+	.card-actions-item {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.card-actions-item-text {
+		font-size: 12px;
+		color: #666;
+		margin-left: 5px;
+	}
+
+	.textTitle {
+		border-left: 0px solid #007AFF;
+		display: inline-block;
+		width: 180rpx;
+		text-align: left;
+		margin-bottom: 5px;
+		color: #8799a3;
+	}
+
+	.u-popup-slot {
+		width: 750rpx;
+		height: 400px;
+		@include flex;
+		justify-content: center;
+		align-items: center;
+		padding: 20px;
+	}
+	.footer {
+		position: fixed;
+		bottom: 0;
+		z-index: 10;
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+		height: 108rpx;
+		background: #FFFFFF;
+		border-top: 1px solid #E8E8E8;
+
+		>view {
+			width: 50%;
+			height: 100%;
+			font-size: 34rpx;
+			font-weight: 600;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			&:active {
+				opacity: 0.8;
+			}
+
+			.cart {
+				width: 67rpx;
+				height: 67rpx;
+				margin-top: 10rpx;
+				margin-right: 25rpx;
+			}
+
+			.amout {
+				font-size: 34rpx;
+
+				>text {
+					font-size: 20rpx;
+				}
+			}
+
+			.badge {
+				position: relative;
+
+				>text {
+					position: absolute;
+					top: 2rpx;
+					right: 10rpx;
+					z-index: 10;
+					font-size: 22rpx;
+					background: #FF3D00;
+					border-radius: 50%;
+					color: #fff;
+					padding: 0 10rpx 2rpx;
+				}
+			}
+		}
+
+		>view:last-child {
+			background: #FFD202;
+		}
+	}
+</style>

pages/index/me.vue

@@ -48,7 +48,7 @@
 		methods: {
 			initData() {
 				let _that = this;
-				request.httpPost("/apis/dnyDriver/getDriverInfo", {}).then(res => {
+				request.httpPost("/dnyDriver/getDriverInfo", {}).then(res => {
 					if (res.httpCode == 200) {
 						console.log("3333", res.data)
 						_that.driverInfo = res.data
@@ -101,4 +101,4 @@
 	.flex-item-70 {
 		flex-basis: 70%;
 	}
-</style>
+</style>

pages/index/myTruckList.vue

@@ -3,9 +3,15 @@
 		<view class="u-page">
 			<u-list>
 				<u-list-item v-for="(item, index) in truckList" :key="index">
-					<u-cell :title="item.truckCode + '-' + item.truckTypeName">
+					<u-cell v-if="idDefaultTruck==item.id" :title="item.truckCode + '-' + item.truckTypeName">
 						<u-avatar slot="icon" shape="square" size="35" :src="item.url? item.url: defaultAvatar"
 							customStyle="margin: -3px 5px -3px 0"></u-avatar>
+							<span style="color: #e4493c;" class="item-span" slot="right-icon">已默认</span>
+					</u-cell>
+					<u-cell v-else :title="item.truckCode + '-' + item.truckTypeName">
+						<u-avatar slot="icon" shape="square" size="35" :src="item.url? item.url: defaultAvatar"
+							customStyle="margin: -3px 5px -3px 0"></u-avatar>
+							<span @click="setChecked(item.id)" class="item-span" slot="right-icon">设置默认</span>
 					</u-cell>
 				</u-list-item>
 				<u-list-item :key="10000">
@@ -24,6 +30,8 @@
 		},
 		data() {
 			return {
+				idDefaultTruck:"",
+				checked:false,
 				defaultAvatar: 'http://dn-dounengyin.qbox.me/Fvz4y4_hhBt0CaY9_8PMm8IeXc8p',
 				truckList: [
 
@@ -32,9 +40,46 @@
 			}
 		},
 		methods: {
+			setChecked(id){
+				let _that = this;
+				var trukData = {
+					"id":id
+				}
+				var truckInfo = {
+					 "truckInfo": JSON.stringify(trukData),
+				};
+				request.httpPost("/dnyDriver/changeDriverTruck", truckInfo, false).then(res => {
+					console.log(res);
+					request.httpPost("/dnyDriver/getDriverInfo", {}).then(res => {
+						if (res.httpCode == 200) {
+							uni.setStorageSync("idDefaultTruck", res.data.idDefaultTruck);
+							_that.idDefaultTruck =  res.data.idDefaultTruck
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: "error"
+							})
+						}
+					});
+					uni.showToast({
+						title: "设置默认成功",
+						icon: "none"
+					})
+				
+					if (res.httpCode == 200) {
+						_that.initData();
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "error"
+						})
+					}
+				})
+			},
 			initData() {
 				let _that = this;
-				request.httpPost("/apis/dnyDriver/getTruckInfoList", {}).then(res => {
+				_that.idDefaultTruck = uni.getStorageSync('idDefaultTruck');
+				request.httpPost("/dnyDriver/getTruckInfoList", {}).then(res => {
 					if (res.httpCode == 200) {
 						_that.truckList = res.data
 					} else {
@@ -54,7 +99,9 @@
 		padding-left: 60rpx;
 		padding-top: 30rpx;
 	}
-
+	.item-span{
+		
+	}
 	.avatar-txt span {
 		display: block;
 		width: 100;

pages/index/tabbar.vue

@@ -56,7 +56,11 @@
 				pageCurrent: 'workTable'
 			}
 		},
+		mounted() {
+			
+		},
 		methods: {
+			
 			navChange: function(e) {
 				console.log(e.currentTarget.dataset.cur);
 				this.pageCurrent = e.currentTarget.dataset.cur;

pages/index/workTable.vue

@@ -3,7 +3,7 @@
 		<view class="orderMonitor">
 			<u-row  class="userinfo-topbox" gutter="16" justify="center">
 				<u-col span="6" text-align="center" style="margin: 1px;">
-					<view style="color: #CCFFFF;">豫A99uk68</view>
+					<view style="color: #CCFFFF;">{{defaultTruckCode}}</view>
 				</u-col>
 				<u-col span="6" text-align="center" style="margin: 1px;">
 					<view style="color: #CCFFFF;"></view>
@@ -23,7 +23,7 @@
 		<view class="workbench-title">常用应用</view>
 		<view class="toolbar">
 			<u-grid class="grid" :col="4" :border="false">
-				<u-grid-item @click="navTo('/pages/feedback/scanOrderCode')"  :index="0">
+				<u-grid-item @click="navTo('/pages/feedback/scancodeCar')"  :index="0">
 						<view   class="home-icon icon-color02">
 							<i class="iconfont icon-cangpeitubiao_huanhuorukutuihuoruku"></i>
 						</view>
@@ -49,9 +49,10 @@
 <script>
 	import request from '@/common/libs/request.js';
 	export default {
-		
+
 		data() {
 			return {
+				defaultTruckCode:"",
 				orderData:[],
 				cardData: "",
 				listData: {
@@ -62,16 +63,30 @@
 			}
 		},
 		onLoad(){
-	
+
 		},
 		mounted: function(option) {
-			console.log("111111111111")
+			this.initData()
 			// this.getCurrentItems();
 			//不再这里调用，由主页刷新获取
 			// this.getIndexCardPanelData();
 		},
-	
+
 		methods: {
+			initData() {
+				let _that = this;
+				request.httpPost("/dnyDriver/getDriverInfo", {}).then(res => {
+					if (res.httpCode == 200) {
+						uni.setStorageSync("idDefaultTruck", res.data.idDefaultTruck);
+						_that.defaultTruckCode =  res.data.defaultTruckCode
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "error"
+						})
+					}
+				});
+			},
 			navTo(url) {
 				uni.navigateTo({
 					url: url
@@ -93,7 +108,7 @@
 				success: function(res) {
 					console.log("121221",res)
 					_that.billScanOrderCode(res.result)
-				
+
 				}
 			})
 
@@ -104,8 +119,8 @@
 			let dataInfo = {
 				"idOrder": idOrder,
 			}
-			
-			request.httpPost("/apis/dnyDriver/scanOrderCode", dataInfo, true).then(res => {
+
+			request.httpPost("/dnyDriver/scanOrderCode", dataInfo, true).then(res => {
 				if (res.httpCode == 200) {
 					console.log("3333",res)
 				}
@@ -120,7 +135,7 @@
 			var data = {
 				"page": JSON.stringify(page)
 			}
-			request.httpPost("/apis/dnyDriver/showCurrentTransitioningItems", data, false).then(res => {
+			request.httpPost("/dnyDriver/showCurrentTransitioningItems", data, false).then(res => {
 				if (res.httpCode == 200) {
 					console.log("4444",res)
 					_that.orderData = res.data
@@ -130,7 +145,7 @@
 						icon: "error"
 					})
 				}
-				
+
 
 			})
 		},

pages/login/login.vue

@@ -57,7 +57,7 @@
 					"user": JSON.stringify(user),
 					"supplierId":1
 				}
-				request.httpPost("/apis/dnyDriver/login", userData, false).then(res => {
+				request.httpPost("/dnyDriver/login", userData, false).then(res => {
 					console.log(res);
 
 					if (res.httpCode == 200) {

uni_modules/uni-fab/components/uni-fab/uni-fab.vue

@@ -116,7 +116,7 @@
 					backgroundColor: '#fff',
 					buttonColor: '#007AFF',
 					iconColor: '#fff',
-					icon: 'plusempty'
+					icon: 'scan'
 				}
 			}
 		},