From bcac38e6ac89c5637487febc2ab08b185e54ce98 Mon Sep 17 00:00:00 2001
From: "@QQNZX" <cccccc420590@163.com>
Date: Thu, 14 Mar 2024 19:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/.env.development                   |  2 +-
 .../activeConsumption/index.vue               |  7 +++-
 .../EventMarketing/cardExchange/index.vue     | 38 +++++++++++--------
 .../EventMarketing/cardFavorable/index.vue    | 14 +++++--
 fuintAdmin_zt/.env.development                |  2 +-
 5 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development
index f707cfc86..63cfebb2b 100644
--- a/fuintAdmin/.env.development
+++ b/fuintAdmin/.env.development
@@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.0.196:8081/'
+VUE_APP_SERVER_URL = 'http://192.168.31.55:8081/'
 
 
 
diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index de954a8e7..3cdcd93ac 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -167,8 +167,11 @@
     <el-dialog :title="title" :visible.sync="open" width="45%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="110px">
 
-        <el-form-item label="活动名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入活动名称" />
+        <el-form-item label="活动名称" prop="name" >
+          <div style="width: 217px">
+            <el-input v-model="form.name" placeholder="请输入活动名称" />
+          </div>
+
         </el-form-item>
         <el-form-item label="满足金额" prop="moneyType">
 
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
index 785b3d4ab..31bd0e1fd 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
@@ -158,14 +158,11 @@
     <!-- 添加或修改兑换券对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="140px">
-        <!--        <el-form-item label="所属连锁店id" prop="chainStorId">-->
-        <!--          <el-input v-model="form.chainStorId" placeholder="请输入所属连锁店id" />-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="所属店铺id" prop="storeId">-->
-        <!--          <el-input v-model="form.storeId" placeholder="请输入所属店铺id" />-->
-        <!--        </el-form-item>-->
+
         <el-form-item label="兑换券名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入兑换券名称"/>
+            <div style="width: 217px">
+              <el-input v-model="form.name" placeholder="请输入兑换券名称"/>
+            </div>
         </el-form-item>
         <el-form-item label="兑换券类型" prop="type">
           <el-radio-group v-model="form.type">
@@ -187,18 +184,27 @@
           </el-select>
         </el-form-item>
         <el-form-item label="商品数量" prop="productCount" v-if="form.type==0">
-          <el-input placeholder="请输入商品数量" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                    v-model="form.productCount" :min="0" :max="stock" @input="goodsStock">
-            <template slot="append">个</template>
-          </el-input>
+          <div style="width: 217px">
+            <el-input placeholder="请输入商品数量" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                      v-model="form.productCount" :min="0" :max="stock" @input="goodsStock">
+              <template slot="append">个</template>
+            </el-input>
+          </div>
+
         </el-form-item>
         <el-form-item label="卡券有效期" prop="validity">
-          <el-input type="number" placeholder="请输入卡券有效期" v-model="form.validity">
-            <template slot="append">天</template>
-          </el-input>
+          <div style="width: 217px">
+            <el-input type="number" placeholder="请输入卡券有效期" v-model="form.validity">
+              <template slot="append">天</template>
+            </el-input>
+          </div>
+
         </el-form-item>
         <el-form-item label="使用说明" prop="useInstructions">
-          <el-input type="textarea" v-model="form.useInstructions" placeholder="请输入使用说明"></el-input>
+          <div style="width: 217px">
+            <el-input type="textarea" v-model="form.useInstructions" placeholder="请输入使用说明"></el-input>
+          </div>
+
         </el-form-item>
 <!--        <el-form-item label="参与次数" prop="count">
           <el-input-number v-model="form.count" controls-position="right" :min="1" :max="999"></el-input-number>
@@ -426,7 +432,7 @@ export default {
       this.reset()
       this.open = true
       this.form.status = '0'
-      this.title = '添加兑换券'
+      this.title = '添加电子兑换券'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
diff --git a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
index f5691a112..1f6f07eaa 100644
--- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
@@ -194,6 +194,7 @@
                             <template slot="append">元</template>
                           </el-input>
           </div>
+
 <!--          <div class="_k">-->
 <!--            <el-form-item label="满" prop="satisfiedAmount" v-if="form.discountType == 0">-->
 <!--              <el-input v-model="form.satisfiedAmount" placeholder="请输入满足金额"  >-->
@@ -209,6 +210,7 @@
 <!--            </el-form-item>-->
 <!--          </div>-->
         </div>
+        <div style="color: red" v-if="form.discountAmount>form.satisfiedAmount" >检测到优惠金额大于满足金额请确定是否要继续执行</div>
         <div style="display: flex;align-items: center;margin-bottom: 25px"  v-if="form.discountType == 1">
           <div style="color: red">*</div>
           <div style="margin: 0px 10px;font-weight: bold">满</div>
@@ -219,7 +221,7 @@
           </div>
           <div style="margin: 0px 10px;font-weight: bold">打</div>
           <div>
-            <el-input-number v-model="form.specialDiscount" :min="0" :max="9.9" placeholder="1 ~ 9.9"/>
+            <el-input-number v-model="form.specialDiscount" :min="1" :max="9.9" placeholder="1 ~ 9.9"/>
           </div>
           <div style="margin: 0px 10px;font-weight: bold">折</div>
         </div>
@@ -272,11 +274,12 @@
 
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="互斥功能" prop="exclusiveFunction">
-          <el-radio-group v-model="form.exclusiveFunction">
+        <el-form-item label="互斥功能" prop="exclusiveFunction" style="margin-left: 10px">
+          <el-radio-group v-model="form.exclusiveFunction" @input="radioCile">
             <el-radio label="0">满减活动</el-radio>
             <el-radio label="1">储值卡付款</el-radio>
             <el-radio label="2">会员等级</el-radio>
+            <el-radio label="">无</el-radio>
           </el-radio-group>
         </el-form-item>
 
@@ -482,6 +485,7 @@ export default {
           pageSize: 10,
           total:0
       },
+      radioShow:[],
       // 表单参数
       form: {},
       vipname:[],
@@ -549,6 +553,8 @@ export default {
     this.getoilName()
   },
   methods: {
+
+
     getoilName(){
       getoilName().then(res=>{
         console.log(res)
@@ -679,7 +685,7 @@ export default {
       })
       this.open = true;
       this.form.status = '0'
-      this.title = "添加优惠券";
+      this.title = "添加电子优惠券";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
diff --git a/fuintAdmin_zt/.env.development b/fuintAdmin_zt/.env.development
index 49559362f..1830d60b1 100644
--- a/fuintAdmin_zt/.env.development
+++ b/fuintAdmin_zt/.env.development
@@ -11,6 +11,6 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.0.178:8008/'
+VUE_APP_SERVER_URL = 'http://192.168.31.55:8081/'