From 946dad07e02567ae765c94b3539c6588568ef044 Mon Sep 17 00:00:00 2001
From: WXD-SEASON\season <season.su@yolipai.com>
Date: Thu, 22 Aug 2024 09:27:25 +0800
Subject: [PATCH] 权益

---
 app.js                                       | 12 ++----------
 packageB/pages/user/user_coupon/c_filter.wxs | 35 ++++++++++++++++++-----------------
 pages/goods/goodsInfo/goodsInfo.js           |  5 -----
 3 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/app.js b/app.js
index 1d96a9e..49908df 100644
--- a/app.js
+++ b/app.js
@@ -201,18 +201,10 @@ App({
                                         //调用接口判断是不是会员
                                         app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => {
                                             if (res.data.code == 0) {
-                                              
-                                        
-                                                // ut.m_toast('获取到导购:'+res.data.data.id)
-
+                                       
                                                 app.globalData.guide_id = res.data.data.id;
                                                 app.globalData.guide_pick_id = res.data.data.pickup_id;
-
-                                                // setTimeout(()=>{
-                                            
-                                                //     ut.m_toast('globalData中导购id:'+app.globalData.guide_id)
-                                                // },1200)
-
+                                               
                                                
                                             }
                                         })
diff --git a/packageB/pages/user/user_coupon/c_filter.wxs b/packageB/pages/user/user_coupon/c_filter.wxs
index 1de6386..6c6337f 100644
--- a/packageB/pages/user/user_coupon/c_filter.wxs
+++ b/packageB/pages/user/user_coupon/c_filter.wxs
@@ -9,41 +9,42 @@ var filters = {
               fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':')
            return fm;
         },
+         //全场为 红色  商品除了全场为蓝色   卡项为绿色
         setcolor:function(ind){
           if(ind==0) return "red";
-          if(ind==1) return "green";
+          if(ind==1) return "blue";
           if(ind==2) return "blue";          
-          if(ind==11) return "green";
+          if(ind==11) return "blue";
 
           if(ind==12) return "blue";
-          if(ind==13) return "red";
+          if(ind==13) return "blue";
           
-          if(ind==14) return "red";
-          if(ind==20) return "green";
+          if(ind==14) return "blue";
+          if(ind==20) return "blue";
 
           if(ind==21) return "green";
-          if(ind==22) return "blue";
+          if(ind==22) return "green";
 
-          if(ind==24) return "red";
-          if(ind==25) return "blue";
+          if(ind==24) return "green";
+          if(ind==25) return "green";
           return "";
         },
       setbgcolor: function (ind) {
         if (ind == 0) return "#ffa1b9";//红
-        if (ind == 1) return "#59e1d2";//绿
+        if (ind == 1) return "#a3bcff";//蓝
         if (ind == 2) return "#a3bcff";//蓝
-        if (ind == 11) return "#59e1d2";//绿
+        if (ind == 11) return "#a3bcff";//蓝
         if (ind == 12) return "#a3bcff";//蓝       
 
-        if (ind==13) return "#ffa1b9";//红
+        if (ind==13) return "#a3bcff";//蓝
 
-        if (ind==14) return "#ffa1b9";//红
-        if (ind == 20) return "#59e1d2";//绿色
-        if (ind==21) return "#59e1d2";
-        if (ind==22) return "#a3bcff";
+        if (ind==14) return "#a3bcff";//蓝
+        if (ind == 20) return "#a3bcff";//蓝
+        if (ind==21) return "#59e1d2";//绿
+        if (ind==22) return "#59e1d2";//绿
 
-        if (ind==24) return "#ffa1b9";//红
-        if (ind==25) return "#a3bcff";
+        if (ind==24) return "#59e1d2";//绿
+        if (ind==25) return "#59e1d2";//绿
         return "";
       },
 
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 9db801d..034bdf8 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1820,11 +1820,6 @@ Page({
             newd.prom_type = 0;
             newd.prom_id = 0;
           }
-
-      
-      
-         // ut.m_toast('商品详情，购买globalData中导购id:'+getApp().globalData.guide_id );
-
           //---是不是从收藏夹出来的---
           if (th.data.c_guide_id) {
             newd['guide_id'] = th.data.c_guide_id;
--
libgit2 0.21.4