都能运app xu

pages/feedback/print.vue

@@ -110,7 +110,7 @@ export default {
         onlyFromCamera: true,
         scanType: ['barCode', 'qrCode'],
         success: function(res) {
-          console.log(res);
+          // console.log(res);
           if (res.result.indexOf('dnySendBill') != -1) {
             let qrCode = res.result
             _that.truckUpOrder(qrCode)
@@ -131,7 +131,7 @@ export default {
         qrCode: qrCode
       }
       request.httpPost("/dnyDriver/handOverScanBillBranch", parms, true).then(res => {
-        console.log("25111",res);
+        // console.log("25111",res);
         _that.loading = false
         _that.breedTaskList = [];
         _that.totalUnit = 0;

pages/feedback/signOrderCode.vue

@@ -115,7 +115,7 @@ export default {
         onlyFromCamera: true,
         scanType: ['barCode', 'qrCode'],
         success: function (res) {
-          console.log("res1212",res);
+          // console.log("res1212",res);
           if (res.result.indexOf('sendOrder') != -1) {
             let idOrder = res.result.split("-")[2];
             _that.truckUpOrder(idOrder)
@@ -160,7 +160,7 @@ export default {
       _that.loading = true;
       _that.signVisible = false;
       var info = {
-        ltItemState: 10
+        ltItemState: 5
       }
       let listData = {
         params: JSON.stringify(info),
@@ -195,7 +195,7 @@ export default {
         idOrder: item.idOrder
       }
       request.httpPost("/dnyDriver/orderPayRequest3", parms, true).then(res => {
-        console.log("res333",res);
+        // console.log("res333",res);
         _that.loading = false;
             if (res.httpCode == 200) {
               _that.show = true;

pages/feedback/traceCamera.vue

@@ -79,7 +79,7 @@
 				if (process.env.NODE_ENV === 'production') {
 					uploadUrl = "http://192.168.1.24:51106/driverSign/signItem"
 				}
-        console.log("111",uploadFiles);
+        // console.log("111",uploadFiles);
         uni.uploadFile({
 					url: uploadUrl,
 					files: uploadFiles,
@@ -90,7 +90,7 @@
             idItem: _that.idOrder
 					},
 					success: (res) => {
-						console.log("222",res);
+						// console.log("222",res);
             uni.showToast({
               title: "签收成功",
             })

pages/index/addTruck.vue

@@ -66,7 +66,7 @@
 					 "truckInfo": JSON.stringify(trukData),
 				};
 				request.httpPost("/dnyDriver/addTruckInfo", truckInfo, false).then(res => {
-					console.log(res);
+					// console.log(res);
 
 					if (res.httpCode == 200) {
 						uni.reLaunch({
@@ -99,7 +99,7 @@
 				this.showTruckType = false
 			},
 			onPickerConfirm(item) {
-				console.log(item)
+				// console.log(item)
 				this.truckInfo.idTruckType = item.value[0].id
 				this.truckInfo.truckTypeName = item.value[0].truckTypeName
 				this.showTruckType = false

pages/index/index.vue

@@ -11,7 +11,7 @@
 			<view style="width: 200upx;" class="border scroll-row-item">4</view>
 			<view style="width: 200upx;" class="border scroll-row-item">5</view>
 		</scroll-view>
-		
+
 		<view class="row p-2">
 			<view class="span-4 text-center">2</view>
 			<view class="span-4 text-center">1</view>
@@ -36,7 +36,7 @@
 			}
 		},
 		onLoad() {
-			console.log(uni.getStorageSync("erpToken"));
+			// console.log(uni.getStorageSync("erpToken"));
 		},
 		methods: {
 

pages/index/me.vue

@@ -59,7 +59,7 @@
 				let _that = this;
 				request.httpPost("/dnyDriver/getDriverInfo", {}).then(res => {
 					if (res.httpCode == 200) {
-						console.log("3333", res.data)
+						// console.log("3333", res.data)
 						_that.driverInfo = res.data
             _that.text = res.data.driverName.charAt(0)
 					} else {

pages/index/myTruckList.vue

@@ -49,7 +49,7 @@
 					 "truckInfo": JSON.stringify(trukData),
 				};
 				request.httpPost("/dnyDriver/changeDriverTruck", truckInfo, false).then(res => {
-					console.log(res);
+					// console.log(res);
 					request.httpPost("/dnyDriver/getDriverInfo", {}).then(res => {
 						if (res.httpCode == 200) {
 							uni.setStorageSync("idDefaultTruck", res.data.idDefaultTruck);
@@ -65,7 +65,7 @@
 						title: "设置默认成功",
 						icon: "none"
 					})
-				
+
 					if (res.httpCode == 200) {
 						_that.initData();
 					} else {
@@ -100,7 +100,7 @@
 		padding-top: 30rpx;
 	}
 	.item-span{
-		
+
 	}
 	.avatar-txt span {
 		display: block;
@@ -127,4 +127,4 @@
 	.flex-item-70 {
 		flex-basis: 70%;
 	}
-</style>
+</style>

pages/index/tabbar.vue

@@ -6,13 +6,13 @@
 
 		<view class="box">
 			<view class="cu-bar tabbar bg-white shadow foot">
-				<view class="action" @click="navChange" data-cur="order">
-					<view class='cuIcon-cu-image'>
-						<image v-if="pageCurrent=='order'" src="../../static/tabbar/order_cur.png"></image>
-						<image v-if="pageCurrent != 'order'" src="../../static/tabbar/order.png"></image>
-					</view>
-					<view :class="pageCurrent=='order'?'color_main':'text-gray'">配送列表</view>
-				</view>
+<!--				<view class="action" @click="navChange" data-cur="order">-->
+<!--					<view class='cuIcon-cu-image'>-->
+<!--						<image v-if="pageCurrent=='order'" src="../../static/tabbar/order_cur.png"></image>-->
+<!--						<image v-if="pageCurrent != 'order'" src="../../static/tabbar/order.png"></image>-->
+<!--					</view>-->
+<!--					<view :class="pageCurrent=='order'?'color_main':'text-gray'">配送列表</view>-->
+<!--				</view>-->
 				<view class="action" @click="navChange" data-cur="workTable">
 					<view class='cuIcon-cu-image'>
 						<image v-if="pageCurrent=='workTable'" src="../../static/tabbar/workTable_cur.png"></image>
@@ -52,7 +52,7 @@
 			}
 		},
     onPullDownRefresh() {
-      console.log('refresh');
+      // console.log('refresh');
       if (this.pageCurrent == 'workTable') {
         this.$refs['workTableRef'].pullDownRefresh();
         setTimeout(function () {

pages/index/workTable.vue

@@ -2,21 +2,9 @@
   <view class="wrap">
     <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;">{{ defaultTruckCode }}</view>
-        </u-col>
-        <u-col span="6" text-align="center" style="margin: 1px;">
-          <view style="color: #CCFFFF;"></view>
-        </u-col>
-      </u-row>
-      <u-row style="margin-top:-25rpx;" class="userinfo-topbox" gutter="16" justify="center">
-        <u-col span="6" text-align="center" style="margin: 1px;">
-          <view style="color: #CCFFFF;">未配送订单</view>
-          <view class="number">50</view>
-        </u-col>
-        <u-col span="6" text-align="center" style="margin: 1px;">
-          <view style="color: #CCFFFF;">已配送订单</view>
-          <view class="number">20</view>
+        <u-col  text-align="left" style="margin: 1px;">
+          <view style="color: #CCFFFF;padding-left: 30rpx">{{ driverName }}</view>
+          <view style="color: #CCFFFF;padding-left: 30rpx">{{ defaultTruckCode }}</view>
         </u-col>
       </u-row>
     </view>
@@ -65,6 +53,7 @@ export default {
 
   data() {
     return {
+      driverName:"",
       defaultTruckCode: "",
       orderData: [],
       cardData: "",
@@ -89,7 +78,8 @@ export default {
         // console.log("res33333",res);
         if (res.httpCode == 200) {
           uni.setStorageSync("idDefaultTruck", res.data.idDefaultTruck);
-          _that.defaultTruckCode = res.data.defaultTruckCode
+          _that.defaultTruckCode = res.data.defaultTruckCode;
+          _that.driverName = res.data.driverName;
         } else {
           uni.showToast({
             title: res.msg,

pages/order/recordOrder.vue

@@ -9,7 +9,8 @@
           <uni-card>
             <view class="demo-layout">
               <view>
-                <text class="tag-con">支付状态</text>
+                <text v-if="item.itemOrderChargeState==0" class="tag-con">未收</text>
+                <text v-else style="color: #5ac725 !important;" class="tag-con">已收</text>
                 <span>{{ item.shipmentPackageCount }}</span>{{ item.shipmentUnit }}&nbsp;&nbsp;&nbsp;&nbsp;代收金额:<span>{{ item.shipmentMoney }}</span>&nbsp;&nbsp;&nbsp;&nbsp;
               </view>
               <view>{{ item.erpOrderCode }}</view>
@@ -71,7 +72,7 @@ export default {
         onlyFromCamera: true,
         scanType: ['barCode', 'qrCode'],
         success: function (res) {
-          console.log("res1212",res);
+          // console.log("res1212",res);
           if (res.result.indexOf('sendOrder') != -1) {
             let idOrder = res.result.split("-")[2];
             _that.truckUpOrder(idOrder)
@@ -94,7 +95,7 @@ export default {
         idOrder: idOrder
       }
       request.httpPost("/dnyDriver/signInScanSendOrder", parms, true).then(res => {
-        console.log('res444',res);
+        // console.log('res444',res);
       })
     },
     getShipDetails(orderCode){
@@ -110,6 +111,7 @@ export default {
     getSignBillList: function () {
       let _that = this;
       var info = {
+        itemStates:"5,10"
       }
       let listData = {
         params: JSON.stringify(info),

uni_modules/uni-easyinput/components/uni-easyinput/common.js

@@ -6,9 +6,9 @@
  */
 export const debounce = function(func, wait = 1000, immediate = true) {
 	let timer;
-	console.log(1);
+	// console.log(1);
 	return function() {
-		console.log(123);
+		// console.log(123);
 		let context = this,
 			args = arguments;
 		if (timer) clearTimeout(timer);