From c2f3279e5c9b2d553aa6b83840a41f1129292a6c Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 14 Mar 2024 10:46:35 +0800
Subject: [PATCH] bug

---
 .../views/EventMarketing/SaveBlock/index.vue  | 14 +++++-----
 .../activeConsumption/index.vue               | 14 +++++-----
 .../EventMarketing/activeNewlyweds/index.vue  | 16 +++++------
 .../EventMarketing/activeRecommend/index.vue  | 19 ++++++-------
 .../EventMarketing/cardExchange/index.vue     |  1 +
 .../EventMarketing/cardFavorable/index.vue    |  1 +
 .../EventMarketing/storeOilBlock/index.vue    |  9 ++++---
 .../EventMarketing/yijiancoupon/index.vue     |  8 +++---
 fuintAdmin/src/views/userGrade/index.vue      |  8 +++---
 fuintAdmin_zt/src/main.js                     |  4 +--
 gasStation-uni/pages/index/index.vue          | 11 +++++++-
 .../pagesHome/oilRecharge/oilRecharge.vue     | 27 +++++++++++++------
 12 files changed, 76 insertions(+), 56 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
index e40cf5ed0..d96489a65 100644
--- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
@@ -319,12 +319,11 @@
                 </el-table-column>
                 <el-table-column
                   prop="date"
-                  label="有效期（天）"
-                  width="240">
+                  label="有效期（天）">
                   <template slot-scope="scope">
-                    <span v-if="scope.row.timeType == 0" >    <el-input-number v-model="scope.row.validityZero" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
-                    <span v-if="scope.row.timeType == 1" >   <el-input-number v-model="scope.row.validityOne" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
-                    <span v-if="scope.row.timeType == 2" >     <el-input-number v-model="scope.row.validityTwo" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
+                    <span v-if="scope.row.timeType == 0" >  {{scope.row.validityZero}}天 </span>
+                    <span v-if="scope.row.timeType == 1" >  {{scope.row.validityOne}}天 </span>
+                    <span v-if="scope.row.timeType == 2" >  {{scope.row.validityTwo}}天 </span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -388,10 +387,9 @@
                 </el-table-column>
                 <el-table-column
                   prop="date"
-                  label="有效期（天）"
-                  width="240">
+                  label="有效期（天）">
                   <template slot-scope="scope">
-                    <span  >    <el-input-number v-model="scope.row.giftCardTime" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
+                    <span> {{ scope.row.giftCardTime }}天 </span>
 
                   </template>
                 </el-table-column>
diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 8706fe52d..de954a8e7 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -251,12 +251,11 @@
                 </el-table-column>
                 <el-table-column
                   prop="date"
-                  label="有效期（天）"
-                  width="240">
+                  label="有效期（天）">
                   <template slot-scope="scope">
-                    <span v-if="scope.row.timeType == 0" >    <el-input-number v-model="scope.row.validityZero" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
-                    <span v-if="scope.row.timeType == 1" >   <el-input-number v-model="scope.row.validityOne" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
-                    <span v-if="scope.row.timeType == 2" >     <el-input-number v-model="scope.row.validityTwo" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
+                    <span v-if="scope.row.timeType == 0" > {{ scope.row.validityZero }}天 </span>
+                    <span v-if="scope.row.timeType == 1" > {{ scope.row.validityOne }}天 </span>
+                    <span v-if="scope.row.timeType == 2" > {{ scope.row.validityTwo }}天 </span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -322,10 +321,9 @@
               </el-table-column>
               <el-table-column
                 prop="date"
-                label="有效期（天）"
-                width="240">
+                label="有效期（天）">
                 <template slot-scope="scope">
-                  <span  >    <el-input-number v-model="scope.row.giftCardTime" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
+                  <span> {{ scope.row.giftCardTime }}天 </span>
 
                 </template>
               </el-table-column>
diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
index 1eb8ca9f1..97671cda7 100644
--- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
@@ -114,17 +114,17 @@
                 label="有效期（天）"
               >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.timeType == 0" >    <el-input-number v-model="scope.row.validityZero" size="small" controls-position="right"  :min="0" :max="9999"></el-input-number>天 </span>
-                  <span v-if="scope.row.timeType == 1" >   <el-input-number v-model="scope.row.validityOne" size="small" controls-position="right"  :min="0" :max="9999"></el-input-number>天 </span>
-                  <span v-if="scope.row.timeType == 2" >     <el-input-number v-model="scope.row.validityTwo" size="small" controls-position="right"  :min="0" :max="9999"></el-input-number>天 </span>
+                  <span v-if="scope.row.timeType == 0" > {{ scope.row.validityZero }}天 </span>
+                  <span v-if="scope.row.timeType == 1" > {{ scope.row.validityOne }}天 </span>
+                  <span v-if="scope.row.timeType == 2" > {{ scope.row.validityTwo }}天 </span>
                 </template>
               </el-table-column>
               <el-table-column
                 prop="date"
