取件单暂存

src/App.vue

@@ -15,6 +15,7 @@ onHide(() => {
 <style lang="scss">
 // 字体图标
 @import '@/styles/fonts.scss';
+@import '@/static/iconfont/iconfont.css';
 
 view,
 navigator,

src/pages/pickup/waybillPickUpOrder.vue

@@ -5,7 +5,7 @@
       <uni-easyinput v-model="searchValue" placeholder="请输入单号" :inputBorder="false" />
       <view class="filter">
         <text>筛选</text>
-        <uni-icons fontFamily="iconFont" size="14" color="#999999">{{ '\ue7b6' }}</uni-icons>
+        <uni-icons fontFamily="iconFont" size="16" color="#999999">{{ '\ue8b7' }}</uni-icons>
       </view>
     </view>
     <!-- 列表 -->
@@ -20,28 +20,43 @@
         >
           <view class="order_no_state">
             <view class="order_no">
-              <text>订单号</text>
-              <text>{{ item.order_no }}</text>
+              <text class="title">订单号</text>
+              <text class="content">{{ item.order_no }}</text>
             </view>
 
             <view class="order_state">
               <text>{{ item.status_text }}</text>
             </view>
           </view>
+          <view class="pick_up_date">
+            <text>{{ item.pick_up_date }}</text>
+          </view>
+          <view class="segmentation-line"></view>
+
           <view class="address">
-            <view>
-              <text>{{ item.address?.first_name + ' ' + item.address?.last_name }}</text>
-              <text>{{ item.address?.mobile_code + ' ' + item.address?.mobile }}</text>
+            <view class="user-info">
+              <uni-icons fontFamily="iconFont" size="16" color="#e0620d">{{ '\ue605' }}</uni-icons>
+              <text class="user">{{
+                item.address?.first_name + ' ' + item.address?.last_name
+              }}</text>
+              <text class="mobile"
+                >+{{ item.address?.mobile_code + ' ' + item.address?.mobile }}</text
+              >
             </view>
-            <view>
+            <view class="address-info">
+              <uni-icons fontFamily="iconFont" size="16" color="#007AFF">{{ '\ue7b7' }}</uni-icons>
               <text>{{ item.address?.city }}</text>
               <text>{{ item.address?.zip_code }}</text>
             </view>
           </view>
-
-          <view class="price">
-            <text class="symbol">¥</text>
-            <text class="number">{{ item.order_no }}</text>
+          <view>
+            <view v-for="good in item.goods" :key="good.id" class="goods">
+              <uni-icons fontFamily="iconFont" size="16" color="#999999">{{ '\ue7ba' }}</uni-icons>
+              <text class="item"
+                >{{ good.name }}
+                <text class="qty"> x{{ good.qty }} </text>
+              </text>
+            </view>
           </view>
         </navigator>
       </view>
@@ -346,10 +361,6 @@ const onScrolltolower = async () => {
 </script>
 
 <style lang="scss" scoped>
-@font-face {
-  font-family: iconFont;
-  src: url('/static/iconfont/iconfont.ttf');
-}
 page {
   height: 100%;
   background-color: #f4f4f4;
@@ -406,24 +417,75 @@ page {
     border-radius: 10rpx;
     background-color: #fff;
   }
-  .thumb {
-    width: 305rpx;
-    height: 305rpx;
+  .order_no_state {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    .order_no {
+      font-size: 30rpx;
+      color: #333333;
+      .title {
+        font-weight: 600;
+        margin-right: 10rpx;
+      }
+      .content {
+        font-size: 26rpx;
+      }
+    }
+    .order_state {
+      font-size: 24rpx;
+    }
   }
-  .name {
-    height: 88rpx;
-    font-size: 26rpx;
+  .pick_up_date {
+    font-size: 24rpx;
   }
-  .price {
-    line-height: 1;
-    color: #cf4444;
-    font-size: 30rpx;
+  .segmentation-line {
+    width: 98%;
+    height: 1px;
+    background-color: #ccc;
+    margin: 10px 0;
+  }
+  .address {
+    display: flex;
+    flex-direction: column;
+    .user-info {
+      display: flex;
+      flex-direction: row;
+      align-items: baseline;
+      margin-bottom: 10rpx;
+      .user {
+        display: block;
+        font-weight: bold;
+        font-size: 32rpx;
+        margin-right: 10rpx;
+      }
+      .mobile {
+        display: block;
+        font-size: 26rpx;
+      }
+    }
+    .address-info {
+      margin-bottom: 10rpx;
+      font-size: 26rpx;
+    }
   }
-  .symbol {
-    font-size: 70%;
+  .goods {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    font-size: 26rpx;
+    color: #333333;
+    .item {
+      display: block;
+      margin-bottom: 10rpx;
+      .qty {
+        color: #999999;
+      }
+    }
   }
-  .decimal {
-    font-size: 70%;
+  .uni-icons {
+    margin-right: 10rpx;
   }
 }
 </style>

src/static/iconfont/demo_index.html

@@ -55,9 +55,21 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
-              <span class="icon iconfont">&#xe7b6;</span>
+              <span class="icon iconfont">&#xe8b7;</span>
                 <div class="name">filter</div>
-                <div class="code-name">&amp;#xe7b6;</div>
+                <div class="code-name">&amp;#xe8b7;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe7ba;</span>
+                <div class="name">box</div>
+                <div class="code-name">&amp;#xe7ba;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe7b7;</span>
+                <div class="name">location</div>
+                <div class="code-name">&amp;#xe7b7;</div>
               </li>
           
             <li class="dib">
@@ -174,9 +186,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1734012491787') format('woff2'),
-       url('iconfont.woff?t=1734012491787') format('woff'),
-       url('iconfont.ttf?t=1734012491787') format('truetype');
+  src: url('iconfont.woff2?t=1734183808723') format('woff2'),
+       url('iconfont.woff?t=1734183808723') format('woff'),
+       url('iconfont.ttf?t=1734183808723') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -203,11 +215,29 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
-            <span class="icon iconfont icon-filter"></span>
+            <span class="icon iconfont icon-filter-copy"></span>
             <div class="name">
               filter
             </div>
-            <div class="code-name">.icon-filter
+            <div class="code-name">.icon-filter-copy
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-box-copy"></span>
+            <div class="name">
+              box
+            </div>
+            <div class="code-name">.icon-box-copy
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-location-copy"></span>
+            <div class="name">
+              location
+            </div>
+            <div class="code-name">.icon-location-copy
             </div>
           </li>
           
@@ -384,10 +414,26 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-filter"></use>
+                  <use xlink:href="#icon-filter-copy"></use>
                 </svg>
                 <div class="name">filter</div>
-                <div class="code-name">#icon-filter</div>
+                <div class="code-name">#icon-filter-copy</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-box-copy"></use>
+                </svg>
+                <div class="name">box</div>
+                <div class="code-name">#icon-box-copy</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-location-copy"></use>
+                </svg>
+                <div class="name">location</div>
+                <div class="code-name">#icon-location-copy</div>
             </li>
           
             <li class="dib">

src/static/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4410178 */
-  src: url('iconfont.woff2?t=1734012491787') format('woff2'),
-       url('iconfont.woff?t=1734012491787') format('woff'),
-       url('iconfont.ttf?t=1734012491787') format('truetype');
+  src: url('iconfont.woff2?t=1734183808723') format('woff2'),
+       url('iconfont.woff?t=1734183808723') format('woff'),
+       url('iconfont.ttf?t=1734183808723') format('truetype');
 }
 
 .iconfont {
@@ -13,8 +13,16 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-filter:before {
-  content: "\e7b6";
+.icon-filter-copy:before {
+  content: "\e8b7";
+}
+
+.icon-box-copy:before {
+  content: "\e7ba";
+}
+
+.icon-location-copy:before {
+  content: "\e7b7";
 }
 
 .icon-qujian:before {

src/static/iconfont/iconfont.json

@@ -6,11 +6,25 @@
   "description": "",
   "glyphs": [
     {
-      "icon_id": "42794368",
+      "icon_id": "42812376",
       "name": "filter",
-      "font_class": "filter",
-      "unicode": "e7b6",
-      "unicode_decimal": 59318
+      "font_class": "filter-copy",
+      "unicode": "e8b7",
+      "unicode_decimal": 59575
+    },
+    {
+      "icon_id": "42812320",
+      "name": "box",
+      "font_class": "box-copy",
+      "unicode": "e7ba",
+      "unicode_decimal": 59322
+    },
+    {
+      "icon_id": "42812317",
+      "name": "location",
+      "font_class": "location-copy",
+      "unicode": "e7b7",
+      "unicode_decimal": 59319
     },
     {
       "icon_id": "42761956",