From c5a5d808b776d711d8da1485f6fee3cb18ef8151 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Tue, 22 Mar 2022 01:08:27 +0800 Subject: [PATCH] =?UTF-8?q?#=202022-03-22=20###=201.4.1=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.3.1=20=E4=B8=93=E4=B8=9A=E7=89=88=EF=BC=9A=20=E3=80=90?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=91=E5=89=8D=E7=AB=AF=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0=E4=B8=8D=E5=90=8C=E6=B5=B7?= =?UTF-8?q?=E6=8A=A5=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=85=A8=E5=B1=80=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E6=96=B9=E4=BE=BF=E8=B0=83=E7=94=A8=E3=80=82?= =?UTF-8?q?=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E4=BB=96=E4=BA=BA=E5=8F=82=E5=9B=A2=E7=9A=84=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98=E3=80=82=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=A0=81=E5=88=97=E8=A1=A8=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E4=B8=8D=E5=BC=B9=E5=87=BA=E5=BC=B9=E7=AA=97=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E5=95=86=E5=AE=B6=E4=B8=AD=E5=BF=83=E6=A0=B8=E9=94=80=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=A0=81=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82#I4YR6N=20?= =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=BA=A4=E6=98=93=E7=BB=84=E4=BB=B6=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9=E5=93=81=E7=89=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=AA=E5=85=B3=E8=81=94=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Configuration/GlobalEnumVars.cs | 8 +- .../CoreCmsUserServicesOrderServices.cs | 2 +- .../common/setting/constVarsHelper.js | 30 +++++ .../coreshop-share-wx/coreshop-share-wx.vue | 32 ++++- .../pinTuan/pinTuanDetails/pinTuanDetails.vue | 12 +- .../pages/goods/goodDetails/goodDetails.vue | 16 ++- .../merchant/serviceVerification/index.vue | 16 ++- .../order/invitationGroup/invitationGroup.vue | 64 ++++------ .../member/serviceOrder/details/details.vue | 7 +- .../CoreShop/pages/share/jump/jump.vue | 17 ++- .../CoreCmsUserServicesOrderController.cs | 2 +- ...eChatTransactionComponentGoodController.cs | 22 +++- CoreCms.Net.Web.Admin/Doc.xml | 120 +++++++++++++++++- .../transactioncomponent/goods/create.html | 5 +- .../transactioncomponent/goods/edit.html | 5 +- .../Controllers/ServiceController.cs | 8 +- CoreCms.Net.Web.WebApi/Doc.xml | 28 ++++ 17 files changed, 307 insertions(+), 87 deletions(-) diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs index 0fd42c28..d4030beb 100644 --- a/CoreCms.Net.Configuration/GlobalEnumVars.cs +++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs @@ -2559,22 +2559,22 @@ namespace CoreCms.Net.Configuration /// 正常 /// [Description("")] - Normal = 0, + 正常 = 0, /// /// 过期 /// [Description("")] - Overdue = 1, + 过期 = 1, /// /// 作废 /// [Description("")] - Cancellation = 2, + 作废 = 2, /// /// 已核销 /// [Description("")] - Verification = 3 + 已核销 = 3 } /// diff --git a/CoreCms.Net.Services/Service/CoreCmsUserServicesOrderServices.cs b/CoreCms.Net.Services/Service/CoreCmsUserServicesOrderServices.cs index 9077cdf5..1d44e3e2 100644 --- a/CoreCms.Net.Services/Service/CoreCmsUserServicesOrderServices.cs +++ b/CoreCms.Net.Services/Service/CoreCmsUserServicesOrderServices.cs @@ -92,7 +92,7 @@ namespace CoreCms.Net.Services tk.redeemCode = CommonHelper.GetSerialNumberType((int)GlobalEnumVars.SerialNumberType.服务券兑换码); tk.serviceId = model.servicesId; tk.userId = model.userId; - tk.status = (int)GlobalEnumVars.ServicesTicketStatus.Normal; + tk.status = (int)GlobalEnumVars.ServicesTicketStatus.正常; tk.validityType = servicesModel.validityType; tk.validityStartTime = servicesModel.validityStartTime; tk.validityEndTime = servicesModel.validityEndTime; diff --git a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js index 1d3b04e1..26026c1e 100644 --- a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js +++ b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js @@ -45,6 +45,36 @@ export const paymentType = { formOrder: 302, }; + +//分享链接及海报类型 +export const shareType = { + // 首页 + index: 1, + // 2商品详情页 + goods: 2, + // 3拼团详情页 + pinTuan: 3, + // 4店铺邀请 + inv: 4, + // 5文章页面 + article: 5, + // 6参团页面 + addPinTuan: 6, + // 7自定义页面 + page: 7, + // 8智能表单 + form: 8, + // 9团购 + group: 9, + // 10秒杀 + seckill: 10, + // 11代理 + agent: 11, + // 12接龙 + solitaire: 12, +}; + + // #ifdef MP-TOUTIAO export const ttPlatform = 'toutiao'; //toutiao=今日头条小程序, douyin=抖音小程序, pipixia=皮皮虾小程序, huoshan=火山小视频小程序 // #endif diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-wx/coreshop-share-wx.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-wx/coreshop-share-wx.vue index 08da4e3e..4c6c9e17 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-wx/coreshop-share-wx.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-wx/coreshop-share-wx.vue @@ -55,7 +55,7 @@ //分享类型 shareType: { type: Number, - default: 2 + default: 1 }, //拼团id groupId: { @@ -74,7 +74,7 @@ } }, mounted() { - + // console.log("类型：" + this.shareType); }, methods: { // 关闭弹出层 @@ -84,7 +84,7 @@ // 生成海报 createPoster() { let data = {}; - if (this.shareType == 2) { + if (this.shareType == this.$globalConstVars.shareType.index) { data = { page: this.shareType, //商品 url: 'pages/share/jump/jump', @@ -98,7 +98,24 @@ if (userToken) { data.token = userToken } - } else if (this.shareType == 3) { + } else if (this.shareType == this.$globalConstVars.shareType.pinTuan) { + data = { + page: this.shareType, //拼团 + url: 'pages/share/jump/jump', + params: { + goodsId: this.goodsId, + teamId: this.teamId + }, + type: 3,//参团 + client: 2 + } + let userToken = this.$db.get('userToken') + if (userToken) { + data.token = userToken + } + console.log(data); + } + else if (this.shareType == this.$globalConstVars.shareType.addPinTuan) { data = { page: this.shareType, //拼团 url: 'pages/share/jump/jump', @@ -107,16 +124,17 @@ groupId: this.groupId, teamId: this.teamId }, - type: 3,//海报 + type: 3,//参团 client: 2 } let userToken = this.$db.get('userToken') if (userToken) { data.token = userToken } - } else if (this.shareType == 12) { + console.log(data); + } else if (this.shareType == this.$globalConstVars.shareType.solitaire) { data = { - page: this.shareType, //拼团 + page: this.shareType, url: 'pages/share/jump/jump', params: { id: this.objectId 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 d7ab135c..e12e6e3b 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 @@ -294,19 +294,19 @@ - + - + - + - + - +
@@ -566,7 +566,7 @@ console.log(e); this.goodsId = e.id; this.pinTuanId = e.pinTuanId; - if (e.teamId) { + if (e.teamId && e.teamId > 0) { this.teamId = e.teamId; this.getTeam(this.teamId); } 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 4b6a5d91..74427f3c 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue @@ -11,9 +11,7 @@ - - - + {{ product.price || '0.00' }} @@ -427,6 +425,7 @@ goodsId: 0, // 商品id goodsInfo: {}, // 商品详情 cartNums: 0, // 购物车数量 + bannerList: [], // 幻灯片 product: {}, // 货品详情 shopRecommendData: [], // 本店推荐数据 otherRecommendData: [], // 其他数据 @@ -610,11 +609,20 @@ _this.goodsInfo = info; if (_this.goodsInfo.album && _this.goodsInfo.video) { + var sw = []; var videoObj = { url: _this.goodsInfo.video, poster: _this.goodsInfo.image }; - _this.goodsInfo.album.unshift(videoObj); + sw.push(videoObj); + for (var i = 0; i < _this.goodsInfo.album.length; i++) { + let img = { + url: _this.goodsInfo.album[i] + }; + sw.push(img); + } + _this.bannerList = sw; + console.log(_this.bannerList); _this.autoplay = false; } diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/index.vue index f60a24fc..fbe4a9c5 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/index.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/index.vue @@ -28,14 +28,16 @@ 服务单号：{{ticket.serviceOrderId}} - - - - + + + + - + + + {{service.title}} 是否核销：{{ticket.isVerification?'是':'否'}} @@ -43,12 +45,12 @@ 服务券状态：{{ ticket.statusStr }} - + 可核销时间：{{ticket.validityStartTime}} 至 {{ticket.validityEndTime}} - + 下单时间：{{ $u.timeFormat(ticket.createTime, 'mm-dd hh:MM:ss') }} diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue index 67d10ca4..b5b02c17 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue @@ -13,7 +13,7 @@ - 剩余： + 剩余： @@ -41,29 +41,19 @@ - + - + - + - + - + @@ -219,10 +209,11 @@ client: 2, url: "/pages/share/jump/jump", type: 1, - page: 3, + page: this.$globalConstVars.shareType.addPinTuan, params: { goodsId: this.goodsInfo.goodsId, - teamId: this.teamInfo.list[0].teamId + teamId: this.teamInfo.teamId, + groupId: this.teamInfo.ruleId } }; let userToken = this.$db.get('userToken'); @@ -234,32 +225,33 @@ }); } }, - //watch: { - // goodsInfo: { - // handler() { - // this.getShareUrl(); - // }, - // deep: true - // }, - // teamInfo: { - // handler() { - // this.getShareUrl(); - // }, - // deep: true - // } - //}, + watch: { + goodsInfo: { + handler() { + this.getShareUrl(); + }, + deep: true + }, + teamInfo: { + handler() { + this.getShareUrl(); + }, + deep: true + } + }, //分享 onShareAppMessage(res) { + console.log(this.shareUrl); return { - title: this.$store.state.config.shareTitle, - imageUrl: this.$store.state.config.shareImage, + title: this.goodsInfo.name, + imageUrl: this.goodsInfo.imageUrl, path: this.shareUrl } }, onShareTimeline(res) { return { - title: this.$store.state.config.shareTitle, - imageUrl: this.$store.state.config.shareImage, + title: this.goodsInfo.name, + imageUrl: this.goodsInfo.imageUrl, path: this.shareUrl } }, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue index fde1bb37..05adfeef 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue @@ -64,7 +64,7 @@ - + @@ -132,6 +132,9 @@ } }) }, + close() { + this.show = false + }, showQrcodeBox(index) { let _this = this; var item = _this.list[index]; @@ -141,6 +144,8 @@ } }, make(textStr) { + console.log(textStr); + console.log(uQRCode); uQRCode.make({ canvasId: 'qrcode', componentInstance: this, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue index fa8eb49d..c0a9fe51 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue @@ -128,15 +128,14 @@ } }, //跳转到参团 - //todo:: 功能暂无后续开发 - // gotoInvitationGroup(id, groupId, teamId) { - // if(id && id != '' && groupId && groupId != '' && teamId && teamId != ''){ - // let url = '/pages/member/order/invitationGroup/invitationGroup?id=' + id + '&groupId=' + groupId + '&teamId=' + teamId; - // this.$u.route({ type: 'redirectTo', url: url }); - // }else{ - // this.gotoIndex(); - // } - // }, + gotoInvitationGroup(goodsId, groupId, teamId) { + if (goodsId && groupId && teamId) { + let url = '/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails?id=' + goodsId + '&pinTuanId=' + groupId + '&teamId=' + teamId; + this.$u.route({ type: 'redirectTo', url: url }); + } else { + this.gotoIndex(); + } + }, //跳转到自定义页 gotoCustom(pageCode) { if (pageCode && pageCode != '') { diff --git a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs index 18c3922e..fba81520 100644 --- a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs @@ -919,7 +919,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = "不存在此信息"; return jm; } - oldModel.status = (int)GlobalEnumVars.ServicesTicketStatus.Cancellation; + oldModel.status = (int)GlobalEnumVars.ServicesTicketStatus.作废; var bl = await _coreCmsUserServicesTicketServices.UpdateAsync(oldModel); diff --git a/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatTransactionComponentGoodController.cs b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatTransactionComponentGoodController.cs index d6749bc6..9dcd10ff 100644 --- a/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatTransactionComponentGoodController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatTransactionComponentGoodController.cs @@ -56,12 +56,15 @@ namespace CoreCms.Net.Web.Admin.Controllers private readonly ICoreCmsProductsServices _productsServices; private readonly WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory; + private readonly IWeChatTransactionComponentBrandAuditServices _weChatTransactionComponentBrandAuditServices; + + /// /// 构造函数 /// public WeChatTransactionComponentGoodController(IWebHostEnvironment webHostEnvironment - , IWeChatTransactionComponentGoodServices weChatTransactionComponentGoodsServices, IWeChatTransactionComponentGoodSKUServices weChatTransactionComponentGoodSkuServices, ICoreCmsProductsServices productsServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, IWeChatTransactionComponentAuditCategoryServices weChatTransactionComponentAuditCategoryServices) + , IWeChatTransactionComponentGoodServices weChatTransactionComponentGoodsServices, IWeChatTransactionComponentGoodSKUServices weChatTransactionComponentGoodSkuServices, ICoreCmsProductsServices productsServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, IWeChatTransactionComponentAuditCategoryServices weChatTransactionComponentAuditCategoryServices, IWeChatTransactionComponentBrandAuditServices weChatTransactionComponentBrandAuditServices) { _webHostEnvironment = webHostEnvironment; _weChatTransactionComponentGoodsServices = weChatTransactionComponentGoodsServices; @@ -69,6 +72,7 @@ namespace CoreCms.Net.Web.Admin.Controllers _productsServices = productsServices; _weChatApiHttpClientFactory = weChatApiHttpClientFactory; _weChatTransactionComponentAuditCategoryServices = weChatTransactionComponentAuditCategoryServices; + _weChatTransactionComponentBrandAuditServices = weChatTransactionComponentBrandAuditServices; } #region 获取列表============================================================ @@ -279,10 +283,18 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public AdminUiCallBack GetCreate() + public async Task GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; + + var brand = await _weChatTransactionComponentBrandAuditServices.QueryListByClauseAsync(p => p.brandId > 0 && p.status == (int)AuditEnum.AuditCategoryStatus.审核成功); + + jm.data = new + { + brand + }; + return jm; } #endregion @@ -328,13 +340,15 @@ namespace CoreCms.Net.Web.Admin.Controllers var products = await _productsServices.QueryListByClauseAsync(p => p.goodsId == goodId && p.isDel == false, p => p.id, OrderByType.Asc, true); var sku = await _weChatTransactionComponentGoodSkuServices.QueryListByClauseAsync(p => p.outProductId == model.outProductId, p => p.id, OrderByType.Asc, true); + var brand = await _weChatTransactionComponentBrandAuditServices.QueryListByClauseAsync(p => p.brandId > 0 && p.status == (int)AuditEnum.AuditCategoryStatus.审核成功); jm.code = 0; jm.data = new { model, products, - sku + sku, + brand }; return jm; @@ -418,7 +432,7 @@ namespace CoreCms.Net.Web.Admin.Controllers request.HeadImageUrlList = new List(model.headImg.Split(",")); var category = await _weChatTransactionComponentAuditCategoryServices.QueryByClauseAsync(p => p.level3 == model.thirdCatId, true); - if (category!=null && !string.IsNullOrEmpty(category.certificateImage)) + if (category != null && !string.IsNullOrEmpty(category.certificateImage)) { request.QualificationPictureUrlList = new List(category.certificateImage.Split(",")); } diff --git a/CoreCms.Net.Web.Admin/Doc.xml b/CoreCms.Net.Web.Admin/Doc.xml index 1fe60dda..7d6c8ea6 100644 --- a/CoreCms.Net.Web.Admin/Doc.xml +++ b/CoreCms.Net.Web.Admin/Doc.xml @@ -625,6 +625,12 @@ + + + 后台生成商品小程序码 + + + 后台生成预览页面设计小程序码 @@ -3121,6 +3127,41 @@ + + + 日历签到设置 + + + + + 构造函数 + + + + + 首页数据 + + + + + + 保存提交 + + + + + + + 保存累计签到规则 + + + + + + 保存连续签到规则 + + + 物流公司表 @@ -5303,6 +5344,76 @@ + + + 自定义交易组件上传品牌信息 + + + + + 构造函数 + + + + + 获取列表 + + + + + + 首页数据 + + + + + + 创建数据 + + + + + + 创建提交 + + + + + + + 编辑数据 + + + + + + + 编辑提交 + + + + + + + 单选删除 + + + + + + + 预览数据 + + + + + + + 提交审核 + + + + 自定义交易组件快递公司 @@ -5336,7 +5447,7 @@ 自定义交易组件商品列表 - + 构造函数 @@ -5443,6 +5554,13 @@ + + + 提交更新 + + + + 自定义交易组件三级类目 diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/create.html index c53520b2..a89ac93f 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/create.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/create.html @@ -30,7 +30,10 @@
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/edit.html index 4fdaf9fb..b0a2639b 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/edit.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/edit.html @@ -23,7 +23,10 @@
diff --git a/CoreCms.Net.Web.WebApi/Controllers/ServiceController.cs b/CoreCms.Net.Web.WebApi/Controllers/ServiceController.cs index 422911ea..4e304653 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/ServiceController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/ServiceController.cs @@ -296,8 +296,8 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.msg = "未查询到服务券"; return jm; } - - ticket.statusStr = EnumHelper.GetEnumDescriptionByValue(ticket.status); + var enumModel = EnumHelper.GetEnumberEntity(ticket.status); + ticket.statusStr = enumModel.title; var service = await _servicesServices.QueryByClauseAsync(p => p.id == ticket.serviceId); var serviceOrder = @@ -338,7 +338,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers return jm; } - if (ticket.status != (int)GlobalEnumVars.ServicesTicketStatus.Normal) + if (ticket.status != (int)GlobalEnumVars.ServicesTicketStatus.正常) { jm.msg = "服务券状态不支持核销"; return jm; @@ -383,7 +383,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers isDel = false }; - ticket.status = (int)GlobalEnumVars.ServicesTicketStatus.Verification; + ticket.status = (int)GlobalEnumVars.ServicesTicketStatus.已核销; ticket.verificationTime = DateTime.Now; ticket.isVerification = true; var up = await _userServicesTicketServices.UpdateAsync(ticket); diff --git a/CoreCms.Net.Web.WebApi/Doc.xml b/CoreCms.Net.Web.WebApi/Doc.xml index 8320e63e..3ebc48d5 100644 --- a/CoreCms.Net.Web.WebApi/Doc.xml +++ b/CoreCms.Net.Web.WebApi/Doc.xml @@ -176,6 +176,34 @@ + + + 签到控制器 + + + + + 构造函数 + + + + + 用户签到 + + + + + + 获取用户总签到次数 + + + + + + 获取用户按月签到数据 + + + 通用调用接口数据