From 22cbe5921c258b1817c63999286842f171540933 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Sat, 19 Feb 2022 01:09:21 +0800 Subject: [PATCH] =?UTF-8?q?#=202022-02-19=20###=201.3.7=20=E5=BC=80?= =?UTF-8?q?=E6=BA=90=E7=A4=BE=E5=8C=BA=E7=89=88=EF=BC=9A=20=E6=97=A0=20###?= =?UTF-8?q?=200.2.0=20=E4=BC=9A=E5=91=98=E4=B8=93=E4=B8=9A=E7=89=88?= =?UTF-8?q?=EF=BC=9A=20=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E6=8B=86?= =?UTF-8?q?=E5=88=86=E4=B8=8B=E5=8D=95=E6=94=AF=E4=BB=98=E5=8D=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E7=94=B1=E3=80=90=E8=AE=A2=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E5=85=85=E5=80=BC=EF=BC=8C=E6=9C=8D=E5=8A=A1=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E8=A1=A8=E5=8D=95=E4=BB=98=E6=AC=BE=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E8=AE=A2=E5=8D=95=E3=80=91=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=BB=86=E5=88=99=E4=B8=BA=E3=80=90=E6=99=AE=E9=80=9A=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E6=8B=BC=E5=9B=A2=E8=AE=A2=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E8=AE=A2=E5=8D=95=EF=BC=8C=E7=A7=92=E6=9D=80?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=8C=E7=A0=8D=E4=BB=B7=EF=BC=8C=E8=B5=A0?= =?UTF-8?q?=E5=93=81=EF=BC=8C=E6=8E=A5=E9=BE=99=EF=BC=8C=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=85=85=E5=80=BC=EF=BC=8C=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E8=AE=A2=E5=8D=95=EF=BC=8C=E8=A1=A8=E5=8D=95=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E7=A0=81=EF=BC=8C=E8=A1=A8=E5=8D=95=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E3=80=91=E3=80=82=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=BC=E5=9B=A2=EF=BC=8C=E7=A7=92=E6=9D=80?= =?UTF-8?q?=EF=BC=8C=E5=9B=A2=E8=B4=AD=E4=B8=8B=E5=8D=95=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=BD=86=E6=8F=90=E7=A4=BA=E2=80=9C=E8=AE=A2=E5=8D=95=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF=E2=80=9D=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82=20=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?= =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E5=B0=81=E9=9D=A2=E5=9B=BE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E3=80=90=E5=8E=9F=E5=9B=BE=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E3=80=91=EF=BC=8C=E5=89=8D=E3=80=90=E4=B8=8A=E4=BC=A0=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E3=80=91=E6=8C=89=E9=92=AE=E6=94=B9=E4=B8=BA=E3=80=90?= =?UTF-8?q?=E8=A3=81=E5=89=AA=E4=B8=8A=E4=BC=A0=E3=80=91=E3=80=82=20?= =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E5=95=86=E5=93=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=9B=BE=E9=9B=86=E5=A2=9E=E5=8A=A0=E3=80=90=E5=8E=9F?= =?UTF-8?q?=E5=9B=BE=E4=B8=8A=E4=BC=A0=E3=80=91=EF=BC=8C=E5=89=8D=E3=80=90?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E3=80=91=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E3=80=90=E8=A3=81=E5=89=AA=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E3=80=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Configuration/GlobalEnumVars.cs | 58 +++++++-- .../Bill/CoreCmsBillPaymentsRepository.cs | 7 +- .../Bill/CoreCmsBillPaymentsServices.cs | 111 ++++++++++++------ CoreCms.Net.Services/Pay/WeChatPayServices.cs | 9 +- .../common/setting/constVarsHelper.js | 36 ++++-- .../coreshop-paymentsByWx.vue | 8 +- .../groupBuyingDetails/groupBuyingDetails.vue | 2 +- .../pinTuan/pinTuanDetails/pinTuanDetails.vue | 4 +- .../seckill/seckillDetails/seckillDetails.vue | 2 +- .../solitaireDetails/solitaireDetails.vue | 2 +- .../CoreShop/pages/form/details/details.vue | 10 -- .../pages/goods/goodDetails/goodDetails.vue | 2 +- .../CoreShop/pages/index/default/default.vue | 2 - .../member/balance/recharge/recharge.vue | 2 +- .../CoreShop/pages/payment/pay/pay.vue | 26 ++-- .../CoreShop/pages/payment/result/result.vue | 8 +- .../wwwroot/views/good/goods/create.html | 58 ++++++++- .../wwwroot/views/good/goods/edit.html | 61 +++++++++- 18 files changed, 308 insertions(+), 100 deletions(-) diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs index 27e6985b..7f2b1878 100644 --- a/CoreCms.Net.Configuration/GlobalEnumVars.cs +++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs @@ -964,31 +964,70 @@ namespace CoreCms.Net.Configuration /// public enum BillPaymentsType { - /// - /// 订单 - /// - [Description("订单")] - Order = 1, /// /// 充值 /// [Description("充值")] - Recharge = 2, + Recharge = 201, /// /// 表单订单 /// [Description("表单订单")] - FormOrder = 3, + FormOrder = 302, /// /// 表单付款码 /// [Description("表单付款码")] - FormPay = 4, + FormPay = 301, /// /// 服务订单 /// [Description("服务订单")] - ServiceOrder = 5, + ServiceOrder = 501, + + + /// + /// 普通 + /// + [Description("普通")] + Common = 1, + /// + /// 拼团 + /// + [Description("拼团")] + PinTuan = 2, + /// + /// 团购 + /// + [Description("团购")] + Group = 3, + /// + /// 秒杀 + /// + [Description("秒杀")] + Skill = 4, + /// + /// 砍价 + /// + [Description("砍价")] + Bargain = 6, + /// + /// 赠品 + /// + [Description("赠品")] + Giveaway = 7, + /// + /// 接龙 + /// + [Description("接龙")] + Solitaire = 8, + /// + /// 微信交易组件 + /// + [Description("微信交易组件")] + TransactionComponent = 10, + + } /// /// 付款单状态【对应CoreCmsBillPayments.status字段】 @@ -2841,6 +2880,5 @@ namespace CoreCms.Net.Configuration } #endregion - } } diff --git a/CoreCms.Net.Repository/Bill/CoreCmsBillPaymentsRepository.cs b/CoreCms.Net.Repository/Bill/CoreCmsBillPaymentsRepository.cs index d69dc923..19ed5675 100644 --- a/CoreCms.Net.Repository/Bill/CoreCmsBillPaymentsRepository.cs +++ b/CoreCms.Net.Repository/Bill/CoreCmsBillPaymentsRepository.cs @@ -14,11 +14,13 @@ using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; using CoreCms.Net.Configuration; + using CoreCms.Net.IRepository; using CoreCms.Net.IRepository.UnitOfWork; using CoreCms.Net.Model.Entities; using CoreCms.Net.Model.ViewModels.Basics; using CoreCms.Net.Model.ViewModels.UI; + using SqlSugar; namespace CoreCms.Net.Repository @@ -35,6 +37,7 @@ namespace CoreCms.Net.Repository } + /// /// 支付单7天统计 /// @@ -43,8 +46,10 @@ namespace CoreCms.Net.Repository { var dt = DateTime.Now.AddDays(-8); + var types = new int[] { (int)GlobalEnumVars.BillPaymentsType.Common, (int)GlobalEnumVars.BillPaymentsType.PinTuan, (int)GlobalEnumVars.BillPaymentsType.Group, (int)GlobalEnumVars.BillPaymentsType.Skill, (int)GlobalEnumVars.BillPaymentsType.Bargain, (int)GlobalEnumVars.BillPaymentsType.Giveaway, (int)GlobalEnumVars.BillPaymentsType.Solitaire, (int)GlobalEnumVars.BillPaymentsType.TransactionComponent }; + var list = await DbClient.Queryable() - .Where(p => p.createTime >= dt && p.status == (int)GlobalEnumVars.BillPaymentsStatus.Payed && p.type == (int)GlobalEnumVars.BillPaymentsType.Order) + .Where(p => p.createTime >= dt && p.status == (int)GlobalEnumVars.BillPaymentsStatus.Payed && types.Contains(p.type)) .Select(it => new { it.paymentId, diff --git a/CoreCms.Net.Services/Bill/CoreCmsBillPaymentsServices.cs b/CoreCms.Net.Services/Bill/CoreCmsBillPaymentsServices.cs index d9b9451e..d2b7942b 100644 --- a/CoreCms.Net.Services/Bill/CoreCmsBillPaymentsServices.cs +++ b/CoreCms.Net.Services/Bill/CoreCmsBillPaymentsServices.cs @@ -116,7 +116,15 @@ namespace CoreCms.Net.Services var dto = new CheckPayDTO(); //订单 - if (type == (int)GlobalEnumVars.BillPaymentsType.Order) + if (type == (int)GlobalEnumVars.BillPaymentsType.Common + || type == (int)GlobalEnumVars.BillPaymentsType.PinTuan + || type == (int)GlobalEnumVars.BillPaymentsType.Group + || type == (int)GlobalEnumVars.BillPaymentsType.Skill + || type == (int)GlobalEnumVars.BillPaymentsType.Bargain + || type == (int)GlobalEnumVars.BillPaymentsType.Giveaway + || type == (int)GlobalEnumVars.BillPaymentsType.Solitaire + || type == (int)GlobalEnumVars.BillPaymentsType.TransactionComponent + ) { //如果是订单生成支付单的话，取第一条订单的店铺id，后面的所有订单都要保证是此店铺的id var orderModel = await orderServices.QueryByClauseAsync(p => @@ -264,7 +272,15 @@ namespace CoreCms.Net.Services var dto = new CheckPayDTO(); //订单 - if (type == (int)GlobalEnumVars.BillPaymentsType.Order) + if (type == (int)GlobalEnumVars.BillPaymentsType.Common + || type == (int)GlobalEnumVars.BillPaymentsType.PinTuan + || type == (int)GlobalEnumVars.BillPaymentsType.Group + || type == (int)GlobalEnumVars.BillPaymentsType.Skill + || type == (int)GlobalEnumVars.BillPaymentsType.Bargain + || type == (int)GlobalEnumVars.BillPaymentsType.Giveaway + || type == (int)GlobalEnumVars.BillPaymentsType.Solitaire + || type == (int)GlobalEnumVars.BillPaymentsType.TransactionComponent + ) { //如果是订单生成支付单的话，取第一条订单的店铺id，后面的所有订单都要保证是此店铺的id foreach (var item in sourceStr) @@ -538,7 +554,7 @@ namespace CoreCms.Net.Services /// 支付类型 /// 参数 /// - private async Task ToAdd(string sourceStr, string paymentCode, int userId = 0, int type = (int)GlobalEnumVars.BillPaymentsType.Order, JObject @params = null) + private async Task ToAdd(string sourceStr, string paymentCode, int userId = 0, int type = (int)GlobalEnumVars.BillPaymentsType.Common, JObject @params = null) { var jm = new WebApiCallBack(); @@ -647,7 +663,15 @@ namespace CoreCms.Net.Services await _dal.UpdateAsync(billPaymentInfo); if (status == (int)GlobalEnumVars.BillPaymentsStatus.Payed) { - if (billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Order) + if (billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Common + || billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.PinTuan + || billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Group + || billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Skill + || billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Bargain + || billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Giveaway + || billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Solitaire + || billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.TransactionComponent + ) { //如果是订单类型，做支付后处理 await orderServices.Pay(billPaymentInfo.sourceId, paymentCode, billPaymentInfo); @@ -725,27 +749,38 @@ namespace CoreCms.Net.Services { var res = string.Empty; - switch (entity.type) + if (entity.type == (int)GlobalEnumVars.BillPaymentsType.Common + || entity.type == (int)GlobalEnumVars.BillPaymentsType.PinTuan + || entity.type == (int)GlobalEnumVars.BillPaymentsType.Group + || entity.type == (int)GlobalEnumVars.BillPaymentsType.Skill + || entity.type == (int)GlobalEnumVars.BillPaymentsType.Bargain + || entity.type == (int)GlobalEnumVars.BillPaymentsType.Giveaway + || entity.type == (int)GlobalEnumVars.BillPaymentsType.Solitaire + || entity.type == (int)GlobalEnumVars.BillPaymentsType.TransactionComponent) { - case (int)GlobalEnumVars.BillPaymentsType.Order: - var orderItem = await _orderItemServices.QueryByClauseAsync(p => p.orderId == entity.sourceId); - if (orderItem != null) - { - res = orderItem.name; - } - break; - case (int)GlobalEnumVars.BillPaymentsType.Recharge: - res = "账户充值"; - break; - case (int)GlobalEnumVars.BillPaymentsType.FormPay: - break; - case (int)GlobalEnumVars.BillPaymentsType.FormOrder: - break; - case (int)GlobalEnumVars.BillPaymentsType.ServiceOrder: - break; - default: - break; + var orderItem = await _orderItemServices.QueryByClauseAsync(p => p.orderId == entity.sourceId); + if (orderItem != null) + { + res = orderItem.name; + } } + else if (entity.type == (int)GlobalEnumVars.BillPaymentsType.Recharge) + { + res = "账户充值"; + } + else if (entity.type == (int)GlobalEnumVars.BillPaymentsType.FormPay) + { + } + else if (entity.type == (int)GlobalEnumVars.BillPaymentsType.FormOrder) + { + } + else if (entity.type == (int)GlobalEnumVars.BillPaymentsType.ServiceOrder) + { + } + else + { + } + if (string.IsNullOrEmpty(res)) { var allConfigs = await _settingServices.GetConfigDictionaries(); @@ -774,19 +809,27 @@ namespace CoreCms.Net.Services //查支付人id var userId = 0; - switch (type) + if (type == (int)GlobalEnumVars.BillPaymentsType.Common + || type == (int)GlobalEnumVars.BillPaymentsType.PinTuan + || type == (int)GlobalEnumVars.BillPaymentsType.Group + || type == (int)GlobalEnumVars.BillPaymentsType.Skill + || type == (int)GlobalEnumVars.BillPaymentsType.Bargain + || type == (int)GlobalEnumVars.BillPaymentsType.Giveaway + || type == (int)GlobalEnumVars.BillPaymentsType.Solitaire + || type == (int)GlobalEnumVars.BillPaymentsType.TransactionComponent + ) { - case (int)GlobalEnumVars.BillPaymentsType.Order: - var orderInfo = await orderServices.QueryByIdAsync(orderId); - if (orderInfo == null) - { - jm.code = 10000; - jm.msg = GlobalErrorCodeVars.Code10000; - return jm; - } - userId = orderInfo.userId; - break; + var orderInfo = await orderServices.QueryByIdAsync(orderId); + if (orderInfo == null) + { + jm.code = 10000; + jm.msg = GlobalErrorCodeVars.Code10000; + return jm; + } + + userId = orderInfo.userId; } + //::todo 校验支付方式是否存在 //生成支付单 var result = await ToAdd(orderId, paymentCode, userId, type); diff --git a/CoreCms.Net.Services/Pay/WeChatPayServices.cs b/CoreCms.Net.Services/Pay/WeChatPayServices.cs index 24a96dd4..8068cba0 100644 --- a/CoreCms.Net.Services/Pay/WeChatPayServices.cs +++ b/CoreCms.Net.Services/Pay/WeChatPayServices.cs @@ -145,7 +145,14 @@ namespace CoreCms.Net.Services // 将参数(parameter)给 公众号前端 让他在微信内H5调起支付(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6) parameter.Add("paymentId", entity.paymentId); - if (entity.type == (int)GlobalEnumVars.BillPaymentsType.Order) + if (entity.type == (int)GlobalEnumVars.BillPaymentsType.Common + || entity.type == (int)GlobalEnumVars.BillPaymentsType.PinTuan + || entity.type == (int)GlobalEnumVars.BillPaymentsType.Group + || entity.type == (int)GlobalEnumVars.BillPaymentsType.Skill + || entity.type == (int)GlobalEnumVars.BillPaymentsType.Bargain + || entity.type == (int)GlobalEnumVars.BillPaymentsType.Giveaway + || entity.type == (int)GlobalEnumVars.BillPaymentsType.Solitaire + || entity.type == (int)GlobalEnumVars.BillPaymentsType.TransactionComponent) { var payment = await billPaymentsServices.QueryByClauseAsync(p => p.paymentId == entity.paymentId); if (payment != null) diff --git a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js index 3afac60a..bae7b333 100644 --- a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js +++ b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js @@ -4,7 +4,7 @@ */ //接口请求地址，如果需要不部署接口端的情况下测试uni-app，可以直接替换为官方测试接口：https://api.demo.coreshop.cn -export const apiBaseUrl = 'https://api.demo.coreshop.cn'; +export const apiBaseUrl = 'https://api.nsts.mvccms.cn'; //项目静态资源请求地址，如果使用官方的静态文件地址可以直接替换为：https://files.cdn.coreshop.cn export const apiFilesUrl = 'https://files.cdn.coreshop.cn'; @@ -14,13 +14,35 @@ export const h5Url = apiBaseUrl + "/wap/"; //H5端网站地址, export const baseUrl = process.env.NODE_ENV === 'development' ? window.location.origin + '/' : apiBaseUrl // #endif +//支付单类型 export const paymentType = { - //支付单类型 - order: 1, //订单 - recharge: 2, //充值 - formPay: 3, //表单订单 - formOrder: 4, //表单付款码 - serviceOrder: 5, //服务订单 + //普通订单 + common: 1, + //拼团订单 + pinTuan: 2, + //团购订单 + group: 3, + //秒杀订单 + skill: 4, + + //砍价 + bargain: 6, + //赠品 + giveaway: 7, + //接龙 + solitaire: 8, + //交易组件 + transactionComponent: 10, + + //充值 + recharge: 201, + + //服务订单 + serviceOrder: 501, + //表单付款码 + formPay: 301, + //表单订单 + formOrder: 302, }; // #ifdef MP-TOUTIAO diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue index 0b93563b..a4bdaa96 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue @@ -91,7 +91,7 @@ payments = payments.filter(item => item.code !== 'alipay') // 如果是充值订单,服务订单 过滤余额支付 过滤非线上支付方式 - if (this.type === 2 || this.type === 5) { + if (this.type == this.$globalConstVars.paymentType.recharge || this.type === this.$globalConstVars.paymentType.serviceOrder) { payments = payments.filter(item => item.code !== 'balancepay' || item.isOnline === false) } @@ -112,14 +112,14 @@ payment_type: this.type, params: {} } - data['ids'] = (this.type == 1 || this.type == 3 || this.type == 4 || this.type == 5) ? this.orderId : this.uid + data['ids'] = (this.type == this.$globalConstVars.paymentType.common || this.type == this.$globalConstVars.paymentType.pinTuan || this.type == this.$globalConstVars.paymentType.group || this.type == this.$globalConstVars.paymentType.skill || this.type == this.$globalConstVars.paymentType.bargain || this.type == this.$globalConstVars.paymentType.giveaway || this.type == this.$globalConstVars.paymentType.solitaire || this.type == this.$globalConstVars.paymentType.transactionComponent) ? this.orderId : this.uid // 判断订单支付类型 - if (this.type == 2 && this.recharge) { + if (this.type == this.$globalConstVars.paymentType.recharge && this.recharge) { data['params'] = { money: this.recharge } - } else if ((this.type == 3 || this.type == 4) && this.recharge) { + } else if ((this.type == this.$globalConstVars.paymentType.formPay || this.type == this.$globalConstVars.paymentType.formOrder) && this.recharge) { data['params'] = { } } diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue index c6ccd9c9..d5b155d9 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue @@ -401,7 +401,7 @@ buyNum: 1, // 选定的购买数量 minBuyNum: 1, // 最小可购买数量 type: 2, - cartType: 3, + cartType: this.$globalConstVars.paymentType.group, isfav: false, // 商品是否收藏 //拼团列表滑动数据 swiperSet: { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue index e4cdbba8..b84fe551 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue @@ -254,7 +254,7 @@ - {{items.name}} + {{items.name}} {{items.price}}元 @@ -529,7 +529,7 @@ minBuyNum: 1, // 最小可购买数量 pinTuanType: 2, // 1单独购买 2拼团 type: 2, - cartType: 2, + cartType: this.$globalConstVars.paymentType.pinTuan, isfav: false, // 商品是否收藏 //拼团列表滑动数据 swiperSet: { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue index f15cfb98..f7b83311 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue @@ -403,7 +403,7 @@ buyNum: 1, // 选定的购买数量 minBuyNum: 1, // 最小可购买数量 type: 2, - cartType: 4, + cartType: this.$globalConstVars.paymentType.skill, isfav: false, // 商品是否收藏 //拼团列表滑动数据 swiperSet: { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue index 5367d814..7c2e6a5a 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue @@ -169,7 +169,7 @@ totalprice: '0.00', cart: [], type: 2, - cartType: 8, + cartType: this.$globalConstVars.paymentType.solitaire, shareBox: false, submitStatus: false, shareUrl: '/pages/share/jump/jump', diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue index 9b892e8f..62fff24d 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue @@ -500,16 +500,6 @@ } else if (res.data.needLogin) { console.log("要登录权限了"); this.$u.route({ type: 'switchTab', url: '/pages/index/default/default' }) - //if (this.$db.get('userToken')) { - // this.hasLogin = true - // this.$u.api.userInfo().then(res => { - // if (res.status) { - - // } - // }) - //} else { - // this.hasLogin = false - //} if (!this.hasLogin) { this.$store.commit('showLoginTip', true); diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue index 70356ca3..58eb9b6d 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue @@ -422,7 +422,7 @@ buyNum: 1, // 选定的购买数量 minBuyNum: 1, // 最小可购买数量 type: 2, // 1加入购物车 2购买 - cartType: 1, + cartType: this.$globalConstVars.paymentType.common, isfav: false, // 商品是否收藏 submitStatus: false, bottomModal: false, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue index d4051c1d..4aa7691b 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue @@ -43,8 +43,6 @@ export default { data() { return { - background: this.$coreTheme.mainNabBar.background, - titleColor: this.$coreTheme.mainNabBar.titleColor, swiperItems: [], currentIndex: 0, opacity: 0, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge/recharge.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge/recharge.vue index bc951b6d..969a6192 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge/recharge.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge/recharge.vue @@ -48,7 +48,7 @@ } ] }, - orderType: 2 // 储值类型 + orderType: this.$globalConstVars.paymentType.recharge // 储值类型 } }, onReady() { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue b/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue index d46c1942..42837a26 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue @@ -20,14 +20,14 @@ 订单类型 - 商品订单 - 充值订单 - 表单订单 - 付款码 - 服务订单 + 商品订单 + 充值订单 + 表单订单 + 付款码 + 服务订单 -