From 80ded4e6da80e584e84d4b7d9e26cc301d0dd8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 13 May 2022 19:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/createOrder.vue | 20 ++++++++++----------
 src/views/order/enterprise.vue  | 11 ++++++++---
 src/views/order/index.scss      |  6 +-----
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/views/order/createOrder.vue b/src/views/order/createOrder.vue
index b73cf8b6..1e6b31d1 100644
--- a/src/views/order/createOrder.vue
+++ b/src/views/order/createOrder.vue
@@ -4,22 +4,16 @@
         <p>购买流程:&nbsp;&nbsp;&nbsp;1.选择模块 》 <span style="color:red;">2.确认订单 》</span> 3.支付 》 4.完成</p>
     </div>
     <div class="flux_continer">
-      <div class="content">
-        <div class="top_desc">
-          <h2>购买信息</h2>
-          <p>团队名:&nbsp;&nbsp;{{userInfo.branchName?userInfo.branchName:userInfo.branchId}}</p>
-        </div>
-
+      <div class="content">  
         <div class="order_detail">
-          <h2>订单详情</h2>
-
+          <h2>订单详情</h2> 
           <div class="order_box">
             <div class="content">
               <div class="middle">
                 <div class="desc">
                   <el-descriptions size="larget" :column="3" >
-                    <el-descriptions-item label="购买版本">企业版</el-descriptions-item>
-                    <el-descriptions-item label="创建人">{{userInfo.username}}</el-descriptions-item>
+                    <el-descriptions-item label="购买版本">企业版 ( {{data.ousers}} 人 )</el-descriptions-item> 
+                    <el-descriptions-item label="企业">{{data.order.obranchName?data.order.obranchName:data.order.obranchId}}</el-descriptions-item>
                     <!-- <el-descriptions-item label="手机号码">18826103122</el-descriptions-item> -->
                     <el-descriptions-item label="支付方式">{{data.payway == 'aliPay' ? '支付宝' : '微信'}}</el-descriptions-item>
                   </el-descriptions>
@@ -56,11 +50,17 @@
                       prop="orginFee"
                       label="原价"
                       min-width="120">
+                      <template slot-scope="scope">
+                        ￥{{scope.row.orginFee}}
+                      </template>
                     </el-table-column>
                     <el-table-column
                       prop="finalFee"
                       label="折扣价"
                       min-width="120">
+                      <template slot-scope="scope">
+                        ￥{{scope.row.finalFee}}
+                      </template>
                     </el-table-column>
                   </el-table>
                 </div>
diff --git a/src/views/order/enterprise.vue b/src/views/order/enterprise.vue
index 68ecdd57..c8abc7d8 100644
--- a/src/views/order/enterprise.vue
+++ b/src/views/order/enterprise.vue
@@ -21,10 +21,10 @@
           <div class="head"  :class="{active: item.isChecked == true}" @click="selectItem(item, index)">
             <div class="module_top">
               <img :src="item.logoUrl" alt="">
-              <span>{{item.name}}</span>
+              <span>{{item.name}}</span> 
             </div>
-            <div v-if="item.isChecked == true" :class="{module_bottom_active: item.isChecked == true}" class="module_bottom">
-              <i class="selected el-icon-check"></i>
+            <div v-if="item.isChecked == true || item.billMode==='0'" :class="{module_bottom_active: item.isChecked == true|| item.billMode==='0'}" class="module_bottom">
+              <i class="selected el-icon-check"></i><span v-if="item.billMode==='0'">&nbsp;&nbsp;<font color="red">免费</font></span>
             </div>
           </div> 
         </div>
@@ -188,6 +188,11 @@ export default {
         this.$notify({position:"bottom-left",message:"【"+item.name+"】已购买，如需调整，请进入【我的订单->加购】 处理",type:"warning"})
         return;
       }
+      
+        if(item.billMode==='0'){ 
+          this.$notify({position:"bottom-left",message:"【"+item.name+"】为免费开通，无须下单。",type:"warning"}) 
+          return false;
+        }
        item.isChecked=!item.isChecked;
        if(item.isChecked==false){
           this.form.moduleIds=this.form.moduleIds.filter(i=>i!=item.id)
diff --git a/src/views/order/index.scss b/src/views/order/index.scss
index ebfb66c9..6a318a94 100644
--- a/src/views/order/index.scss
+++ b/src/views/order/index.scss
@@ -167,11 +167,7 @@ h2 {
                         .selected {
                             color: #fff;
                         }
-                    }
-                    .module_bottom_active {
-                        background-color: rgb(116, 155, 242);
-                    }
-
+                    } 
 
                 }