From f1b41839847596a325b6302afae92a4b07005ba0 Mon Sep 17 00:00:00 2001
From: wqy <1191068887@qq.com>
Date: Fri, 1 Mar 2024 14:45:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/ruoyi.scss      |   4 +
 src/views/set/integralSetting.vue | 121 ++++++++++++++++++++++++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 src/views/set/integralSetting.vue

diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 34c9e84..0a84f19 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -60,6 +60,10 @@
 	color: inherit;
 }
 
+.ml-auto{
+  margin-left:auto;
+}
+
 .el-dialog:not(.is-fullscreen) {
 	margin-top: 6vh !important;
 }
diff --git a/src/views/set/integralSetting.vue b/src/views/set/integralSetting.vue
new file mode 100644
index 0000000..1ea2ce0
--- /dev/null
+++ b/src/views/set/integralSetting.vue
@@ -0,0 +1,121 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <div slot="header" class="clearfix">
+        <div class="flex-center">
+          <h2>积分获取规则</h2>
+          <el-button class="ml-auto" type="primary" @click="saveData" v-hasPermi="['sys:integral:save']">保存
+          </el-button>
+        </div>
+      </div>
+      <el-form :model="incomeVal" label-width="180px">
+        <el-form-item label="签到活动状态">
+          <el-switch v-model="incomeVal.signStatus" :active-value="1" :inactive-value="0"/>
+        </el-form-item>
+        <el-form-item label="每日签到固定积分">
+          <el-input
+            type="number"
+            v-model="incomeVal.signCount"
+            style="width:200px"
+            placeholder="每天签到获取的积分"
+          >
+            <template slot="append">
+              <span>积分</span>
+            </template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="消费获得积分">
+          <div class="flex-center">
+            <span class="mr5">每消费</span>
+            <el-input
+              type="number"
+              v-model="incomeVal.orderAmount"
+              style="width:200px"
+              placeholder="每天签到获取的积分"
+            >
+              <template slot="append">
+                <span>元</span>
+              </template>
+            </el-input>
+            <span class="ml5 mr5">，获得</span>
+            <el-input
+              type="number"
+              v-model="incomeVal.orderCount"
+              style="width:200px"
+              placeholder="每天签到获取的积分"
+            >
+              <template slot="append">
+                <span>积分</span>
+              </template>
+            </el-input>
+          </div>
+        </el-form-item>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {addOrUpdate, getConfigKey2} from "@/api/system/config";
+
+const key = "activity-integral-income-set-key"
+
+const defaultIncomeVal = {
+  signStatus: 1,
+  signCount: 1,
+  orderAmount: 1,
+  orderCount: 1
+}
+
+export default {
+  data() {
+    return {
+      incomeObj: {},
+      incomeVal: {},
+    }
+  },
+  methods: {
+    initData() {
+      getConfigKey2(key).then(res => {
+        if (res.data) {
+          this.incomeObj = res.data
+          this.incomeVal = JSON.parse(res.data.configValue)
+        } else {
+          this.incomeVal = {...defaultIncomeVal}
+          this.incomeObj = {
+            configValue: JSON.stringify(this.incomeVal),
+            configKey: key,
+            configType: 'N',
+            configName: '业务员礼金上限设置',
+            configId: null
+          }
+        }
+      })
+    },
+    saveData() {
+      let self = this;
+      this.$modal.confirm('是否确认要保存积分获取规则？').then(function () {
+        self.incomeObj.configValue = JSON.stringify(self.incomeVal)
+        return addOrUpdate(self.incomeObj);
+      }).then(() => {
+        this.initData();
+        this.$modal.msgSuccess("保存成功");
+      }).catch(() => {
+      });
+    },
+  },
+  created() {
+    this.initData()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.number-input {
+  width: 120px;
+}
+
+.jc {
+  justify-content: center;
+}
+</style>

From 1123bad1d825070b523eb02655a9f6501a8ed009 Mon Sep 17 00:00:00 2001
From: czc <czc15706259078@163.com>
Date: Fri, 1 Mar 2024 15:02:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=E5=95=86=E5=93=81=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=80=89=E6=8B=A9=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/BrandSelect.vue           | 4 +++-
 src/views/components/ProductCategorySelect.vue | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/components/BrandSelect.vue b/src/views/components/BrandSelect.vue
index 6a7e6db..e74e492 100644
--- a/src/views/components/BrandSelect.vue
+++ b/src/views/components/BrandSelect.vue
@@ -26,11 +26,13 @@ export default {
   },
   methods:{
     handleBrandChange (id) {
-      if (this.value1) {       
+      if (id) {
         let brand=this.brandList.find(item=>{
           return item.id==id
         })
         this.$emit('change', brand.name);
+      } else {
+        this.$emit('change', null);
       }
     },
   },
diff --git a/src/views/components/ProductCategorySelect.vue b/src/views/components/ProductCategorySelect.vue
index de91645..c02e451 100644
--- a/src/views/components/ProductCategorySelect.vue
+++ b/src/views/components/ProductCategorySelect.vue
@@ -36,10 +36,12 @@ export default {
     }
   },
   methods: {
-    handleMallCatergoryChange () {
-      if (this.value1 && this.value1.length != 0) {       
+    handleMallCatergoryChange (e) {
+      if (e.length > 0) {
         let arr = this.$refs['cascaderMallCatergory'].getCheckedNodes()[0].pathLabels
         this.$emit('change', arr);
+      } else {
+        this.$emit('change', '');
       }
     },
     recurs(list){