Merge branch 'score_shop'

wzy

2022-10-12 4615437af0749766f519c10734e19360b0877ece

 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>