wangyong 6 yıl önce
ebeveyn
işleme
94f0ba820b

Dosya farkı çok büyük olduğundan ihmal edildi
+ 68 - 1579
newsShop/pages/orderList/orderList.js


+ 5 - 1
newsShop/pages/orderList/orderList.json

@@ -1,3 +1,7 @@
 {
-  "navigationBarTitleText": "我的订单"
+  "navigationBarTitleText": "采购订单",
+  "usingComponents": {
+    "data-none": "/components/data-none/data-none",
+    "divider": "/components/divider/divider"
+  }
 }

+ 35 - 329
newsShop/pages/orderList/orderList.wxml

@@ -1,339 +1,45 @@
-<!--orderList.wxml    我的订单  -->
-<view class="container  ">
-  <view class='header_wrap'>
-    <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="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>
+<!-- header -->
+<view class='header'>
+  <view class='header-box'>
+    <view class='f-box f-justify-content-center'>
+      <view wx:for="{{dataStateArray}}" data-state="{{item.state}}" class='f-item header-item {{item.state == isSelect ? "bdc-theme c-theme":""}}' bindtap='tab'>
+        {{item.label}}
+      </view>
     </view>
   </view>
-  
-  <view class='list_wrap'>
-
-    <!-- 循环每一个订单 -->
-    <scroll-view scroll-y class="scoll-h"   bindscrolltolower="searchScrollLower">
-
-      <block wx:for="{{goosdListnew}}"  wx:key="index" wx:for-index="i">  
-
-        <view class="each_order">
-          <view bindtap='orderInfor' data-id="{{i}}" >
-            <view class="order_num">订单号:{{item.order_number}}</view>
-            <!-- 未拆分订单 -->
-            <block wx:if="{{item.order_number_o == ''}}">
-                <block wx:if="{{item.order_sta == 1}}">
-                    <view  class="confirme_btn  btn_green">待付款</view>
-                </block>
-                <block wx:elif="{{item.order_sta == 2}}">
-                    <view  class="confirme_btn  btn_green">待定制</view>
-                </block>
-                <view wx:elif="{{item.order_sta == 10}}"  class="confirme_btn  btn_purple">待送礼</view>
-                <view wx:elif="{{item.order_sta == 4}}"  class="confirme_btn  btn_purple">已发货</view>
-                <view wx:elif="{{item.order_sta == 5}}"  class="confirme_btn  btn_blue">已完成</view>
-                <view wx:elif="{{item.order_sta == 6}}"  class="confirme_btn  btn_blue">已取消</view>
-            </block>
-            <block wx:else>
-                <view wx:if="{{item.order_sta == 3}}"  class="confirme_btn  btn_yellow">待发货</view>
-                <view wx:elif="{{item.order_sta == 4}}"  class="confirme_btn  btn_purple">已发货</view>
-                <view wx:elif="{{item.order_sta == 5}}"  class="confirme_btn  btn_blue">已完成</view>
-                <view wx:elif="{{item.order_sta == 6}}"  class="confirme_btn  btn_blue">已取消</view>
-            </block>
-            
-          </view>
-            
-          <view class="goods_infor">          
-            <view class="each_goods">
-
-              <!-- 循环相同订单的不同产品 -->  
-              <block wx:for="{{item.list_order_aff_data}}" wx:key="*this" wx:for-index="j"> 
-                <view class="each_goods_infor" >
-
-                  <view  wx:if="{{item.order_sta == 2 && (item.img2 == '' || item.img2 == null || item.img2 == undefined)&& item.order_gy_id > 0}}"  bindtap='contactWind'   class="yulan_btn">开始定制</view> 
-
-                  <!-- 完成定制之后的预览 -->
-                  <view  wx:elif="{{(item.img2) && item.order_sta >= 2}}"  bindtap='preview'  data-id="{{i}}" data-index="{{j}}" data-url="{{item.img2}}"  class="yulan_btn">定制预览</view> 
-
-
-                  <image src="{{item.logo}}" class="goods_img"></image>
-
-                  <view bindtap='orderInfor' data-id="{{i}}" class="goods_cont">
-                    <view class="goods_name">{{item.com_name}}</view>
-                    <view class="goods_style">
-                      <text wx:if="{{item.com_style1 != 'null'}}">{{item.com_style1}} </text>
-                      <text wx:if="{{item.com_style2 != 'null'}}">{{item.com_style2}} </text>
-                      <text wx:if="{{item.com_style3 != 'null'}}">{{item.com_style3}} </text>
-                      <text wx:if="{{item.com_style4 != 'null'}}">{{item.com_style4}} </text>
-                      <text wx:if="{{item.com_style5 != 'null'}}">{{item.com_style5}} </text>
-                      <text wx:if="{{item.com_dz != 'null'}}">{{item.com_dz}} </text>
-                      <text wx:if="{{item.com_lh != 'null'}}">{{item.com_lh}}</text>
-                    </view>
-                    <view class="goods_num">×{{item.com_num}}</view>
-                  </view>
-                  <view class="clearfix"></view>
-                </view>            
-              </block>
-
-              <view class="goods_msg">
-                <text class="num_title">共{{item.totalNumber}}件 商品合计:</text>
-                <text class="money_title">¥</text>
-                <text class="money_money">{{item.total}}<text class="money_title"></text></text>
-              </view>
-              <view class='msg'>(含运费:0.00)</view>
-            </view> 
-            
-            <!-- 原始单有操作按钮 -->
-            <!-- <block wx:if="{{item.order_number_o == '' && item.order_split_flag != 2}}"> -->
-                <view class="order_btn_wrap  clearfix">
-
-                  <!-- 待付款 -->
-                  <block wx:if="{{item.order_sta == 1}}">
-                  <text class="count_down">
-                    <block wx:if="{{item.total_micro_second<=0}}">支付时间已截止</block>
-                    <block wx:if="{{item.clock!='支付时间已截止'}}">剩余时间:{{item.clock}}</block>
-                  </text>
-                    <view  class="order_btn" bindtap="cancalSaveMsg"  data-id="{{i}}">取消</view>
-                    <view  class="order_btn" bindtap="save"  data-id="{{i}}">立即付款</view>
-                  </block>
-
-
-                  <!-- 待定制 -->
-                  <block wx:elif="{{item.order_sta == 2}}">     
-
-                    <!-- <navigator  url='/pages/webview/webview'>待定制</navigator> -->
-
-                    <block wx:if="{{item.list_order_aff_data[0].order_check_sta == 1}}"><!-- 申请取消订单 -->
-                      <view  class="order_btn">审核中</view>
-                    </block>
-                    <block wx:else>
-                      <view  class="order_btn"  data-id="{{i}}" data-order_number="{{item.order_number}}" bindtap='openCancelWind'>取消</view>
-                      <view  class="order_btn"  data-id="{{i}}" data-order_number="{{item.order_number}}" bindtap='dzwc'>定制完成</view>
-                    </block>
-                  </block>
-                  
-                  <!-- 待送礼 -->
-                  <block wx:elif="{{item.order_sta == 10}}">
-                      <view bindtap='breakFriend'  data-sendflag="1"  data-id="{{i}}"  data-order="{{goosdListnew[i]}}"   class="order_btn  xinyi">送自己</view>
-                      <view bindtap='breakFriend'  data-sendflag="0"  data-id="{{i}}"  data-order="{{goosdListnew[i]}}"    class="order_btn  xinyi">送朋友</view>
-                  </block>
-
-                  
-                  <!-- 待发货 -->
-                  <block wx:elif="{{item.order_sta == 3}}"> 
-                    <view  bindtap='fahuo'  data-ordernum="{{item.order_number}}"  class="order_btn">提醒发货</view>
-                  </block>  
+</view>
 
