Browse Source

物流单

zhaoxiaohai 2 years ago
parent
commit
b84c5bf469

+ 170 - 76
packageA/shipment/detail.js

@@ -1,80 +1,174 @@
 const _Http = getApp().globalData.http;
 
 Page({
-    data: {
-        loading: true,
-        sa_orderid: null,
-        tabsActive: 0,
-        tabsList: [{
-            label: "详细信息",
-            icon: "icon-tabchanpin",
-            model: "#Product"
-        }, {
-            label: "物流查询",
-            icon: "icon-tabfujian1",
-            model: "#Query"
-        }, {
-            label: "装箱明细",
-            icon: "icon-tabcaozuojilu1",
-            model: "#Progress"
-        }],
-    },
-    onLoad(options) {
-        /* this.setData({
-            sa_orderid: options.id
-        });
-        this.getDetail(true); */
-    },
-    /* 获取详情 */
-    getDetail(init = false, show = true) {
-        _Http.basic({
-            "id": 20221108151302,
-            "content": {
-                nocache: true,
-                "sa_orderid": this.data.sa_orderid
-            }
-        }, show).then(res => {
-            console.log("订单详情", res)
-            if (res.msg != '成功') return wx.showToast({
-                title: res.msg,
-                icon: "none"
-            });
-            this.setData({
-                detail: res.data,
-                loading: false
-            });
-            if (init) this.partialRenewal(true)
-        })
-    },
-    //tabs 切换
-    tabsChange({
-        detail
-    }) {
-        this.setData({
-            tabsActive: detail
-        });
-        this.partialRenewal();
-    },
-    //局部数据更新 tabs
-    partialRenewal(init = false) {
-        return ;
-        let model = this.data.tabsList[this.data.tabsActive].model;
-        if (model) {
-            let Component = this.selectComponent(model),
-                {
-                    total,
-                    pageNumber,
-                    pageTotal
-                } = Component.data.content,
-                id = this.data.detail.sa_orderid;
-            if (total == null || init) {
-                Component.getList(id, init);
-            } else if (pageNumber < pageTotal) {
-                Component.getList(id, false);
-            }
-        }
-    },
-    onReachBottom() {
-        this.partialRenewal();
-    },
+	data: {
+		loading: true,
+		sa_logisticsid: null,
+		tabsActive: 0,
+		tabsList: [{
+			label: "详细信息",
+			icon: "icon-tabchanpin"
+		}, {
+			label: "物流查询",
+			icon: "icon-tabfujian1",
+			model: "#Query"
+		}, {
+			label: "装箱明细",
+			icon: "icon-tabcaozuojilu1",
+			model: "#Binding"
+		}]
+	},
+	onLoad(options) {
+		this.setData({
+			sa_logisticsid: options.id
+		});
+		this.getDetail(true);
+	},
+	/* 获取详情 */
+	getDetail(init = false, show = true) {
+		_Http.basic({
+			"id": 20221204201804,
+			"content": {
+				nocache: true,
+				"sa_logisticsid": this.data.sa_logisticsid
+			}
+		}, show).then(res => {
+			console.log("出货详情", res)
+			if (res.msg != '成功') return wx.showToast({
+				title: res.msg,
+				icon: "none"
+			});
+			this.setPreview(res.data[0]);
+			this.setData({
+				detail: res.data[0],
+				loading: false
+			});
+			if (init) this.partialRenewal(true)
+		})
+	},
+	/* 设置详情信息 */
+	setPreview(data) {
+		let list1 = [{
+				label: "物流单号",
+				value: data.logisticno
+			}, {
+				label: "状态",
+				value: data.status == '审核' ? '待收货' : '已收货'
+			}, {
+				label: "收货人",
+				value: data.name
+			}, {
+				label: "收货地址",
+				value: data.address
+			}, {
+				label: "快递公司",
+				value: data.logiscomp_enterprisename
+			}, {
+				label: "快递单号",
+				value: data.logisticno
+			}, {
+				label: "运费状态",
+				value: data.paytype
+			}, {
+				label: "运费",
+				value: data.freightamount
+			}, {
+				label: "备注",
+				value: data.remarks
+			}, ],
+			list2 = [{
+				label: "创建人",
+				value: data.createby
+			}, {
+				label: "创建时间",
+				value: data.createdate
+			}, {
+				label: "审核人",
+				value: data.checkby
+			}, {
+				label: "审核时间",
+				value: data.checkdate
+			}, {
+				label: "收货人",
+				value: data.receiveby
+			}, {
+				label: "收货时间",
+				value: data.receivedate
+			}];
+		this.setData({
+			list1,
+			list2
+		})
+	},
+	//tabs 切换
+	tabsChange({
+		detail
+	}) {
+		this.setData({
+			tabsActive: detail
+		});
+		this.partialRenewal();
+	},
+	//局部数据更新 tabs
+	partialRenewal(init = false) {
+		let model = this.data.tabsList[this.data.tabsActive].model;
+		if (model) {
+			let Component = this.selectComponent(model),
+				{
+					total,
+					pageNumber,
+					pageTotal
+				} = Component.data.content,
+				id = this.data.detail.sa_logisticsid;
+			// if (model == "#Binding") id = this.data.detail.sa_logistics_boxid;
+			if (total == null || init) {
+				Component.getList(id, init);
+			} else if (pageNumber < pageTotal) {
+				Component.getList(id, false);
+			}
+		}
+	},
+	/* 确认收货 */
+	receiving() {
+		let that = this;
+		wx.showModal({
+			title: '提示',
+			content: '是否确认收货?确认后不可更改',
+			complete: (res) => {
+				if (res.confirm) _Http.basic({
+					"id": "20221122133204",
+					"content": {
+						"sa_logisticsid": that.data.sa_logisticsid
+					}
+				}).then(s => {
+					console.log("确认收货", s)
+					wx.showToast({
+						title: s.msg == '成功' ? "确认收货成功" : s.msg,
+						icon: "none",
+						mask: true
+					});
+					if (s.msg == '成功') that.getDetail(true, false);
+				})
+			}
+		})
+	},
+	onReachBottom() {
+		this.partialRenewal();
+	},
+	onUnload() {
+		console.log("更新列表数据")
+		let page = getCurrentPages().find(v => v.__route__ == 'packageA/shipment/index');
+		let content = JSON.parse(JSON.stringify(page.data.content));
+		content.pageNumber = 1;
+		content.pageSize = page.data.list.length;
+		_Http.basic({
+			"id": 20230111141104,
+			content
+		}).then(res => {
+			console.log("更新订单列表", res)
+			if (res.msg == '成功') page.setData({
+				list: res.data
+			})
+		})
+	},
 })