-                label="数量"
+                label="数量" width="130"
               >
                 <template slot-scope="scope">
-                  <el-input-number v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
+                  <el-input-number style="width: 110px" v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column
@@ -182,15 +182,15 @@
                 label="有效期（天）"
               >
                 <template slot-scope="scope">
-                  <span  >    <el-input-number v-model="scope.row.giftCardTime" size="small" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
+                  <span  > {{ scope.row.giftCardTime }}天 </span>
                 </template>
               </el-table-column>
               <el-table-column
                 prop="date"
-                label="数量"
+                label="数量" width="130"
               >
                 <template slot-scope="scope">
-                  <el-input-number v-model="scope.row.giftCardTotal" size="small" controls-position="right"  :min="1" :max="9999"></el-input-number>
+                  <el-input-number style="width: 110px" v-model="scope.row.giftCardTotal" size="small" controls-position="right"  :min="1" :max="9999"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column
diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
index dae6c5dd1..5cc2dc6a1 100644
--- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
@@ -208,17 +208,17 @@
                 label="有效期（天）"
                 >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.timeType == 0" >    <el-input-number v-model="scope.row.validityZero" controls-position="right"  :min="1" :max="9999"></el-input-number> </span>
-                  <span v-if="scope.row.timeType == 1" >   <el-input-number v-model="scope.row.validityOne" controls-position="right"  :min="1" :max="9999"></el-input-number> </span>
-                  <span v-if="scope.row.timeType == 2" >     <el-input-number v-model="scope.row.validityTwo" controls-position="right"  :min="1" :max="9999"></el-input-number></span>
+                  <span v-if="scope.row.timeType == 0" > {{ scope.row.validityZero }}天 </span>
+                  <span v-if="scope.row.timeType == 1" > {{ scope.row.validityOne }}天 </span>
+                  <span v-if="scope.row.timeType == 2" > {{ scope.row.validityTwo }}天 </span>
                 </template>
               </el-table-column>
               <el-table-column
                 prop="date"
-                label="数量"
+                label="数量" width="130"
                 >
                 <template slot-scope="scope">
-                  <el-input-number v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
+                  <el-input-number style="width: 110px" v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
                 </template>
               </el-table-column>
 
@@ -279,15 +279,15 @@
                 label="有效期（天）"
                 >
                 <template slot-scope="scope">
-                  <span >    <el-input-number v-model="scope.row.giftCardTime" controls-position="right"  :min="1" :max="9999"></el-input-number> </span>
+                  <span > {{ scope.row.giftCardTime }}天 </span>
                 </template>
               </el-table-column>
               <el-table-column
                 prop="date"
-                label="数量"
+                label="数量" width="130"
               >
                 <template slot-scope="scope">
-                  <el-input-number v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
+                  <el-input-number style="width: 110px" v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column
@@ -833,7 +833,8 @@ export default {
         activeNewName:'',
         activeNewId:'',
         status:'1'
-      },
+      }
+      this.ruleForm.ylist = []
       this.xzshow = true
     },
     // 图片上传成功
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
index ff9ae54c2..785b3d4ab 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
@@ -425,6 +425,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
+      this.form.status = '0'
       this.title = '添加兑换券'
     },
     /** 修改按钮操作 */
diff --git a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
index 674614f59..f5691a112 100644
--- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
@@ -678,6 +678,7 @@ export default {
         this.vipname = res.data.records
       })
       this.open = true;
+      this.form.status = '0'
       this.title = "添加优惠券";
     },
     /** 修改按钮操作 */
diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
index 286bf7b04..eef844834 100644
--- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
@@ -274,16 +274,17 @@
           </el-form-item>
 
           <el-form-item label="到期时间" prop="expireTime">
-            <div style="width: 100%;display: flex;align-items: center ">
-              <div style="width: 45%">
+<!--            <div style="width: 100%;display: flex;align-items: center ">-->
+<!--              <div style="width: 45%">-->
                 <el-date-picker
                   v-model="ruleForm.expireTime"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   type="datetime"
                   placeholder="到期时间">
                 </el-date-picker>
-              </div>
-            </div>
+<!--              </div>-->
+<!--            </div>-->
+            <div style="color: red;font-size: 12px;line-height: 18px;margin-top: 5px">注：当前到期时间为用户充值后电子囤油卡的余油的到期时间，如果到期后没有用完则自动转为电子储值卡余额</div>
 
 
           </el-form-item>
diff --git a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
index d3c50df87..d2dc5bbd6 100644
--- a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
@@ -191,9 +191,9 @@
                 label="有效期（天）"
                >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.timeType == 0" >    <el-input-number v-model="scope.row.validityZero" controls-position="right" size="mini"  :min="1" :max="9999"></el-input-number></span>