-                  <!-- 已发货 -->
-                  <block wx:elif="{{item.order_sta == 4}}"> 
-                    <view  class="order_btn" data-id="{{i}}"  data-order_number="{{item.order_number}}"   bindtap='qrsh'>确认收货</view>
-                    <navigator url='/pages/wuliu/wuliu?id={{item.order_number}}'  class="order_btn  xinyi">查看物流</navigator>
-                  </block>
-                  
-                  <!-- 已完成 -->
-                  <block wx:elif="{{item.order_sta == 5}}">
-                    <block wx:if="{{item.list_order_aff_data[0].order_check_sta == 1}}">
-                      <view  class="order_btn">处理中</view>
-                    </block>
-                    <block wx:else>
-                      <view  class="order_btn"  data-id="{{i}}"  bindtap='openShowhouWind'>申请售后</view>
-                      <!-- 改版前的订单 -->
-                      <block wx:if="{{item.order_number_o == '' && item.order_split_flag == ''}}">
-                        <navigator url='/pages/wuliu/wuliu?id={{item.order_number}}'  class="order_btn  xinyi">查看物流</navigator>
-                      </block>
-                      <block wx:elif="{{item.order_number_o != ''}}">
-                        <navigator url='/pages/wuliu/wuliu?id={{item.order_number}}'  class="order_btn  xinyi">查看物流</navigator>
-                      </block>
-                    </block>
-                  </block>
-                </view>
-          
+<!-- 内容 -->
+<view class='order-box'>
+  <view class='order-list mar-t20 bg-white pad-b26' wx:for="{{goodsList}}">
+    <view class='auto'>
+      <view class='pad-t20 pad-b20'>订单:{{item.order_number}}</view>
+      <view class='f-box mar-b20' wx:for="{{item.list_order_aff_data}}" wx:for-item="orderItem">
+        <view class='order-image mar-r26'>
+          <image mode="aspectFit" src='{{orderItem.logo}}'></image>
+        </view>
+        <view class='f-item'>
+          <view class='f-s30'>{{orderItem.com_name}}</view>
+          <view class='f-s24 c-999 mar-t20 f-box'>
+            <view class='f-item mar-r20'>
+              <view>{{orderItem.com_dz}}  {{orderItem.com_lh}}  {{orderItem.com_style1}}</view>
+            </view>
+            <view>×{{orderItem.com_num}}</view>
           </view>
         </view>
