完善订单

components/order-goods/order-goods.vue

@@ -3,15 +3,17 @@
         <view v-for="(item, index) in list" :key="index" class="item-wrap u-p-b-20">
             <view class="row-between u-p-r-20 u-p-t-20 u-p-b-24" v-if="mode === 'order'">
                 <view class="u-line-1 nr bold-500 text-000"> {{ item.goods_name || item.name }}</view>
-                <view class="text-999 flex1 u-m-l-40 text-nowrap">{{ orderDesc }}</view>
+                <!-- 未发货订单暂时理解为未制作 -->
+                <!-- 已发货订单暂时理解为已完成 -->
+                <view class="flex1 u-m-l-40 text-nowrap" :class="{'primary': orderStatus == 1, 'text-999': orderStatus != 1}">{{ orderDesc }}</view>
             </view>
             <view class="item" :class="{row: mode != 'pay', 'row-start': mode == 'pay'}" @tap="toGoods(item.goods_id)">
-                <view>
+                <view :style="{ width: imageWidth + 'rpx', height: imageHeight + 'rpx' }">
                     <u-image :src="item.image_str || item.image" 
                         :width="imageWidth"
                         :height="imageHeight"
                         :border-radius="imageRadius"
-                        :mode="mode === 'confirm' ? 'aspectFill' : 'aspectFit'"
+                        :mode="imgMode"
                         lazy-load/>
                 </view>
                 <view class="goods-info ml20 flex1">
@@ -21,7 +23,7 @@
                         <view>数量:x{{ item.goods_num }}</view>
                         <view>实付:   
                             <price-format
-                                v-if="!item.is_member && order_type === 0"
+                                v-if="!item.is_member && (order_type === 0 || order_type === 1)"
                                 :weight="500"
                                 :subscript-size="24"
                                 :first-size="34"
@@ -63,33 +65,6 @@
                     >该商品不支持门店自提</view
                 >
             </template>
-
-            <view class="goods-footer row" v-if="link">
-                <view style="flex: 1"></view>
-                <navigator
-                    class="mr20"
-                    hover-class="none"
-                    :url="'/bundle/pages/goods_reviews/goods_reviews?id=' + item.id"
-                    v-if="item.comment_btn"
-                >
-                    <button size="xs" class="plain br60" hover-class="none">评价晒图</button>
-                </navigator>
-                <navigator
-                    v-if="item.refund_btn"
-                    hover-class="none"
-                    :url="
-                        '/bundle/pages/apply_refund/apply_refund?order_id=' +
-                        item.order_id +
-                        '&item_id=' +
-                        item.item_id
-                    "
-                >
-                    <button size="xs" class="plain br60" hover-class="none">申请退款</button>
-                </navigator>
-                <view v-if="item.after_status_desc" style="color: orange">
-                    {{ item.after_status_desc }}
-                </view>
-            </view>
         </view>
     </view>
 </template>
@@ -142,6 +117,14 @@ export default {
         orderDesc: {
             type: String,
             default: ''
+        },
+        imgMode: {
+            type: String,
+            default: 'scaleToFill'
+        },
+        orderStatus: {
+            type: Number,
+            default: 0
         }
     },