From 93cdab616218b4c91ebbb1b90891f43b3f0c4d9b Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 22 Nov 2023 13:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/order/buyorder.vue | 30 ++++++++++++++++------------
 static/config/index.js               |  4 ++--
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/order/buyorder.vue b/src/views/modules/order/buyorder.vue
index ba264ce..b86b2f2 100644
--- a/src/views/modules/order/buyorder.vue
+++ b/src/views/modules/order/buyorder.vue
@@ -24,7 +24,7 @@
       <!-- <el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder:delete')" type="primary" @click="printHandle(dataListSelections)"
                 :disabled="dataListSelections.length <= 0" >批量打印</el-button> -->
     </div>
-    <div style="margin-bottom: 10px; float:left;  margin-right: 15px" v-if="tabChange.isPrint == '1'">
+    <div style="margin-bottom: 10px; float:left;  margin-right: 15px" v-if="tabChange.isPrint == '1' && tabChange.tabActiveName == 2">
       <el-radio v-model="tabChange.sheetCode" :label="0" border size="mini">全部</el-radio>
       <el-radio v-model="tabChange.sheetCode" :label="2" border size="mini">未打印</el-radio>
       <el-radio v-model="tabChange.sheetCode" :label="1" border size="mini">已打印</el-radio>
@@ -152,6 +152,7 @@
                     <router-link :to="{ path: 'order-buyorderdetail', query: { orderSn: fitem.orderSn , ordertype: fitem.orderStatus} }" style="margin-left:20px">
                       <el-button type="warning" style="" size="mini" plain>订单详情</el-button>                      
                     </router-link>
+                    <!-- <el-button type="danger" style="" size="mini" plain @click="deleteHandle(fitem.orderId)">删除订单</el-button>  -->
                   </el-col>
                 <el-col :span="6">
                   <div class="tip">
@@ -208,7 +209,9 @@
                   <!-- <img v-if="fitem.orderType == 'vip'" src="../../../../static/img/oder_vip.png"  width="60px" height="60px">  -->
                 </div>
                 <div class="total td2 xcenter">
-                  <div class="tabName">合计：<em>￥{{ fitem.orderPrice }}</em></div>
+                  <div class="tabName">商品合计：<em>￥{{ fitem.orderPrice }}</em></div>
+                  <div class="tabName">运费：<em>￥{{ fitem.shippingPrice }}</em></div>
+                  <div class="tabName">实收：<em>￥{{ fitem.realPrice }}</em></div>
                   <div class="tabContent">
                     <div></div>
                     <!-- <div>含快递费：10.00，优惠券：{{ fitem.couponName }}，积分抵扣：-10.00</div> -->
@@ -322,12 +325,12 @@
             align="center"
             label="地址">
           </el-table-column> -->
-      <el-table-column prop="paymentMethod" header-align="center" align="center" label="支付方式" width="100">
+      <el-table-column prop="paymentMethod" header-align="center" align="center" label="支付方式" width="130">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.paymentMethod == 1" type="success">微信</el-tag>
-          <el-tag v-if="scope.row.paymentMethod == 2" type="primary">支付宝</el-tag>          
-          <el-tag v-if="scope.row.paymentMethod == 3" type="warning">ios内购</el-tag>
-          <el-tag v-if="scope.row.paymentMethod == 4" type="warnning">天医币支付</el-tag>
+          <el-tag size="mini" v-if="scope.row.paymentMethod == 1" type="success">微信</el-tag>
+          <el-tag  size="mini" v-if="scope.row.paymentMethod == 2" type="primary">支付宝</el-tag>          
+          <el-tag size="mini" v-if="scope.row.paymentMethod == 3" type="warning">ios内购</el-tag>
+          <el-tag size="mini" v-if="scope.row.paymentMethod == 4" type="info" >天医币支付</el-tag>
         </template>
       </el-table-column>
       <!-- 1 支付宝 2 微信 3 ios内购-->
@@ -341,10 +344,11 @@
       <el-table-column prop="realMoney" header-align="center" align="center" label="实收金额">
         <template slot-scope="scope">
           <div class="detailsFonts">
-          <span>实收：<b style="font-size: 16px; color: #fda328;">￥{{scope.row.orderPrice}}</b></span>
-          <span v-if="scope.row.couponId">优惠券：-</span>
-          <span v-if="scope.row.shippingMoney">运费：+{{scope.row.shippingMoney}}</span>
+            <span v-if="scope.row.shippingPrice">商品合计：￥{{scope.row.orderPrice}}</span>
+          <!-- <span v-if="scope.row.couponId">优惠券：-</span> -->
+          <span v-if="scope.row.shippingPrice">运费：￥{{scope.row.shippingPrice}}</span>
           <!-- <span >积分抵扣：-</span> -->
+          <span>实收：<b style="font-size: 16px; color: #fda328;">￥{{scope.row.realPrice}}</b></span>
         </div>
         </template>
       </el-table-column>
@@ -365,7 +369,7 @@
                  <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.productImage" width="40px" height="40px">
               </div>
               <div>
-                <span>{{item.productName}} [ ×{{item.quantity}} ]  
+                <span>{{item.productName}} [ ￥{{item.productPrice}} × {{item.quantity}} ]  
                   <i v-if="item.books && item.books.length > 0" @click.stop="seeBooks(item.books)" class="el-icon-view" style="color:#409eff; cursor: pointer;"></i></span>             
               </div>
             </div>
@@ -576,7 +580,7 @@ export default {
         tabActiveName: '1',  // tab筛选默认all全部 0：待付款  1：待发货 2：已发货 3：已完成
         isPrint: 0,   // 已发货列表筛选 0：显示订单 1：显示可打印列表,
         orderName: '0',   //订单名称筛选 all:全部  0:健康超市 1:电子书   2:充值订单
-        sheetCode: 0,  // 面单状态2 未打印，1 已打印 0全部
+        sheetCode: 2,  // 面单状态2 未打印，1 已打印 0全部
       },
       editBeizhudialogVisible: false,  // 修改备注按钮
       editBeizhuform: {
@@ -1237,7 +1241,7 @@ export default {
       handler(val, oldVal) {
         //console.log(val)
         this.getDataList()
-        if (this.tabChange.tabActiveName === '0' || this.tabChange.tabActiveName === '1' || this.tabChange.tabActiveName === '3') {
+        if (this.tabChange.tabActiveName === '' || this.tabChange.tabActiveName === '0' || this.tabChange.tabActiveName === '1' || this.tabChange.tabActiveName === '3') {
           this.tabChange.isPrint = '0'
         }
         if (this.tabChange.isPrint === '1') { this.getPrintSheetList() }
diff --git a/static/config/index.js b/static/config/index.js
index dc5c9f1..4e7dbc4 100644
--- a/static/config/index.js
+++ b/static/config/index.js
@@ -7,9 +7,9 @@
   // api接口请求地址
   // window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb';
   // window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb';
-  window.SITE_CONFIG['baseUrl'] = 'https://testapi.nuttyreading.com';         // 线上测试环境
+  // window.SITE_CONFIG['baseUrl'] = 'https://testapi.nuttyreading.com';         // 线上测试环境
   // window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com';         // 线上正式环境
-  // window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.38:9200/pb';
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.110:9200/pb';
   // window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb';
 
   // cdn地址 = 域名 + 版本号