+      </view>
+      <!-- 价格与按钮 -->
+      <view class="f-box f-justify-content-center order-btn">
+        <view class='f-item f-box f-justify-content-end mar-r26'>
+          <view class='btn'>上传凭证</view>
+          <view class='btn'>查看物流</view>
+          <view class='btn'>确认收货</view>
+        </view>
         
-      </block>
-      <view class="loading" hidden="{{!searchLoading}}">加载中...</view>  
-      <view class="loading complete" hidden="{{!searchLoadingComplete}}">已加载全部</view>
-    </scroll-view>
-
-  </view>
-</view>
-<view class="modal_wrap  {{hiddenmodal ? 'hidden' : ''}}">
-  <view class="modal  {{hiddenmodal ? 'hidden' : ''}}">{{modalCont}}</view>
-</view>
-<view wx:if="{{maskBg}}" class="modal_bg "></view>
-
-<!-- 模拟定制预览弹窗 -->
-<view class="preview_wrap  {{previewHidden}}"  bindtap="cancelPreview">
-    <swiper class="banner_swiper"  indicator-dots="true"   circular="true"  duration="1000">   
-    <!-- <block wx:for="{{previewUrlEach}}"   wx:key="{{index}}" wx:for-index="i">   -->
-       <swiper-item class="banner">   
-        <view class="preview_img"> 
-          <image src="{{previewUrlEach}}" mode="widthFix"></image>
-        </view>        
-       </swiper-item>
-       <swiper-item class="banner">   
-        <view class="preview_img"> 
-          <image src="{{previewUrlBoxEach}}" mode="widthFix"></image>
-        </view>        
-       </swiper-item>      
-    <!-- </block>   -->
-   </swiper>   
-</view>
-
-<!-- 开始定制 -->
-<view class='contact_wind  {{showContact ? "show_contact_wind" : ""}}'>
-  <view class='qrfh_content_wrap'>
-    <image src='/images/close_gray_icon.png' class='close_contact'  bindtap='closeContactWind'></image>
-    <view class='qrfh_cont  contact_title'>定制商品请联系客服</view>
-    <view class='contact_btn  clearfix'>
-      <view class='qrfh_sure  contact_each_btn  dingzhi_btn_left'  bindtap='tel'>客服电话</view>
-      <button  open-type="contact" class='qrfh_sure  dingzhi_btn_right'  bindtap='sureFh'>联系客服</button>
-    </view>
-  </view>
-</view>
-
-
-<!-- 定制完成  -->
-<view class="qrfh_wrap  {{showQrfhMode ? '' : 'hidden'}}">
-  <view class='qrfh_content_wrap'>
-    <view class='qrfh_cont_wrap'>
-      <view class='qrfh_cont'>定制确认后将无法修改,</view>
-      <view class='qrfh_cont'>是否确认?</view>
-    </view>
-    <view class='qrsh_btn_wrap  clearfix'>
-      <view class='qrfh_cancle'  bindtap='cancelFh'>取消</view>
-      <view class='qrfh_sure'  bindtap='sureFh'>确定</view>
-    </view>
-  </view>
-</view>
-
-<!-- 送自己  -->
-<view class="qrfh_wrap  {{showSendMineMsg ? '' : 'hidden'}}">
-  <view class='qrfh_content_wrap'>
-    <view class='qrfh_cont_wrap'>
-      <view class='qrfh_cont'>将会按照您即将填写的订地址为您发货,</view>
-      <view class='qrfh_cont'>是否确认?</view>
-    </view>
-    <view class='qrsh_btn_wrap  clearfix'>
-      <view class='qrfh_cancle'  bindtap='cancelSendMine'>取消</view>
-      <view class='qrfh_sure'  bindtap='sureSendMine'>确定</view>
-    </view>
-  </view>
-</view>
-
-<!-- 送朋友  -->
-<!-- <view class="qrfh_wrap  {{showSendFriendMsg ? '' : 'hidden'}}">
-  <view class='qrfh_content_wrap'>
-    <view class='qrfh_cont_wrap'>
-      <view class='qrfh_cont'>将会按照朋友填写的地址为您发货,</view>
-      <view class='qrfh_cont'>是否确认?</view>
-    </view>
-    <view class='qrsh_btn_wrap  clearfix'>
-      <view class='qrfh_cancle'  bindtap='cancelSendFriend'>取消</view>
-      <view class='qrfh_sure'  bindtap='sureSendFriend'>确定</view>
-    </view>
-  </view>
-</view> -->
-
-<!-- 待定制 - 申请取消  -->
-<view class="qrfh_wrap  {{showCancelOrder ? '' : 'hidden'}}">
-  <view class='qrfh_content_wrap'>
-    <view class='qrfh_cont_wrap'>
-      <view class='qrfh_cont'>将会为您申请取消,</view>
-      <view class='qrfh_cont'>是否确认?</view>
-    </view>
-    <view class='qrsh_btn_wrap  clearfix'>
-      <view class='qrfh_cancle'  bindtap='cancelCancelOrder'>取消</view>
-      <view class='qrfh_sure'  bindtap='cancelOrder'>确定</view>
-    </view>
-  </view>
-</view>
-
-<!-- 已完成 - 申请售后  -->
-<view class="qrfh_wrap  {{showShouhou ? '' : 'hidden'}}">
-  <view class='qrfh_content_wrap'>
-    <view class='qrfh_cont_wrap'>
-      <view class='qrfh_cont'>将会为您申请售后,</view>
-      <view class='qrfh_cont'>是否确认?</view>
-    </view>
-    <view class='qrsh_btn_wrap  clearfix'>
-      <view class='qrfh_cancle'  bindtap='cancelShouhou'>取消</view>
-      <view class='qrfh_sure'  bindtap='sureShouhou'>确定</view>
+        <view>合计:<text class='c-theme'>¥ {{orderItem.com_price}}</text></view>
+      </view>
     </view>
   </view>
 </view>