+ 3 - 1
packageA/shipment/detail.json

@@ -1,5 +1,7 @@
 {
   "usingComponents": {
-    "Query": "./modules/query/index"
+    "Preview":"./modules/preview/index",
+    "Query": "./modules/query/index",
+    "Binding": "./modules/binding/index"
   }
 }

+ 31 - 0
packageA/shipment/detail.scss

@@ -1,3 +1,5 @@
+@import "./detail.skeleton.wxss";
+
 .intr {
     position: relative;
     width: 100vw;
@@ -12,6 +14,7 @@
         font-family: PingFang SC-Bold, PingFang SC;
         font-weight: bold;
         color: #333333;
+        margin-bottom: 10rpx;
     }
 
     .exp {
@@ -64,4 +67,32 @@
             height: 36rpx;
         }
     }
+}
+
+
+.footer {
+    display: flex;
+    justify-content: center;
+    padding: 0 30rpx;
+    position: fixed;
+    width: 100vw;
+    height: 130rpx;
+    background: #FFFFFF;
+    box-shadow: 0px -4rpx 16rpx 2rpx rgba(150, 157, 165, 0.16);
+    bottom: 0;
+    box-sizing: border-box;
+    z-index: 9999;
+    padding-top: 10rpx;
+
+    .but {
+        width: 690rpx;
+        height: 90rpx;
+        background: var(--warning);
+        border-radius: 16rpx;
+        font-size: 28rpx;
+        font-family: PingFang SC-Bold, PingFang SC;
+        font-weight: bold;
+        color: #fff;
+    }
+
 }

+ 169 - 0
packageA/shipment/detail.skeleton.wxml

