tijiao

pages/bookShop/orderLCont.vue

@@ -174,6 +174,23 @@
 
             <br clear="both" />
           </view>
+          <view class="orderContent" v-if="orderContet.orderType == 'relearn'">
+            <image
+              src="/static/icon/fugou.png"
+              mode="aspectFill"
+              style="width: 100rpx; height: 100rpx"
+            ></image>
+            <view class="itemJian">
+              <view class="orderTitle" style="line-height: 60rpx">
+                <text>{{ orderContet.remark }}</text>
+              </view>
+              <view class="orderPrice">
+                <text style="font-weight: bold">&nbsp;</text>
+              </view>
+              <br clear="both" />
+            </view>
+            <br clear="both" />
+          </view>
           <view class="orderContent" v-if="orderContet.orderType == 'vip'">
             <image
               src="/static/icon/vip.png"
@@ -213,6 +230,7 @@
           </view>
 
           <view class="order_item" style="">
+          
             <view class="orderallpri">
               <span style="color: #666; margin-right: 10rpx; float: left"
                 >商品总价 :
@@ -259,12 +277,88 @@
                   >- ￥{{ orderContet.vipDiscountAmount }}</span
                 >
               </view>
-            <view class="orderReal" v-if="orderContet.orderType == 'order'">
+              <view
+              class="orderReal"
+              v-if="orderContet.couponId && orderContet.couponId != null"
+            >
+              <span style="color: #666; margin-right: 10rpx; float: left"
+                >优惠券 :
+              </span>
+              <span>- ￥</span>{{ orderContet.couponAmount }}
+            </view>
+            <view class="orderReal" v-if="orderContet.jfDeduction > 0">
               <span style="color: #666; margin-right: 10rpx; float: left"
                 >积分 :
               </span>
-              <span v-if="orderContet.jfDeduction > 0">-</span> <span>￥</span
-              >{{ orderContet.jfDeduction }}
+              <span style="color: #fa2d12" v-if="orderContet.jfDeduction > 0"
+                >-</span
+              >
+              <span style="color: #fa2d12"
+                >￥ {{ orderContet.jfDeduction }}</span
+              >
+            </view>
+            <view
+              class="orderReal"
+              v-if="orderContet.paymentMethod == 4 && orderContet.realMoney > 0"
+            >
+              <span style="color: #666; margin-right: 10rpx; float: left"
+                >天医币抵扣:
+              </span>
+              <span style="color: #fa2d12">-&nbsp;&nbsp;</span>
+              <span style="color: #fa2d12">￥{{ orderContet.realMoney }}</span>
+            </view>
+            <view
+              class="orderReal"
+              v-if="orderContet.orderStatus != 0"
+              style="margin-bottom: 20rpx"
+            >
+              <span style="color: #666; margin-right: 10rpx; float: left"
+                >实付款 :
+              </span>
+              <b v-if="orderContet.orderType == 'point'" style="color: #dd3c0c"
+                >￥ {{ orderContet.bookBuyConfigEntity.realMoney }}</b
+              >
+              <b style="color: #dd3c0c" v-else>
+                <template v-if="orderContet.realMoney > 0">
+                  ￥{{ orderContet.realMoney }}
+
+                  <text style="font-size: 28rpx;margin-left: 10rpx;">
+                    <span
+                      style=""
+                      v-if="orderContet.paymentMethod == 1"
+                      >微信支付</span
+                    >
+                    <span
+                      style=""
+                      v-if="orderContet.paymentMethod == 2"
+                      >支付宝支付</span
+                    >
+                    <span
+                      style=""
+                      v-if="orderContet.paymentMethod == 3"
+                      >苹果支付</span
+                    >
+                    <span
+                      style=""
+                      v-if="orderContet.paymentMethod == 4"
+                    >
+                      天医币支付
+                    </span></text
+                  >
+                </template>
+                <text
+                  style="margin: 0 4rpx"
+                  v-if="
+                    orderContet.realMoney > 0 && orderContet.jfDeduction > 0
+                  "
+                >
+                  +
+                </text>
+
+                <text v-if="orderContet.jfDeduction > 0"
+                  >{{ orderContet.jfDeduction }} 积分</text
+                ></b
+              >
             </view>
             <!-- <view class="orderReal">
             <span style="color: #666; margin-right: 10rpx; float: left"
@@ -275,14 +369,7 @@
             >
             <b v-else style="color: #dd3c0c"><span>-￥</span>0</b>
           </view> -->
-            <view class="orderReal" v-if="orderContet.orderStatus != 0">
-              <span style="color: #666; margin-right: 10rpx; float: left"
-                >实付款 :
-              </span>
-              <b style="color: #dd3c0c"
-                ><span>￥</span>{{ orderContet.realMoney }}</b
-              >
-            </view>
+         
           </view>
           <view class="order_item">
             <view class="orderYunf">
@@ -327,9 +414,11 @@
                 >付款时间 :
               </span>
               <text style="font-size: 24rpx; color: #666">{{
-                orderContet.paymentDate
+                orderContet.paymentDate? orderContet.paymentDate:''
               }}</text>
             </view>
+            <br/>
+          
           </view>
 
           <!-- <view class="orderReal" v-if="orderContet.orderStatus >= 2 && orderContet.orderStatus != 5">