-                  <span v-if="scope.row.timeType == 1" >   <el-input-number v-model="scope.row.validityOne" controls-position="right" size="mini"  :min="1" :max="9999"></el-input-number></span>
-                  <span v-if="scope.row.timeType == 2" >     <el-input-number v-model="scope.row.validityTwo" controls-position="right" size="mini"  :min="1" :max="9999"></el-input-number></span>
+                  <span v-if="scope.row.timeType == 0" > {{ scope.row.validityZero }}天</span>
+                  <span v-if="scope.row.timeType == 1" > {{ scope.row.validityOne }}天</span>
+                  <span v-if="scope.row.timeType == 2" > {{ scope.row.validityTwo }}天</span>
                 </template>
               </el-table-column>
 <!--              <el-table-column-->
@@ -258,7 +258,7 @@
                 label="有效期（天）"
               >
                 <template slot-scope="scope">
-                  <span  >    <el-input-number v-model="scope.row.validity" controls-position="right" size="mini"  :min="1" :max="9999"></el-input-number> </span>
+                  <span  >  {{ scope.row.validity }}天 </span>
 
                 </template>
               </el-table-column>
diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue
index 006412e80..f27b7b996 100644
--- a/fuintAdmin/src/views/userGrade/index.vue
+++ b/fuintAdmin/src/views/userGrade/index.vue
@@ -346,9 +346,9 @@
                 label="有效期（天）"
                 width="240">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.timeType == 0" >    <el-input-number v-model="scope.row.validityZero" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
-                  <span v-if="scope.row.timeType == 1" >   <el-input-number v-model="scope.row.validityOne" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
-                  <span v-if="scope.row.timeType == 2" >     <el-input-number v-model="scope.row.validityTwo" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
+                  <span v-if="scope.row.timeType == 0" > {{ scope.row.validityZero }}天 </span>
+                  <span v-if="scope.row.timeType == 1" > {{ scope.row.validityOne }}天 </span>
+                  <span v-if="scope.row.timeType == 2" > {{ scope.row.validityTwo }}天 </span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -412,7 +412,7 @@
                 label="有效期（天）"
                 width="240">
                 <template slot-scope="scope">
-                  <span  >    <el-input-number v-model="scope.row.giftCardTime" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
+                  <span  > {{ scope.row.giftCardTime }}天 </span>
 
                 </template>
               </el-table-column>
diff --git a/fuintAdmin_zt/src/main.js b/fuintAdmin_zt/src/main.js
index f14522b38..82a714338 100644
--- a/fuintAdmin_zt/src/main.js
+++ b/fuintAdmin_zt/src/main.js
@@ -48,8 +48,8 @@ Vue.prototype.getName = getName
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 // Vue.prototype.pcUrl = 'http://192.168.0.121:82/'
-Vue.prototype.pcUrl = 'http://192.168.31.96:82/'
-// Vue.prototype.pcUrl = 'http://47.95.206.185:85/'
+// Vue.prototype.pcUrl = 'http://192.168.31.96:82/'
+Vue.prototype.pcUrl = 'http://47.95.206.185:85/'
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 3a68df9ad..9202c0407 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -41,7 +41,7 @@
 						</view>
 						<view class="jg-size">本站活动</view>
 					</view>
-					<view class="jg-box" @click="goCard()">
+					<view class="jg-box" @click="goCard()" v-if="isOpen">
 						<view class="jg-img">
 							<image src="../../static/imgs/ykcz.png" mode="aspectFit"></image>
 						</view>
@@ -53,6 +53,7 @@
 						</view>
 						<view class="jg-size">积分商城</view>
 					</view>
+					<view @click="isRecharge">.</view>
 
 				</view>
 				<!-- 金刚区结束 -->
@@ -159,6 +160,7 @@
 	export default {
 		data() {
 			return {
+				isOpen:false,
 				chainStoreId: '',
 				indicatorDots: true,
 				autoplay: true,
@@ -279,6 +281,13 @@
 			tabbar
 		},
 		methods: {
+			isRecharge(){
+				if (this.isOpen){
+					this.isOpen = false;
+				}else{
+					this.isOpen = true
+				}
+			},
 			// 返回图片路径
 			getBannerUrl(url) {
 				let imgurl = ""
diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
index 2ee3d0820..0a8cd8a41 100644
--- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
+++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
@@ -433,14 +433,25 @@
 			},
 			//储值卡充值
 			addValueCarRecords() {
-
-				// if (this.carValueId == '') {
-				// 	uni.showToast({
-				// 		title: "储值卡为必填项",
-				// 		icon: "error"
-				// 	})
-				// 	return
-				// }
+				if (this.types==0){
+					if (this.carValueId == '') {
+						uni.showToast({
+							title: "当前店铺暂未设置电子囤油卡储值优惠，请先联系商家",
+							icon: "error"
+						})
+						return
+					}
+				}else{
+					if (!this.balance || this.balance<=0) {
+						uni.showToast({
+							title: "请填写充值金额，并确保充值金额大于0",
+							icon: "error"
+						})
+						return
+					}
+				}
+				
+				
 				let _this = this
 
 				request({