提交

src/views/modules/order/buyorderdetail.vue

@@ -59,7 +59,7 @@
           <!-- <el-button v-if="orderDetails.orderStatus == 1" @click="godeliver" class="text_button" size="mini" type="text">去发货</el-button>           -->
         </li>
         <!-- <li><span class="infoTitle">商品总数：</span><span>{{orderDetails.}}</span></li> -->
-        <li>
+        <!-- <li>
           <span class="infoTitle">订单金额：</span
           ><span>￥{{ orderDetails.orderPrice }}</span>
         </li>
@@ -71,7 +71,7 @@
         <li v-if="orderDetails.orderStatus > 0">
           <span class="infoTitle">实际支付金额：</span
           ><span>￥{{ orderDetails.realPrice }}</span>
-        </li>
+        </li> -->
         <li>
           <span class="infoTitle">创建时间：</span
           ><span>{{ orderDetails.createTime }}</span>
@@ -80,7 +80,7 @@
           <span class="infoTitle">支付时间：</span
           ><span>{{ orderDetails.paymentDate }}</span>
         </li>
-        <li style="width: 100%;" v-if="orderDetails.orderStatus > 0">
+         <li style="width: 100%;" v-if="orderDetails.orderStatus > 0">
           <span class="infoTitle">支付方式：</span>
           <span v-if="orderDetails.paymentMethod == 2"
             ><icon-svg name="zhifubao"></icon-svg> <span>支付宝支付</span></span
@@ -97,10 +97,10 @@
             <span>天医币支付</span></span
           >
           <span v-if="orderDetails.paymentMethod == 3">
-            <!-- <icon-svg name="zhifubao"></icon-svg>  -->
+           
             <span>IOS内购</span>
           </span>
-        </li>
+        </li> 
 
         <li
           style="width: 100%;"
@@ -118,20 +118,198 @@
         </li>
         <li class="line"></li>
         <div style="clear:both"></div>
-        <div v-if="orderDetails.orderStatus > 0">
+        <div>
-          <div class="liName">优惠信息</div>
+          <div class="liName">支付信息</div>
-          <!-- <li><span class="infoTitle">优惠金额：</span><span>0</span></li>
+          <li>
-          <li><span class="infoTitle">会员商品优惠：</span><span>0</span></li> -->
+            <span class="infoTitle">订单金额：</span
+            ><span>￥{{ orderDetails.orderPrice }}</span>
+          </li>
+          <li>
+            <span class="infoTitle">交付邮费：</span
+            ><span
+              >￥{{
+                orderDetails.shippingPrice ? orderDetails.shippingPrice : 0
+              }}</span
+            >
+          </li>
+
+          <li>
+            <span class="infoTitle"
+              ><span class="DiscountColor" style="font-weight: bold;">VIP </span
+              >立减：</span
+            ><span
+              v-if="orderDetails.vipDiscountAmount > 0"
+            
+              >-</span
+            >
+            <span
+             
+              >￥{{ orderDetails.vipDiscountAmount }}</span
+            >
+          </li>
+          <li>
+            <span class="infoTitle">活动立减：</span
+            ><span  v-if="orderDetails.districtPrice > 0"
+              >-</span
+            >
+            <span 
+              >￥{{
+                orderDetails.districtPrice ? orderDetails.districtPrice : 0
+              }}</span
+            >
+          </li>
           <li>
             <span class="infoTitle">积分抵扣：</span
+            ><span
+             
+              v-if="orderDetails.jfDeduction > 0"
+              >-</span
+            >
+            <span
+             
+              >{{ orderDetails.jfDeduction }}</span
+            >
+            <span
+             
+              v-if="orderDetails.jfDeduction > 0"
+              >积分</span
+            >
+          </li>
+          <li>
+            <span class="infoTitle">天医币抵扣：</span
+            ><span
+              v-if="
+                orderDetails.paymentMethod == 4 && orderDetails.realPrice > 0
+              "
+             
+              >- {{ orderDetails.realPrice }}
+            </span>
+            <span
+              v-if="
+                orderDetails.paymentMethod == 4 && orderDetails.realPrice == 0
+              "
+              >0
+            </span>
+          </li>
+
+          <li v-if="orderDetails.orderStatus > 0" style="width: 100%;">
+            <span class="infoTitle">实际支付：</span>
+            <span v-if="orderDetails.orderType == 'point'"
+              >￥{{ orderDetails.realPrice }}</span
+            >
+
+            <span class="DiscountColor" v-else>
+              <span v-if="orderDetails.realPrice > 0">
+                ￥{{ orderDetails.realPrice }}
+
+                <span style="" v-if="orderDetails.paymentMethod == 1"
+                  >微信支付</span
+                >
+                <span style="" v-if="orderDetails.paymentMethod == 2"
+                  >支付宝支付</span
+                >
+                <span style="" v-if="orderDetails.paymentMethod == 3"
+                  >苹果支付</span
+                >
+                <span style="" v-if="orderDetails.paymentMethod == 4">
+                  天医币支付
+                </span>
+              </span>
+             
+
+               <span
+                style="margin: 0 4rpx"
+                v-if="
+                  orderDetails.realPrice > 0 && orderDetails.jfDeduction > 0
+                "
+              >
+                +
+              </span>
+
+              <span v-if="orderDetails.jfDeduction > 0"
+                >{{ orderDetails.jfDeduction }} 积分</span
+              > 
+            </span>
+          </li>
+          <li class="line"></li>
+          <div style="clear:both"></div>
+        </div>
+
+        <!-- <div v-if="orderDetails.orderStatus > 0">
+          <div class="liName">优惠信息</div>
+        
+          <li>
+            <span class="infoTitle">优惠抵扣：</span
             ><span>{{ orderDetails.districtPrice }}</span>
           </li>
           <li class="line"></li>
