都能运app xu

pages/feedback/print.vue

@@ -110,6 +110,7 @@ export default {
         onlyFromCamera: true,
         scanType: ['barCode', 'qrCode'],
         success: function(res) {
+          console.log(res);
           if (res.result.indexOf('dnySendBill') != -1) {
             let qrCode = res.result
             _that.truckUpOrder(qrCode)
@@ -130,7 +131,7 @@ export default {
         qrCode: qrCode
       }
       request.httpPost("/dnyDriver/handOverScanBillBranch", parms, true).then(res => {
-        console.log(res);
+        console.log("25111",res);
         _that.loading = false
         _that.breedTaskList = [];
         _that.totalUnit = 0;
@@ -151,7 +152,6 @@ export default {
             _that.totalUnit+=items.shipmentPackageCount
             _that.breedTaskList.push(itemData)
           }
-          console.log("res333",_that.breedTaskList);
         }else {
           uni.showToast({
             title: res.msg,

pages/feedback/scancodeCar.vue

@@ -31,6 +31,7 @@
 
 		<uni-fab style="bottom: 100rpx;" ref="fab" :pattern="fabPattern" icon="color" :popMenu="false" horizontal="right" vertical="bottom"
 			@fabClick="scanFabClick" />
+    <u-loading-page :loading="loading"></u-loading-page>
 	</view>
 </template>
 
@@ -39,6 +40,7 @@
 	export default {
 		data() {
 			return {
+        loading:false,
 				token:"",
 				totalUnit:0,
 				fabPattern: {
@@ -65,6 +67,7 @@
 					})
           return
 				}
+        _that.loading = true;
 				for (let i = 0; i < _that.breedTaskList.length; i++) {
 					ids.push(_that.breedTaskList[i].id)
 				}
@@ -73,6 +76,8 @@
 					token: _that.token
 				}
 				request.httpPost("/dnyDriver/truckUp", parms, true).then(res => {
+          _that.loading = false;
+          _that.breedTaskList = [];
 					_that.initData()
 					if (res.httpCode == 200) {
 					_that.breedTaskList = [];
@@ -93,7 +98,6 @@
 			initData(){
 				let _that = this;
 				request.httpPost("/dnyDriver/driverFormToken", {},true).then(tokenRes => {
-					console.log(tokenRes)
 					_that.token = tokenRes.data
 				})
 			},

pages/feedback/signOrderCode.vue

@@ -9,16 +9,16 @@
           <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>
-              <view>{{ item.clientName }}</view>
               <view>{{ item.shipmentName }}&{{item.productName}}</view>
               <view style="font-size: 28rpx">{{ item.receiveAddress }}</view>
             </view>
             <view slot="actions" class="card-actions">
-              <view class="card-actions-item" @click="viewDetail(item)">
+              <view  class="card-actions-item" @click="updateBillBtn(item)">
                 <uni-icons type="info-filled" size="18" color="#999"></uni-icons>
                 <text class="card-actions-item-text">货款代收</text>
               </view>
@@ -37,6 +37,28 @@
     <uni-fab style="bottom: 100rpx;" ref="fab" :pattern="fabPattern" icon="color" :popMenu="false" horizontal="right"
              vertical="bottom"
              @fabClick="scanFabClick"/>
+    <u-loading-page :loading="loading"></u-loading-page>
+    <view>
+      <u-popup :show="show" @close="close" :closeable="true" mode="center"  @open="open">
+        <view class="popup-con">
+          <div v-if="qrCodeInfo" class="qrCodeInfo">
+            {{erpOrderCode}} &nbsp;&nbsp;代收金额:<span>{{qrCodeInfo}}</span>
+          </div>
+          <div style="margin: auto;width: 600rpx">
+            <u--image :showLoading="true" :src="src" width="600rpx" height="600rpx"></u--image>
+          </div>
+          <div style="text-align: center;line-height: 60rpx;margin-left: 180rpx;padding-top: 10px">
+            <span style="float: left">请使用</span>
+            <u-icon style="float: left" name="zhifubao-circle-fill" color="#2979ff" size="28"></u-icon>
+            &nbsp;&nbsp;&nbsp;&nbsp;
+            <u-icon style="float: left" name="weixin-circle-fill" color="#53c21d" size="28"></u-icon>
+            <span style="float: left">支付</span>
+          </div>
+
+        </view>
+      </u-popup>
+      <u-button @click="show = true">打开</u-button>
+    </view>
   </view>
 </template>
 
@@ -46,6 +68,11 @@ import request from '@/common/libs/request.js';
 export default {
   data() {
     return {
+      src:"",
+      qrCodeInfo:"",
+      erpOrderCode:"",
+      show:false,
+      loading:false,
       signVisible:false,
       fabPattern: {
         color: '#7A7E83',
@@ -74,6 +101,10 @@ export default {
     this.getSignBillList();
   },
   methods: {
+    close(){
+      this.show=false;
+    },
+    open(){},
     handelEvent(data){
       this.billList.splice(data, 1)
     },
@@ -103,25 +134,31 @@ export default {
     },
     truckUpOrder(idOrder){
       let _that = this;
+      _that.billList = [];
       let parms = {
         idOrder: idOrder
       }
       request.httpPost("/dnyDriver/signInScanSendOrder", parms, true).then(res => {
-        console.log('res444',res);
+        _that.signVisible = true;
+        _that.billList = res.data
       })
     },
     getShipDetails(orderCode){
       let _that = this;
+      _that.billList = [];
       let parms = {
         orderCode: orderCode
       }
       request.httpPost("/dnyDriver/signInScanERPOrder", parms, true).then(res => {
         _that.signVisible = true;
+        _that.billList = res.data
 
       })
     },
     getSignBillList: function () {
       let _that = this;
+      _that.loading = true;
+      _that.signVisible = false;
       var info = {
         ltItemState: 10
       }
@@ -130,6 +167,7 @@ export default {
         page: JSON.stringify(_that.page)
       }
       request.httpPost("/dnyDriver/driverQuerySignInItem", listData, true).then(res => {
+        _that.loading = false;
         // console.log("res1111", res);
         uni.stopPullDownRefresh();
         if (!res.data || res.data.length == 0) {
@@ -150,11 +188,30 @@ export default {
         this.getSignBillList();
       }, 100);
     },
-    viewDetail: function (item) {
-      // console.log(item.id);
-      uni.navigateTo({
-        url: "./detail?id=" + item.id + "&billCode=" + item.billCode,
-        animationType: 'pop-in'
+    updateBillBtn: function (item) {
+      let _that = this;
+      _that.loading = true;
+      let parms = {
+        idOrder: item.idOrder
+      }
+      request.httpPost("/dnyDriver/orderPayRequest3", parms, true).then(res => {
+        console.log("res333",res);
+        _that.loading = false;
+            if (res.httpCode == 200) {
+              _that.show = true;
+              _that.erpOrderCode = item.erpOrderCode
+              _that.qrCodeInfo = res.data.qrCodeInfo
+              _that.src = res.data.qrCodeImageUrl.substring(1).replace('apis', 'http://192.168.1.24:51106');
+              console.log(_that.src);
+              // _that.src = res.data.qrCodeImageUrl
+            }else {
+              uni.showToast({
+                title: res.msg,
+                icon: 'none',
+                mask: true,
+                duration: 1000,
+              })
+            }
       })
     },
     parseBillState: function (item) {
@@ -177,6 +234,22 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.qrCodeInfo{
+  font-size: 30rpx;
+
+}
+.qrCodeInfo span{
+  color: #e4493c !important;
+  font-size: 30rpx;
+  font-weight: bold;
+}
+.popup-con{
+  min-height: 800rpx;
+  padding: 40rpx;
+  width: 700rpx;
+  margin: auto;
+  box-sizing: border-box;
+}
 .tag-con {
   color: #e4493c;
   margin-right: 20rpx;

pages/feedback/traceCamera.vue

@@ -91,6 +91,9 @@
 					},
 					success: (res) => {
 						console.log("222",res);
+            uni.showToast({
+              title: "签收成功",
+            })
             uni.hideLoading();
             uni.navigateBack({})
             uni.$emit("eventName",_that.index)

pages/index/me.vue

@@ -3,7 +3,13 @@
 		<view class="cu-bar">
 			<u-row gutter="20">
 				<u-col span="4">
-					<view><u-avatar :src="src"></u-avatar></view>
+					<view>
+            <u-avatar
+                :text="text"
+                fontSize="18"
+                randomBgColor
+            ></u-avatar>
+          </view>
 				</u-col>
 				<u-col span="8">
 					<view class="avatar-txt">
@@ -39,7 +45,7 @@
 		},
 		data() {
 			return {
-				src: 'http://dn-dounengyin.qbox.me/Fvz4y4_hhBt0CaY9_8PMm8IeXc8p',
+        text: '',
 				driverInfo: {
 					driverName: '',
 					driverState: 0,
@@ -55,6 +61,7 @@
 					if (res.httpCode == 200) {
 						console.log("3333", res.data)
 						_that.driverInfo = res.data
+            _that.text = res.data.driverName.charAt(0)
 					} else {
 						uni.showToast({
 							title: res.msg,

pages/index/order.vue

@@ -12,7 +12,6 @@
 			}
 		},
     mounted() {
-      console.log('2222222222222');
       uni.setNavigationBarTitle({
         title:'配送列表'
       })