Browse Source

add 低昂之

sharp-agezi 6 years ago
parent
commit
f157993e66

+ 3 - 2
customized/pages/order/order.js

@@ -101,8 +101,9 @@ Page({
       success(res){
         console.log(res,"orderList")
         let data = res.data;
-        data.forEach(el=>{
-          el['imgArray'] = el.orderCustomGoodsList[0].customGoodsImg ? el.orderCustomGoodsList[0].customGoodsImg.split(',') : [];
+        data.forEach((el,index)=>{
+          console.log(index)
+          el['imgArray'] = el.orderCustomGoodsList.length > 0 && el.orderCustomGoodsList[0].customGoodsImg ? el.orderCustomGoodsList[0].customGoodsImg.split(',') : [];
         })
         orderList.push(...data)
         if(res.data.length < 10 && rows !==1){

+ 1 - 1
customized/pages/result/result.js

@@ -11,7 +11,7 @@ Page({
       color:'#00af66',
       text:'支付成功',
       btnText:'查看订单',
-      url:'/customized/pages/order/order?state=2'
+      url:'/customized/pages/order/order?state=1'
     }
   },
 

+ 4 - 0
customized/pages/user/user.wxml

@@ -16,6 +16,10 @@
         <icon class='iconfont icon-icon-test c-orange'></icon>
         <view>待付款</view>
       </view>
+      <view class='f-item' data-state="1" bindtap='orderInfor'>
+        <icon class='iconfont icon-dingzhijiaju c-orange'></icon>
+        <view>待定制</view>
+      </view>
       <view class='f-item' data-state="2" bindtap='orderInfor'>
         <icon class='iconfont icon-daifahuo1 c-orange'></icon>
         <view>待发货</view>

+ 23 - 0
style/font/demo_index.html

@@ -31,6 +31,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe619;</span>
+                <div class="name">定制家居</div>
+                <div class="code-name">&amp;#xe619;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe600;</span>
                 <div class="name">待发货</div>
                 <div class="code-name">&amp;#xe600;</div>
@@ -153,6 +159,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-dingzhijiaju"></span>
+            <div class="name">
+              定制家居
+            </div>
+            <div class="code-name">.icon-dingzhijiaju
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-daifahuo1"></span>
             <div class="name">
               待发货
@@ -291,6 +306,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-dingzhijiaju"></use>
+                </svg>
+                <div class="name">定制家居</div>
+                <div class="code-name">#icon-dingzhijiaju</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-daifahuo1"></use>
                 </svg>
                 <div class="name">待发货</div>

File diff suppressed because it is too large
+ 10 - 6
style/font/iconfont.css


BIN
style/font/iconfont.eot


File diff suppressed because it is too large
+ 1 - 1
style/font/iconfont.js


File diff suppressed because it is too large
+ 3 - 0
style/font/iconfont.svg


BIN
style/font/iconfont.ttf


BIN
style/font/iconfont.woff


BIN
style/font/iconfont.woff2


File diff suppressed because it is too large
+ 10 - 6
style/iconfont.wxss