-        </div>
+        </div> -->
-        <div style="clear:both"></div>
+        <!-- <div style="clear:both"></div> -->
         <!-- 订单商品 -->
         <div class="liName">商品信息</div>
-        <el-table :data="orderDetails.goodsList" style="width: 100%">
+        <el-table
+          :data="orderDetails.relearnData"
+          style="width: 100%"
+          v-if="orderDetails.orderType == 'relearn'"
+        >
+          <el-table-column label="商品名" min-width="280">
+            <template slot-scope="scope">
+              <div class="flexbox">
+                <!-- <img
+                  style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;"
+                  :src="scope.row.productImage"
+                  width="30px"
+                  height="30px"
+                /> -->
+                <div class="proname">
+                  {{ scope.row.productName }}
+                  <i
+                    v-if="scope.row.books && scope.row.books.length > 0"
+                    @click.stop="seeBooks(scope.row.books)"
+                    class="el-icon-view"
+                    style="color:#409eff; cursor: pointer;"
+                  ></i>
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="productPrice" label="价格" width="180">
+          </el-table-column>
+          <el-table-column prop="quantity" label="数量" width="80">
+          </el-table-column>
+        </el-table>
+        <el-table
+          :data="orderDetails.vipData"
+          style="width: 100%"
+          v-if="orderDetails.orderType == 'vip'"
+        >
+          <el-table-column label="商品名" min-width="280">
+            <template slot-scope="scope">
+              <div class="flexbox">
+                <!-- <img
+                  style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;"
+                  :src="scope.row.productImage"
+                  width="30px"
+                  height="30px"
+                /> -->
+                <div class="proname">
+                  {{ scope.row.productName }}
+                  <i
+                    v-if="scope.row.books && scope.row.books.length > 0"
+                    @click.stop="seeBooks(scope.row.books)"
+                    class="el-icon-view"
+                    style="color:#409eff; cursor: pointer;"
+                  ></i>
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="productPrice" label="价格" width="180">
+          </el-table-column>
+          <el-table-column prop="quantity" label="数量" width="80">
+          </el-table-column>
+        </el-table>
+        <el-table :data="orderDetails.goodsList" style="width: 100%" v-else>
           <el-table-column label="商品名" width="280">
             <template slot-scope="scope">
               <div class="flexbox">
@@ -165,8 +343,8 @@
             <a
               href="#"
               @click="changeAddressShow"
-              v-if="orderDetails.orderStatus <= 1&&pageType != 'user'"
+              v-if="orderDetails.orderStatus <= 1 && pageType != 'user'"
-              ><i class="el-icon-edit" ></i>修改收货信息</a
+              ><i class="el-icon-edit"></i>修改收货信息</a
             >
           </div>
           <div style="background:#f9f9f9; padding:5px; overflow:hidden; ">
@@ -756,6 +934,25 @@ export default {
         if (data && data.code === 0) {
           // console.log(data.result,'data.result')
           this.orderDetails = data.result;
+
+          if (this.orderDetails.orderType == "relearn") {
+            this.orderDetails.relearnData = [
+              {
+                productName: this.orderDetails.remark,
+                productPrice: this.orderDetails.orderPrice,
+                quantity: 1
+              }
+            ];
+          }
+          if (this.orderDetails.orderType == "vip") {
+            this.orderDetails.vipData = [
+              {
+                productName: 'VIP 商品',
+                productPrice: this.orderDetails.orderPrice,
+                quantity: 1
+              }
+            ];
+          }
           if (data.result.expressOrders) {
             data.result.expressOrders.forEach(element => {
               element.showProduct = false;
@@ -1025,4 +1222,7 @@ ul.list {
 /deep/ .el-select-dropdown__list {
   width: 200px !important;
 }
+.DiscountColor {
+  color: #f94f04;
+}
 </style>

src/views/modules/user/user-point-jf.vue

@@ -253,7 +253,7 @@
       append-to-body
       width="80%"
     >
-      <div>
+      <!-- <div>
         充/扣主题：<span>{{ mdetail.remark }}</span>
       </div>
       <div>
@@ -265,9 +265,9 @@
         <span :style="`color:${mdetail.changeAmount < 0 ? 'red' : ''}`">{{
           mdetail.changeAmount
         }}</span>
-      </div>
+      </div> -->
       <div>
-        订单详情：<buyorderdetail
+        <buyorderdetail
           v-if="memoryDetail"
           ref="buyorderdetail"
           :orderSn="mdetail.orderSn"

src/views/modules/user/user-point-memery.vue

@@ -112,27 +112,15 @@
     >
     </el-pagination>
     <el-dialog
-      title="充/扣积分明细"
+      title="充/扣天医币明细"
       :close-on-click-modal="false"
       :visible.sync="memoryDetail"
       append-to-body
       width="80%"
     >
+      
       <div>
-        充/扣主题：<span>{{ mdetail.remark }}</span>
+        <buyorderdetail
-      </div>
-      <div>
-        操作时间：<span>{{ mdetail.createTime }}</span>
-      </div>
-
-      <div>
-        积分：
-        <span :style="`color:${mdetail.changeAmount < 0 ? 'red' : ''}`">{{
-          mdetail.changeAmount
-        }}</span>
-      </div>
-      <div>
-        订单详情：<buyorderdetail
           v-if="memoryDetail"
           ref="buyorderdetail"
           :orderSn="mdetail.orderSn"