order

newsShop/pages/mine/mine.js

@@ -4,7 +4,59 @@ Page({
   data: {
     userId : '',
     userInfo: {},
-    phone:''
+    phone:'',
+    orderList:{
+      label:'我的采购订单',
+      summary:"全部",
+      state:"",
+      icon:"icon-left",
+      data:[
+        {
+          label:"待付款",
+          state:"1",
+          icon:"icon-icon-test",
+          num:0,
+        },
+        {
+          label: "待发货",
+          state: "3",
+          icon: "icon-daifahuo1",
+          num: 0,
+        },
+        {
+          label: "待收货",
+          state: "4",
+          icon: "icon-daishouhuo",
+          num: 0,
+        }
+      ]
+    },
+    madeList: {
+      label: '我的定制订单',
+      summary: "全部",
+      state: "",
+      icon: "icon-left",
+      data: [
+        {
+          label: "待付款",
+          state: "",
+          icon: "icon-icon-test",
+          num: 0,
+        },
+        {
+          label: "待发货",
+          state: "",
+          icon: "icon-daifahuo1",
+          num: 0,
+        },
+        {
+          label: "待收货",
+          state: "",
+          icon: "icon-daishouhuo",
+          num: 0,
+        }
+      ]
+    },
   },
 
   onLoad: function () {
@@ -71,5 +123,12 @@ Page({
       userRole: userRole
     })
   },
+  orderList(e){
+    console.log(e,"orderList")
+    let state = e.currentTarget.dataset.state
+    wx.navigateTo({
+      url: '/newsShop/pages/orderList/orderList?state' + state,
+    })
+  }
 
 })

newsShop/pages/mine/mine.wxml

@@ -17,44 +17,36 @@
 
   <!-- 采购订单 -->
  <view class='user-order'>
-    <view class="pad-t20 pad-b20 mar-r20 f-s30 mar-l20 order-title">我的采购订单</view>
-    <view class='f-box order-list f-justify-content-center mar-l20 mar-r20 f-s28'>
-      <view class='f-item  order-item' data-state="0" bindtap='orderInfor'>
-        <text>1</text>
-        <icon class='iconfont icon-icon-test'></icon>
-        <view>待付款</view>
-      </view>
-      <view class='f-item order-item' data-state="2" bindtap='orderInfor'>
-        <text>1</text>
-        <icon class='iconfont icon-daifahuo1'></icon>
-        <view>待发货</view>
+    <view class="pad-t20 pad-b20 mar-r20 f-s30 mar-l20 order-title f-box f-align-items-center">
+      <view class='f-item'>{{orderList.label}}</view>
+      <view class='f-s28 f-box f-align-items-center'>
+        <view>{{orderList.summary}}</view>
+        <icon class='{{orderList.icon}} iconfont'></icon>
       </view>
-      <view class='f-item order-item' data-state="3" bindtap='orderInfor'>
-        <text>12</text>
-        <icon class='iconfont icon-daishouhuo'></icon>
-        <view>待收货</view>
+    </view>
+    <view class='f-box order-list f-justify-content-center mar-l20 mar-r20 f-s28'>
+      <view class='f-item  order-item' wx:for="{{orderList.data}}" data-state="{{item.state}}" bindtap='orderList'>
+        <text wx:if="{{item.num > 0 }}">{{item.num}}</text>
+        <icon class='iconfont {{item.icon}}'></icon>
+        <view>{{item.label}}</view>
       </view>
     </view>
 </view>
 
   <!-- 我的定制订单 -->
  <view class='user-order'>
-    <view class="pad-t20 pad-b20 mar-r20 f-s30 mar-l20 order-title">我的定制订单</view>
-    <view class='f-box order-list f-justify-content-center mar-l20 mar-r20 f-s28'>
-      <view class='f-item order-item' data-state="0" bindtap='orderInfor'>
-        <text>1</text>
-        <icon class='iconfont icon-icon-test'></icon>
-        <view>待付款</view>
-      </view>
-      <view class='f-item order-item' data-state="2" bindtap='orderInfor'>
-        <text>1</text>
-        <icon class='iconfont icon-daifahuo1'></icon>
-        <view>待发货</view>
+    <view class="pad-t20 pad-b20 mar-r20 f-s30 mar-l20 order-title f-box f-align-items-center">
+      <view class='f-item'>{{madeList.label}}</view>
+      <view class='f-s28 f-box f-align-items-center'>
+        <view>{{madeList.summary}}</view>
+        <icon class='{{madeList.icon}} iconfont'></icon>
       </view>
-      <view class='f-item order-item' data-state="3" bindtap='orderInfor'>
-        <text>1</text>
-        <icon class='iconfont icon-daishouhuo'></icon>
-        <view>待收货</view>
+    </view>
+    <view class='f-box order-list f-justify-content-center mar-l20 mar-r20 f-s28'>
+      <view class='f-item  order-item' wx:for="{{orderList.data}}" data-state="{{item.state}}" bindtap='madeList'>
+        <text wx:if="{{item.num > 0 }}">{{item.num}}</text>
+        <icon class='iconfont {{item.icon}}'></icon>
+        <view>{{item.label}}</view>
       </view>
     </view>
 </view>

newsShop/pages/orderList/orderList.wxml