-
-<!-- 待付款 - 取消  -->
-<view class="qrfh_wrap  {{showCancelPay ? '' : 'hidden'}}">
-  <view class='qrfh_content_wrap'>
-    <view class='qrfh_cont_wrap'>
-      <view class='qrfh_cont'>取消后订单无法恢复,</view>
-      <view class='qrfh_cont'>是否确认?</view>
-    </view>
-    <view class='qrsh_btn_wrap  clearfix'>
-      <view class='qrfh_cancle'  bindtap='closeSaveMsg'>取消</view>
-      <view class='qrfh_sure'  bindtap='sureSave'>确定</view>
-    </view>
-  </view>
 </view>
-
-<!-- 拆分订单弹窗  -->
-<view class='qrfh_wrap  {{showSendFriendMsg ? "" : "hidden"}}'>
-  <view class='break_order_content'>
-      <view class='break_title_wrap'>
-          <view class='break_title'>请选择需要赠送的礼物及数量</view>
-      </view>
-      
-      <view class='break_content'>
-          <block wx:for="{{breakOrderList.list_order_aff_data}}"  wx:key="index" wx:for-index="i">
-              <view class='each_break_goods  clearfix'>
-
-                  <image src="{{item.logo}}" class="goods_img"></image>
-                  <!-- 商品信息开始 -->
-                  <view class='break_goods_infor'>
-                      <view class='break_infor_content  clearfix'>
-                          <view class="goods_name  break_goods_name">{{item.com_name}}</view>
-                          <view class="goods_style  break_goods_style">
-                            <text wx:if="{{item.com_style1 != 'null'}}">{{item.com_style1}} </text>
-                            <text wx:if="{{item.com_style2 != 'null'}}">{{item.com_style2}} </text>
-                            <text wx:if="{{item.com_style3 != 'null'}}">{{item.com_style3}} </text>
-                            <text wx:if="{{item.com_style4 != 'null'}}">{{item.com_style4}} </text>
-                            <text wx:if="{{item.com_style5 != 'null'}}">{{item.com_style5}} </text>
-                            <text wx:if="{{item.com_dz != 'null'}}">{{item.com_dz}} </text>
-                            <text wx:if="{{item.com_lh != 'null'}}">{{item.com_lh}}</text>
-                          </view>
-                          <view class="goods_num  break_goods_num">×{{item.com_num}}</view>
-                      </view>
-                      <view class='break_num_wrap  clearfix'>
-                        <view class='each_break_btn'>选择数量:</view>
-                        <view class='each_break_btn_wrap'>
-                            <view  class='each_break  {{item.minus}}' bindtap='minusCount'  data-breaknum="{{item.break_num}}"  data-price="{{item.com_price}}"  data-id="{{i}}"  data-num='{{item.com_num}}'>-</view>
-
-                            <input class='each_break' type='number'  bindblur='writeNum'  bindconfirm='writeNum'  data-breaknum="{{item.break_num}}"  data-num='{{item.com_num}}'  value='{{item.break_num}}'  data-id="{{i}}"   />
-
-                            <!-- <view class='each_break'>{{item.break_num}}</view> -->
-                            <view class='each_break  {{item.add}}'  bindtap='addCount'  data-breaknum="{{item.break_num}}"   data-price="{{item.com_price}}"  data-id="{{i}}"  data-num='{{item.com_num}}'>+</view>
-                        </view>
-                      </view>
-                      
-                  </view>
-                  <!-- 商品信息结束 -->
-
-              </view>
-          </block>
-      </view>
-      <!-- 操作按钮 -->
-      <view class='break_btn_wrap'>
-        <view class='break_btn  break_btn_left'  bindtap='cancelSendFriend'>取消</view>
-        <form bindsubmit="sureSendFriend"  report-submit  >
-          <button formType="submit"  class='form_button'>
-              <view class='break_btn  break_btn_right'>确定</view>
-          </button>
-        </form>
-
-        <!-- <view class='break_btn  break_btn_right' bindtap='sureSendFriend'>确定</view> -->
-      </view>
-  </view>
-</view>

