解决冲突

Mall.Common/Plugin/WeiXinHelper.cs

@@ -56,7 +56,12 @@ namespace Mall.Common.Plugin
             }
             catch (Exception ex)
             {
-                Common.Plugin.LogHelper.Write(ex, string.Format("GetWeChatOpenId:result={0}&&Code={1}", result, Code));
+                //GetWeChatOpenId:result={"errcode":40163,"errmsg":"code been used, hints: [ req_id: AHGbGiqNe-OhJh.a ]"}&&Code=051S1Ykl2wYCF64U7gnl2AK6ga0S1Yk2
+                //Code过期
+                if (result != null && !string.IsNullOrEmpty(result) && !result.Contains("40163"))
+                {
+                    Common.Plugin.LogHelper.Write(ex, string.Format("GetWeChatOpenId:result={0}&&Code={1}", result, Code));
+                }
             }
             return openid;
         }

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -2800,7 +2800,7 @@ namespace Mall.WebApi.Controllers
                     resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#555555", IsEducation = 0 };
                     break;
                 case MallShopStyleEnum.FreshGreen:
-                    resultMallShopStyle = new ResultMallShopStyle() { main = "#63be72", secondary = "#e1f4e3", IsEducation = 0 };
+                    resultMallShopStyle = new ResultMallShopStyle() { main = "#00C6C1", secondary = "#e1f4e3", IsEducation = 0 };
                     break;
                 case MallShopStyleEnum.BusinessBlue:
                     resultMallShopStyle = new ResultMallShopStyle() { main = "#4a90e2", secondary = "#dbe9f9", IsEducation = 0 };

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -325,6 +325,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 获取商会活动类型列表
         /// </summary>
         /// <returns></returns>
+        [AllowAnonymous]
         public ApiResult GetCommerceActivityTypeList()
         {
             var query = new RB_Commerce_ActivityType_Extend();