@@ -0,0 +1,169 @@
+<!--
+此文件为开发者工具生成,生成时间: 2023/1/11下午2:14:30
+使用方法:
+在 E:\云链项目\e-wechat\packageA\shipment\detail.wxml 引入模板
+
+```
+<import src="detail.skeleton.wxml"/>
+<template is="skeleton" wx:if="{{loading}}" />
+```
+
+在 E:\云链项目\e-wechat\packageA\shipment\detail.wxss 中引入样式
+```
+@import "./detail.skeleton.wxss";
+```
+
+更多详细信息可以参考文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
+-->
+<template name="skeleton">
+  <view class="sk-container">
+    <view class="intr">
+      <view class="num sk-transparent sk-text-10-0000-245 sk-text">
+        LO202212200001
+      </view>
+      <view class="exp sk-transparent sk-text-11-7647-448 sk-text">状态:审核</view>
+      <view class="exp sk-transparent sk-text-11-7647-698 sk-text">单据时间:占无</view>
+      <view class="exp sk-transparent sk-text-11-7647-195 sk-text">创建日期:2022-12-20 16:41:39</view>
+      <view class="exp sk-transparent sk-text-11-7647-731 sk-text">收货状态:待收货</view>
+    </view>
+    <view is="components/Yl_FunTabs/index">
+      <scroll-view enable-flex="true" enable-passive="true" scroll-with-animation="true" scroll-x="true" class="scroll FunTabs-index--scroll" scroll-left="0">
+        <view class="item FunTabs-index--item active FunTabs-index--active" data-index="0" id="6c1ac03f--active0">
+          <view class="icon FunTabs-index--icon">
+            <text class="iconfont FunTabs-index--iconfont icon-tabchanpin FunTabs-index--icon-tabchanpin sk-pseudo sk-pseudo-circle"></text>
+          </view>
+          <view class="label FunTabs-index--label line-1 FunTabs-index--line-1 sk-transparent sk-text-14-2857-896 sk-text" style="background-position-x: 50%;">详细信息</view>
+        </view>
+        <view class="item FunTabs-index--item" data-index="1">
+          <view class="icon FunTabs-index--icon">
+            <text class="iconfont FunTabs-index--iconfont icon-tabfujian1 FunTabs-index--icon-tabfujian1 sk-pseudo sk-pseudo-circle"></text>
+          </view>
+          <view class="label FunTabs-index--label line-1 FunTabs-index--line-1 sk-transparent sk-text-14-2857-170 sk-text" style="background-position-x: 50%;">物流查询</view>
+        </view>
+        <view class="item FunTabs-index--item" data-index="2">
+          <view class="icon FunTabs-index--icon">
+            <text class="iconfont FunTabs-index--iconfont icon-tabcaozuojilu1 FunTabs-index--icon-tabcaozuojilu1 sk-pseudo sk-pseudo-circle"></text>
+          </view>
+          <view class="label FunTabs-index--label line-1 FunTabs-index--line-1 sk-transparent sk-text-14-2857-96 sk-text" style="background-position-x: 50%;">装箱明细</view>
+        </view>
+      </scroll-view>
+      <view class="slot-box FunTabs-index--slot-box">
+        <view is="packageA/shipment/modules/preview/index">
+          <view is="components/Yl_Headline/index">
+            <view class="Headline-index--box">
+              <view class="Headline-index--title sk-transparent sk-text-14-2857-218 sk-text">基本信息</view>
+              <view class="Headline-index--rep">
+                <view class="Headline-index--switch">
+                  <text class="sk-transparent sk-text-33-3333-535 sk-text">仅显示已填信息</text>
+                  <view is="miniprogram_npm/@vant/weapp/switch/index">
+                    <view class="van-switch switch-index--van-switch " style="font-size:22px">
+                      <view class="van-switch__node switch-index--van-switch__node "></view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view is="components/Yl_ReportForms/index">
+            <view is="miniprogram_npm/@vant/weapp/transition/index">
+              <view class="van-transition transition-index--van-transition ReportForms-index--block van-fade-enter-to transition-index--van-fade-enter-to van-fade-enter-active transition-index--van-fade-enter-active  " style="-webkit-transition-duration:300ms;transition-duration:300ms">
+                <navigator class="ReportForms-index--box" data-item="[object Object]">
+                  <view class="ReportForms-index--label sk-transparent sk-text-14-2857-520 sk-text">物流单号</view>
+                  <view class="ReportForms-index--value sk-transparent sk-text-14-2857-396 sk-text">--</view>
+                </navigator>
+              </view>
+            </view>
+            <view is="miniprogram_npm/@vant/weapp/transition/index">
+              <view class="van-transition transition-index--van-transition ReportForms-index--block van-fade-enter-to transition-index--van-fade-enter-to van-fade-enter-active transition-index--van-fade-enter-active  " style="-webkit-transition-duration:300ms;transition-duration:300ms">
+                <navigator class="ReportForms-index--box" data-item="[object Object]">
+                  <view class="ReportForms-index--label sk-transparent sk-text-14-2857-370 sk-text">状态</view>
+                  <view class="ReportForms-index--value sk-transparent sk-text-14-2857-590 sk-text">待收货</view>
+                </navigator>
+              </view>
+            </view>
+            <view is="miniprogram_npm/@vant/weapp/transition/index">
+              <view class="van-transition transition-index--van-transition ReportForms-index--block van-fade-enter-to transition-index--van-fade-enter-to van-fade-enter-active transition-index--van-fade-enter-active  " style="-webkit-transition-duration:300ms;transition-duration:300ms">
+                <navigator class="ReportForms-index--box" data-item="[object Object]">
+                  <view class="ReportForms-index--label sk-transparent sk-text-14-2857-882 sk-text">收货人</view>
+                  <view class="ReportForms-index--value sk-transparent sk-text-14-2857-358 sk-text">朱文华1</view>
+                </navigator>
+              </view>
+            </view>
+            <view is="miniprogram_npm/@vant/weapp/transition/index">
+              <view class="van-transition transition-index--van-transition ReportForms-index--block van-fade-enter-to transition-index--van-fade-enter-to van-fade-enter-active transition-index--van-fade-enter-active  " style="-webkit-transition-duration:300ms;transition-duration:300ms">
+                <navigator class="ReportForms-index--box" data-item="[object Object]">
+                  <view class="ReportForms-index--label sk-transparent sk-text-14-2857-672 sk-text">收货地址</view>
+                  <view class="ReportForms-index--value sk-transparent sk-text-14-2857-508 sk-text">昌盛南路智慧产业创业园</view>
+                </navigator>
+              </view>
+            </view>
+            <view is="miniprogram_npm/@vant/weapp/transition/index">
+              <view class="van-transition transition-index--van-transition ReportForms-index--block van-fade-enter-to transition-index--van-fade-enter-to van-fade-enter-active transition-index--van-fade-enter-active  " style="-webkit-transition-duration:300ms;transition-duration:300ms">
+                <navigator class="ReportForms-index--box" data-item="[object Object]">
+                  <view class="ReportForms-index--label sk-transparent sk-text-14-2857-246 sk-text">快递公司</view>
+                  <view class="ReportForms-index--value sk-transparent sk-text-14-2857-108 sk-text">嘉兴市南湖区大神1</view>
+                </navigator>
+              </view>
+            </view>
+            <view is="miniprogram_npm/@vant/weapp/transition/index">
+              <view class="van-transition transition-index--van-transition ReportForms-index--block van-fade-enter-to transition-index--van-fade-enter-to van-fade-enter-active transition-index--van-fade-enter-active  " style="-webkit-transition-duration:300ms;transition-duration:300ms">
+                <navigator class="ReportForms-index--box" data-item="[object Object]">
+                  <view class="ReportForms-index--label sk-transparent sk-text-14-2857-853 sk-text">快递单号</view>
+                  <view class="ReportForms-index--value sk-transparent sk-text-14-2857-406 sk-text">--</view>
+                </navigator>
+              </view>
+            </view>
+            <view is="miniprogram_npm/@vant/weapp/transition/index">
+              <view class="van-transition transition-index--van-transition ReportForms-index--block van-fade-enter-to transition-index--van-fade-enter-to van-fade-enter-active transition-index--van-fade-enter-active  " style="-webkit-transition-duration:300ms;transition-duration:300ms">
+                <navigator class="ReportForms-index--box" data-item="[object Object]">
+                  <view class="ReportForms-index--label sk-transparent sk-text-14-2857-454 sk-text">运费状态</view>
+                  <view class="ReportForms-index--value sk-transparent sk-text-14-2857-45 sk-text">到付</view>
+                </navigator>
+              </view>
+            </view>
+            <view is="miniprogram_npm/@vant/weapp/transition/index">
+              <view class="van-transition transition-index--van-transition ReportForms-index--block van-fade-enter-to transition-index--van-fade-enter-to van-fade-enter-active transition-index--van-fade-enter-active  " style="-webkit-transition-duration:300ms;transition-duration:300ms">
+                <navigator class="ReportForms-index--box" data-item="[object Object]">
+                  <view class="ReportForms-index--label sk-transparent sk-text-14-2857-439 sk-text">运费</view>
+                  <view class="ReportForms-index--value sk-transparent sk-text-14-2857-696 sk-text">--</view>
+                </navigator>
+              </view>
+            </view>
+            <view is="miniprogram_npm/@vant/weapp/transition/index">
+              <view class="van-transition transition-index--van-transition ReportForms-index--block van-fade-enter-to transition-index--van-fade-enter-to van-fade-enter-active transition-index--van-fade-enter-active  " style="-webkit-transition-duration:300ms;transition-duration:300ms">
+                <navigator class="ReportForms-index--box" data-item="[object Object]">
+                  <view class="ReportForms-index--label sk-transparent sk-text-14-2857-252 sk-text">备注</view>
+                  <view class="ReportForms-index--value sk-transparent sk-text-14-2857-80 sk-text">--</view>
+                </navigator>
+              </view>
+            </view>
+          </view>
+          <view is="components/Yl_Headline/index">
+            <view class="Headline-index--box">
+              <view class="Headline-index--title sk-transparent sk-text-14-2857-722 sk-text">系统信息</view>
+              <view class="Headline-index--rep"></view>
+            </view>
+          </view>
+          <view is="components/Yl_ReportForms/index">
+            <view is="miniprogram_npm/@vant/weapp/transition/index">
+              <view class="van-transition transition-index--van-transition ReportForms-index--block van-fade-enter-to transition-index--van-fade-enter-to van-fade-enter-active transition-index--van-fade-enter-active  " style="-webkit-transition-duration:300ms;transition-duration:300ms">
+                <navigator class="ReportForms-index--box" data-item="[object Object]">
+                  <view class="ReportForms-index--label sk-transparent sk-text-14-2857-220 sk-text">创建人</view>
+                  <view class="ReportForms-index--value sk-transparent sk-text-14-2857-222 sk-text">小赵</view>
+                </navigator>
+              </view>
+            </view>
+            <view is="miniprogram_npm/@vant/weapp/transition/index">
+              <view class="van-transition transition-index--van-transition ReportForms-index--block van-fade-enter-to transition-index--van-fade-enter-to van-fade-enter-active transition-index--van-fade-enter-active  " style="-webkit-transition-duration:300ms;transition-duration:300ms">
+                <navigator class="ReportForms-index--box" data-item="[object Object]">
+                  <view class="ReportForms-index--label sk-transparent sk-text-14-2857-423 sk-text">创建时间</view>
+                  <view class="ReportForms-index--value sk-transparent sk-text-14-2857-832 sk-text">2022-12-20 16:41:39</view>
+                </navigator>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>