@@ -4,11 +4,11 @@
     <view class="header">
       <view  bindtap="tabNav"  data-id="0" class="header_each  {{isSelect == 0 ? 'header_each_active' : ''}}">全部</view>
       <view  bindtap="tabNav"  data-id="1" class="header_each  {{isSelect == 1 ? 'header_each_active' : ''}}">待付款</view>
-      <view  bindtap="tabNav"  data-id="2" class="header_each  {{isSelect == 2 ? 'header_each_active' : ''}}">待定制</view>
-      <view  bindtap="tabNav"  data-id="6" class="header_each  {{isSelect == 6 ? 'header_each_active' : ''}}">待送礼</view>
+      <!-- <view  bindtap="tabNav"  data-id="2" class="header_each  {{isSelect == 2 ? 'header_each_active' : ''}}">待定制</view> -->
+      <!-- <view  bindtap="tabNav"  data-id="6" class="header_each  {{isSelect == 6 ? 'header_each_active' : ''}}">待送礼</view> -->
       <view  bindtap="tabNav"  data-id="3" class="header_each  {{isSelect == 3 ? 'header_each_active' : ''}}">待发货</view>
-      <view  bindtap="tabNav"  data-id="4" class="header_each  {{isSelect == 4 ? 'header_each_active' : ''}}">已发货</view>
-      <view  bindtap="tabNav"  data-id="5" class="header_each  {{isSelect == 5 ? 'header_each_active' : ''}}">已完成</view>
+      <view  bindtap="tabNav"  data-id="4" class="header_each  {{isSelect == 4 ? 'header_each_active' : ''}}">待收货</view>
+      <view  bindtap="tabNav"  data-id="5" class="header_each  {{isSelect == 5 ? 'header_each_active' : ''}}">待评价</view>
     </view>
   </view>
   

style/font/demo_index.html

@@ -85,12 +85,24 @@
               </li>
           
             <li class="dib">
+              <span class="icon iconfont">&#xe651;</span>
+                <div class="name">搜索</div>
+                <div class="code-name">&amp;#xe651;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe61a;</span>
                 <div class="name">我的</div>
                 <div class="code-name">&amp;#xe61a;</div>
               </li>
           
             <li class="dib">
+              <span class="icon iconfont">&#xe601;</span>
+                <div class="name">htb－Arrow right02</div>
+                <div class="code-name">&amp;#xe601;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe615;</span>
                 <div class="name">旋转</div>
                 <div class="code-name">&amp;#xe615;</div>
@@ -109,11 +121,23 @@
               </li>
           
             <li class="dib">
+              <span class="icon iconfont">&#xe6bb;</span>
+                <div class="name">icon_三角形</div>
+                <div class="code-name">&amp;#xe6bb;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe743;</span>
                 <div class="name">fangda</div>
                 <div class="code-name">&amp;#xe743;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe744;</span>
+                <div class="name">icon_三角形</div>
+                <div class="code-name">&amp;#xe744;</div>
+              </li>
+          
           </ul>
           <div class="article markdown">
           <h2 id="unicode-">Unicode 引用</h2>
@@ -246,6 +270,15 @@
           </li>
           
           <li class="dib">
+            <span class="icon iconfont icon-sousuo"></span>
+            <div class="name">
+              搜索
+            </div>
+            <div class="code-name">.icon-sousuo
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-wode"></span>
             <div class="name">
               我的
@@ -255,6 +288,15 @@
           </li>
           
           <li class="dib">
+            <span class="icon iconfont icon-left"></span>
+            <div class="name">
+              htb－Arrow right02
+            </div>
+            <div class="code-name">.icon-left
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-xuanzhuan"></span>
             <div class="name">
               旋转
@@ -282,6 +324,15 @@
           </li>
           
           <li class="dib">
+            <span class="icon iconfont icon-icon_sanjiaoxing"></span>
+            <div class="name">
+              icon_三角形
+            </div>
+            <div class="code-name">.icon-icon_sanjiaoxing
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-fangda"></span>
             <div class="name">
               fangda
@@ -290,6 +341,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-icon_sanjiaoxing-copy"></span>
+            <div class="name">
+              icon_三角形
+            </div>
+            <div class="code-name">.icon-icon_sanjiaoxing-copy
+            </div>
+          </li>
+          
         </ul>
         <div class="article markdown">
         <h2 id="font-class-">font-class 引用</h2>
@@ -393,6 +453,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-sousuo"></use>
+                </svg>
+                <div class="name">搜索</div>
+                <div class="code-name">#icon-sousuo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-wode"></use>
                 </svg>
                 <div class="name">我的</div>
@@ -401,6 +469,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-left"></use>
+                </svg>
+                <div class="name">htb－Arrow right02</div>
+                <div class="code-name">#icon-left</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xuanzhuan"></use>
                 </svg>
                 <div class="name">旋转</div>
@@ -425,12 +501,28 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_sanjiaoxing"></use>
+                </svg>
+                <div class="name">icon_三角形</div>
+                <div class="code-name">#icon-icon_sanjiaoxing</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-fangda"></use>
                 </svg>
                 <div class="name">fangda</div>
                 <div class="code-name">#icon-fangda</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_sanjiaoxing-copy"></use>
+                </svg>
+                <div class="name">icon_三角形</div>
+                <div class="code-name">#icon-icon_sanjiaoxing-copy</div>
+            </li>
+          
           </ul>
           <div class="article markdown">
           <h2 id="symbol-">Symbol 引用</h2>