【优化】优化微信支付和小程序支付都使用JSAPI的enum导致混乱的问题，拆分为JSAPI和JSAPI_OFFICIAL

CoreCms.Net.Services/Pay/WeChatPayServices.cs

@@ -156,7 +156,7 @@ namespace CoreCms.Net.Services
                 };
 
                 var openId = string.Empty;
-                if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString())
+                if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString() || tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString())
                 {
                     var userAccount = await _userServices.QueryByIdAsync(_user.ID);
                     if (userAccount == null)
@@ -239,6 +239,21 @@ namespace CoreCms.Net.Services
                         jm.data = parameter;
                         jm.otherData = response;
                     }
+                    //JsApi通用微信支付（和上一样，但是为了区分，单独编写。）
+                    else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString())
+                    {
+                        // 将参数(parameter)给 公众号前端 让他在微信内H5调起支付(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6)
+                        var req = new WeChatPayJsApiSdkRequest
+                        {
+                            Package = "prepay_id=" + response.PrepayId
+                        };
+                        var parameter = await _client.ExecuteAsync(req, payOptions);
+                        parameter.Add("paymentId", entity.paymentId);
+                        jm.status = true;
+                        jm.msg = "创建微信公众号支付环境成功";
+                        jm.data = parameter;
+                        jm.otherData = response;
+                    }
                     //扫码支付
                     else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.NATIVE.ToString())
                     {