优化订单列表 review by肖亚东

@@ -7,6 +7,7 @@ import { showDialog } from './orderActionUtil.js';
 const BUY_AGAIN = 'buy_again';
 // const CANCEL_ORDER = 'cancel_order';
 const NOW_BUY = 'now_buy';
+const SHOW_DETAIL = 'show_detail';
 // const CONFIRM_ORDER = 'confirm_order';//确认收货
 // //订单操作接口
 // const UFO_BUYER_DELETE_ORDER = 'ufo.buyer.delete';//删除订单
@@ -103,6 +104,10 @@ detached: function () {
          
           //url: '/pages/productDetail/index?id=' + productId,
         })
+      } else if (actionCode == SHOW_DETAIL) {
+        wx.navigateTo({
+          url: '../orderDetail/index?orderCode=' + orderCode
+        })
       }else {
         showDialog(orderCode, actionCode, 0);
       }

@@ -92,7 +92,7 @@ Page({
   },
 
   submit() {
-    if (this.data.agreeProtocol) return
+    if (!this.data.agreeProtocol) return
 
     if (!this.data.hasAddress) {
       wx.showToast({
@@ -113,6 +113,8 @@ Page({
     api.buyerSubmit(skup,channelNo,addressId, () => wx.hideLoading())
       .then(data => {
         if (data && data.orderCode) {
+          //todo:待处理微信数据分析上报，订单生成
+          // wx.reportAnalytics(eventName, data)
           this.prePay(data.orderCode)
         }
       })

@@ -63,7 +63,7 @@
 </scroll-view>
 <view class='order-detail-bottom-action-view'>
 <!-- <orderdetailaction id="orderdetailaction" buttons="{{buttons}}" order-code="orderCode" real-price="{{priceInfo.realPayPrice}}" product-id='{{goodsInfo.productId}}'/> -->
-<view class='order-detail-bottom-realprice-view'>
+<view class='order-detail-bottom-realprice-view' wx:if='{{buttons.length >0}}'>
     <text class='order-action-pay-amount-txt'>¥{{priceInfo.realPayPrice}}</text>
     <text class='order-daction-pay-amount-title-txt'>实付金额</text>
   </view>

@@ -28,15 +28,15 @@
     flex: 1;
     padding: 20rpx 0;
     text-align: center;
-    font-size: 30rpx;
-    color: #E0E0E0;
+    font-size: 28rpx;
+    color: #999999;
     height: 68rpx;
     line-height: 68rpx;
 }
 .order-list-navbar-item-on {
     color: #000000;
     font-weight: bold;
-    font-size: 35rpx;
+    font-size: 36rpx;
 }
 .order-list-navbar-slider {
     position: absolute;