common/http.api.js

@@ -113,16 +113,16 @@ const install = (Vue, vm) => {
 		    return vm.$u.post("/order/goodsTryOrderInfo",{goods_try_id})
 		},
 		// 绑定物流订单
-		bindpushid({order_id,shipping_code,shipping_express_id}){
+		bindpushid({store_deliver_type,order_id,shipping_code,shipping_express_id}){
-		    return vm.$u.post("/order/send",{order_id,shipping_code,shipping_express_id})
+		    return vm.$u.post("/order/send",{store_deliver_type,order_id,shipping_code,shipping_express_id})
 		},
 		// 绑定骑手
-		bindcarer({order_id,takeawayer_id}){
+		bindcarer({store_deliver_type,order_id,takeawayer_id}){
-		    return vm.$u.post("/order/orderRider",{order_id,takeawayer_id})
+		    return vm.$u.post("/order/send",{store_deliver_type,order_id,takeawayer_id})
 		},
         // 自提
-        bindmention({shipping_express_id,deliver_explain,order_id,sendimg}) {
+        bindmention({store_deliver_type,shipping_express_id,deliver_explain,order_id,sendimg}) {
-            return vm.$u.post("/order/send",{shipping_express_id,deliver_explain,order_id,sendimg})
+            return vm.$u.post("/order/send",{store_deliver_type,shipping_express_id,deliver_explain,order_id,sendimg})
         },
 		// 发货物流公司
 		pushcompany(){

pages/index/details.vue

@@ -51,7 +51,7 @@
 				</view>
                 <view>
                     <view class="title">派送方式</view>
-                    <view class="value u-line-1">{{ cur == 0 ? "快递" : cur == 1 ? "骑手" : "自提" }}</view>
+                    <view class="value u-line-1">{{ users_type == 0 ? "-" : users_type == 1 ? "快递" : users_type == 2 ? "骑手" : "自提" }}</view>
                 </view>
                 <view @click="showInvoice">
                     <view class="title">开具发票</view>
@@ -95,12 +95,42 @@
 		</view>
 		<!-- 已发货 -->
 		<view class="pushtimeline" v-if="type == 2">
+            <view v-if="ordered_type == 1">
                 <view class="timelinetitle">物流信息</view>
                 <view class="timelineid">订单单号:&nbsp;&nbsp;&nbsp;{{ info.order_sn }}</view>
                 <view class="timelinebox" v-for="(list,index) in info.express_list" :key="index">
                 	<view class="timelinecontent">{{list.content}}</view>
                 	<view class="timelinetime">{{list.kd_time}}</view>
                 </view>
+            </view>
+			<view v-else-if="ordered_type == 2">
+                <view class="timelinetitle">骑手信息</view>
+                <view class="refunds-user-two">
+                    <view>
+                    	<image src="/static/image/home/2.png"></image>
+                    	<view>{{ takeawayer_info.takeawayer_name }}</view>
+                    </view>
+                    <view>
+                    	<image src="/static/image/home/3.png"></image>
+                    	<view>{{ takeawayer_info.takeawayer_mobile }}</view>
+                    </view>
+                    <view>
+                    	<image src="/static/image/home/4.png"></image>
+                    	<view class="address u-line-1">{{ takeawayer_info.company_name }}</view>
+                    </view>
+                </view>
+            </view>
+            <view v-else style="padding-bottom: 20rpx;">
+                <view class="timelinetitle">自提信息</view>
+                <view>
+                    <view class="ziti-title">凭证图片</view>
+                    <image class="certificate-img" :src="mineBy_img" @tap="viewImage" mode="aspectFill"></image>
+                </view>
+                <view>
+                    <view class="ziti-title">备注:</view>
+                    <view class="u-line-5">{{ mineBy_text }}</view>
+                </view>
+            </view>
 		</view>
 		<!-- 已完成 -->
 		<!-- 退款处理 -->
@@ -234,6 +264,11 @@ export default {
 			is_invoice: 0, // 判断发票
 			invoice_type: null,
 			invoiceList: {}, // 发票数据
+			users_type: "", // 用户选择发货type
+			ordered_type: 0, // 发货方式的状态
+      takeawayer_info: {}, // 骑手信息
+			mineBy_img: "", // 自提图片
+			mineBy_text: "", // 自提备注
 		};
 	},
 	onLoad(option) {
@@ -247,7 +282,7 @@ export default {
 		}
 		if (this.type == 2) {
 			// 获取物流信息
-			this.getcarinfo();
+			// this.getcarinfo();
 		}
 		// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
 	},
@@ -439,6 +474,7 @@ export default {
 				}
 				// console.log(this.pushid);
 				this.$u.api.bindpushid({
+          store_deliver_type: 1,
 					order_id: this.orderid,
 					shipping_code: this.pushid,
 					shipping_express_id: this.companyidA.express_id
@@ -467,6 +503,7 @@ export default {
 						return;
 				}
 				this.$u.api.bindcarer({
+          store_deliver_type: 2,
 					order_id: this.orderid,
 					takeawayer_id: this.selctcar.takeawayer_id
 				}).then(res => {
@@ -515,10 +552,17 @@ export default {
 					});
 				} else {
 					this.info = res.data;
-                    this.cur = res.data.is_selfraising;
+					this.cur = res.data.member_deliver_type - 1;
+					this.users_type = res.data.member_deliver_type; // 用户选择发货方式
 					this.invoiceList = res.data.extend_order_common.invoice_info;
 					this.is_invoice = this.invoiceList.invoice_id || false;
 					this.invoice_type = this.invoiceList.invoice_type;
+					this.ordered_type = res.data.store_deliver_type; // 发货方式
+					// 骑手
+					this.takeawayer_info = res.data.takeawayer || {}; // 骑手信息
+					// 自提
+					this.mineBy_img = res.data.extend_order_common.sendimg; // 自提图片
+					this.mineBy_text = res.data.extend_order_common.deliver_explain; // 自提备注
 					// console.log(this.invoiceList,this.is_invoice,this.invoice_type);
 				}
 			});
@@ -538,6 +582,14 @@ export default {
 					this.list = arr;
 				}
 			});
+		},
+        // 预览图片
+        viewImage() {
+            console.log(this.mineBy_img);
+            uni.previewImage({
+                urls: this.mineBy_img,
+                current: 1
+            })
         }
 	}
 };
