Ver código fonte

合伙人订单详细

Alex 9 meses atrás
pai
commit
fcf3c5dc1e

+ 63 - 27
pages-mine/components/partner-order-item.vue

@@ -5,12 +5,18 @@
             <text class="status">{{ statusList[order.status] }}</text>
         </view>
         <view class="book-list">
-            <image v-for="(book, index) in order.detailCoverList" :key="index" :src="book" mode="aspectFill" class="book-cover"/>
+            <image
+                v-for="(book, index) in order.detailCoverList"
+                :key="index"
+                :src="book"
+                mode="aspectFill"
+                class="book-cover"
+            />
         </view>
         <view class="order-info">
             <view class="info-row">
                 <text>买书订单状态</text>
-                <text>{{ order.orderStatus }}</text>
+                <text>{{ orderStatusList[order.orderStatus] || "-" }}</text>
             </view>
             <view class="info-row">
                 <text>买书订单预估金额</text>
@@ -20,13 +26,13 @@
                 <text>我的预估佣金</text>
                 <text class="commission">¥{{ order.expectSettlementMoney }}</text>
             </view>
-            <view class="info-row" v-if="order.status==2||order.status==3">
+            <view class="info-row" v-if="order.status == 2 || order.status == 3">
                 <text>买书订单核算金额</text>
-                <text class="amount">¥{{ order.orderFinalMoney || '-' }}</text>
+                <text class="amount">¥{{ order.orderFinalMoney || "-" }}</text>
             </view>
-            <view class="info-row" v-if="order.status==2||order.status==3">
+            <view class="info-row" v-if="order.status == 2 || order.status == 3">
                 <text>我的结算佣金</text>
-                <text class="commission">¥{{ order.settlementMoney || '-' }}</text>
+                <text class="commission">¥{{ order.settlementMoney || "-" }}</text>
             </view>
         </view>
         <view class="order-time">创建时间:{{ order.createTime }}</view>
@@ -35,29 +41,45 @@
 
 <script>
 export default {
-    name: 'partner-order-item',
+    name: "partner-order-item",
     props: {
         order: {
             type: Object,
-            default: () => ({})
-        }
+            default: () => ({}),
+        },
     },
     data() {
         return {
             statusList: {
-                1: '未结算',
-                2: '已结算',
-                3: '已到账',
-                4: '已失效'
-            }
-        }
-    }
-}
+                1: "未结算",
+                2: "已结算",
+                3: "已到账",
+                4: "已失效",
+            },
+            //-1-已取消 0-待提交 1-已删除 2-待初审 3-待取件 4-初审未通过 5-待签收 6-待收货 7-待收货 8-待审核 9-审核中 10-待到款 11-已完成
+            orderStatusList: {
+                "-1": "已取消",
+                0: "待提交",
+                1: "已删除",
+                2: "待初审",
+                3: "待取件",
+                4: "初审未通过",
+                5: "待签收",
+                6: "待收货",
+                7: "待收货",
+                8: "待审核",
+                9: "审核中",
+                10: "待到款",
+                11: "已完成",
+            },
+        };
+    },
+};
 </script>
 
 <style lang="scss" scoped>
 .order-item {
-    background: #FFFFFF;
+    background: #ffffff;
     border-radius: 8px;
     padding: 16px;
     margin-bottom: 12px;
@@ -69,9 +91,11 @@ export default {
         font-size: 28rpx;
         color: #333333;
         line-height: 36rpx;
+        font-family: PingFang SC;
+        font-weight: bold;
 
         .status {
-            color: #FF0000;
+            color: #ff0000;
         }
     }
 
@@ -90,35 +114,47 @@ export default {
     }
 
     .order-info {
-        background: #F8F8F8;
-        padding: 12px;
+        background: #f8f8f8;
         border-radius: 4px;
+        width: 630rpx;
+        border: 1px solid #ebebeb;
 
         .info-row {
             display: flex;
             justify-content: space-between;
             font-size: 14px;
-            margin-bottom: 8px;
+            height: 60rpx;
+            line-height: 60rpx;
+            border-bottom: 1px solid #ebebeb;
             color: #666;
-
+            &:last-child {
+                border-bottom: none;
+            }
             &:last-child {
                 margin-bottom: 0;
             }
-
+            text {
+                flex: 1;
+                padding-left: 20rpx;
+            }
+            text:last-child {
+                border-left: 1px solid #ebebeb;
+                background-color: #ffffff;
+            }
             .amount {
                 color: #333;
             }
 
             .commission {
-                color: #FF0000;
+                color: #ff0000;
             }
         }
     }
 
     .order-time {
         margin-top: 12px;
-        font-size: 12px;
+        font-size: 13px;
         color: #999;
     }
 }
