From a97c0299116e264269553c1cf65c569ab9d5576f Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 8 Aug 2024 21:26:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/applyList/technician.vue   | 51 ++++++++++++++++++++++++++++
 src/views/integral/IntegralGoods.vue | 39 ++++++++++++++++++++-
 src/views/locality/locality.vue      | 18 +++++-----
 3 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/src/views/applyList/technician.vue b/src/views/applyList/technician.vue
index fc9bfd4..72f4f02 100644
--- a/src/views/applyList/technician.vue
+++ b/src/views/applyList/technician.vue
@@ -300,6 +300,25 @@
               </el-switch>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="dskg"
+            label="是否开启打赏"
+            fixed="right"
+            width="80"
+          >
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.dskg"
+                @change="changeDskg(scope.row.dskg, scope.row.artificerId)"
+                :active-value="openValue"
+                :disabled="!isAuth('locality:update')"
+                :inactive-value="closeValue"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+              >
+              </el-switch>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" prop="id" width="250" fixed="right">
             <template slot-scope="scope">
               <el-button
@@ -4151,6 +4170,38 @@ export default {
         }
       });
     },
+    // 是否明星技师
+    changeDskg(val, artificerId) {
+      this.$http({
+        url: this.$http.adornUrl("artificer/updateArtificers"),
+        method: "post",
+        // params: this.$http.adornParams({
+        data: this.$http.adornData({
+          artificerId: artificerId,
+          dskg: val,
+        }),
+      }).then(({ data }) => {
+        if (data.code == 0) {
+          this.$message({
+            message: "操作成功",
+            type: "success",
+            duration: 1500,
+            onClose: () => {
+              this.InformationSelect();
+            },
+          });
+        } else {
+          this.$message({
+            message: data.msg,
+            type: "warning",
+            duration: 1500,
+            onClose: () => {
+              this.InformationSelect();
+            },
+          });
+        }
+      });
+    },
     //修改提成比例
     xiugai(row) {
       this.titleBl = "抽成比例";
diff --git a/src/views/integral/IntegralGoods.vue b/src/views/integral/IntegralGoods.vue
index 80e00c8..856ca48 100644
--- a/src/views/integral/IntegralGoods.vue
+++ b/src/views/integral/IntegralGoods.vue
@@ -13,6 +13,8 @@
 			</el-table-column>
 			<el-table-column prop="money" label="到账金额">
 			</el-table-column>
+			<el-table-column prop="createTime" label="创建时间">
+			</el-table-column>
 			<el-table-column label="操作" width="180">
 				<template slot-scope="scope">
 					<el-button size="mini" type="primary" :disabled="!isAuth('vipPrivilege:update')"
@@ -39,9 +41,18 @@
 				<span style="width: 200px;display: inline-block;text-align: right;">到账金额：</span>
 				<el-input style="width:50%;" v-model="money" placeholder="请输入到账金额"></el-input>
 			</div>
+			<div style="margin-bottom: 10px;" v-if="yhjday">
+				<span style="width: 200px;display: inline-block;text-align: right;">赠送多少天：</span>
+				<el-input style="width:50%;" v-model="dayNum" placeholder="请输入赠送多少天"></el-input>
+			</div>
+			<div style="margin-bottom: 10px;" v-if="yhjday">
+				<span style="width: 200px;display: inline-block;text-align: right;">每天赠送盛安豆：</span>
+				<el-input style="width:50%;" v-model="dayMoney" placeholder="请输入每天赠送盛安豆"></el-input>
+			</div>
 			<el-button type="primary" plain class="button-new-tag" size="small" @click="couponIdBtn()">选择优惠券</el-button>
+			<el-button type="primary" plain class="button-new-tag" size="small" @click="handleDay()">赠送盛安豆</el-button>
 			
-			<el-table v-loading="tableDataLoading" :data="yhjTableData">
+			<el-table v-loading="tableDataLoading" :data="yhjTableData" v-if="!yhjday">
 				<el-table-column fixed prop="couponId" label="编号" width="50">
 				</el-table-column>
 				<el-table-column prop="couponName" label="优惠卷名称">
@@ -114,8 +125,11 @@
 				couponName: '',
 				sort: '',
 				payClassifyId: '',
+				dayNum:'',
+				dayMoney:'',
 				title: '添加',
 				dialogFormVisible4: false,
+				yhjday:false,
 			}
 		},
 		methods: {
@@ -165,6 +179,12 @@
 				this.page = 1
 				this.dataSelect()
 			},
+			handleDay(){
+				this.dayNum = ''
+				this.dayMoney = ''
+				this.yhjday = true;
+				this.yhjTableData = [];
+			},
 			addNotice() {
 				this.money = ''
 				this.memberId = ''
@@ -172,6 +192,9 @@
 				this.couponId = ''
 				this.sort = ''
 				this.couponName = ''
+				this.dayNum = ''
+				this.dayMoney = ''
+				this.yhjday = false;
 				this.yhjTableData = [];
 				this.title = '添加'
 				this.dialogFormVisible = true
@@ -244,6 +267,8 @@
 						'couponId': this.couponId,
 						'payClassifyId': this.payClassifyId,
 						'detailList':this.yhjTableData,
+						'dayNum':this.dayNum,
+						'dayMoney':this.dayMoney,
 					})
 				}).then(({
 					data
@@ -302,6 +327,15 @@
 				
 				this.price = rows.price
 				this.title = '修改'
+
+				this.dayMoney = rows.dayMoney
+				this.dayNum = rows.dayNum
+				if(this.dayNum){
+					this.yhjday = true;
+				}else{
+					this.yhjday = false;
+				}
+
 			},
 			//删除一级
 			deletes(row) {
@@ -355,6 +389,9 @@
 			},
 			// 打开优惠券列表
 			couponIdBtn() {
+				this.dayNum = ''
+				this.dayMoney = ''
+				this.yhjday = false;
 				this.dataSelectY()
 				this.dialogFormVisible4 = true
 			},
diff --git a/src/views/locality/locality.vue b/src/views/locality/locality.vue
index 975b966..eade680 100644
--- a/src/views/locality/locality.vue
+++ b/src/views/locality/locality.vue
@@ -3685,15 +3685,15 @@ export default {
         });
         return;
       }
-      if (this.addNum === "") {
-        this.$notify({
-          title: "提示",
-          duration: 1800,
-          message: "请输入加钟次数",
-          type: "warning",
-        });
-        return;
-      }
+      // if (this.addNum === "") {
+      //   this.$notify({
+      //     title: "提示",
+      //     duration: 1800,
+      //     message: "请输入加钟次数",
+      //     type: "warning",
+      //   });
+      //   return;
+      // }
 
       if (this.massageTypeStatus === "") {
         this.$notify({