+
+ 商户姓名: {{goodsInfo.shop_name}}
+
+
+
+ 收货人姓名: {{ fuzzyName(goodsInfo.receiver_name) }}
+
+
+ 收货人姓名: {{fuzzyName(goodsInfo.receiver_name)}}
+
+
+
+
+
+
+ 店主姓名
+
+
+ {{goodsInfo.shop_user ||'暂无'}}
+
+
+
+
+
+ 联系方式
+
+
+ {{goodsInfo.shop_phone}}
+
+
+
+
+ 商家地址
+
+
+
+ {{goodsInfo.shop_address}}
+
+
+
+
+
+ 订单编号
+
+
+
+ {{goodsInfo.order_sn}}
+
+
+
+
+
+
+
+ 商品信息
+
+
+
+ {{item.goods_name}}
+ X{{item.product_num}}{{item.goods_unit}}
+
+
+
-
-
-
- {{goodsInfo.shop_name}}
- {{goodsInfo.user_name}}
- 联系方式 :{{goodsInfo.shop_phone}}
- 联系方式 :{{goodsInfo.user_phone}}
-
-
-
- 商家地址
-
- 用户地址
-
-
- 订单编号
-
-
- 采购商品
+
+
+ 共计{{goodsInfo.product_count}}件商品
+
+
+
+ 扫码取货
+
+
-
-
- {{goodsInfo.shop_address}}
+
+
+
+
+
+
+
+
+
+ 收货地址
+
+
+
+ {{goodsInfo.receiver_address}}
+
+
+
+
+
+ 订单编号
+
+
+ {{goodsInfo.order_sn}}
+
+
+
+
+
+
+
+ 商品信息
+
+
+
+ {{item.goods_name}}
+ X{{item.product_num}}{{item.goods_unit}}
+
+
+
+
+
-
- {{goodsInfo.user_address}}
+
+
+
+ 联系电话
+
+
+ {{goodsInfo.receiver_phone}}
+
+
-
- {{goodsInfo.order_sn}}
-
-
- {{item.goods_name}}
- X{{item.product_num}}{{item.goods_unit}}
+
+
+ 共计{{goodsInfo.product_count}}件商品
+
+ 货物送达
+
+
+
+
+
+
+
+ 联系电话
+
+
+ {{goodsInfo.receiver_phone}}
+
+
+
+
+
+ 用户地址
+
+
+
+ {{goodsInfo.receiver_address}}
+
+
+
+
+
+
+ 取货时间
+
+
+ {{goodsInfo.qh_time}}
+
+
+
+
+
+ 送达时间
+
+
+ {{goodsInfo.ps_time}}
+
+
+
+
+
+
+
+
+
+
+ 共计{{goodsInfo.product_count}}件商品
+
+
+
+
+ 查看详情
+
+
+
+
-
-
-
-
-
- 订单编号 {{goodsInfo.order_sn}}
-
-
- 联系方式 {{goodsInfo.user_phone}}
-
-
- 收货时间 {{goodsInfo.xd_time||"暂未收货"}}
-
-
- 送达时间 {{goodsInfo.pc_time||"暂未送达"}}
-
-
- 取货时间 {{goodsInfo.qh_time||"暂未取货"}}
+
-
- 共计{{goodsInfo.product_count}}件商品
-
-
-
-
-
-
- 已取货
- 已送达
- 查看详情
+
+
+
+
+
+
+
@@ -93,39 +242,60 @@
props: ['goodsInfo'],
data() {
return {
-
list: [],
flag: undefined,
showPop: false,
- popContent: ["请确认已经收到货", "请确认已送达"]
+ take_code: "",
+
}
},
methods: {
+ fuzzyName(name) {
+ let length = name.length;
+ let fuzzyChars = "*".repeat(length - 1);
+ return name[0] + fuzzyChars;
+ },
goDetil() {
let status = this.goodsInfo.status
uni.navigateTo({
url: `/pages/logistics/${status==0?"deliveryDetil":"logisticDetil"}?id=${this.goodsInfo.id}`
})
},
+ callFn(num) {
+ uni.makePhoneCall({
+ phoneNumber: num
+ });
+ // console.log(9999)
+ },
- test() {
- this.showMore()
- this.getMore()
+ // 扫码
+ qrqodeFn() {
+ let that = this
+ uni.scanCode({
+ onlyFromCamera: true,
+ success: function(res) {
+ that.takeGood(res.result)
+
+ }
+ });
},
// 取货{}
- takeGood() {
-
+ takeGood(sn) {
takeGoods({
- user_id: this.goodsInfo.courier_id,
- logistics_id: this.goodsInfo.id
+ logistics_id: this.goodsInfo.id,
+ order_id: this.goodsInfo.order_id,
+ order_sn: sn
}).then(res => {
this.$emit('showTost')
this.$emit('getlist')
})
},
- async confirm() {
- await this.goodsInfo.status == 0 ? this.takeGood() : this.doneGood()
+ confirm() {
+ if (!this.take_code) {
+ return
+ }
+ this.doneGood()
this.showPop = false
this.showMore()
@@ -133,41 +303,17 @@
// 送达
doneGood() {
doneDelivery({
- user_id: this.goodsInfo.courier_id,
- // user_id: 167,
+ take_code: this.take_code,
logistics_id: this.goodsInfo.id
}).then(res => {
this.$emit('showTost')
this.$emit('getlist')
})
},
- showMore() {
- if (this.goodsInfo.products.length <= 3) {
- this.list = this.goodsInfo.products
- } else {
- this.flag = true
- for (let i = 0; i < 3; i++) {
- this.list.push(this.goodsInfo.products[i])
- }
- }
- },
- getMore() {
- if (this.flag) {
- for (let i = 3; i < this.goodsInfo.products.length; i++) {
- this.list.push(this.goodsInfo.products[i])
- }
- this.flag = false
- }
- }
+
},
- mounted() {
- // this.showMore()
- console.log(this.goodsInfo)
- // console.log(this.goodsInfo)
- // conso
- }
}
@@ -175,107 +321,107 @@
.order {
position: relative;
background-color: white;
- margin: 20rpx 0;
border-radius: 15rpx;
height: auto;
- padding: 2vh 3vw;
box-sizing: border-box;
+ overflow: hidden;
+ margin: 2vh 2vw;
- .custom-style {
- border: 0;
- width: 25vw;
- position: absolute;
- top: 0;
- right: 0;
- height: 4vh;
- border-radius: 0 7px 0 7px;
- }
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
+ /* padding: 2vh 2vw; */
- .goods_tit {
- width: 60vw;
-
- text-overflow: ellipsis;
- overflow: hidden;
- word-break: break-all;
- white-space: nowrap;
- }
-
- p {
- font-family: "PingFang SC-Medium";
+ .tit {
+ /* padding: 2vh 2vw; */
font-size: 32rpx;
font-weight: bold;
+ background-color: #FF7C32;
+ color: white;
+ padding: 30rpx 20rpx;
}
- .phone {
- color: #999999;
- padding: 10rpx 0;
- border-bottom: 1px dashed blue;
+ .contents {
+ background-color: #fff;
+ padding: 30rpx 20rpx;
+
+ .list {
+ margin: 10rpx 0;
+ }
+
+
+ .hr {
+ border-bottom: 1px dashed #0122C7;
+ margin: 20rpx 0;
+ }
}
- .content_box {
+
+
+ .left {
+ .list {
+ display: flex;
+
+ .norow {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ view {
+ flex: 8;
+
+ view {
+ margin-bottom: 10rpx;
+ }
+ }
+
+ text {
+ flex: 2;
+ }
+
+ }
+ }
+
+ .pro_list {
display: flex;
- justify-content: space-between;
- margin: 15rpx 0;
- .left {
- flex: 1;
- color: #999999;
+ text {
+ margin-right: 20rpx;
}
-
- .right {
- flex: 4;
-
- .product {
- margin: 10rpx 0;
- display: flex;
- justify-content: space-between;
- }
-
- .icon_a {
- /* transform: translateX(180deg); */
- transform: rotate(90deg);
- display: inline-block;
- /* font-family: ; */
- }
-
-
- }
- }
-
- .cil_left {
- width: 30rpx;
- height: 30rpx;
- background-color: #F5F5F5;
- border-radius: 30rpx;
- position: absolute;
- top: 110rpx;
- left: -15rpx;
-
- }
-
- .cil_right {
- width: 30rpx;
- height: 30rpx;
- background-color: #F5F5F5;
- border-radius: 30rpx;
- position: absolute;
- top: 110rpx;
- right: -15rpx;
-
}
.total {
- text-align: right;
+ margin: 20rpx 0;
color: #3274F9;
font-weight: bold;
font-size: 32rpx;
- margin: 20rpx 0;
+ text-align: right;
}
- .icon {
+
+
+ .goods_tit {
+ display: flex;
+ justify-content: space-between;
+
+ .goods_detil {
+ width: 55vw;
+ margin: 0;
+ padding: 0;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ }
+
+ .tost_tit {
text-align: center;
-
}
+
+ }
+
+ .address {
+ width: 65vw;
+
}
.finishOrder {
diff --git a/components/newArchives/deepProcessing.vue b/components/newArchives/deepProcessing.vue
index 486c0af..684de93 100644
--- a/components/newArchives/deepProcessing.vue
+++ b/components/newArchives/deepProcessing.vue
@@ -151,7 +151,6 @@
-