+ 206 - 0
packageA/shipment/detail.skeleton.wxss

@@ -0,0 +1,206 @@
+/*
+此文件为开发者工具生成,生成时间: 2023/1/11下午2:14:30
+
+在 E:\云链项目\e-wechat\packageA\shipment\detail.wxss 中引入样式
+```
+@import "./detail.skeleton.wxss";
+```
+
+更多详细信息可以参考文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
+*/
+.sk-transparent {
+    color: transparent !important;
+  }
+.sk-text-10-0000-245 {
+    background-image: linear-gradient(transparent 10.0000%, #EEEEEE 0%, #EEEEEE 90.0000%, transparent 0%) !important;
+    background-size: 100% 40.0000rpx;
+    position: relative !important;
+  }
+.sk-text {
+    background-origin: content-box !important;
+    background-clip: content-box !important;
+    background-color: transparent !important;
+    color: transparent !important;
+    background-repeat: repeat-y !important;
+  }
+.sk-text-11-7647-448 {
+    background-image: linear-gradient(transparent 11.7647%, #EEEEEE 0%, #EEEEEE 88.2353%, transparent 0%) !important;
+    background-size: 100% 34.0000rpx;
+    position: relative !important;
+  }
+.sk-text-11-7647-698 {
+    background-image: linear-gradient(transparent 11.7647%, #EEEEEE 0%, #EEEEEE 88.2353%, transparent 0%) !important;
+    background-size: 100% 34.0000rpx;
+    position: relative !important;
+  }
+.sk-text-11-7647-195 {
+    background-image: linear-gradient(transparent 11.7647%, #EEEEEE 0%, #EEEEEE 88.2353%, transparent 0%) !important;
+    background-size: 100% 34.0000rpx;
+    position: relative !important;
+  }
+.sk-text-11-7647-731 {
+    background-image: linear-gradient(transparent 11.7647%, #EEEEEE 0%, #EEEEEE 88.2353%, transparent 0%) !important;
+    background-size: 100% 34.0000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-896 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 33.6000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-170 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 33.6000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-96 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 33.6000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-218 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 42.0000rpx;
+    position: relative !important;
+  }
+.sk-text-33-3333-535 {
+    background-image: linear-gradient(transparent 33.3333%, #EEEEEE 0%, #EEEEEE 66.6667%, transparent 0%) !important;
+    background-size: 100% 84.0000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-520 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-396 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-370 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-590 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-882 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-358 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-672 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-508 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-246 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-108 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-853 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-406 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-454 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-45 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-439 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-696 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-252 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-80 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-722 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 42.0000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-220 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-222 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-423 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-832 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-pseudo::before, .sk-pseudo::after {
+      background: #EFEFEF !important;
+      background-image: none !important;
+      color: transparent !important;
+      border-color: transparent !important;
+    }
+.sk-pseudo-rect::before, .sk-pseudo-rect::after {
+      border-radius: 0 !important;
+    }
+.sk-pseudo-circle::before, .sk-pseudo-circle::after {
+      border-radius: 50% !important;
+    }
+.sk-container {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    background-color: transparent;
+  }

+ 14 - 4
packageA/shipment/detail.wxml

@@ -1,12 +1,22 @@
+<import src="detail.skeleton.wxml" />
+<template is="skeleton" wx:if="{{loading}}" />
+
 <view class="intr">
 	<view class="num">
-		sa6489144646846484
+		{{detail.billno}}
 	</view>
 	<view class="exp">状态:{{detail.status}}</view>
-	<view class="exp">单据日期:{{detail.submitdate || '暂无'}}</view>
+	<view class="exp">单据时间:{{detail.billdate}}</view>
 	<view class="exp">创建日期:{{detail.createdate}}</view>
-	<view class="exp">收货状态:{{detail.invoicestatus}}</view>
+	<view class="exp">收货状态:{{ detail.status == '审核' ? '待收货' : '已收货'}}</view>
 </view>
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
+	<Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
 	<Query slot='物流查询' id='Query' />
-</Yl_FunTabs>
+	<Binding slot='装箱明细' id='Binding' />
+	<view style="height: 140rpx;" />
+</Yl_FunTabs>
+
+<view class="footer" wx:if="{{detail.status=='审核'}}">
+	<van-button custom-class='but' bind:click="receiving">确认收货</van-button>
+</view>

+ 96 - 103
packageA/shipment/index.js

@@ -1,107 +1,100 @@
 const _Http = getApp().globalData.http;
 
 Page({
-    data: {
-        loading: true,
-        active: 1,
-        amount: 0,
-        "content": {
-            "isExport": 0,
-            "pageNumber": 1,
-            "pageTotal": 1,
-            "pageSize": 20,
-            total: 0,
-            "where": {
-                "condition": "",
-                "status": "",
-                "brandname": "",
-                "tradefield": ""
-            },
-            sort: []
-        },
-        filter: [{
-            label: "品牌",
-            index: null,
-            showName: "brandname", //显示字段
-            valueKey: "brandname", //返回Key
-            selectKey: "brandname", //传参 代表选着字段 不传参返回整个选择对象
-            value: "", //选中值
-            list: []
-        }, {
-            label: "领域",
-            index: null,
-            showName: "tradefield", //显示字段
-            valueKey: "tradefield", //返回Key
-            selectKey: "tradefield", //传参 代表选着字段 不传参返回整个选择对象
-            value: "", //选中值
-            list: []
-        }]
-    },
-    onLoad(options) {
-    },
-    /* 处理筛选 */
-    handleFilter({
-        detail
-    }) {
-        console.log(detail)
-    },
-    /* 获取产品 */
-    getList(init = false) {
-        if (init.detail != undefined) init = init.detail;
-        let content = this.data.content;
-        if (init) content.pageNumber = 1;
-        if (content.pageNumber > content.pageTotal) return;
-        _Http.basic({
-            "id": wx.getStorageSync('userMsg').usertype == 1 ? 20221111145202 : 20221224180302,
-            content
-        }).then(res => {
-            console.log("订单列表", res)
-            this.selectComponent('#ListBox').RefreshToComplete();
-            this.setData({
-                list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
-                "content.pageNumber": res.pageNumber + 1,
-                "content.pageTotal": res.pageTotal,
-                "content.sort": res.sort,
-                "content.total": res.total,
-                loading: false,
-                amount: res.tips.amount || 0
-            })
-        })
-    },
-    /* 搜索 */
-    onSearch({
-        detail
-    }) {
-        this.setData({
-            "content.where.condition": detail
-        });
-        this.getList(true)
-    },
-    /* 切换tabs */
-    tabsChange(e) {
-        let status = "";
-        switch (e.detail.title) {
-            case '全部':
-                status = "";
-                break;
-            case '待确认':
-                status = "交期待确认";
-                break;
-            default:
-                status = e.detail.title
-                break;
-        }
-        this.setData({
-            active: e.detail.index,
-            "content.where.status": status
-        });
-        this.getList(true);
-    },
-    onReady() {
-        this.setListHeight()
-    },
-    /* 设置页面高度 */
-    setListHeight() {
-        this.selectComponent("#ListBox").setHeight(".tips", this);
-    },
+	data: {
+		loading: true,
+		active: 0,
+		"content": {
+			nocache: true,
+			"pageNumber": 1,
+			"pageTotal": 1,
+			"pageSize": 20,
+			status: "审核",
+			total: 0,
+			"where": {
+				"condition": "",
+			},
+			sort: []
+		},
+		filter: [{
+			label: "品牌",
+			index: null,
+			showName: "brandname", //显示字段
+			valueKey: "brandname", //返回Key
+			selectKey: "brandname", //传参 代表选着字段 不传参返回整个选择对象
+			value: "", //选中值
+			list: []
+		}, {
+			label: "领域",
+			index: null,
+			showName: "tradefield", //显示字段
+			valueKey: "tradefield", //返回Key
+			selectKey: "tradefield", //传参 代表选着字段 不传参返回整个选择对象
+			value: "", //选中值
+			list: []
+		}]
+	},
+	onLoad(options) {
+		this.getList(true)
+	},
+	/* 处理筛选 */
+	handleFilter({
+		detail
+	}) {
+		console.log(detail)
+	},
+	getList(init = false) {
+		if (init.detail != undefined) init = init.detail;
+		let content = this.data.content;
+		if (init) content.pageNumber = 1;
+		if (content.pageNumber > content.pageTotal) return;
+		_Http.basic({
+			"id": 20230111141104,
+			content
+		}).then(res => {
+			console.log("订单列表", res)
+			this.selectComponent('#ListBox').RefreshToComplete();
+			this.setData({
+				list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
+				"content.pageNumber": res.pageNumber + 1,
+				"content.pageTotal": res.pageTotal,
+				"content.sort": res.sort,
+				"content.total": res.total,
+				loading: false
+			})
+		})
+	},
+	/* 搜索 */
+	onSearch({
+		detail
+	}) {
+		this.setData({
+			"content.where.condition": detail
+		});
+		this.getList(true)
+	},
+	/* 切换tabs */
+	tabsChange(e) {
+		let status = "";
+		switch (e.detail.title) {
+			case '待收货':
+				status = "审核";
+				break;
+			case '已收货':
+				status = "收货";
+				break;
+		}
+		this.setData({
+			active: e.detail.index,
+			"content.status": status
+		});
+		this.getList(true);
+	},
+	onReady() {
+		this.setListHeight()
+	},
+	/* 设置页面高度 */
+	setListHeight() {
+		this.selectComponent("#ListBox").setHeight(".total", this);
+	},
 })

+ 0 - 12
packageA/shipment/index.scss

@@ -1,12 +0,0 @@
-
-.tips {
-	width: 750rpx;
-	text-align: center;
-	height: 64rpx;
-	line-height: 64rpx;
-	background: #FFEFD9;
-	font-size: 28rpx;
-	font-family: PingFang SC-Semibold, PingFang SC;
-	font-weight: 600;
-	color: #FA8C16;
-}

+ 4 - 11
packageA/shipment/index.wxml

@@ -1,20 +1,13 @@
 <Yl_HeadNav styleType="1" sort='{{content.sort}}' placeholder='搜索' bindonSearch="onSearch" />
 <van-tabs active="{{ active }}" color='var(--assist)' title-active-color='var(--assist)' bind:change="tabsChange">
-    <van-tab title="全部" />
-    <van-tab title="新建" />
-    <van-tab title="提交" />
-    <van-tab title="待确认" />
-    <van-tab title="交期确认" />
-    <van-tab title="审核" />
-    <van-tab title="关闭" />
+    <van-tab title="待收货" />
+    <van-tab title="已收货" />
 </van-tabs>
-<view class="tips">
-    共计{{content.total}}单,合计¥{{amount}}
-</view>
+<view class="total" style="height: 20rpx;" />
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
     <List list="{{list}}" />
 </Yl_ListBox>
 <!-- 新建浮动按钮 -->
 <Float />
 <!-- 筛选条件 -->
-<Yl_Filtrate id='Filtrate' list="{{filter}}" bind:handle="handleFilter" dateRange='{{false}}' />
+<Yl_Filtrate id='Filtrate' list="{{filter}}" bind:handle="handleFilter" dateRange='{{false}}' />

+ 32 - 18
packageA/shipment/modules/binding/index.js

@@ -1,23 +1,37 @@
-// packageA/shipment/modules/binding/index.js
+const _Http = getApp().globalData.http;
 Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-
-  },
-
-  /**
-   * 组件的初始数据
-   */
   data: {
-
+    sa_logisticsid: 0,
+    content: {
+      nocache: true,
+      pageNumber: 1,
+      pageTotal: 1,
+      total: null
+    }
   },
-
-  /**
-   * 组件的方法列表
-   */
   methods: {
-
+    getList(id, init) {
+      let content = this.data.content;
+      content.sa_logisticsid = id;
+      if (init) content.pageNumber = 1;
+      _Http.basic({
+        "id": "20230111144504",
+        content
+      }).then(res => {
+        console.log("装箱列表", res)
+        if (res.msg != '成功') return wx.showToast({
+          title: res.msg,
+          icon: "none"
+        })
+        this.setData({
+          list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
+          "content.pageNumber": res.pageNumber + 1,
+          "content.pageSize": res.pageSize,
+          "content.pageTotal": res.pageTotal,
+          "content.total": res.total,
+          sa_logisticsid: id
+        })
+      })
+    }
   }
-})
+})

+ 6 - 3
packageA/shipment/modules/binding/index.scss

@@ -27,15 +27,18 @@
 		width: 100%;
 		margin-bottom: 20rpx;
 
-		.image{
+		.image {
 			width: 130rpx;
 			height: 130rpx;
-			background-color: red;
 			margin-right: 20rpx;
+			border-radius: 16rpx;
+			overflow: hidden;
+			flex-shrink: 0;
 		}
 
 		.content {
 			flex: 1;
+			color: #333;
 
 			.content-title {
 				line-height: 40rpx;
@@ -45,9 +48,9 @@
 
 			.row {
 				font-size: 26rpx;
-				color: #333;
 				width: 100%;
 				margin-top: 8rpx;
+
 				text {
 					line-height: 30rpx;
 					display: inline-block;

+ 24 - 19
packageA/shipment/modules/binding/index.wxml

@@ -1,26 +1,31 @@
 <view class="title">装箱明细</view>
-
-<view class="binding-box" wx:for="{{5}}" wx:key="index">
+<view class="binding-box" wx:for="{{list}}" wx:key="sa_logistics_boxid">
 	<view class="boxnum">
-		箱码:{{index}}
+		箱码:{{item.boxnum}}
 	</view>
-	<view class="numno">
-		订货单:598616598984
-	</view>
-	<navigator class="product" url="#" wx:for="{{2}}">
-		<view class="image">
-
+	<block wx:for="{{item.logisticsBox}}" wx:for-item="it" wx:for-index="i" wx:key="i">
+		<view class="numno">
+			订货单:{{it.itemno}}
 		</view>
-		<view class="content">
-			<view class="content-title">产品名称</view>
-			<view class="row">
-				<text>编号:123456789</text>
-				<text>规格:HQ9555555</text>
+		<view class="product" url="#">
+			<view class="image">
+				<van-image width="100%" height="100%" fit="cover" src="{{it.attinfos[0].subfiles[0].url}}" use-loading-slot use-error-slot lazy-load>
+					<van-loading slot="loading" type="spinner" size="20" vertical />
+					<text slot="error">加载失败</text>
+				</van-image>
 			</view>
-			<view class="row">
-				<text>型号:HQ9555555</text>
-				<text class="qty">x5</text>
+			<view class="content">
+				<view class="content-title">{{it.itemname||' --'}}</view>
+				<view class="row">
+					<text>编号:{{ite.itemno || ' --'}}</text>
+					<text>规格:{{it.spec || ' --'}}</text>
+				</view>
+				<view class="row">
+					<text>型号:{{it.model || ' --'}}</text>
+					<text class="qty">x{{it.qty||0}}</text>
+				</view>
 			</view>
 		</view>
-	</navigator>
-</view>
+	</block>
+</view>
+<Yl_Empty wx:if="{{list.length==0}}" />

+ 14 - 0
packageA/shipment/modules/list/index.js

@@ -2,4 +2,18 @@ Component({
   properties: {
     list: Array
   },
+  methods: {
+    copyNum(e) {
+      let data = e.currentTarget.dataset.num;
+      if (data) wx.setClipboardData({
+        data,
+        success: function (res) {
+          wx.showToast({
+            title: '快递单号复制成功',
+            icon: "none"
+          })
+        }
+      })
+    }
+  }
 })

+ 9 - 18
packageA/shipment/modules/list/index.scss

@@ -1,7 +1,6 @@
 .item {
     width: 100vw;
-    padding-left: 30rpx;
-    box-sizing: border-box;
+
     margin-bottom: 20rpx;
     background-color: #ffffff;
 
@@ -15,29 +14,21 @@
         border-bottom: 1rpx solid #ddd;
         box-sizing: border-box;
         padding-right: 30rpx;
+        font-size: 28rpx;
+        padding-left: 30rpx;
+        box-sizing: border-box;
 
-        .tags {
-            text {
-                display: inline-block;
-                height: 40rpx;
-                line-height: 40rpx;
-                background: #E7EEFF;
-                border-radius: 20rpx;
-                padding: 0 15rpx;
-                font-size: 20rpx;
-                color: #3874F6;
-                margin-right: 10rpx;
-            }
-        }
-
-        .statu {
-            font-size: 28rpx;
+        text{
+            color: var(--assist);
         }
     }
 
     .content {
         position: relative;
         padding-bottom: 20rpx;
+        padding-left: 30rpx;
+        box-sizing: border-box;
+
         .num {
             height: 40rpx;
             line-height: 40rpx;

+ 15 - 40
packageA/shipment/modules/list/index.wxml

@@ -1,48 +1,23 @@
-<navigator url="/packageA/shipment/detail" class="item" wx:for="{{5}}" wx:key="item.sonum">
-    <view class="top">
-        <view class="tags">
-            <text>{{item.type}}</text>
-            <text>{{item.brandname}}</text>
-            <text>{{item.tradefield}}</text>
-        </view>
-        <!--  style="color: {{set.color(item.status)}};" -->
-        <view class="statu">
-            新建
-        </view>
-    </view>
-    <view class="content">
+<view class="item" wx:for="{{list}}" wx:key="billno">
+    <navigator url="#" class="top" data-num="{{item.logisticno}}" bindtap="copyNum">
+        快递单号: {{item.logisticno||' --'}} <text wx:if="{{item.logisticno}}">复制</text>
+    </navigator>
+    <navigator url="/packageA/shipment/detail?id={{item.sa_logisticsid}}" class="content">
         <view class="num">
-            202212345646545654
+            物流单:{{item.billno}}
+        </view>
+        <view class="exp">
+            收货人:{{item.name || ' --'}}
         </view>
         <view class="exp">
-            收货人:zzz
+            收货地址:{{item.address || ' --'}}
         </view>
         <view class="exp">
-            单据时间:2022-05-06 11:11:11
+            单据时间:{{item.billdate}}
         </view>
         <view class="exp">
-            审核时间:2022-05-06 11:11:11
+            审核时间:{{item.checkdate || ' --'}}
         </view>
-    </view>
-</navigator>
-
-<Yl_Empty wx:if="{{list.length==0}}" />
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "审核":
-                    color = '#FA8C16';
-                    break;
-                case "提交":
-                    color = '#52C41A';
-                    break;
-                case "新建":
-                    color = '#333333';
-                    break;
-            };
-            return color;
-        }
-    }
-</wxs>
+    </navigator>
+</view>
+<Yl_Empty wx:if="{{list.length==0}}" />

+ 18 - 0
packageA/shipment/modules/preview/index.js

@@ -0,0 +1,18 @@
+Component({
+  properties: {
+    list1: Array,
+    list2: Array
+  },
+  data: {
+    showAll: false
+  },
+  methods: {
+    onChange({
+      detail
+    }) {
+      this.setData({
+        showAll: detail
+      })
+    }
+  }
+})

+ 7 - 0
packageA/shipment/modules/preview/index.json

@@ -0,0 +1,7 @@
+{
+    "component": true,
+    "usingComponents": {
+        "Yl_Headline":"/components/Yl_Headline/index",
+        "Yl_ReportForms":"/components/Yl_ReportForms/index"
+    }
+}

+ 0 - 0
packageA/shipment/modules/preview/index.scss


+ 6 - 0
packageA/shipment/modules/preview/index.wxml

@@ -0,0 +1,6 @@
+<!-- 基本信息 -->
+<Yl_Headline title='基本信息' type='switch' switchLabel='仅显示已填信息' switch='{{showAll}}' bind:callBack='onChange' />
+<Yl_ReportForms showAll='{{!showAll}}' list='{{list1}}' />
+<!-- 系统信息 -->
+<Yl_Headline title='系统信息' />
+<Yl_ReportForms showAll='{{!showAll}}' list='{{list2}}' />

+ 48 - 51
packageA/shipment/modules/query/index.js

@@ -1,54 +1,51 @@
 const _Http = getApp().globalData.http;
 Component({
-  data: {
-    steps: [{
-        text: '步骤一',
-        desc: '描述信息',
-      },
-      {
-        text: '步骤二',
-        desc: '描述信息',
-      },
-      {
-        text: '步骤三',
-        desc: '描述信息',
-      },
-      {
-        text: '步骤四',
-        desc: '描述信息',
-      },
-    ],
-    sa_orderid: 0,
-    content: {
-      nocache: true,
-      pageNumber: 1,
-      pageTotal: 1,
-      total: null
-    }
-  },
-  methods: {
-    getList(id, init) {
-      let content = this.data.content;
-      content.sa_orderid = id;
-      if (init) content.pageNumber = 1;
-      _Http.basic({
-        "id": "20221229093602",
-        content
-      }).then(res => {
-        console.log("订单进度", res)
-        if (res.msg != '成功') return wx.showToast({
-          title: res.msg,
-          icon: "none"
-        })
-        this.setData({
-          list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
-          "content.pageNumber": res.pageNumber + 1,
-          "content.pageSize": res.pageSize,
-          "content.pageTotal": res.pageTotal,
-          "content.total": res.total,
-          sa_orderid: id
-        })
-      })
-    }
-  }
+	data: {
+		steps: [],
+		sa_logisticsid: 0,
+		content: {
+			nocache: true,
+			pageNumber: 1,
+			pageTotal: 1,
+			total: null
+		}
+	},
+	methods: {
+		copyNum(e) {
+			if (this.data.un) wx.setClipboardData({
+				data: this.data.un,
+				success: function (res) {
+					wx.showToast({
+						title: '快递单号复制成功',
+						icon: "none"
+					})
+				}
+			})
+		},
+		getList(id) {
+			let content = this.data.content;
+			content.sa_logisticsid = id;
+			_Http.basic({
+				"id": "20230110135004",
+				content
+			}).then(res => {
+				console.log("物流查询", res)
+				if (res.msg != '成功') return wx.showToast({
+					title: res.msg,
+					icon: "none"
+				})
+				if (res.data.message) this.setData({
+					steps: res.data.data.map(v => {
+						return {
+							text: v.time,
+							desc: v.context
+						}
+					}),
+					nu: res.data.nu,
+					"content.total": 1,
+					sa_logisticsid: id
+				})
+			})
+		}
+	}
 })

+ 3 - 1
packageA/shipment/modules/query/index.scss

@@ -1,5 +1,7 @@
 .title {
+	display: flex;
+	justify-content: space-between;
 	font-size: 28rpx;
 	color: #333333;
-	margin: 30rpx;
+	padding: 30rpx;
 }

+ 3 - 3
packageA/shipment/modules/query/index.wxml

@@ -1,3 +1,3 @@
-<view class="title">物流查询</view>
-
-<van-steps steps="{{ steps }}" active="{{ active }}" direction="vertical" active-color="#375CAC" />
+<navigator url="#" class="title" bindtap="copyNum"><text wx:if="{{nu}}">快递单号:{{nu}}</text><text wx:else>暂无物流信息</text><text wx:if="{{nu}}">复制</text></navigator>
+<van-steps steps="{{ steps }}" active="{{ active }}" direction="vertical" active-color="#375CAC" />
+<Yl_Empty wx:if="{{steps.length==0}}" />