@@ -625,6 +677,51 @@ export default {
 			}
 		}
 	}
+    .refunds-user-two {
+        padding: 25rpx 0;
+        background-color: #ffffff;
+        margin-bottom: 20rpx;
+        > view {
+        	display: flex;
+        	align-items: center;
+        	justify-content: space-between;
+        	margin-bottom: 30rpx;
+        	@mixin image-class($width, $right) {
+        		> image {
+        			flex-shrink: 0;
+        			width: $width;
+        			height: 40rpx;
+        			margin-right: $right;
+        		}
+        	}
+        	&:first-child {
+        		@include image-class($width: 40rpx, $right: 20rpx);
+        	}
+        	&:nth-child(2) {
+        		margin-left: 4rpx;
+        		@include image-class($width: 32rpx, $right: 24rpx);
+        	}
+        	&:last-child {
+        		margin-left: 2rpx;
+        		@include image-class($width: 36rpx, $right: 22rpx);
+        	}
+        	> view {
+        		flex: 1;
+        		font-size: 26rpx;
+        		color: rgba(51, 51, 51, 1);
+        	}
+        }
+    }
+    .ziti-title {
+        margin: 20rpx 0 10rpx;
+        font-size: 28rpx;
+        color: #333;
+    }
+    .certificate-img {
+        width: 320rpx;
+        height: 240rpx;
+        border-radius: 4rpx;
+    }
 	.user-info {
 		.info-title {
 			font-size: 30rpx;

pages/index/mention.vue

@@ -69,6 +69,7 @@
                 }
                 // 提交
                 this.$u.api.bindmention({
+                    store_deliver_type: 3,
                     shipping_express_id: "e1000",
                     deliver_explain: this.textareaVal,
                     order_id: this.order_id,

pages/release/zhibo.nvue

@@ -73,10 +73,10 @@
         </view>
         </div>
         <div class="jieshu" v-if="!zhibo" :style="{'height':height + 'px'}">
-            <div class="jieshuback" :style="{'height':height + 'px'}"></div>
+            <div class="jieshuback" :style="{'height':height + 'px'}" @click="closes1"></div>
             <image class="closeimg" src="../../static/image/cloneb.png" @click="closes"></image>
             <text class="jieshutitle">徳铭阳光在线</text>
-            <image class="jieshuheadimg" :src="info.member_avatar"></image>
+            <image class="jieshuheadimg" @click="closes1" :src="info.member_avatar"></image>
             <text class="jieshuusername">{{info.member_nickname}}</text>
             <div class="jieshubox">
                 <view class="jieshuboxitem">
@@ -138,6 +138,7 @@
 .jieshutitle{
     font-size: 30rpx;
     color:#fff;
+    width: 350rpx;
     position: fixed;
     top: 70rpx;
     left: 31rpx;
@@ -146,13 +147,14 @@
 .jieshuback{
     background-color: #000;
     opacity: 0.8;
-    position: absolute;
+    position: fixed;
     left: 0;
     top: 0;
     width: 750rpx;
-    
+    z-index: 901;
 }
 .jieshu{
+    z-index: 9999;
     position: fixed;
     top: 0;
     left: 0;
@@ -175,7 +177,7 @@
     bottom: 24rpx;
 }
 .closeimg{
-    position: fixed;
+    position: absolute;
     top: 70rpx;
     right: 31rpx;
     width: 51rpx;
@@ -623,7 +625,11 @@
                     duration: 2000
                 });
             },
+            closes1() {
+                console.log(111);
+            },
             closes(){
+                console.log(this.zhibo)
                 if(!this.zhibo){
                     uni.navigateBack({
                         delta:1