From 376739137cc7aaeebdcb9c8fdec5d70a53d68781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Mon, 6 Mar 2023 10:13:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/goodsInfo/goodsInfojs.js | 8 ++++----
 src/views/system/goodsInfo/index.vue      | 8 ++++----
 src/views/system/goodsOrder/index.vue     | 1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/views/system/goodsInfo/goodsInfojs.js b/src/views/system/goodsInfo/goodsInfojs.js
index 54e3523..ceb0587 100644
--- a/src/views/system/goodsInfo/goodsInfojs.js
+++ b/src/views/system/goodsInfo/goodsInfojs.js
@@ -59,10 +59,10 @@ export default {
                     value: "BUSINESS",
                     label: "买卖",
                 },
-                {
-                    value: "LEASE",
-                    label: "租赁",
-                },
+                // {
+                //     value: "LEASE",
+                //     label: "租赁",
+                // },
             ],
             options: [{
                     value: 0,
diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue
index 67df2ea..13698a9 100644
--- a/src/views/system/goodsInfo/index.vue
+++ b/src/views/system/goodsInfo/index.vue
@@ -277,24 +277,24 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="积分兑换门槛值" align="center">
+          <el-table-column label="积分兑换数值" align="center">
             <template slot-scope="scope">
               <el-input
               :disabled="!scope.row.integralExchangeFlag?true:false"
                 v-model.number="scope.row.integralExchangeSill"
                 oninput="value=value.replace(/[^\d]/g,'')"
-                placeholder="积分兑换门槛值"
+                placeholder="积分兑换数值"
                 maxLength="10"
               ></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="积分兑换商品数量" align="center">
+          <el-table-column label="使用积分数量" align="center">
             <template slot-scope="scope">
               <el-input
               :disabled="!scope.row.integralExchangeFlag?true:false"
                 v-model.number="scope.row.integralExchangeCount"
                 oninput="value=value.replace(/[^\d]/g,'')"
-                placeholder="积分兑换商品数量"
+                placeholder="使用积分数量"
                 maxLength="10"
               ></el-input>
             </template>
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 9ae6a7c..69e91d3 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -324,7 +324,6 @@
         <el-form-item
           label="订单原始总金额"
           prop="originalTotalPrice"
-          v-if="orderList.orderType == 'INTEGRAL_EXCHANGE'"
         >
           <el-input
             v-model="orderList.originalTotalPrice"