confirm_order

pages/confirmOrder/confirmOrder.js

@@ -54,7 +54,7 @@ Page({
       if (res.code == 200) {
         let datas = res.datas
         let goods_list = self.getGoodsList(datas.summary,datas.goods_list)
-        
+        console.log(goods_list)
         self.setData({
           datas,
           goods_list
@@ -75,7 +75,9 @@ Page({
     goods_list.map((item,index) => {
       summary.filter((list, key) => {
         if (item.goods_id == list.goods_id) {
-          newGoodsList.push(list)
+          let goods_item = list
+          goods_item.goods_num = item.goods_num
+          newGoodsList.push(goods_item)
           return true
         }
       })

pages/confirmOrder/confirmOrder.wxml

@@ -1,5 +1,5 @@
 <!--pages/confirmOrder/confirmOrder.wxml-->
-<view>
+<view class="check_order">
   <view class="address_wrap" wx:if="{{datas.address}}">
     <image class="adress-icon" src="../../image/address-icon.jpeg"></image>
     <view>
@@ -24,45 +24,44 @@
     </view>
   </view>
 
-  <view class="mt20 bacfff">
+  <view class="mt20 bacfff" wx:for="{{goods_list}}" wx:for-index="idx" wx:key="idx">
     <view class="order_goods_content vux-1px-b">
-      <image class="order_content_img" src="https://passport.lrlz.com/data/upload/shop/store/goods/6/6_05543959481448371_1280.jpg"></image>
+      <image class="order_content_img" src="{{item.goods_image_url}}"></image>
       <view class="order_content_middle">
-        <view>梦妆 花心派对唇膏</view>
-        <view class="order_letter_pro">14（霓虹粉色）</view>
+        <view>{{item.goods_mobile_name}}</view>
+        <view class="order_letter_pro">{{item.goods_spec}}</view>
         <view>
-          <text class="f30 coleb4e4f">¥48.25</text>
-          <text decode="{{true}}" class="cola7">&nbsp;&nbsp;天猫价70.00</text>
+          <text class="f30 coleb4e4f">¥{{item.act_type == 0?item.bonus_price:item.goods_promotion_price}}</text>
+          <text decode="{{true}}" class="cola7">&nbsp;&nbsp;天猫价{{item.goods_price}}</text>
         </view>
       </view>
-      <view class="order_content_nums">x4</view>
-    </view>
-    <view class="packet_price-tips">恭喜，您的红包已经达到员工内买价格～</view>
+       <view class="order_content_nums">x{{item.goods_num}}</view> 
+    </view>  
   </view>
-
+<view class="packet_price-tips bacfff" wx:if="{{datas.payinfo.gap_desc}}">{{datas.payinfo.gap_desc}}～</view>
   <view class="order_entry mt20">
     <view class="expenses_info">
       <view>商品总价</view>
-      <view class="coleb4e4f">¥ 280</view>
+      <view class="coleb4e4f">¥ {{datas.payinfo['goods_amount']}}</view>
     </view>
-    <view class="expenses_info">
-      <view><text class="bonus_bg"><text class="bonus_rate">40%</text></text><text>红包抵扣</text></view>
-      <view class="col09BB07">- ¥ 3</view>
+    <view class="expenses_info" wx:for="{{datas.payinfo['bonus_rates']}}" wx:for-index="idx" wx:key="idx">
+      <view><text class="bonus_bg"><text class="bonus_rate">{{item.rate}}%</text></text><text>红包抵扣</text></view>
+      <view class="col09BB07">- ¥ {{item.total}}</view>
     </view>
-    <view class="expenses_info">
+    <!-- <view class="expenses_info">
       <view><text class="bonus_bg"><text class="bonus_rate">40%</text></text><text>红包抵扣</text></view>
       <view class="col09BB07">- ¥ 3</view>
-    </view>
+    </view> -->
     <view class="expenses_info">
       <view>运费</view>
-      <view class="coleb4e4f">+ ¥ 9</view>
+      <view class="coleb4e4f">+ ¥ {{datas.payinfo['freight']}}</view>
     </view>
   </view>
 
   <view class="order_pay">
-    <view class="default_address">配送至：上海	上海市	徐汇区番禺路876号丽人丽妆</view>
+    <view class="default_address" wx:if="{{datas.address}}">配送至：{{datas.address.area_info}}{{datas.address.address}}</view>
     <view class="just_buy">
-      <view class="just_buy_left"><text>应付: </text><text class="coleb4e4f">¥ 204.25</text></view>
+      <view class="just_buy_left"><text>应付: </text><text class="coleb4e4f">¥ {{datas.payinfo['pay_cash_pred']}}</text></view>
       <view class="just_buy_right">去付款</view>
     </view>
   </view>

pages/confirmOrder/confirmOrder.wxss

@@ -1,5 +1,7 @@
 /* pages/confirmOrder/confirmOrder.wxss */
-
+.check_order {
+  padding-bottom: 134rpx;
+}
 .address_wrap {
   display: -webkit-flex;
   display: flex;
@@ -73,6 +75,7 @@
 .order_content_middle {
   -webkit-flex: 0 0 50%;
   flex: 0 0 50%;
+  padding-left: 25rpx;
   font-size: 24rpx;
 }