-</style> 
+</style>

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages-mine/components/partner-order-item.js.map


+ 27 - 5
unpackage/dist/dev/mp-weixin/pages-mine/components/partner-order-item.js

@@ -155,8 +155,14 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
+//
 var _default2 = {
-  name: 'partner-order-item',
+  name: "partner-order-item",
   props: {
     order: {
       type: Object,
@@ -168,10 +174,26 @@ var _default2 = {
   data: function data() {
     return {
       statusList: {
-        1: '未结算',
-        2: '已结算',
-        3: '已到账',
-        4: '已失效'
+        1: "未结算",
+        2: "已结算",
+        3: "已到账",
+        4: "已失效"
+      },
+      //-1-已取消 0-待提交 1-已删除 2-待初审 3-待取件 4-初审未通过 5-待签收 6-待收货 7-待收货 8-待审核 9-审核中 10-待到款 11-已完成
+      orderStatusList: {
+        "-1": "已取消",
+        0: "待提交",
+        1: "已删除",
+        2: "待初审",
+        3: "待取件",
+        4: "初审未通过",
+        5: "待签收",
+        6: "待收货",
+        7: "待收货",
+        8: "待审核",
+        9: "审核中",
+        10: "待到款",
+        11: "已完成"
       }
     };
   }

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages-mine/components/partner-order-item.wxml

@@ -1 +1 @@
-<view class="order-item data-v-7f7c44eb"><view class="order-no data-v-7f7c44eb">{{'订单编号:'+order.orderId+''}}<text class="status data-v-7f7c44eb">{{statusList[order.status]}}</text></view><view class="book-list data-v-7f7c44eb"><block wx:for="{{order.detailCoverList}}" wx:for-item="book" wx:for-index="index" wx:key="index"><image class="book-cover data-v-7f7c44eb" src="{{book}}" mode="aspectFill"></image></block></view><view class="order-info data-v-7f7c44eb"><view class="info-row data-v-7f7c44eb"><text class="data-v-7f7c44eb">买书订单状态</text><text class="data-v-7f7c44eb">{{order.orderStatus}}</text></view><view class="info-row data-v-7f7c44eb"><text class="data-v-7f7c44eb">买书订单预估金额</text><text class="amount data-v-7f7c44eb">{{"¥"+order.orderExpectMoney}}</text></view><view class="info-row data-v-7f7c44eb"><text class="data-v-7f7c44eb">我的预估佣金</text><text class="commission data-v-7f7c44eb">{{"¥"+order.expectSettlementMoney}}</text></view><block wx:if="{{order.status==2||order.status==3}}"><view class="info-row data-v-7f7c44eb"><text class="data-v-7f7c44eb">买书订单核算金额</text><text class="amount data-v-7f7c44eb">{{"¥"+(order.orderFinalMoney||'-')}}</text></view></block><block wx:if="{{order.status==2||order.status==3}}"><view class="info-row data-v-7f7c44eb"><text class="data-v-7f7c44eb">我的结算佣金</text><text class="commission data-v-7f7c44eb">{{"¥"+(order.settlementMoney||'-')}}</text></view></block></view><view class="order-time data-v-7f7c44eb">{{"创建时间:"+order.createTime}}</view></view>
+<view class="order-item data-v-7f7c44eb"><view class="order-no data-v-7f7c44eb">{{'订单编号:'+order.orderId+''}}<text class="status data-v-7f7c44eb">{{statusList[order.status]}}</text></view><view class="book-list data-v-7f7c44eb"><block wx:for="{{order.detailCoverList}}" wx:for-item="book" wx:for-index="index" wx:key="index"><image class="book-cover data-v-7f7c44eb" src="{{book}}" mode="aspectFill"></image></block></view><view class="order-info data-v-7f7c44eb"><view class="info-row data-v-7f7c44eb"><text class="data-v-7f7c44eb">买书订单状态</text><text class="data-v-7f7c44eb">{{orderStatusList[order.orderStatus]||"-"}}</text></view><view class="info-row data-v-7f7c44eb"><text class="data-v-7f7c44eb">买书订单预估金额</text><text class="amount data-v-7f7c44eb">{{"¥"+order.orderExpectMoney}}</text></view><view class="info-row data-v-7f7c44eb"><text class="data-v-7f7c44eb">我的预估佣金</text><text class="commission data-v-7f7c44eb">{{"¥"+order.expectSettlementMoney}}</text></view><block wx:if="{{order.status==2||order.status==3}}"><view class="info-row data-v-7f7c44eb"><text class="data-v-7f7c44eb">买书订单核算金额</text><text class="amount data-v-7f7c44eb">{{"¥"+(order.orderFinalMoney||"-")}}</text></view></block><block wx:if="{{order.status==2||order.status==3}}"><view class="info-row data-v-7f7c44eb"><text class="data-v-7f7c44eb">我的结算佣金</text><text class="commission data-v-7f7c44eb">{{"¥"+(order.settlementMoney||"-")}}</text></view></block></view><view class="order-time data-v-7f7c44eb">{{"创建时间:"+order.createTime}}</view></view>

+ 23 - 7
unpackage/dist/dev/mp-weixin/pages-mine/components/partner-order-item.wxss

@@ -48,7 +48,7 @@
   appThemeBuyBtnBgColor: #ed3f14;
 }
 .order-item.data-v-7f7c44eb {
-  background: #FFFFFF;
+  background: #ffffff;
   border-radius: 8px;
   padding: 16px;
   margin-bottom: 12px;
@@ -60,9 +60,11 @@
   font-size: 28rpx;
   color: #333333;
   line-height: 36rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
 }
 .order-item .order-no .status.data-v-7f7c44eb {
-  color: #FF0000;
+  color: #ff0000;
 }
 .order-item .book-list.data-v-7f7c44eb {
   width: 100%;
@@ -77,29 +79,43 @@
   border-radius: 10rpx;
 }
 .order-item .order-info.data-v-7f7c44eb {
-  background: #F8F8F8;
-  padding: 12px;
+  background: #f8f8f8;
   border-radius: 4px;
+  width: 630rpx;
+  border: 1px solid #ebebeb;
 }
 .order-item .order-info .info-row.data-v-7f7c44eb {
   display: flex;
   justify-content: space-between;
   font-size: 14px;
-  margin-bottom: 8px;
+  height: 60rpx;
+  line-height: 60rpx;
+  border-bottom: 1px solid #ebebeb;
   color: #666;
 }
+.order-item .order-info .info-row.data-v-7f7c44eb:last-child {
+  border-bottom: none;
+}
 .order-item .order-info .info-row.data-v-7f7c44eb:last-child {
   margin-bottom: 0;
 }
+.order-item .order-info .info-row text.data-v-7f7c44eb {
+  flex: 1;
+  padding-left: 20rpx;
+}
+.order-item .order-info .info-row text.data-v-7f7c44eb:last-child {
+  border-left: 1px solid #ebebeb;
+  background-color: #ffffff;
+}
 .order-item .order-info .info-row .amount.data-v-7f7c44eb {
   color: #333;
 }
 .order-item .order-info .info-row .commission.data-v-7f7c44eb {
-  color: #FF0000;
+  color: #ff0000;
 }
 .order-item .order-time.data-v-7f7c44eb {
   margin-top: 12px;
-  font-size: 12px;
+  font-size: 13px;
   color: #999;
 }
 

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff