From c9fd0ac0abf0318a238ea7ae80722bfce3b71f64 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 21 Mar 2024 14:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/admin.js                 | 14 +++++++-------
 pages/activeCode/subsidy.vue | 15 ++++++++++-----
 pages/index/index.vue        |  2 +-
 pages/store/home/index.vue   | 31 +++++++++----------------------
 4 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/api/admin.js b/api/admin.js
index 988502c..4b39f58 100644
--- a/api/admin.js
+++ b/api/admin.js
@@ -368,17 +368,17 @@ export function getSubsidyRecord(merId, data) {
 /*
 	领取补贴
 */
-export function couponReceive(id, data) {
-	return request.post(`coupon/receive/${id}`, data, {
-		login: true
-	});
+export function couponReceive(data) {
+	return request.get(`server/${data.mer_id}/subsidyReceive/${data.id}`);
 }
 
 /*
-	领取补贴
+	拒绝领取补贴
 */
-export function couponRefuse(id, data) {
-	return request.post(`coupon/refuse/{id}`, data, {
+export function couponRefuse(data) {
+	return request.post(`server/${data.mer_id}/subsidyRefuse/${data.id}`, {
+    reason: data.reason
+  }, {
 		login: true
 	});
 }
\ No newline at end of file
diff --git a/pages/activeCode/subsidy.vue b/pages/activeCode/subsidy.vue
index b5a668a..ce87741 100644
--- a/pages/activeCode/subsidy.vue
+++ b/pages/activeCode/subsidy.vue
@@ -194,9 +194,9 @@
       this.mer_id = user.service.mer_id;
       this.getSubsidy();
       if(this.type==2)this.getSubsidyRecord();
-      this.$nextTick(res=>{
-        this.$refs.pupRef.open();
-      })
+      // this.$nextTick(res=>{
+      //   this.$refs.pupRef.open();
+      // })
     },
     onShow() {},
     methods: {
@@ -227,7 +227,10 @@
       },
       couponReceive(){
         this.closePopup();
-        couponReceive(this.send_id).then(res=>{
+        couponReceive({
+          mer_id: this.mer_id,
+          id: this.send_id,
+        }).then(res=>{
           this.$nextTick(()=>{
             Toast('领取成功')
           })
@@ -243,7 +246,9 @@
       couponRefuse(){
         if(this.reason=='') return Toast('错误内容不能为空');
         this.closePopup();
-        couponRefuse(this.send_id, {
+        couponRefuse({
+          mer_id: this.mer_id,
+          id: this.send_id,
           reason: this.reason
         }).then(res=>{
           this.$nextTick(()=>{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 10a1c13..4ba3c6e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1243,7 +1243,7 @@
 					})
 				} else {
 					uni.navigateTo({
-						url: `/pages/store/home/index?id=` + this.userInfoData.service.mer_id + `&type=7`
+						url: `/pages/store/home/index?id=` + this.userInfoData.service.mer_id
 					})
 
 				}
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 37f673c..d09d034 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -693,11 +693,13 @@
 						value: 4,
 					}
 				],
-				tabs3: [{
-						icon: 'icon-yizhan_o',
-						name: '云商品',
-						value: 7,
-					}, {
+				tabs3: [
+     //      {
+					// 	icon: 'icon-yizhan_o',
+					// 	name: '云商品',
+					// 	value: 7,
+					// }, 
+          {
 						icon: 'icon-gouwu_o',
 						name: '商品',
 						value: 3,
@@ -719,11 +721,6 @@
 						value: 2,
 					}
 				],
-				tabs5: [{
-					icon: 'icon-yizhan_o',
-					name: '云商品',
-					value: 7,
-				}],
 				tabs: [],
 				storeScroll: true,
 				storeTop: 0,
@@ -889,6 +886,7 @@
 				})
 			},
 			getProductSpu() {
+        return ;
 				let that = this;
 				if (that.loadend) return;
 				if (that.loading) return;
@@ -1067,20 +1065,9 @@
 				getStoreDetail(this.id).then(res => {
 					this.store = res.data;
 					this.care_conut = res.data.care_count
-					// if ((res.data.delivery_way.length == 1 && res.data.delivery_way[0] == '1') || res.data.delivery_way
-					//   .length == 2) {
-					//   this.tabs = this.tabs1
-					//   this.service_open = true
-					// } else {
-					//   this.tabs = this.tabs2
-					//   this.service_open = false
-					// }
 					if (res.data.business_status == 2) {
 						this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
-					} else {
-						this.tabs = this.tabs5
-						this.type = 7
-					}
+					} 
 					this.tab(this.type)
 					// #ifdef H5
 					this.ShareInfo();