Ver código fonte

【代码评审】门店自提:相关代码的优化、以及 todo 评审

YunaiV 1 ano atrás
pai
commit
c7ea2f97ac

+ 1 - 4
pages/goods/index.vue

@@ -157,10 +157,7 @@
         items: [{
           skuId: e.id,
           count: e.goods_num
-        }],
-        // TODO 芋艿:后续清理掉这 2 参数
-        deliveryType: 1,
-        pointStatus: false,
+        }]
       }),
     });
 	}

+ 1 - 6
pages/index/cart.vue

@@ -124,12 +124,7 @@
 		}
 		sheep.$router.go('/pages/order/confirm', {
 			data: JSON.stringify({
-				// order_type: 'goods',
-				// goods_list,
-				items,
-				// from: 'cart',
-				deliveryType: 1,
-				pointStatus: false,
+				items
 			}),
 		});
 	}

+ 4 - 3
pages/order/addressSelection.vue

@@ -1,3 +1,4 @@
+<!-- 下单界面,收货地址 or 自提门店的选择组件 -->
 <template>
   <view class="allAddress" :style="state.isPickUp ? '':'padding-top:10rpx;'">
     <view class="nav flex flex-wrap">
@@ -6,7 +7,7 @@
       <view class="item font-color" :class="state.deliveryType === 2 ? 'on' : 'on2'"
             @tap="switchDeliveryType(2)" v-if='state.isPickUp' />
     </view>
-    <!-- 收货地址的选择 -->
+    <!-- 情况一:收货地址的选择 -->
     <view class='address flex flex-wrap flex-center ss-row-between' @tap='onSelectAddress' v-if='state.deliveryType === 1'
           :style="state.isPickUp ? '':'border-top-left-radius: 14rpx;border-top-right-radius: 14rpx;'">
       <view class='addressCon' v-if="state.addressInfo.name">
@@ -27,7 +28,7 @@
         </view>
       </view>
     </view>
-    <!-- 门店的选择 -->
+    <!-- 情况二:门店的选择 -->
     <view class='address flex flex-wrap flex-center ss-row-between' v-else @tap="onSelectAddress">
         <view class='addressCon' v-if="state.pickUpInfo.name">
           <view class='name'>{{ state.pickUpInfo.name }}
@@ -46,7 +47,7 @@
         </view>
     </view>
     <view class='line'>
-      <image :src="sheep.$url.static('/static/images/line.png', 'local')"></image>
+      <image :src="sheep.$url.static('/static/images/line.png', 'local')" />
     </view>
   </view>
 </template>

+ 3 - 4
pages/order/confirm.vue

@@ -1,7 +1,7 @@
 <template>
   <s-layout title="确认订单">
     <!-- 头部地址选择【配送地址】【自提地址】 -->
-    <AddressSelection v-model="addressState"></AddressSelection>
+    <AddressSelection v-model="addressState" />
 
     <!-- 商品信息 -->
     <view class="order-card-box ss-m-b-14">
@@ -40,9 +40,6 @@
             </text>
           </view>
         </view>
-        <!-- TODO 芋艿:接入积分 -->
-        <!-- TODO puhui999: v-if="state.orderInfo.type === 0 && state.orderPayload.order_type === 'normal'" -->
-        <!-- TODO puhui999: 没有搞懂 order_type 和  orderInfo.type 的区别和作用暂时不考虑 order_type 条件-->
         <view
           class="order-item ss-flex ss-col-center ss-row-between"
           v-if="state.orderInfo.type === 0"
@@ -62,6 +59,7 @@
             </checkbox-group>
           </view>
         </view>
+        <!-- 快递配置时,信息的展示 -->
         <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 1'>
           <view class="item-title">运费</view>
           <view class="ss-flex ss-col-center">
@@ -71,6 +69,7 @@
             <view class='item-value ss-m-r-24' v-else>免运费</view>
           </view>
         </view>
+        <!-- 门店自提时,需要填写姓名和手机号 -->
         <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 2'>
           <view class="item-title">联系人</view>
           <view class="ss-flex ss-col-center">

+ 1 - 1
pages/order/pickUpVerify.vue

@@ -18,7 +18,7 @@
       </view>
       <view class="num">{{ orderInfo.pickUpVerifyCode }}</view>
       <view class="rules">
-        <!-- TODO puhui999: 需要后端放回 -->
+        <!-- TODO puhui999: 需要后端放回:使用 receiveTime 即可 -->
 <!--        <view class="item">-->
 <!--          <view class="rulesTitle flex flex-wrap align-center">-->
 <!--            核销时间-->