+ 23 - 487
newsShop/pages/orderList/orderList.wxss

@@ -1,494 +1,30 @@
-/* orderList.wxss */
-page{
-    background:#f9f9f9;  
-}
-.header_wrap{
-  width: 100%;
-  height: 98rpx;
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 1000;
-  background-color: #fff;
-}
+/* newsShop/pages/orderList/orderList.wxss */
 .header{
-  display: flex;
-  flex-flow: row;
-  height: 98rpx;
-  font-size: 30rpx;
-  color: #768187;
-  background-color: #fff;
-}
-.header_each{
-  display: inline-block;
-  flex: 1;
-  width: 116rpx;
-  height: 96rpx;
-  line-height: 96rpx;
-  color: #768187;
   text-align: center;
 }
-.header_each_active{
-  color: #b4a078;
-  border-bottom:2rpx solid #b4a078;
-}
-
-.list_wrap{
-  padding: 100rpx 0 0 0;
-}
-.each_order{
-  padding:0 20rpx 40rpx  30rpx;
-  height: auto;
-  background-color: #fff;
-  position: relative;
-  margin-bottom: 15rpx;
-}
-.order_num{
-  font-size: 24rpx;
-  line-height: 86rpx;
-  color: #646464;
-  padding-top: 13px;
-  border-bottom: 1px solid #dedede;
-}
-/* 状态按钮 */
-.confirme_btn{
-  width: 110rpx;
-  height: 40rpx;
-  font-size: 24rpx;
-  line-height: 40rpx;
-  color: #fff;
-  text-align: center;
-  border-radius: 20rpx;
-  position: absolute;
-  top:46rpx;
-  right:24rpx;
-}
-/*  待定制 */
-.btn_green{
-  color: #b4a078;
-  border:1px solid #b4a078;
-}
-/* 待付款  */
-.btn_red{
-  color: #b4a078;
-  border:1px solid #b4a078;
-}
-/* 待发货  */
-.btn_yellow{
-  color: #cc9368;
-  border:1px solid #cc9368;
-}
-/* 已发货  */
-.btn_purple{
-  color: #ce976e;
-  border:1px solid #ce976e;
-}
-/* 已完成  */
-.btn_blue{
-  color: #232323;
-  border:1px solid #232323;
-}
-
-/* 商品信息 */
-.goods_img{
-  float: left;
-  display: block;
-  width: 200rpx;
-  height: 200rpx;
-  margin:0 36rpx 0 0;
-}
-.goods_cont{
-  float: left;
-  width: 450rpx;
-  padding-top:25rpx;
-}
-.goods_name{
-  height: 68rpx;
-  font-size: 24rpx;
-  font-weight: bold;
-  line-height: 34rpx;
-  color: #333;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-  padding:20rpx 0 20rpx 0;
-}
-.goods_style{
-  float: left;
-  font-size: 24rpx;
-  line-height: 32rpx;
-  color: #646464;
-}
-.goods_num,.goods_price{
-  font-size: 24rpx;
-  color:#646464;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  white-space: nowrap;
-}
-
-.goods_price{
-  color: #ff8400;
-}
-.goods_price text{
-  font-size: 36rpx;
-  font-weight: bold;
-  font-style: italic;
-}
-.goods_style{
-  width: 340rpx;
-}
-.goods_num{
-  width: 110rpx;
-  text-align: right;
-}
-.goods_price{
-  width:130rpx;
-  text-align: right;
-  padding-right: 10rpx;
-}
-.infor_content{
-  background-color: #fff;
-  margin-top:-14rpx;
-}
-.each_infor{
-  width: 90%;
-  margin-left:5%;
-  height: 106rpx;
-  font-size: 28rpx;
-  line-height: 106rpx;
-  color: #666;
-  position: relative;
-}
-.infor_title{
-  float: left;
-}
-.goods_msg{
-  text-align: right;
-  line-height: 50rpx;
-  padding-top: 6rpx;
-}
-.num_title{
-  font-size: 24rpx;
-  color: #646464;
-}
-.money_title,.money_money{
-  font-size: 28rpx;
-  color: #b4a078;
-}
-.msg{
-  text-align: right;
-  font-size: 18rpx;
-  color: #aaa;
-  padding-bottom: 26rpx;
-}
-.order_btn{
-  float: right;
-  width: 136rpx;
-  height: 48rpx;
-  font-size: 24rpx;
-  text-align: center;
-  line-height: 48rpx;
-  color: #fff;
-  background-color: #b4a078;
-  border: 1px solid #b4a078;
-  margin-right:26rpx;
-  padding:0;
-}
-/* 用心送 */
-.xinyi{
-  color:#636363;
-  border: 1px solid #b5b5b5;
-   background-color: #fff;
-}
-.each_goods_infor{
-  border-bottom:1px solid #dedede;
-  position: relative;
-}
-/* 定制预览按钮 */
-.yulan_btn{
-  position: absolute;
-  top:78rpx;
-  left: 40rpx;
-  z-index: 1;
-  width: 120rpx;
-  height: 44rpx;
-  font-size:22rpx;
-  line-height: 44rpx;
-  text-align: center;
-  color:#fff;
-  background-color: rgba(0,0,0,0.6);
-  border-radius: 60rpx;
-}
-/* 定制预览 */
-.preview_wrap{
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 999999;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(0,0,0,1);
-}
-.banner_swiper{
-  width: 100%;
-  height: 100%;
-}
-.banner{
-  vertical-align: middle;
-}
-.preview_img{
-   width: 100%; 
-   height: 100%; 
-   display: flex;
-   align-items: center;
-}
-.preview_wrap image{
-  width: 100%;
+.header-item{
+  color:#000;
+  border-bottom-style: solid;
+  border-bottom-width: 4rpx; 
+  border-bottom-color:#fff;
 }
-/* 倒计时 */
-.count_down{
-  font-size:24rpx;
-  line-height:44rpx;
-  color:#646464;
+.order-image{
+  width:150rpx;
+  height:150rpx;
+  background:#eeedf2;
 }
-/* 定制完成  */
-.qrfh_wrap{
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  top: 0;
-  left: 0; 
-  z-index: 9999;
-  background-color: rgba(0,0,0,0.6);
-}
-.qrfh_content_wrap{
-  width: 80%;
-  height: 283rpx;
-  background-color: #fff;
-  border-radius: 4px;
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  margin: -141rpx 0 0 -40%; 
-}
-.qrfh_cont_wrap{
-  padding: 50rpx 15rpx;
-  font-size: 32rpx;
-  line-height: 46rpx;
-  text-align: center;
-  color: #999;
-}
-.qrfh_btn_wrap{
-  position: absolute;
-  left:0;
-  bottom: 0;
-}
-.qrfh_cancle,.qrfh_sure{
-  float: left;
-  width: 50%;
-  height: 90rpx;
-  font-size: 40rpx;
-  line-height: 90rpx;
-  border-top: 1px solid #ccc;
-  text-align: center;
-  background-color: #fff;
-  border-radius: 0;
-  box-sizing: border-box;
-}
-.qrfh_cancle{
-  color:#222;
-  border-right: 1px solid #ccc;
-}
-.qrfh_sure{
-  color: #b4a078;
-}
-.qrfh_sure:after,.qrfh_sure:before {
-  display: none;
-  border: 0px;
-}
-
-/* 拆分订单 */
-.break_goods_img{
-  float:left;
-  display:block;
-  width:96px;
-  height:96px;
-  margin:0 17px 0 0;
-}
-
-.break_order_content{
-  width: 700rpx;
-  height: 892rpx;
-  background-color: #fff;
-  border-radius: 4px;
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  margin: -450rpx 0 0 -350rpx; 
-  overflow:hidden;
-}
-.break_title_wrap{
-  padding: 40rpx 0;
-}
-.break_title{
-  font-size: 36rpx;
-  line-height: 46rpx;
-  color: #484848;
-  text-align: center;
-}
-.break_content{
-  width: 612rpx;
-  height: 676rpx;
-  overflow-y: scroll;
-  border-top: 1px solid #ccc;
-  margin: 0 auto;
-}
-.each_break_goods{
-  margin: 28rpx 0 0 0;
-  border-bottom: 1px solid #ccc;
-}
-.break_goods_style{
-  width: 220rpx;
-}
-.break_num_wrap{
-  font-size:30rpx ;
-  line-height: 70rpx;
-  color:#b4a078;
-  margin: 20rpx 0 0 0;
-}
-.break_goods_infor{
-  float: left;
-  width: 370rpx;
-  margin: 0 0 20rpx 0;
-}
-.each_break_btn{
-  float: left;
-}
-.each_break_btn_wrap{
-  float: left;
-  border: 1px solid #eee;
-  margin: 8rpx 0 0 0;
-}
-.break_infor_content{
-  height: 200rpx;
-}
-.break_goods_name{
-  height: 68rpx;
-  font-size: 24rpx;
-  font-weight: bold;
-  line-height: 34rpx;
-  color: #333;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-  padding:0 0 20rpx 0;
-}
-.each_break{
-  float: left;
-  width: 70rpx;
-  height: 56rpx;
-  font-size: 26rpx;
-  line-height: 56rpx;
-  color: #282727;
-  text-align: center;
-}
-.break_goods_num{
-  width: 110rpx;
-  text-align: right;
-  font-size: 24rpx;
-  color:#646464;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  white-space: nowrap;
-}
-
-/* 操作按钮 */
-.break_btn{
-  float: left;
-  width: 50%;
-  height: 96rpx;
-  font-size: 30rpx;
-  line-height: 96rpx;
-  color: #656565;
-  background-color: #f0f0f0;
-  text-align: center;
-  cursor:pointer;
-}
-.break_btn_right{
-  color: #fff;
-  background-color: #b4a078;
-}
-.no_opar{
-  color:#c8c8c8;
-}
-/* .scrollHidden{
-  height: 100%;
-  overflow: hidden;
-  position: fixed;
-} */
-
-.contact_wind{
-  display: none;
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  top: 0;
-  left: 0;
-  background-color: rgba(0,0,0,0.6);
-  z-index: 99999;
-}
-.close_contact{
-  display: block;
-  width: 33rpx;
-  height: 33rpx;
-  position: absolute;
-  top: 20rpx;
-  right: 20rpx;
-}
-.contact_title{
-  padding:56rpx 15rpx;
-  font-size:32rpx;
-  line-height:80rpx;
-  text-align:center;
-  color:#999;
-}
-.contact_btn{
+.order-image image{
   width:100%;
-  position:absolute;
-  left:0;
-  bottom:0;
-}
-.contact_each_btn{
-  border-right: 1px solid #ccc;
-  box-sizing: border-box;
-}
-.show_contact_wind{
-  display: block;
-}
-
-.container{
-  height: 100%;
-}
-.scoll-h{
-  height: 100vh;
-  overflow: hidden;
-}
-
-/* 定制联系客服 */
-.dingzhi_btn_left{
-  font-size: 36prpx;
-  color: #fff;
-  background-color: #c3b497;
-  border: 0px none;
-}
-.dingzhi_btn_right{
-  font-size: 36prpx;
-  color: #fff;
-  background-color: #b4a177;
-  border: 0px none;
+  height:100%;
+}
+.order-btn{
+  height:66rpx;
+  line-height:66rpx;
+}
+.btn{
+  border:2rpx solid #e0e0e0;
+  height:inherit;
+  padding:0rpx 20rpx;
+  border-radius:20rpx;
+  margin:0 10rpx;
 }

+ 9 - 1
project.config.json

@@ -28,7 +28,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 17,
+			"current": 18,
 			"list": [
 				{
 					"id": 0,
@@ -148,6 +148,14 @@
 					"id": -1,
 					"name": "改版-我的",
 					"pathName": "newsShop/pages/mine/mine",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "shop-订单列表",
+					"pathName": "newsShop/pages/orderList/orderList",
+					"query": "",
 					"scene": null
 				}
 			]

+ 50 - 1
style/customized.wxss

@@ -75,6 +75,9 @@ page{
   flex-wrap:wrap;
 }
 /* color */
+.c-theme{
+  color:#e60012 !important;
+}
 .c-green{
   color:#00af66
 }
@@ -96,12 +99,18 @@ page{
 .c-333{
   color:#333;
 }
+.bg-theme{
+  background:#e60012 !important;
+}
 .bg-orange{
   background:#e8976a;
 }
 .bg-green{
   background:#00af66;
 }
+.bdc-theme{
+  border-color:#e60012 !important;
+}
 /* 通用样式 */
 .t-right{
   text-align: right
@@ -150,6 +159,32 @@ page{
   padding-right:20rpx;
 }
 
+.mar-l26{
+  margin-left:26rpx;
+}
+.mar-t26{
+  margin-top:26rpx;
+}
+.mar-b26{
+  margin-bottom:26rpx;
+}
+.mar-r26{
+  margin-right:26rpx;
+}
+
+.pad-l26{
+  padding-left:26rpx;
+}
+.pad-t26{
+  padding-top:26rpx;
+}
+.pad-b26{
+  padding-bottom:26rpx;
+}
+.pad-r26{
+  padding-right:26rpx;
+}
+
 
 /* 公用样式 */
 .public-prompt{
@@ -163,7 +198,21 @@ page{
   bottom: 92rpx;
   z-index:10;
 }
-
+/* header */
+.header{
+  padding-top:100rpx;
+}
+.header-box{
+  position: absolute;
+  top:0;
+  left:0;
+  width:100%;
+  height:100rpx;
+  line-height:100rpx;
+  background:#fff;
+  font-size:30rpx;
+  z-index:10;
+}
 /* footer */
 .footer{
   padding-bottom:120rpx;