From dd6cab3f295e2e9f127313c1ea3dde09eccb2ce6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Jun 2021 21:57:50 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/score/score-setting.html | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/score/score-setting.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/score/score-setting.html
index 1df9d0b..da44764 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/score/score-setting.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/score/score-setting.html
@@ -158,15 +158,30 @@
<el-col :span="3">
<el-input v-model="paramSettingShop.paramValue" oninput ="value=value.replace(/[^0-9.]/g,'')"></el-input>
</el-col>
- <el-col class="line" :span="4" style="margin-left: 10px">元/积分</el-col>
+ <div v-show="paramSettingShop.paramName !== '现金消费'">
+ <el-col class="line" :span="4" style="margin-left: 10px">积分/次</el-col>
+ </div>
+ <div v-show="paramSettingShop.paramName === '现金消费'">
+ <el-col class="line" :span="4" style="margin-left: 10px">元/积分</el-col>
+ </div>
<el-col :span="3">
<el-input v-model="paramSettingShop.paramValue1" oninput ="value=value.replace(/[^0-9.]/g,'')"></el-input>
</el-col>
- <el-col class="line" :span="4" style="margin-left: 10px">元/积分</el-col>
+ <div v-show="paramSettingShop.paramName !== '现金消费'">
+ <el-col class="line" :span="4" style="margin-left: 10px">积分/次</el-col>
+ </div>
+ <div v-show="paramSettingShop.paramName === '现金消费'">
+ <el-col class="line" :span="4" style="margin-left: 10px">元/积分</el-col>
+ </div>
<el-col :span="3">
<el-input v-model="paramSettingShop.paramValue2" oninput ="value=value.replace(/[^0-9.]/g,'')"></el-input>
</el-col>
- <el-col class="line" :span="4" style="margin-left: 10px">元/积分</el-col>
+ <div v-show="paramSettingShop.paramName !== '现金消费'">
+ <el-col class="line" :span="4" style="margin-left: 10px">积分/次</el-col>
+ </div>
+ <div v-show="paramSettingShop.paramName === '现金消费'">
+ <el-col class="line" :span="4" style="margin-left: 10px">元/积分</el-col>
+ </div>
</el-form-item>
</template>
</el-col>
--
Gitblit v1.9.1