From 81dcf814d1736d07b9045488a858557a812c3c70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= <jianweie@163.com>
Date: Mon, 31 Oct 2022 05:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=AF=B9=E6=8E=A5PC=E7=AB=AF?=
 =?UTF-8?q?=E3=80=82=20=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0DTO=E7=B1=BB=E5=BA=93=EF=BC=8C=E5=B0=86=E9=80=90?=
 =?UTF-8?q?=E6=AD=A5=E5=AE=8C=E5=96=84dto=E5=B1=82=E3=80=82=20=E3=80=90?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E3=80=90=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E3=80=91=E5=88=87=E6=8D=A2=E5=90=8E=EF=BC=8C=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=9B=9E=E6=9D=A5=E6=9C=AA=E6=B8=85=E9=9B=B6=E5=8E=9F?=
 =?UTF-8?q?=E5=A7=8B=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82=20=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=A8=A1=E6=9D=BF=E5=BA=93=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E6=A8=A1=E6=9D=BF=E5=BA=93=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E8=80=8C=E5=AF=BC=E8=87=B4=E7=9A=84=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=A4=B1=E8=B4=A5=E3=80=82=E6=9A=82=E5=B0=86=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=BA=93=E7=9A=84=E4=BB=A3=E7=A0=81=E5=AD=98=E6=94=BE?=
 =?UTF-8?q?=E5=88=B0=E4=BC=9A=E5=91=98QQ=E7=BE=A4=E5=86=85=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=E4=B8=8B=E8=BD=BD=E4=BD=BF=E7=94=A8=E3=80=82?=
 =?UTF-8?q?=20=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E3=80=90Repository.tpl=E3=80=91?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4Cache=E6=89=8B=E5=8A=A8=E5=A2=9E=E5=88=A0?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E3=80=90SqlSugarSetup=E3=80=91=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0sqlsugar=E8=87=AA=E5=8A=A8=E6=A3=80=E6=B5=8B=E5=A2=9E?=
 =?UTF-8?q?=E5=88=A0=E6=94=B9=E5=90=8E=E6=B8=85=E7=90=86=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E3=80=82=20=E3=80=90=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E3=80=91=E5=90=8E=E7=AB=AF=E6=96=B0=E5=A2=9E=E7=A7=92=E6=9D=80?=
 =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BB=84=E4=BB=B6=EF=BC=8C=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=9B=A2=E8=B4=AD=E5=8F=8A=E7=A7=92=E6=9D=80?=
 =?UTF-8?q?=E7=9A=84=E5=B7=AE=E5=BC=82=EF=BC=8C=E9=A6=96=E9=A1=B5=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=A7=92=E6=9D=80=E7=BB=84=E4=BB=B6=E3=80=82=20?=
 =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E9=87=8D=E5=86=99=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=89=80=E6=9C=89=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=8F=8A=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=95=88=E7=8E=87=E3=80=82=20=E3=80=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96=E6=8B=BC=E5=9B=A2=EF=BC=8C=E7=A7=92?=
 =?UTF-8?q?=E6=9D=80=EF=BC=8C=E5=9B=A2=E8=B4=AD=EF=BC=8C=E6=8E=A5=E9=BE=99?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E5=8D=87=E5=88=97=E8=A1=A8=E5=8F=8A=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E6=95=88?=
 =?UTF-8?q?=E7=8E=87=E3=80=82=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=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=EF=BC=8C=E6=9C=8D=E5=8A=A1=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=8E=A8=E5=B9=BF=E6=B5=B7=E6=8A=A5=E4=B8=BA=E6=96=B0?=
 =?UTF-8?q?=E5=BC=8F=E6=B5=B7=E6=8A=A5=E6=95=88=E6=9E=9C=E3=80=82=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=95=86=E5=93=81=E6=8E=A8=E5=B9=BF?=
 =?UTF-8?q?=E6=B5=B7=E6=8A=A5=E3=80=82=20=E3=80=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E6=B8=85=E7=90=86h5=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=88=A4=E6=96=AD=EF=BC=8C=E7=A7=BB=E9=99=A4h5?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=8F=90=E9=AB=98?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E9=80=9F=E5=BA=A6=E3=80=82=20=E3=80=90?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E7=A7=BB=E9=99=A4=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E5=89=8D=E7=AB=AF=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82=E5=8A=A0=E5=BF=AB=E4=BB=A3=E7=A0=81=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=95=88=E7=8E=87=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrudTemplete/Repositories/Repository.tpl  |  10 +-
 CoreCms.Net.Configuration/GlobalEnumVars.cs   |  39 +-
 CoreCms.Net.Core/Config/SqlSugarSetup.cs      |   7 +-
 CoreCms.Net.DTO/CoreCms.Net.DTO.csproj        |   9 +
 CoreCms.Net.DTO/GroupPurchaseSeckillDTO.cs    | 112 +++
 CoreCms.Net.DTO/PinTuanListDTO.cs             | 120 +++
 .../Article/ICoreCmsArticleTypeRepository.cs  |  38 +-
 .../CoreCms.Net.IRepository.csproj            |   1 +
 .../Good/ICoreCmsGoodsRepository.cs           |  13 +
 .../Pintuan/ICoreCmsPintuanRuleRepository.cs  |  16 +
 .../Shop/ICoreCmsNoticeRepository.cs          |  10 +-
 .../Article/ICoreCmsArticleTypeServices.cs    |  35 +-
 .../CoreCms.Net.IServices.csproj              |   1 +
 .../Good/ICoreCmsGoodsServices.cs             |  16 +-
 .../Pintuan/ICoreCmsPintuanRuleServices.cs    |  18 +-
 .../Promotion/ICoreCmsPromotionServices.cs    |   4 +-
 .../Shop/ICoreCmsNoticeServices.cs            |  10 +-
 .../Promotion/CoreCmsPromotionCondition.cs    |   2 +-
 .../Promotion/CoreCmsPromotionResult.cs       |   2 +-
 .../Service/CoreCmsServicesPartial.cs         |   7 +
 CoreCms.Net.Model/FromBody/FMGroup.cs         |   7 +-
 CoreCms.Net.Model/ViewModels/DTO/OrderDTO.cs  |   4 +-
 CoreCms.Net.Model/ViewModels/DTO/UserDto.cs   |   2 +-
 .../Agent/CoreCmsAgentGradeRepository.cs      |  10 +-
 .../Api/CoreCmsPrinterRepository.cs           |   6 +-
 .../Article/CoreCmsArticleTypeRepository.cs   |  81 +-
 ...CoreCmsContinuousCheckInRulesRepository.cs |   8 +-
 .../CoreCmsDistributionGradeRepository.cs     |  14 +-
 .../CoreCmsDistributionResultRepository.cs    |  10 +-
 .../Good/CoreCmsGoodsCategoryRepository.cs    |   6 +-
 .../Good/CoreCmsGoodsRepository.cs            | 133 ++-
 .../Good/CoreCmsGoodsTypeSpecRepository.cs    |  14 +-
 .../Order/CoreCmsOrderRepository.cs           |   1 -
 .../Pintuan/CoreCmsPintuanRuleRepository.cs   |  67 ++
 .../Shop/CoreCmsAreaRepository.cs             |   6 +-
 .../Shop/CoreCmsNoticeRepository.cs           |  32 +-
 ...CoreCmsOrderDistributionModelRepository.cs |   6 +-
 .../CoreCmsServiceDescriptionRepository.cs    |   6 +-
 .../CoreCmsSolitaireItemsRepository.cs        |   8 +-
 .../System/SysMenuRepository.cs               |   8 +-
 .../Article/CoreCmsArticleTypeServices.cs     |  50 +-
 .../CoreCms.Net.Services.csproj               |   1 +
 .../Good/CoreCmsGoodsServices.cs              |  15 +-
 .../Order/CoreCmsOrderServices.cs             |   1 +
 CoreCms.Net.Services/Pay/AliPayServices.cs    |   3 +-
 CoreCms.Net.Services/Pay/WeChatPayServices.cs |  67 +-
 .../Pintuan/CoreCmsPintuanGoodsServices.cs    |   6 +-
 .../Pintuan/CoreCmsPintuanRuleServices.cs     |  70 +-
 .../Promotion/CoreCmsPromotionServices.cs     | 141 +--
 .../Share/CoreCmsShareServices.cs             |  58 +-
 .../Shop/CoreCmsNoticeServices.cs             |  12 +-
 .../Shop/CoreCmsPagesServices.cs              | 918 +++++++++---------
 CoreCms.Net.Uni-App/CoreShop/App.vue          |  21 +-
 .../CoreShop/common/mixins/mixinsHelper.js    |  33 +-
 .../CoreShop/common/request/http.api.js       |  17 +-
 .../CoreShop/common/request/request.js        |   8 +-
 .../common/setting/constVarsHelper.js         |  61 +-
 .../common/setting/coreThemeHelper.js         |  25 -
 .../CoreShop/common/utils/commonHelper.js     |  73 --
 .../coreshop-login-modal.vue                  |   2 +-
 .../coreshop-page/coreshop-article.vue        |  55 +-
 .../coreshop-articleClassify.vue              |  47 +-
 .../coreshop-page/coreshop-blank.vue          |  13 +-
 .../coreshop-page/coreshop-content.vue        |   9 -
 .../coreshop-page/coreshop-coupon.vue         | 127 +--
 .../coreshop-page/coreshop-goodTabBar.vue     | 245 +++--
 .../coreshop-page/coreshop-goods.vue          | 198 ++--
 .../coreshop-page/coreshop-groupPurchase.vue  | 132 ++-
 .../coreshop-page/coreshop-imgSingle.vue      |  24 +-
 .../coreshop-page/coreshop-imgSlide.vue       |  24 +-
 .../coreshop-page/coreshop-imgWindow.vue      |  59 +-
 .../coreshop-page/coreshop-navBar.vue         |  13 +-
 .../coreshop-page/coreshop-notice.vue         |  22 +-
 .../coreshop-page/coreshop-page.vue           | 166 ++--
 .../coreshop-page/coreshop-pinTuan.vue        | 104 +-
 .../coreshop-page/coreshop-record.vue         |  12 +-
 .../coreshop-page/coreshop-search.vue         |  21 +-
 .../coreshop-page/coreshop-seckill.vue        | 141 +++
 .../coreshop-page/coreshop-serviceGood.vue    | 125 +++
 .../coreshop-page/coreshop-tabbar.vue         |   9 -
 .../coreshop-page/coreshop-textarea.vue       |  16 +-
 .../coreshop-page/coreshop-video.vue          |   8 +-
 .../coreshop-share-h5/coreshop-share-h5.vue   | 185 ----
 .../coreshop-share-wx/coreshop-share-wx.vue   |  65 +-
 .../components/fy-dropdown/fy-dropdown.vue    |  11 +-
 CoreCms.Net.Uni-App/CoreShop/main.js          |   4 -
 CoreCms.Net.Uni-App/CoreShop/manifest.json    | 339 ++++---
 CoreCms.Net.Uni-App/CoreShop/pages.json       |   7 -
 .../activity/checkIn/checkIn/checkIn.vue      |   2 +-
 .../groupBuyingDetails/groupBuyingDetails.vue |  50 +-
 .../pages/activity/groupBuying/list/list.vue  | 115 ++-
 .../pages/activity/pinTuan/list/list.vue      |  75 +-
 .../pinTuan/pinTuanDetails/details.scss       |   7 +-
 .../pinTuan/pinTuanDetails/pinTuanDetails.vue | 194 ++--
 .../pages/activity/seckill/list/list.vue      | 144 ++-
 .../seckill/seckillDetails/seckillDetails.vue |  74 +-
 .../pages/activity/solitaire/list/list.vue    |  11 +-
 .../solitaireDetails/solitaireDetails.vue     |  53 +-
 .../pages/article/details/details.vue         |  10 +-
 .../CoreShop/pages/category/index/index.scss  |   2 +-
 .../CoreShop/pages/category/index/index.vue   |  12 +-
 .../CoreShop/pages/category/list/list.vue     |  16 +-
 .../CoreShop/pages/form/details/details.vue   |  25 +-
 .../pages/goods/goodComments/goodComments.vue |   2 +-
 .../pages/goods/goodDetails/goodDetails.vue   |  77 +-
 .../CoreShop/pages/index/cart/cart.vue        |   4 +-
 .../CoreShop/pages/index/custom/custom.vue    |  29 +-
 .../CoreShop/pages/index/default/default.vue  |  19 +-
 .../CoreShop/pages/index/member/member.vue    |  12 +-
 .../pages/login/loginBySMS/loginBySMS.vue     |   4 +-
 .../pages/member/address/list/list.vue        |   2 +-
 .../CoreShop/pages/member/address/map/map.vue |  28 +-
 .../pages/member/afterSales/list/list.vue     |   2 +-
 .../pages/member/afterSales/submit/submit.vue |   2 +-
 .../pages/member/agent/myStore/myStore.vue    |  45 +-
 .../pages/member/agent/panel/panel.vue        |  32 +-
 .../member/balance/bankcard/bankcard.vue      |   2 +-
 .../member/distribution/myStore/myStore.vue   |  50 +-
 .../pages/member/distribution/panel/panel.vue |  33 +-
 .../CoreShop/pages/member/invite/index.vue    |  90 +-
 .../pages/member/merchant/detail/detail.vue   |   6 +-
 .../pages/member/merchant/index/index.vue     |  11 -
 .../pages/member/merchant/search/index.vue    |   8 +-
 .../merchant/serviceVerification/index.vue    |   2 +-
 .../member/merchant/takeDelivery/index.vue    |   2 +-
 .../member/merchant/takeDelivery/list.vue     |   2 +-
 .../pages/member/order/detail/detail.scss     |   1 +
 .../pages/member/order/detail/detail.vue      |  34 +-
 .../pages/member/order/evaluate/evaluate.vue  |   9 +-
 .../pages/member/order/index/index.vue        |   5 +-
 .../order/invitationGroup/invitationGroup.vue |  26 +-
 .../pages/member/serviceOrder/index/index.vue |   2 +-
 .../CoreShop/pages/notice/details/details.vue |  10 +-
 .../components/coreshop-paymentsByApp.vue     |   3 +-
 .../components/coreshop-paymentsByH5.vue      | 334 -------
 .../components/coreshop-paymentsByWx.vue      |   9 +-
 .../CoreShop/pages/payment/pay/pay.vue        |  21 +-
 .../pages/payment/waiting/waiting.scss        |   6 -
 .../pages/payment/waiting/waiting.vue         | 135 ---
 .../CoreShop/pages/placeOrder/index/index.vue |  15 +-
 .../pages/placeOrder/invoice/invoice.vue      |   4 +-
 .../pages/placeOrder/storeList/storeList.vue  |   6 +-
 .../pages/serviceGoods/details/details.vue    | 173 +++-
 .../pages/serviceGoods/index/index.scss       |   7 -
 .../pages/serviceGoods/index/index.vue        |  88 +-
 .../CoreShop/pages/share/jump/jump.vue        |  50 +-
 .../share/shareNewPoster/shareNewPoster.vue   | 133 ++-
 .../pages/share/sharePoster/sharePoster.vue   |  12 +-
 .../CoreShop/pages/storeMap/storeMap.scss     |   2 +-
 .../CoreShop/static/style/coreCommon.scss     |   9 +-
 .../style/{style.vue.scss => style.app.scss}  |  27 +
 .../CoreShop/static/style/style.mp.scss       |  22 +-
 .../CoreShop/static/style/tags.scss           |   2 +-
 .../Article/CoreCmsArticleTypeController.cs   |  20 +-
 .../Controllers/Com/ToolsController.cs        |   4 +-
 CoreCms.Net.Web.Admin/appsettings.json        |   2 +-
 .../wwwroot/lib/custom/css/style.css          |  18 +-
 .../wwwroot/lib/custom/css/style.less         |   2 +-
 .../wwwroot/lib/custom/css/style.min.css      |   2 +-
 .../wwwroot/lib/custom/js/main.js             |  63 +-
 .../wwwroot/lib/layuiAdmin/config.js          |   2 +-
 .../wwwroot/lib/layuiAdmin/index.js           |   2 +-
 .../wwwroot/views/common/getGroupIds.html     |   6 +-
 .../wwwroot/views/common/getSeckillIds.html   | 132 +++
 .../wwwroot/views/shop/pages/design.html      |  68 +-
 .../Controllers/GroupController.cs            |   8 +-
 .../Controllers/OrderController.cs            |  54 +-
 .../Controllers/PageController.cs             |  54 +-
 .../Controllers/PinTuanController.cs          |   4 +-
 .../Controllers/ServiceController.cs          |  59 +-
 .../Controllers/StoreController.cs            |   6 +-
 CoreCms.Net.Web.WebApi/appsettings.json       |   2 +-
 CoreShopProfessional.sln                      |  11 +-
 173 files changed, 4172 insertions(+), 3408 deletions(-)
 create mode 100644 CoreCms.Net.DTO/CoreCms.Net.DTO.csproj
 create mode 100644 CoreCms.Net.DTO/GroupPurchaseSeckillDTO.cs
 create mode 100644 CoreCms.Net.DTO/PinTuanListDTO.cs
 delete mode 100644 CoreCms.Net.Uni-App/CoreShop/common/setting/coreThemeHelper.js
 create mode 100644 CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue
 create mode 100644 CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-serviceGood.vue
 delete mode 100644 CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-h5/coreshop-share-h5.vue
 delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/payment/components/coreshop-paymentsByH5.vue
 delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.scss
 delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.vue
 delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.scss
 rename CoreCms.Net.Uni-App/CoreShop/static/style/{style.vue.scss => style.app.scss} (91%)
 create mode 100644 CoreCms.Net.Web.Admin/wwwroot/views/common/getSeckillIds.html

diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/Repository.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/Repository.tpl
index 7c67548a..1b2b795e 100644
--- a/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/Repository.tpl
+++ b/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/Repository.tpl
@@ -45,7 +45,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Insertable(entity).RemoveDataCache().ExecuteReturnIdentityAsync() > 0;
+            var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0;
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
 
@@ -71,7 +71,7 @@ namespace CoreCms.Net.Repository
         	{% for field in ModelFields %}oldModel.{{field.DbColumnName}} = entity.{{field.DbColumnName}};
             {% endfor %}
             //事物处理过程结束
-            var bl = await DbClient.Updateable(oldModel).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
 
@@ -87,7 +87,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Updateable(entity).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(entity).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
 
@@ -103,7 +103,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Deleteable<{{ModelClassName}}>(id).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<{{ModelClassName}}>(id).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
 
@@ -119,7 +119,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Deleteable<{{ModelClassName}}>().In(ids).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<{{ModelClassName}}>().In(ids).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
 
diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs
index 70e13a7e..b27df945 100644
--- a/CoreCms.Net.Configuration/GlobalEnumVars.cs
+++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs
@@ -417,19 +417,19 @@ namespace CoreCms.Net.Configuration
         public enum OrderStatus
         {
             /// <summary>
-            /// 订单正常
+            /// 进行中
             /// </summary>
-            [Description("<button type='button' class='layui-btn  layui-btn-normal  layui-btn-xs'>订单正常</button>")]
+            [Description("<button type='button' class='layui-btn  layui-btn-normal  layui-btn-xs'>进行中</button>")]
             Normal = 1,
             /// <summary>
-            /// 订单完成
+            /// 已完结
             /// </summary>
-            [Description("<button type='button' class='layui-btn  layui-btn-primary layui-btn-xs'>订单完成</button>")]
+            [Description("<button type='button' class='layui-btn  layui-btn-primary layui-btn-xs'>已完结</button>")]
             Complete = 2,
             /// <summary>
-            /// 订单取消
+            /// 已取消
             /// </summary>
-            [Description("<button type='button' class='layui-btn  layui-btn-primary layui-btn-disabled layui-btn-xs'>订单取消</button>")]
+            [Description("<button type='button' class='layui-btn  layui-btn-primary layui-btn-disabled layui-btn-xs'>已取消</button>")]
             Cancel = 3
         }
 
@@ -439,19 +439,19 @@ namespace CoreCms.Net.Configuration
         public enum OrderStatusDescription
         {
             /// <summary>
-            /// 订单正常
+            /// 进行中
             /// </summary>
-            [Description("正常（-）")]
+            [Description("进行中（-）")]
             Normal = 1,
             /// <summary>
-            /// 订单完成
+            /// 已完结
             /// </summary>
-            [Description("完成（√）")]
+            [Description("已完结（√）")]
             Complete = 2,
             /// <summary>
-            /// 订单取消
+            /// 已取消
             /// </summary>
-            [Description("取消（×）")]
+            [Description("已取消（×）")]
             Cancel = 3
         }
 
@@ -1696,15 +1696,15 @@ namespace CoreCms.Net.Configuration
         /// </summary>
         public enum WeiChatPayTradeType
         {
-            [Description("JSAPI")]
+            [Description("JSAPI(小程序支付)")]
             JSAPI = 1,
-            [Description("JSAPI_OFFICIAL")]
+            [Description("JSAPI_OFFICIAL(公众号支付)")]
             JSAPI_OFFICIAL = 2,
-            [Description("NATIVE")]
+            [Description("NATIVE(扫码支付)")]
             NATIVE = 3,
-            [Description("APP")]
+            [Description("APP(APP支付)")]
             APP = 4,
-            [Description("MWEB")]
+            [Description("MWEB(H5支付)")]
             MWEB = 5
         }
 
@@ -1944,6 +1944,11 @@ namespace CoreCms.Net.Configuration
             /// </summary>
             [Description("12接龙")]
             Solitaire = 12,
+            /// <summary>
+            /// 13服务商品
+            /// </summary>
+            [Description("13服务商品")]
+            ServiceGoods = 13,
         }
 
         /// <summary>
diff --git a/CoreCms.Net.Core/Config/SqlSugarSetup.cs b/CoreCms.Net.Core/Config/SqlSugarSetup.cs
index 6cf727c0..0ee70a9c 100644
--- a/CoreCms.Net.Core/Config/SqlSugarSetup.cs
+++ b/CoreCms.Net.Core/Config/SqlSugarSetup.cs
@@ -39,7 +39,7 @@ namespace CoreCms.Net.Core.Config
                 //判断数据库类型
                 DbType = AppSettingsConstVars.DbDbType == IocDbType.MySql.ToString() ? IocDbType.MySql : IocDbType.SqlServer,
                 //是否开启自动关闭数据库连接
-                IsAutoCloseConnection = true,
+                IsAutoCloseConnection = true
             });
 
             //设置参数
@@ -51,6 +51,11 @@ namespace CoreCms.Net.Core.Config
                     //判断是否开启redis设置二级缓存方式
                     DataInfoCacheService = AppSettingsConstVars.RedisUseCache ? (ICacheService)new SqlSugarRedisCache() : new SqlSugarMemoryCache()
                 };
+                db.CurrentConnectionConfig.MoreSettings = new ConnMoreSettings()
+                {
+                    //所有 增、删 、改 会自动调用.RemoveDataCache()清理二级缓存
+                    IsAutoRemoveDataCache = true
+                };
 
                 //执行SQL 错误事件，可监控sql（暂时屏蔽，需要可开启）
                 //db.Aop.OnLogExecuting = (sql, p) =>
diff --git a/CoreCms.Net.DTO/CoreCms.Net.DTO.csproj b/CoreCms.Net.DTO/CoreCms.Net.DTO.csproj
new file mode 100644
index 00000000..132c02c5
--- /dev/null
+++ b/CoreCms.Net.DTO/CoreCms.Net.DTO.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/CoreCms.Net.DTO/GroupPurchaseSeckillDTO.cs b/CoreCms.Net.DTO/GroupPurchaseSeckillDTO.cs
new file mode 100644
index 00000000..38691e7d
--- /dev/null
+++ b/CoreCms.Net.DTO/GroupPurchaseSeckillDTO.cs
@@ -0,0 +1,112 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace CoreCms.Net.DTO
+{
+    /// <summary>
+    /// 秒杀列表返回dto数据层
+    /// </summary>
+    public class GroupPurchaseSeckillDTO
+    {
+
+        /// <summary>
+        /// 序列
+        /// </summary>
+        public System.Int32 id { get; set; }
+        /// <summary>
+        /// 促销名称
+        /// </summary>
+        public System.String name { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public System.Int32 type { get; set; }
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public System.Int32 sort { get; set; }
+        /// <summary>
+        /// 每人限购数量
+        /// </summary>
+        public System.Int32 maxNums { get; set; }
+        /// <summary>
+        /// 每个商品活动数量
+        /// </summary>
+        public System.Int32 maxGoodsNums { get; set; }
+        /// <summary>
+        /// 最大领取数量
+        /// </summary>
+        public System.Int32 maxRecevieNums { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public System.DateTime startTime { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public System.DateTime endTime { get; set; }
+        /// <summary>
+        /// 是否排他
+        /// </summary>
+        public System.Boolean isExclusive { get; set; }
+        /// <summary>
+        /// 是否自动领取
+        /// </summary>
+        public System.Boolean isAutoReceive { get; set; }
+        /// <summary>
+        /// 是否开启
+        /// </summary>
+        public System.Boolean isEnable { get; set; }
+        /// <summary>
+        /// 有效天数
+        /// </summary>
+        public System.Int32 effectiveDays { get; set; }
+        /// <summary>
+        /// 有效小时
+        /// </summary>
+        public System.Int32 effectiveHours { get; set; } 
+        /// <summary>
+        /// 倒计时
+        /// </summary>
+        public System.Int32 timestamp { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public System.Int32 startStatus { get; set; }
+        /// <summary>
+        /// 商品描述
+        /// </summary>
+        public string goodBrief { get; set; }
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        public string goodName { get; set; }
+        /// <summary>
+        /// 商品缩略图
+        /// </summary>
+        public string goodThumbnail { get; set; }
+        /// <summary>
+        /// 商品图集
+        /// </summary>
+        public string goodImages { get; set; }
+        /// <summary>
+        /// 商品库存
+        /// </summary>
+        public int goodStock { get; set; }
+        /// <summary>
+        /// 商品浏览量
+        /// </summary>
+        public int goodViewCount { get; set; }
+        /// <summary>
+        /// 商品单位
+        /// </summary>
+        public string goodUnit { get; set; }
+        /// <summary>
+        /// 商品市场价
+        /// </summary>
+        public decimal mktPrice { get; set; }
+        /// <summary>
+        /// 商品价格
+        /// </summary>
+        public decimal price { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/CoreCms.Net.DTO/PinTuanListDTO.cs b/CoreCms.Net.DTO/PinTuanListDTO.cs
new file mode 100644
index 00000000..832969a7
--- /dev/null
+++ b/CoreCms.Net.DTO/PinTuanListDTO.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace CoreCms.Net.DTO
+{
+    /// <summary>
+    /// 拼团列表返回
+    /// </summary>
+    public class PinTuanListDTO
+    {
+        /// <summary>
+        /// 拼团序列
+        /// </summary>
+        public System.Int32 id { get; set; }
+
+        /// <summary>
+        /// 商品序列
+        /// </summary>
+        public System.Int32 goodsId { get; set; }
+
+        /// <summary>
+        /// 拼团排序
+        /// </summary>
+        public System.Int32 sortId { get; set; }
+
+        /// <summary>
+        /// 拼团名称
+        /// </summary>
+        public string name { get; set; }
+
+        /// <summary>
+        /// 拼团单数
+        /// </summary>
+        public System.Int32 pinTuanRecordNums { get; set; }
+
+        /// <summary>
+        /// 拼团销量
+        /// </summary>
+        public System.Int32 buyPinTuanCount { get; set; }
+
+        /// <summary>
+        /// 多少人团
+        /// </summary>
+        public System.Int32 peopleNumber { get; set; }
+
+        /// <summary>
+        /// 倒计时
+        /// </summary>
+        public System.Int32 timestamp { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public System.DateTime startTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public System.DateTime endTime { get; set; }
+
+        /// <summary>
+        /// 优惠金额
+        /// </summary>
+        public System.Decimal discountAmount { get; set; }
+        /// <summary>
+        /// 每人限购数量
+        /// </summary>
+        public System.Int32 maxNums { get; set; }
+        /// <summary>
+        /// 每个商品活动数量
+        /// </summary>
+        public System.Int32 maxGoodsNums { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public System.Int32 startStatus { get; set; }
+        /// <summary>
+        /// 商品描述
+        /// </summary>
+        public string goodBrief { get; set; }
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        public string goodName { get; set; }
+        /// <summary>
+        /// 商品缩略图
+        /// </summary>
+        public string goodThumbnail { get; set; }
+        /// <summary>
+        /// 商品图集
+        /// </summary>
+        public string goodImages { get; set; }
+        /// <summary>
+        /// 商品库存
+        /// </summary>
+        public int goodStock { get; set; }
+        /// <summary>
+        /// 商品浏览量
+        /// </summary>
+        public int goodViewCount { get; set; }
+        /// <summary>
+        /// 商品单位
+        /// </summary>
+        public string goodUnit { get; set; }
+        /// <summary>
+        /// 商品市场价
+        /// </summary>
+        public decimal mktPrice { get; set; }
+        /// <summary>
+        /// 拼团价格
+        /// </summary>
+        public decimal pinTuanPrice { get; set; }
+    }
+}
diff --git a/CoreCms.Net.IRepository/Article/ICoreCmsArticleTypeRepository.cs b/CoreCms.Net.IRepository/Article/ICoreCmsArticleTypeRepository.cs
index 26a9bd9c..67302658 100644
--- a/CoreCms.Net.IRepository/Article/ICoreCmsArticleTypeRepository.cs
+++ b/CoreCms.Net.IRepository/Article/ICoreCmsArticleTypeRepository.cs
@@ -4,19 +4,49 @@
  *                Web: https://www.corecms.net                      
  *             Author: 大灰灰                                          
  *              Email: jianweie@163.com                                
- *         CreateTime: 2021/1/31 21:45:10
+ *         CreateTime: 2022/10/24 3:54:14
  *        Description: 暂无
  ***********************************************************************/
 
-
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
 using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
 
 namespace CoreCms.Net.IRepository
 {
     /// <summary>
-    ///     文章分类表 工厂接口
+    /// 文章分类表 工厂接口
     /// </summary>
     public interface ICoreCmsArticleTypeRepository : IBaseRepository<CoreCmsArticleType>
     {
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> InsertAsync(CoreCmsArticleType entity);
+
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsArticleType entity);
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
+
     }
-}
\ No newline at end of file
+}
diff --git a/CoreCms.Net.IRepository/CoreCms.Net.IRepository.csproj b/CoreCms.Net.IRepository/CoreCms.Net.IRepository.csproj
index 656d6675..fe8ae3d8 100644
--- a/CoreCms.Net.IRepository/CoreCms.Net.IRepository.csproj
+++ b/CoreCms.Net.IRepository/CoreCms.Net.IRepository.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\CoreCms.Net.DTO\CoreCms.Net.DTO.csproj" />
     <ProjectReference Include="..\CoreCms.Net.Model\CoreCms.Net.Model.csproj" />
   </ItemGroup>
 
diff --git a/CoreCms.Net.IRepository/Good/ICoreCmsGoodsRepository.cs b/CoreCms.Net.IRepository/Good/ICoreCmsGoodsRepository.cs
index f5982ed3..1ebf7237 100644
--- a/CoreCms.Net.IRepository/Good/ICoreCmsGoodsRepository.cs
+++ b/CoreCms.Net.IRepository/Good/ICoreCmsGoodsRepository.cs
@@ -170,5 +170,18 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <returns></returns>
         Task<List<EnumEntity>> QueryEnumEntityAsync();
+
+
+        /// <summary>
+        ///     获取商品及默认货品信息
+        /// </summary>
+        /// <param name="predicate"></param>
+        /// <param name="orderByPredicate"></param>
+        /// <param name="orderByType"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        Task<List<CoreCmsGoods>> QueryGoodWithDefaultProductAsync(Expression<Func<CoreCmsGoods, bool>> predicate,
+            Expression<Func<CoreCmsGoods, object>> orderByPredicate, OrderByType orderByType, bool blUseNoLock = false);
+
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.IRepository/Pintuan/ICoreCmsPintuanRuleRepository.cs b/CoreCms.Net.IRepository/Pintuan/ICoreCmsPintuanRuleRepository.cs
index 525f5050..07e656e0 100644
--- a/CoreCms.Net.IRepository/Pintuan/ICoreCmsPintuanRuleRepository.cs
+++ b/CoreCms.Net.IRepository/Pintuan/ICoreCmsPintuanRuleRepository.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
+using CoreCms.Net.DTO;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.ViewModels.Basics;
 using CoreCms.Net.Model.ViewModels.DTO;
@@ -53,5 +54,20 @@ namespace CoreCms.Net.IRepository
         /// <param name="ruleId">规则序列</param>
         /// <returns></returns>
         Task<TagPinTuanResult> GetPinTuanInfo(int ruleId);
+
+
+        /// <summary>
+        ///     根据规则ID数组获取拼团相关信息
+        /// </summary>
+        /// <param name="ruleIds">规则序列</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="orderByType"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <returns></returns>
+        Task<IPageList<PinTuanListDTO>> GetPinTuanInfos(int[] ruleIds,
+            Expression<Func<PinTuanListDTO, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20);
+
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.IRepository/Shop/ICoreCmsNoticeRepository.cs b/CoreCms.Net.IRepository/Shop/ICoreCmsNoticeRepository.cs
index 320e77ff..1572ee58 100644
--- a/CoreCms.Net.IRepository/Shop/ICoreCmsNoticeRepository.cs
+++ b/CoreCms.Net.IRepository/Shop/ICoreCmsNoticeRepository.cs
@@ -38,16 +38,10 @@ namespace CoreCms.Net.IRepository
 
 
         /// <summary>
-        ///     获取列表首页用
+        ///     获取首页组件数据
         /// </summary>
         /// <param name="predicate">判断集合</param>
-        /// <param name="orderByType">排序方式</param>
-        /// <param name="pageIndex">当前页面索引</param>
-        /// <param name="pageSize">分布大小</param>
-        /// <param name="orderByExpression"></param>
         /// <returns></returns>
-        Task<List<CoreCmsNotice>> QueryListAsync(Expression<Func<CoreCmsNotice, bool>> predicate,
-            Expression<Func<CoreCmsNotice, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
-            int pageSize = 20);
+        Task<List<dynamic>> QueryComponentAsync(Expression<Func<CoreCmsNotice, bool>> predicate);
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.IServices/Article/ICoreCmsArticleTypeServices.cs b/CoreCms.Net.IServices/Article/ICoreCmsArticleTypeServices.cs
index 63484665..d5c7e316 100644
--- a/CoreCms.Net.IServices/Article/ICoreCmsArticleTypeServices.cs
+++ b/CoreCms.Net.IServices/Article/ICoreCmsArticleTypeServices.cs
@@ -4,18 +4,47 @@
  *                Web: https://www.corecms.net                      
  *             Author: 大灰灰                                          
  *              Email: jianweie@163.com                                
- *         CreateTime: 2021/1/31 21:45:10
+ *         CreateTime: 2022/10/24 3:54:14
  *        Description: 暂无
  ***********************************************************************/
 
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
 using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
 
 namespace CoreCms.Net.IServices
 {
     /// <summary>
-    ///     文章分类表 服务工厂接口
+    /// 文章分类表 服务工厂接口
     /// </summary>
     public interface ICoreCmsArticleTypeServices : IBaseServices<CoreCmsArticleType>
     {
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> InsertAsync(CoreCmsArticleType entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsArticleType entity);
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
+
     }
-}
\ No newline at end of file
+}
diff --git a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj
index 63b74790..44769607 100644
--- a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj
+++ b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CoreCms.Net.Configuration\CoreCms.Net.Configuration.csproj" />
+    <ProjectReference Include="..\CoreCms.Net.DTO\CoreCms.Net.DTO.csproj" />
     <ProjectReference Include="..\CoreCms.Net.Model\CoreCms.Net.Model.csproj" />
   </ItemGroup>
 
diff --git a/CoreCms.Net.IServices/Good/ICoreCmsGoodsServices.cs b/CoreCms.Net.IServices/Good/ICoreCmsGoodsServices.cs
index 8fb5452b..91cd455e 100644
--- a/CoreCms.Net.IServices/Good/ICoreCmsGoodsServices.cs
+++ b/CoreCms.Net.IServices/Good/ICoreCmsGoodsServices.cs
@@ -114,8 +114,7 @@ namespace CoreCms.Net.IServices
         /// <param name="groupId"></param>
         /// <param name="needSku"></param>
         /// <returns></returns>
-        Task<CoreCmsGoods> GetGoodsDetail(int id, int userId = 0, bool isPromotion = false, string type = "goods",
-            int groupId = 0, bool needSku = false);
+        Task<CoreCmsGoods> GetGoodsDetail(int id, int userId = 0, bool isPromotion = false, string type = "goods", int groupId = 0, bool needSku = false);
 
         /// <summary>
         /// 通过商品序列获取sku列表
@@ -263,5 +262,18 @@ namespace CoreCms.Net.IServices
         Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
+
+
+        /// <summary>
+        ///     获取商品及默认货品信息
+        /// </summary>
+        /// <param name="predicate"></param>
+        /// <param name="orderByPredicate"></param>
+        /// <param name="orderByType"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        Task<List<CoreCmsGoods>> QueryGoodWithDefaultProductAsync(Expression<Func<CoreCmsGoods, bool>> predicate,
+            Expression<Func<CoreCmsGoods, object>> orderByPredicate, OrderByType orderByType, bool blUseNoLock = false);
+
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.IServices/Pintuan/ICoreCmsPintuanRuleServices.cs b/CoreCms.Net.IServices/Pintuan/ICoreCmsPintuanRuleServices.cs
index 833cc47f..1195bb9c 100644
--- a/CoreCms.Net.IServices/Pintuan/ICoreCmsPintuanRuleServices.cs
+++ b/CoreCms.Net.IServices/Pintuan/ICoreCmsPintuanRuleServices.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
+using CoreCms.Net.DTO;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.ViewModels.Basics;
 using CoreCms.Net.Model.ViewModels.DTO;
@@ -37,7 +38,7 @@ namespace CoreCms.Net.IServices
         ///     接口上获取拼团所有商品
         /// </summary>
         /// <returns></returns>
-        Task<WebApiCallBack> GetPinTuanList(int userId = 0);
+        Task<WebApiCallBack> GetPinTuanList(int userId = 0, int pageIndex = 1, int pageSize = 20);
 
 
         /// <summary>
@@ -60,5 +61,20 @@ namespace CoreCms.Net.IServices
         /// <param name="ruleId">规则序列</param>
         /// <returns></returns>
         Task<TagPinTuanResult> GetPinTuanInfo(int ruleId);
+
+
+
+        /// <summary>
+        ///     根据规则ID数组获取拼团相关信息
+        /// </summary>
+        /// <param name="ruleIds">规则序列</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="orderByType"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <returns></returns>
+        Task<IPageList<PinTuanListDTO>> GetPinTuanInfos(int[] ruleIds,
+            Expression<Func<PinTuanListDTO, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20);
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.IServices/Promotion/ICoreCmsPromotionServices.cs b/CoreCms.Net.IServices/Promotion/ICoreCmsPromotionServices.cs
index 82cf3874..98c7bf67 100644
--- a/CoreCms.Net.IServices/Promotion/ICoreCmsPromotionServices.cs
+++ b/CoreCms.Net.IServices/Promotion/ICoreCmsPromotionServices.cs
@@ -51,13 +51,13 @@ namespace CoreCms.Net.IServices
         ///     获取团购列表数据
         /// </summary>
         /// <returns></returns>
-        Task<WebApiCallBack> GetGroupList(int type, int userId, int status, int pageIndex, int pageSize);
+        Task<WebApiCallBack> GetGroupList(int type, int status, int pageIndex, int pageSize);
 
         /// <summary>
         ///     获取团购/秒杀商品详情
         /// </summary>
         /// <returns></returns>
-        Task<WebApiCallBack> GetGroupDetail(int goodId = 0, int userId = 0, int type = (int)GlobalEnumVars.PromotionType.Group, int groupId = 0, bool needSku = false);
+        Task<WebApiCallBack> GetGroupDetail(int goodId, int userId, int type, bool needSku);
 
         /// <summary>
         ///     获取可领取的优惠券
diff --git a/CoreCms.Net.IServices/Shop/ICoreCmsNoticeServices.cs b/CoreCms.Net.IServices/Shop/ICoreCmsNoticeServices.cs
index 3389cab3..2fa88129 100644
--- a/CoreCms.Net.IServices/Shop/ICoreCmsNoticeServices.cs
+++ b/CoreCms.Net.IServices/Shop/ICoreCmsNoticeServices.cs
@@ -38,16 +38,10 @@ namespace CoreCms.Net.IServices
 
 
         /// <summary>
-        ///     获取列表首页用
+        ///     获取首页组件数据
         /// </summary>
         /// <param name="predicate">判断集合</param>
-        /// <param name="orderByType">排序方式</param>
-        /// <param name="pageIndex">当前页面索引</param>
-        /// <param name="pageSize">分布大小</param>
-        /// <param name="orderByExpression"></param>
         /// <returns></returns>
-        Task<List<CoreCmsNotice>> QueryListAsync(Expression<Func<CoreCmsNotice, bool>> predicate,
-            Expression<Func<CoreCmsNotice, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
-            int pageSize = 20);
+        Task<List<dynamic>> QueryComponentAsync(Expression<Func<CoreCmsNotice, bool>> predicate);
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.Model/Entities/Promotion/CoreCmsPromotionCondition.cs b/CoreCms.Net.Model/Entities/Promotion/CoreCmsPromotionCondition.cs
index 8b0f85ef..59958b4c 100644
--- a/CoreCms.Net.Model/Entities/Promotion/CoreCmsPromotionCondition.cs
+++ b/CoreCms.Net.Model/Entities/Promotion/CoreCmsPromotionCondition.cs
@@ -37,7 +37,7 @@ namespace CoreCms.Net.Model.Entities
         /// </summary>
         [Display(Name = "促销ID")]
         [SugarColumn(ColumnDescription = "促销ID", IsNullable = true)]
-        public System.Int32? promotionId { get; set; }
+        public System.Int32 promotionId { get; set; }
         /// <summary>
         /// 促销条件编码
         /// </summary>
diff --git a/CoreCms.Net.Model/Entities/Promotion/CoreCmsPromotionResult.cs b/CoreCms.Net.Model/Entities/Promotion/CoreCmsPromotionResult.cs
index 07ef6c88..e49bb1b9 100644
--- a/CoreCms.Net.Model/Entities/Promotion/CoreCmsPromotionResult.cs
+++ b/CoreCms.Net.Model/Entities/Promotion/CoreCmsPromotionResult.cs
@@ -37,7 +37,7 @@ namespace CoreCms.Net.Model.Entities
         /// </summary>
         [Display(Name = "促销ID")]
         [SugarColumn(ColumnDescription = "促销ID", IsNullable = true)]
-        public System.Int32? promotionId { get; set; }
+        public System.Int32 promotionId { get; set; }
         /// <summary>
         /// 促销条件编码
         /// </summary>
diff --git a/CoreCms.Net.Model/Entities/Service/CoreCmsServicesPartial.cs b/CoreCms.Net.Model/Entities/Service/CoreCmsServicesPartial.cs
index db0469d8..fb8fb9c7 100644
--- a/CoreCms.Net.Model/Entities/Service/CoreCmsServicesPartial.cs
+++ b/CoreCms.Net.Model/Entities/Service/CoreCmsServicesPartial.cs
@@ -26,6 +26,13 @@ namespace CoreCms.Net.Model.Entities
         [SugarColumn(IsIgnore = true)]
         public int timestamp { get; set; } = 0;
 
+        /// <summary>
+        ///     开启状态
+        /// </summary>
+        [Display(Name = "开启状态")]
+        [SugarColumn(IsIgnore = true)]
+        public int openStatus { get; set; } = 0;
+
         /// <summary>
         ///     允许购买用户等级
         /// </summary>
diff --git a/CoreCms.Net.Model/FromBody/FMGroup.cs b/CoreCms.Net.Model/FromBody/FMGroup.cs
index 7ddb55fc..baf81090 100644
--- a/CoreCms.Net.Model/FromBody/FMGroup.cs
+++ b/CoreCms.Net.Model/FromBody/FMGroup.cs
@@ -38,17 +38,16 @@ namespace CoreCms.Net.Model.FromBody
         public int status { get; set; } = 0;
     }
 
+    /// <summary>
+    /// 获取团购秒杀商品详情
+    /// </summary>
 
     public class FMGetGoodsDetial
     {
         public int id { get; set; }
-        public int groupId { get; set; }
 
         public int type { get; set; }
 
         public bool needSku { get; set; } = false;
-
-
-
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.Model/ViewModels/DTO/OrderDTO.cs b/CoreCms.Net.Model/ViewModels/DTO/OrderDTO.cs
index 68fc9ed3..09b38065 100644
--- a/CoreCms.Net.Model/ViewModels/DTO/OrderDTO.cs
+++ b/CoreCms.Net.Model/ViewModels/DTO/OrderDTO.cs
@@ -54,7 +54,7 @@ namespace CoreCms.Net.Model.ViewModels.DTO
         public int areaId { get; set; }
 
         /// <summary>
-        ///     购物车货品数据
+        ///     购物车序列
         /// </summary>
         public string cartIds { get; set; }
 
@@ -109,7 +109,7 @@ namespace CoreCms.Net.Model.ViewModels.DTO
         public int storeId { get; set; } = 0;
 
         /// <summary>
-        ///     订单类型，1是普通订单，2是拼团订单
+        ///     订单类型[对应CoreCmsOrder表orderType字段]/也对应购物车cart订单类型
         /// </summary>
         public int orderType { get; set; } = 1;
 
diff --git a/CoreCms.Net.Model/ViewModels/DTO/UserDto.cs b/CoreCms.Net.Model/ViewModels/DTO/UserDto.cs
index 62a59b2a..0612bdcd 100644
--- a/CoreCms.Net.Model/ViewModels/DTO/UserDto.cs
+++ b/CoreCms.Net.Model/ViewModels/DTO/UserDto.cs
@@ -38,7 +38,7 @@ namespace CoreCms.Net.Model.ViewModels.DTO
         public decimal orderMoney { get; set; }
 
         /// <summary>
-        ///  购物车货品序列号
+        ///  购物车序列号
         /// </summary>
         public string ids { get; set; }
 
diff --git a/CoreCms.Net.Repository/Agent/CoreCmsAgentGradeRepository.cs b/CoreCms.Net.Repository/Agent/CoreCmsAgentGradeRepository.cs
index 8cf783a4..cda8e82e 100644
--- a/CoreCms.Net.Repository/Agent/CoreCmsAgentGradeRepository.cs
+++ b/CoreCms.Net.Repository/Agent/CoreCmsAgentGradeRepository.cs
@@ -49,7 +49,7 @@ namespace CoreCms.Net.Repository
                 return jm;
             }
 
-            var id = await DbClient.Insertable(entity).RemoveDataCache().ExecuteReturnIdentityAsync();
+            var id = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync();
             var bl = id > 0;
 
             jm.code = bl ? 0 : 1;
@@ -58,7 +58,7 @@ namespace CoreCms.Net.Repository
             {
                 if (entity.isDefault)
                 {
-                    await DbClient.Updateable<CoreCmsAgentGrade>().SetColumns(p => p.isDefault == false).Where(p => p.isDefault == true && p.id != id).RemoveDataCache().ExecuteCommandAsync();
+                    await DbClient.Updateable<CoreCmsAgentGrade>().SetColumns(p => p.isDefault == false).Where(p => p.isDefault == true && p.id != id).ExecuteCommandAsync();
                 }
             }
             return jm;
@@ -106,7 +106,7 @@ namespace CoreCms.Net.Repository
             oldModel.description = entity.description;
 
             //事物处理过程结束
-            var bl = await DbClient.Updateable(oldModel).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
             if (bl)
@@ -114,7 +114,7 @@ namespace CoreCms.Net.Repository
                 //其他处理
                 if (entity.isDefault)
                 {
-                    await DbClient.Updateable<CoreCmsAgentGrade>().SetColumns(it => it.isDefault == false).Where(p => p.isDefault == true && p.id != entity.id).RemoveDataCache().ExecuteCommandAsync();
+                    await DbClient.Updateable<CoreCmsAgentGrade>().SetColumns(it => it.isDefault == false).Where(p => p.isDefault == true && p.id != entity.id).ExecuteCommandAsync();
                 }
             }
 
@@ -141,7 +141,7 @@ namespace CoreCms.Net.Repository
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
             if (bl)
             {
-                await DbClient.Deleteable<CoreCmsAgentProducts>().Where(p => p.agentGradeId == id).RemoveDataCache().ExecuteCommandHasChangeAsync();
+                await DbClient.Deleteable<CoreCmsAgentProducts>().Where(p => p.agentGradeId == id).ExecuteCommandHasChangeAsync();
             }
             return jm;
         }
diff --git a/CoreCms.Net.Repository/Api/CoreCmsPrinterRepository.cs b/CoreCms.Net.Repository/Api/CoreCmsPrinterRepository.cs
index b51aff62..3ad064c8 100644
--- a/CoreCms.Net.Repository/Api/CoreCmsPrinterRepository.cs
+++ b/CoreCms.Net.Repository/Api/CoreCmsPrinterRepository.cs
@@ -45,7 +45,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
             entity.createTime = DateTime.Now;
-            var bl = await DbClient.Insertable(entity).RemoveDataCache().ExecuteReturnIdentityAsync() > 0;
+            var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0;
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
 
@@ -88,7 +88,7 @@ namespace CoreCms.Net.Repository
             oldModel.storeId = entity.storeId;
 
             //事物处理过程结束
-            var bl = await DbClient.Updateable(oldModel).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
 
@@ -104,7 +104,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Deleteable<CoreCmsPrinter>(id).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<CoreCmsPrinter>(id).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
 
diff --git a/CoreCms.Net.Repository/Article/CoreCmsArticleTypeRepository.cs b/CoreCms.Net.Repository/Article/CoreCmsArticleTypeRepository.cs
index 8aa4865d..464cb0ad 100644
--- a/CoreCms.Net.Repository/Article/CoreCmsArticleTypeRepository.cs
+++ b/CoreCms.Net.Repository/Article/CoreCmsArticleTypeRepository.cs
@@ -4,23 +4,96 @@
  *                Web: https://www.corecms.net                      
  *             Author: 大灰灰                                          
  *              Email: jianweie@163.com                                
- *         CreateTime: 2021/1/31 21:45:10
+ *         CreateTime: 2022/10/24 3:54:14
  *        Description: 暂无
  ***********************************************************************/
 
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Caching.Manual;
+using CoreCms.Net.Configuration;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
 using CoreCms.Net.IRepository;
 using CoreCms.Net.IRepository.UnitOfWork;
-using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
 
 namespace CoreCms.Net.Repository
 {
     /// <summary>
-    ///     文章分类表 接口实现
+    /// 文章分类表 接口实现
     /// </summary>
     public class CoreCmsArticleTypeRepository : BaseRepository<CoreCmsArticleType>, ICoreCmsArticleTypeRepository
     {
+        private readonly IUnitOfWork _unitOfWork;
         public CoreCmsArticleTypeRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
         {
+            _unitOfWork = unitOfWork;
         }
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> InsertAsync(CoreCmsArticleType entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0;
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(CoreCmsArticleType entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var oldModel = await DbClient.Queryable<CoreCmsArticleType>().In(entity.id).SingleAsync();
+            if (oldModel == null)
+            {
+                jm.msg = "不存在此信息";
+                return jm;
+            }
+            //事物处理过程开始
+            //oldModel.id = entity.id;
+            oldModel.name = entity.name;
+            oldModel.parentId = entity.parentId;
+            oldModel.sort = entity.sort;
+
+            //事物处理过程结束
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdAsync(object id)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Deleteable<CoreCmsArticleType>(id).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
+
+            return jm;
+        }
+
     }
-}
\ No newline at end of file
+}
diff --git a/CoreCms.Net.Repository/CheckIn/CoreCmsContinuousCheckInRulesRepository.cs b/CoreCms.Net.Repository/CheckIn/CoreCmsContinuousCheckInRulesRepository.cs
index aa724d09..adf5468d 100644
--- a/CoreCms.Net.Repository/CheckIn/CoreCmsContinuousCheckInRulesRepository.cs
+++ b/CoreCms.Net.Repository/CheckIn/CoreCmsContinuousCheckInRulesRepository.cs
@@ -66,8 +66,8 @@ namespace CoreCms.Net.Repository
                 _unitOfWork.BeginTran();
 
                 //先清理掉数据,因为是配置数据，可直接删除添加新的
-                await DbClient.Deleteable<CoreCmsContinuousCheckInRules>().Where(p => p.id > 0).RemoveDataCache().ExecuteCommandAsync();
-                await DbClient.Deleteable<CoreCmsContinuousCheckInRuleDetails>().Where(p => p.id > 0).RemoveDataCache().ExecuteCommandAsync();
+                await DbClient.Deleteable<CoreCmsContinuousCheckInRules>().Where(p => p.id > 0).ExecuteCommandAsync();
+                await DbClient.Deleteable<CoreCmsContinuousCheckInRuleDetails>().Where(p => p.id > 0).ExecuteCommandAsync();
 
                 //遍历数据存值
                 foreach (var item in entity)
@@ -77,13 +77,13 @@ namespace CoreCms.Net.Repository
                         days = item.days
                     };
 
-                    var id = await DbClient.Insertable(continuous).RemoveDataCache().ExecuteReturnIdentityAsync();
+                    var id = await DbClient.Insertable(continuous).ExecuteReturnIdentityAsync();
                     if (id <= 0) continue;
                     foreach (var detail in item.details)
                     {
                         detail.ruleId = id;
                     }
-                    await DbClient.Insertable(item.details).RemoveDataCache().ExecuteReturnIdentityAsync();
+                    await DbClient.Insertable(item.details).ExecuteReturnIdentityAsync();
                 }
 
                 _unitOfWork.CommitTran();
diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionGradeRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionGradeRepository.cs
index 3b45eb7e..d2b568af 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionGradeRepository.cs
+++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionGradeRepository.cs
@@ -49,7 +49,7 @@ namespace CoreCms.Net.Repository
                 return jm;
             }
 
-            var id = await DbClient.Insertable(entity).RemoveDataCache().ExecuteReturnIdentityAsync();
+            var id = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync();
             var bl = id > 0;
 
             jm.code = bl ? 0 : 1;
@@ -58,7 +58,7 @@ namespace CoreCms.Net.Repository
             {
                 if (entity.isDefault == true)
                 {
-                    await DbClient.Updateable<CoreCmsDistributionGrade>().SetColumns(p => p.isDefault == false).Where(p => p.isDefault == true && p.id != id).RemoveDataCache().ExecuteCommandAsync();
+                    await DbClient.Updateable<CoreCmsDistributionGrade>().SetColumns(p => p.isDefault == false).Where(p => p.isDefault == true && p.id != id).ExecuteCommandAsync();
                 }
             }
             return jm;
@@ -103,7 +103,7 @@ namespace CoreCms.Net.Repository
             oldModel.description = entity.description;
 
             //事物处理过程结束
-            var bl = await DbClient.Updateable(oldModel).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
             if (bl)
@@ -111,7 +111,7 @@ namespace CoreCms.Net.Repository
                 //其他处理
                 if (entity.isDefault)
                 {
-                    await DbClient.Updateable<CoreCmsDistributionGrade>().SetColumns(it => it.isDefault == false).Where(p => p.isDefault == true && p.id != entity.id).RemoveDataCache().ExecuteCommandAsync();
+                    await DbClient.Updateable<CoreCmsDistributionGrade>().SetColumns(it => it.isDefault == false).Where(p => p.isDefault == true && p.id != entity.id).ExecuteCommandAsync();
                 }
             }
 
@@ -133,13 +133,13 @@ namespace CoreCms.Net.Repository
                 jm.msg = "存在关联的分销用户数据,禁止删除";
                 return jm;
             }
-            var bl = await DbClient.Deleteable<CoreCmsDistributionGrade>(id).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<CoreCmsDistributionGrade>(id).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
             if (bl)
             {
-                await DbClient.Deleteable<CoreCmsDistributionCondition>().Where(p => p.gradeId == id).RemoveDataCache().ExecuteCommandAsync();
-                await DbClient.Deleteable<CoreCmsDistributionResult>().Where(p => p.gradeId == id).RemoveDataCache().ExecuteCommandAsync();
+                await DbClient.Deleteable<CoreCmsDistributionCondition>().Where(p => p.gradeId == id).ExecuteCommandAsync();
+                await DbClient.Deleteable<CoreCmsDistributionResult>().Where(p => p.gradeId == id).ExecuteCommandAsync();
             }
 
             return jm;
diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionResultRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionResultRepository.cs
index d5069806..ac8b24db 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionResultRepository.cs
+++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionResultRepository.cs
@@ -49,7 +49,7 @@ namespace CoreCms.Net.Repository
                 return jm;
             }
 
-            var bl = await DbClient.Insertable(entity).RemoveDataCache().ExecuteReturnIdentityAsync() > 0;
+            var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0;
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
 
@@ -84,7 +84,7 @@ namespace CoreCms.Net.Repository
             oldModel.parameters = entity.parameters;
 
             //事物处理过程结束
-            var bl = await DbClient.Updateable(oldModel).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
             return jm;
@@ -99,7 +99,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Updateable(entity).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(entity).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
 
@@ -115,7 +115,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Deleteable<CoreCmsDistributionResult>(id).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<CoreCmsDistributionResult>(id).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
 
@@ -131,7 +131,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Deleteable<CoreCmsDistributionResult>().In(ids).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<CoreCmsDistributionResult>().In(ids).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
 
diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsCategoryRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsCategoryRepository.cs
index 053874c7..d79b2e9d 100644
--- a/CoreCms.Net.Repository/Good/CoreCmsGoodsCategoryRepository.cs
+++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsCategoryRepository.cs
@@ -39,7 +39,7 @@ namespace CoreCms.Net.Repository
         public async Task<AdminUiCallBack> InsertAsync(CoreCmsGoodsCategory entity)
         {
             var jm = new AdminUiCallBack();
-            var bl = await DbClient.Insertable(entity).RemoveDataCache().ExecuteReturnIdentityAsync() > 0;
+            var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0;
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
 
@@ -56,7 +56,7 @@ namespace CoreCms.Net.Repository
             var jm = new AdminUiCallBack();
 
             //事物处理过程结束
-            var bl = await DbClient.Updateable(entity).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(entity).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
 
@@ -72,7 +72,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Deleteable<CoreCmsGoodsCategory>(id).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<CoreCmsGoodsCategory>(id).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
 
diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
index b9bee871..ef597743 100644
--- a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
+++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
@@ -36,6 +36,7 @@ namespace CoreCms.Net.Repository
         }
 
 
+        #region 重写异步插入方法
         /// <summary>
         /// 重写异步插入方法
         /// </summary>
@@ -285,6 +286,9 @@ namespace CoreCms.Net.Repository
             return jm;
         }
 
+        #endregion
+
+        #region 重写异步更新方法方法
         /// <summary>
         /// 重写异步更新方法方法
         /// </summary>
@@ -734,7 +738,7 @@ namespace CoreCms.Net.Repository
             return jm;
         }
 
-
+        #endregion
 
         #region 重写删除指定ID集合的数据(批量删除)
         /// <summary>
@@ -1923,5 +1927,132 @@ namespace CoreCms.Net.Repository
         }
         #endregion
 
+        #region 获取商品及默认货品信息
+
+        /// <summary>
+        ///     获取商品及默认货品信息
+        /// </summary>
+        /// <param name="predicate"></param>
+        /// <param name="orderByPredicate"></param>
+        /// <param name="orderByType"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        public async Task<List<CoreCmsGoods>> QueryGoodWithDefaultProductAsync(Expression<Func<CoreCmsGoods, bool>> predicate, Expression<Func<CoreCmsGoods, object>> orderByPredicate, OrderByType orderByType, bool blUseNoLock = false)
+        {
+            List<CoreCmsGoods> listData;
+            if (blUseNoLock)
+            {
+                listData = await DbClient.Queryable<CoreCmsGoods, CoreCmsProducts>((good, pd) => new JoinQueryInfos(JoinType.Left, good.id == pd.goodsId))
+                    .Where((good, pd) => pd.isDefalut == true && pd.isDel == false)
+                    .Select((good, pd) => new CoreCmsGoods
+                    {
+                        id = good.id,
+                        bn = good.bn,
+                        name = good.name,
+                        brief = good.brief,
+                        image = good.image,
+                        images = good.images,
+                        video = good.video,
+                        productsDistributionType = good.productsDistributionType,
+                        goodsCategoryId = good.goodsCategoryId,
+                        goodsTypeId = good.goodsTypeId,
+                        brandId = good.brandId,
+                        isNomalVirtual = good.isNomalVirtual,
+                        isMarketable = good.isMarketable,
+                        unit = good.unit,
+                        //intro = good.intro,
+                        spesDesc = good.spesDesc,
+                        parameters = good.parameters,
+                        commentsCount = good.commentsCount,
+                        viewCount = good.viewCount,
+                        buyCount = good.buyCount,
+                        uptime = good.uptime,
+                        downtime = good.downtime,
+                        sort = good.sort,
+                        labelIds = good.labelIds,
+                        newSpec = good.newSpec,
+                        openSpec = good.openSpec,
+                        createTime = good.createTime,
+                        updateTime = good.updateTime,
+                        isRecommend = good.isRecommend,
+                        isHot = good.isHot,
+                        isDel = good.isDel,
+                        sn = pd.sn,
+                        price = pd.price,
+                        costprice = pd.costprice,
+                        mktprice = pd.mktprice,
+                        stock = pd.stock,
+                        freezeStock = pd.freezeStock,
+                        pointsDeduction = pd.pointsDeduction,
+                        points = pd.points,
+                        weight = pd.weight,
+                        initialSales = good.initialSales,
+                    })
+                    .With(SqlWith.NoLock)
+                    .MergeTable()
+                    .WhereIF(predicate != null, predicate)
+                    .OrderByIF(orderByPredicate != null, orderByPredicate, orderByType)
+                    .ToListAsync();
+            }
+            else
+            {
+                listData = await DbClient.Queryable<CoreCmsGoods, CoreCmsProducts>((good, pd) => new JoinQueryInfos(
+                            JoinType.Left, good.id == pd.goodsId))
+                    .Where((good, pd) => pd.isDefalut == true && pd.isDel == false)
+                    .Select((good, pd) => new CoreCmsGoods
+                    {
+                        id = good.id,
+                        bn = good.bn,
+                        name = good.name,
+                        brief = good.brief,
+                        image = good.image,
+                        images = good.images,
+                        video = good.video,
+                        productsDistributionType = good.productsDistributionType,
+                        goodsCategoryId = good.goodsCategoryId,
+                        goodsTypeId = good.goodsTypeId,
+                        brandId = good.brandId,
+                        isNomalVirtual = good.isNomalVirtual,
+                        isMarketable = good.isMarketable,
+                        unit = good.unit,
+                        //intro = good.intro,
+                        spesDesc = good.spesDesc,
+                        parameters = good.parameters,
+                        commentsCount = good.commentsCount,
+                        viewCount = good.viewCount,
+                        buyCount = good.buyCount,
+                        uptime = good.uptime,
+                        downtime = good.downtime,
+                        sort = good.sort,
+                        labelIds = good.labelIds,
+                        newSpec = good.newSpec,
+                        openSpec = good.openSpec,
+                        createTime = good.createTime,
+                        updateTime = good.updateTime,
+                        isRecommend = good.isRecommend,
+                        isHot = good.isHot,
+                        isDel = good.isDel,
+                        sn = pd.sn,
+                        price = pd.price,
+                        costprice = pd.costprice,
+                        mktprice = pd.mktprice,
+                        stock = pd.stock,
+                        freezeStock = pd.freezeStock,
+                        pointsDeduction = pd.pointsDeduction,
+                        points = pd.points,
+                        weight = pd.weight,
+                        initialSales = good.initialSales,
+                    })
+                    .MergeTable()
+                    .WhereIF(predicate != null, predicate)
+                    .OrderByIF(orderByPredicate != null, orderByPredicate, orderByType)
+                    .ToListAsync();
+            }
+            return listData;
+        }
+
+
+        #endregion
+
     }
 }
diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsTypeSpecRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsTypeSpecRepository.cs
index 46963763..db66fe6c 100644
--- a/CoreCms.Net.Repository/Good/CoreCmsGoodsTypeSpecRepository.cs
+++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsTypeSpecRepository.cs
@@ -64,10 +64,10 @@ namespace CoreCms.Net.Repository
             var goodsTypeSpec = new CoreCmsGoodsTypeSpec();
             goodsTypeSpec.name = entity.name;
             goodsTypeSpec.sort = entity.sort;
-            var specId = await DbClient.Insertable(goodsTypeSpec).RemoveDataCache().ExecuteReturnIdentityAsync();
+            var specId = await DbClient.Insertable(goodsTypeSpec).ExecuteReturnIdentityAsync();
             if (specId <= 0 || entity.value is not { Count: > 0 }) return jm;
             var list = entity.value.Select((item, index) => new CoreCmsGoodsTypeSpecValue() { specId = specId, value = item, sort = index + 1 }).ToList();
-            var bl = await DbClient.Insertable(list).RemoveDataCache().ExecuteCommandAsync() > 0;
+            var bl = await DbClient.Insertable(list).ExecuteCommandAsync() > 0;
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
 
@@ -107,7 +107,7 @@ namespace CoreCms.Net.Repository
             }
             oldModel.name = entity.name;
             oldModel.sort = entity.sort;
-            var bl = await DbClient.Updateable(oldModel).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
             if (bl)
             {
                 var oldValues = await DbClient.Queryable<CoreCmsGoodsTypeSpecValue>().OrderBy(p => p.sort).Where(p => p.specId == oldModel.id).ToListAsync();
@@ -115,7 +115,7 @@ namespace CoreCms.Net.Repository
                 //获取需要删除的数据库数据
                 var deleteValues = oldValues.Where(p => !entity.value.Contains(p.value)).ToList();
                 //删除旧数据
-                if (deleteValues.Any()) bl = await DbClient.Deleteable<CoreCmsGoodsTypeSpecValue>(deleteValues).RemoveDataCache().ExecuteCommandHasChangeAsync();
+                if (deleteValues.Any()) bl = await DbClient.Deleteable<CoreCmsGoodsTypeSpecValue>(deleteValues).ExecuteCommandHasChangeAsync();
 
                 //新数据
                 var values = oldValues.Select(p => p.value).ToList();
@@ -125,7 +125,7 @@ namespace CoreCms.Net.Repository
                 if (newValues.Any())
                 {
                     var newList = newValues.Select((t, index) => new CoreCmsGoodsTypeSpecValue() { specId = oldModel.id, value = t, sort = oldValues.Count + index }).ToList();
-                    bl = await DbClient.Insertable<CoreCmsGoodsTypeSpecValue>(newList).RemoveDataCache().ExecuteCommandAsync() > 0;
+                    bl = await DbClient.Insertable<CoreCmsGoodsTypeSpecValue>(newList).ExecuteCommandAsync() > 0;
                 }
             }
             jm.code = bl ? 0 : 1;
@@ -144,12 +144,12 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Deleteable<CoreCmsGoodsTypeSpec>(id).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<CoreCmsGoodsTypeSpec>(id).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
             if (bl)
             {
-                await DbClient.Deleteable<CoreCmsGoodsTypeSpecValue>(p => p.specId == (int)id).RemoveDataCache().ExecuteCommandHasChangeAsync();
+                await DbClient.Deleteable<CoreCmsGoodsTypeSpecValue>(p => p.specId == (int)id).ExecuteCommandHasChangeAsync();
             }
 
             return jm;
diff --git a/CoreCms.Net.Repository/Order/CoreCmsOrderRepository.cs b/CoreCms.Net.Repository/Order/CoreCmsOrderRepository.cs
index ac3eba9a..6937776a 100644
--- a/CoreCms.Net.Repository/Order/CoreCmsOrderRepository.cs
+++ b/CoreCms.Net.Repository/Order/CoreCmsOrderRepository.cs
@@ -150,7 +150,6 @@ namespace CoreCms.Net.Repository
 
         #endregion
 
-
         #region 根据用户id和商品id获取下了多少订单
         /// <summary>
         /// 根据用户id和商品id获取下了多少订单
diff --git a/CoreCms.Net.Repository/Pintuan/CoreCmsPintuanRuleRepository.cs b/CoreCms.Net.Repository/Pintuan/CoreCmsPintuanRuleRepository.cs
index 6853d1ed..f4445ddf 100644
--- a/CoreCms.Net.Repository/Pintuan/CoreCmsPintuanRuleRepository.cs
+++ b/CoreCms.Net.Repository/Pintuan/CoreCmsPintuanRuleRepository.cs
@@ -14,6 +14,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using CoreCms.Net.Configuration;
+using CoreCms.Net.DTO;
 using CoreCms.Net.IRepository;
 using CoreCms.Net.IRepository.UnitOfWork;
 using CoreCms.Net.Model.Entities;
@@ -176,5 +177,71 @@ namespace CoreCms.Net.Repository
 
         #endregion
 
+        #region 根据规则ID数组获取拼团相关信息
+
+        /// <summary>
+        ///     根据规则ID数组获取拼团相关信息
+        /// </summary>
+        /// <param name="ruleIds">规则序列</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="orderByType"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <returns></returns>
+        public async Task<IPageList<PinTuanListDTO>> GetPinTuanInfos(int[] ruleIds, Expression<Func<PinTuanListDTO, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1, int pageSize = 20)
+        {
+            var dt = DateTime.Now;
+            RefAsync<int> totalCount = 0;
+            var reuslt = await DbClient.Queryable<CoreCmsPinTuanRule, CoreCmsPinTuanGoods, CoreCmsGoods, CoreCmsProducts>(
+                (prModel, pgModel, goodModel, productsModel) => new object[]
+                {
+                    JoinType.Inner, prModel.id ==pgModel.ruleId ,
+                    JoinType.Inner, pgModel.goodsId == goodModel.id,
+                    JoinType.Left, goodModel.id == productsModel.goodsId
+                })
+                .Where((prModel, pgModel, goodModel, productsModel) => prModel.isStatusOpen == true && ruleIds.Contains(prModel.id) && prModel.endTime > dt && productsModel.isDefalut == true && productsModel.isDel == false)
+                .Select((prModel, pgModel, goodModel, productsModel) => new PinTuanListDTO
+                {
+                    id = prModel.id,
+                    goodsId = pgModel.goodsId,
+                    sortId = prModel.sort,
+                    name = prModel.name,
+                    pinTuanRecordNums = SqlFunc.Subqueryable<CoreCmsOrder>().Where(s => s.objectId == prModel.id).Count(),
+
+                    buyPinTuanCount = SqlFunc.Subqueryable<CoreCmsOrderItem>()
+                        .LeftJoin<CoreCmsOrder>((sOrderItem, sOrder) => sOrder.orderId == sOrderItem.orderId)
+                        .Where((sOrderItem, sOrder) => sOrderItem.goodsId == pgModel.goodsId
+                                                       && sOrder.orderType == (int)GlobalEnumVars.OrderType.PinTuan
+                                                       && sOrder.objectId == prModel.id)
+                        .Sum(p => p.nums),
+
+                    peopleNumber = prModel.peopleNumber,
+                    timestamp = 0,
+                    startStatus = 0,
+                    goodBrief = goodModel.brief,
+                    goodName = goodModel.name,
+                    goodThumbnail = goodModel.image,
+                    goodImages = goodModel.images,
+                    goodStock = productsModel.stock,
+                    goodViewCount = goodModel.viewCount,
+                    goodUnit = goodModel.unit,
+                    mktPrice = productsModel.mktprice,
+                    pinTuanPrice = productsModel.price,
+                    startTime = prModel.startTime,
+                    endTime = prModel.endTime,
+                    discountAmount = prModel.discountAmount,
+                    maxGoodsNums = prModel.maxGoodsNums,
+                    maxNums = prModel.maxNums,
+
+                }).MergeTable()
+                .OrderByIF(orderByExpression != null, orderByExpression, orderByType)
+                .With(SqlWith.Null).ToPageListAsync(pageIndex, pageSize, totalCount);
+
+            var list = new PageList<PinTuanListDTO>(reuslt, pageIndex, pageSize, totalCount);
+            return list;
+        }
+
+        #endregion
+
     }
 }
diff --git a/CoreCms.Net.Repository/Shop/CoreCmsAreaRepository.cs b/CoreCms.Net.Repository/Shop/CoreCmsAreaRepository.cs
index edc16397..fb947b5e 100644
--- a/CoreCms.Net.Repository/Shop/CoreCmsAreaRepository.cs
+++ b/CoreCms.Net.Repository/Shop/CoreCmsAreaRepository.cs
@@ -42,7 +42,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Insertable(entity).RemoveDataCache().ExecuteReturnIdentityAsync() > 0;
+            var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0;
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
 
@@ -69,7 +69,7 @@ namespace CoreCms.Net.Repository
             oldModel.sort = entity.sort;
 
             //事物处理过程结束
-            var bl = await DbClient.Updateable(oldModel).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
 
@@ -85,7 +85,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Deleteable<CoreCmsArea>(id).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<CoreCmsArea>(id).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
 
diff --git a/CoreCms.Net.Repository/Shop/CoreCmsNoticeRepository.cs b/CoreCms.Net.Repository/Shop/CoreCmsNoticeRepository.cs
index f6595b71..c0e95f2a 100644
--- a/CoreCms.Net.Repository/Shop/CoreCmsNoticeRepository.cs
+++ b/CoreCms.Net.Repository/Shop/CoreCmsNoticeRepository.cs
@@ -54,35 +54,31 @@ namespace CoreCms.Net.Repository
                     sort = p.sort,
                     isDel = p.isDel,
                     createTime = p.createTime
-                }).ToPageListAsync(pageIndex, pageSize, totalCount);
+                }).WithCache().ToPageListAsync(pageIndex, pageSize, totalCount);
             var list = new PageList<CoreCmsNotice>(page, pageIndex, pageSize, totalCount);
             return list;
         }
 
 
         /// <summary>
-        ///     获取列表首页用
+        ///     获取首页组件数据
         /// </summary>
         /// <param name="predicate">判断集合</param>
-        /// <param name="orderByType">排序方式</param>
-        /// <param name="pageIndex">当前页面索引</param>
-        /// <param name="pageSize">分布大小</param>
-        /// <param name="orderByExpression"></param>
         /// <returns></returns>
-        public async Task<List<CoreCmsNotice>> QueryListAsync(Expression<Func<CoreCmsNotice, bool>> predicate,
-            Expression<Func<CoreCmsNotice, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
-            int pageSize = 20)
+        public async Task<List<dynamic>> QueryComponentAsync(Expression<Func<CoreCmsNotice, bool>> predicate)
         {
-            var list = await DbClient.Queryable<CoreCmsNotice>().OrderByIF(orderByExpression != null, orderByExpression, orderByType)
-                .WhereIF(predicate != null, predicate).Select(p => new CoreCmsNotice
+            var list = await DbClient.Queryable<CoreCmsNotice>()
+                .WhereIF(predicate != null, predicate)
+                .OrderBy(p => p.sort)
+                .Select(p => (dynamic)new
                 {
-                    id = p.id,
-                    title = p.title,
-                    type = p.type,
-                    sort = p.sort,
-                    isDel = p.isDel,
-                    createTime = p.createTime
-                }).ToPageListAsync(pageIndex, pageSize);
+                    p.id,
+                    p.title,
+                    p.type,
+                    p.sort,
+                    p.createTime
+                })
+                .WithCache().ToListAsync();
             return list;
         }
 
diff --git a/CoreCms.Net.Repository/Shop/CoreCmsOrderDistributionModelRepository.cs b/CoreCms.Net.Repository/Shop/CoreCmsOrderDistributionModelRepository.cs
index f10043ea..3dea07f2 100644
--- a/CoreCms.Net.Repository/Shop/CoreCmsOrderDistributionModelRepository.cs
+++ b/CoreCms.Net.Repository/Shop/CoreCmsOrderDistributionModelRepository.cs
@@ -45,7 +45,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Insertable(entity).RemoveDataCache().ExecuteReturnIdentityAsync() > 0;
+            var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0;
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
 
@@ -76,7 +76,7 @@ namespace CoreCms.Net.Repository
             oldModel.isOpenSelfDelivery = entity.isOpenSelfDelivery;
 
             //事物处理过程结束
-            var bl = await DbClient.Updateable(oldModel).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
 
@@ -92,7 +92,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Deleteable<CoreCmsOrderDistributionModel>(id).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<CoreCmsOrderDistributionModel>(id).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
 
diff --git a/CoreCms.Net.Repository/Shop/CoreCmsServiceDescriptionRepository.cs b/CoreCms.Net.Repository/Shop/CoreCmsServiceDescriptionRepository.cs
index 423268af..01830546 100644
--- a/CoreCms.Net.Repository/Shop/CoreCmsServiceDescriptionRepository.cs
+++ b/CoreCms.Net.Repository/Shop/CoreCmsServiceDescriptionRepository.cs
@@ -43,7 +43,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Insertable(entity).RemoveDataCache().ExecuteReturnIdentityAsync() > 0;
+            var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0;
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
 
@@ -73,7 +73,7 @@ namespace CoreCms.Net.Repository
             oldModel.sortId = entity.sortId;
 
             //事物处理过程结束
-            var bl = await DbClient.Updateable(oldModel).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
 
@@ -89,7 +89,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Deleteable<CoreCmsServiceDescription>(id).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<CoreCmsServiceDescription>(id).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
 
diff --git a/CoreCms.Net.Repository/Solitaire/CoreCmsSolitaireItemsRepository.cs b/CoreCms.Net.Repository/Solitaire/CoreCmsSolitaireItemsRepository.cs
index cb93d312..5e53a2aa 100644
--- a/CoreCms.Net.Repository/Solitaire/CoreCmsSolitaireItemsRepository.cs
+++ b/CoreCms.Net.Repository/Solitaire/CoreCmsSolitaireItemsRepository.cs
@@ -43,7 +43,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Insertable(entity).RemoveDataCache().ExecuteReturnIdentityAsync() > 0;
+            var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0;
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
 
@@ -76,7 +76,7 @@ namespace CoreCms.Net.Repository
             oldModel.isDelete = entity.isDelete;
 
             //事物处理过程结束
-            var bl = await DbClient.Updateable(oldModel).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
 
@@ -92,7 +92,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Deleteable<CoreCmsSolitaireItems>(id).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<CoreCmsSolitaireItems>(id).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
 
@@ -108,7 +108,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Deleteable<CoreCmsSolitaireItems>().In(ids).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<CoreCmsSolitaireItems>().In(ids).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
 
diff --git a/CoreCms.Net.Repository/System/SysMenuRepository.cs b/CoreCms.Net.Repository/System/SysMenuRepository.cs
index 1be99f71..28570261 100644
--- a/CoreCms.Net.Repository/System/SysMenuRepository.cs
+++ b/CoreCms.Net.Repository/System/SysMenuRepository.cs
@@ -42,7 +42,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Insertable(entity).RemoveDataCache().ExecuteReturnIdentityAsync() > 0;
+            var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0;
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
 
@@ -83,7 +83,7 @@ namespace CoreCms.Net.Repository
             oldModel.identificationCode = entity.identificationCode;
 
             //事物处理过程结束
-            var bl = await DbClient.Updateable(oldModel).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
 
@@ -99,7 +99,7 @@ namespace CoreCms.Net.Repository
         {
             var jm = new AdminUiCallBack();
 
-            var bl = await DbClient.Updateable(entity).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Updateable(entity).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
 
@@ -126,7 +126,7 @@ namespace CoreCms.Net.Repository
             var ids = new List<int>() { id };
             GetIds(all, id, ids);
 
-            var bl = await DbClient.Deleteable<SysMenu>().In(ids).RemoveDataCache().ExecuteCommandHasChangeAsync();
+            var bl = await DbClient.Deleteable<SysMenu>().In(ids).ExecuteCommandHasChangeAsync();
             jm.code = bl ? 0 : 1;
             jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
 
diff --git a/CoreCms.Net.Services/Article/CoreCmsArticleTypeServices.cs b/CoreCms.Net.Services/Article/CoreCmsArticleTypeServices.cs
index eceb1118..468a99d7 100644
--- a/CoreCms.Net.Services/Article/CoreCmsArticleTypeServices.cs
+++ b/CoreCms.Net.Services/Article/CoreCmsArticleTypeServices.cs
@@ -4,19 +4,28 @@
  *                Web: https://www.corecms.net                      
  *             Author: 大灰灰                                          
  *              Email: jianweie@163.com                                
- *         CreateTime: 2021/1/31 21:45:10
+ *         CreateTime: 2022/10/24 3:54:14
  *        Description: 暂无
  ***********************************************************************/
 
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Configuration;
 using CoreCms.Net.IRepository;
 using CoreCms.Net.IRepository.UnitOfWork;
 using CoreCms.Net.IServices;
 using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
 
 namespace CoreCms.Net.Services
 {
     /// <summary>
-    ///     文章分类表 接口实现
+    /// 文章分类表 接口实现
     /// </summary>
     public class CoreCmsArticleTypeServices : BaseServices<CoreCmsArticleType>, ICoreCmsArticleTypeServices
     {
@@ -25,9 +34,40 @@ namespace CoreCms.Net.Services
 
         public CoreCmsArticleTypeServices(IUnitOfWork unitOfWork, ICoreCmsArticleTypeRepository dal)
         {
-            _dal = dal;
-            BaseDal = dal;
+            this._dal = dal;
+            base.BaseDal = dal;
             _unitOfWork = unitOfWork;
         }
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> InsertAsync(CoreCmsArticleType entity)
+        {
+            return await _dal.InsertAsync(entity);
+        }
+
+        /// <summary>
+        /// 重写异步更新方法方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(CoreCmsArticleType entity)
+        {
+            return await _dal.UpdateAsync(entity);
+        }
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdAsync(object id)
+        {
+            return await _dal.DeleteByIdAsync(id);
+        }
+
     }
-}
\ No newline at end of file
+}
diff --git a/CoreCms.Net.Services/CoreCms.Net.Services.csproj b/CoreCms.Net.Services/CoreCms.Net.Services.csproj
index c1f555bc..2469aed7 100644
--- a/CoreCms.Net.Services/CoreCms.Net.Services.csproj
+++ b/CoreCms.Net.Services/CoreCms.Net.Services.csproj
@@ -13,6 +13,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="Qiniu" Version="8.2.0" />
+    <PackageReference Include="QRCoder" Version="1.4.3" />
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta13" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
diff --git a/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs b/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs
index 186b1953..6075c8c3 100644
--- a/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs
+++ b/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs
@@ -998,7 +998,6 @@ namespace CoreCms.Net.Services
         }
         #endregion
 
-
         /// <summary>
         ///     根据条件查询代理池商品分页数据
         /// </summary>
@@ -1045,5 +1044,19 @@ namespace CoreCms.Net.Services
         #endregion
 
 
+        /// <summary>
+        ///     获取商品及默认货品信息
+        /// </summary>
+        /// <param name="predicate"></param>
+        /// <param name="orderByPredicate"></param>
+        /// <param name="orderByType"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        public async Task<List<CoreCmsGoods>> QueryGoodWithDefaultProductAsync(Expression<Func<CoreCmsGoods, bool>> predicate,
+            Expression<Func<CoreCmsGoods, object>> orderByPredicate, OrderByType orderByType, bool blUseNoLock = false)
+        {
+            return await _dal.QueryGoodWithDefaultProductAsync(predicate, orderByPredicate, orderByType, blUseNoLock);
+        }
+
     }
 }
diff --git a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
index d271f39e..32d5569d 100644
--- a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
+++ b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
@@ -185,6 +185,7 @@ namespace CoreCms.Net.Services
 
         #endregion
 
+
         #region 获取税号
         /// <summary>
         /// 获取税号
diff --git a/CoreCms.Net.Services/Pay/AliPayServices.cs b/CoreCms.Net.Services/Pay/AliPayServices.cs
index e8ad23e4..9f6b2aca 100644
--- a/CoreCms.Net.Services/Pay/AliPayServices.cs
+++ b/CoreCms.Net.Services/Pay/AliPayServices.cs
@@ -17,6 +17,7 @@ using Newtonsoft.Json;
 using System.Threading.Tasks;
 using NLog;
 using System;
+using System.Globalization;
 using Essensoft.Paylink.Alipay;
 using Essensoft.Paylink.Alipay.Domain;
 using Essensoft.Paylink.Alipay.Request;
@@ -67,7 +68,7 @@ namespace CoreCms.Net.Services
                 OutTradeNo = entity.paymentId,
                 Subject = entity.payTitle.Length > 40 ? entity.payTitle[..40] : entity.payTitle,
                 ProductCode = entity.paymentCode,
-                TotalAmount = entity.money.ToString(),
+                TotalAmount = entity.money.ToString(CultureInfo.InvariantCulture),
                 Body = entity.payTitle.Length > 40 ? entity.payTitle[..40] : entity.payTitle
             };
             var req = new AlipayTradeAppPayRequest();
diff --git a/CoreCms.Net.Services/Pay/WeChatPayServices.cs b/CoreCms.Net.Services/Pay/WeChatPayServices.cs
index 9dcddc6b..5c3e03a8 100644
--- a/CoreCms.Net.Services/Pay/WeChatPayServices.cs
+++ b/CoreCms.Net.Services/Pay/WeChatPayServices.cs
@@ -19,6 +19,7 @@ using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Utility.Extensions;
 using CoreCms.Net.WeChat.Service.HttpClients;
+using Essensoft.Paylink.Alipay.Domain;
 using Essensoft.Paylink.WeChatPay;
 using Essensoft.Paylink.WeChatPay.V2;
 using Essensoft.Paylink.WeChatPay.V2.Request;
@@ -26,6 +27,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using QRCoder;
 using SKIT.FlurlHttpClient.Wechat.Api;
 using SKIT.FlurlHttpClient.Wechat.Api.Models;
 
@@ -178,36 +180,69 @@ namespace CoreCms.Net.Services
                 var response = await _client.ExecuteAsync(orderRequest, _optionsAccessor.Value);
                 if (response.ReturnCode == WeChatPayCode.Success && response.ResultCode == WeChatPayCode.Success)
                 {
-                    var req = new WeChatPayJsApiSdkRequest
-                    {
-                        Package = "prepay_id=" + response.PrepayId
-                    };
-                    WeChatPayDictionary parameter;
+                    //App微信支付
                     if (tradeType == GlobalEnumVars.WeiChatPayTradeType.APP.ToString())
                     {
                         var reqApp = new WeChatPayAppSdkRequest()
                         {
                             PrepayId = response.PrepayId
                         };
-                        parameter = await _client.ExecuteAsync(reqApp, _optionsAccessor.Value);
+                        var parameter = await _client.ExecuteAsync(reqApp, _optionsAccessor.Value);
+                        parameter.Add("paymentId", entity.paymentId);
+                        jm.status = true;
+                        jm.msg = "创建微信APP支付环境成功";
+                        jm.data = parameter;
+                        jm.otherData = response;
                     }
-                    else
+                    //JsApi通用微信支付
+                    else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString())
                     {
-                        parameter = await _client.ExecuteAsync(req, _optionsAccessor.Value);
+                        // 将参数(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, _optionsAccessor.Value);
+                        parameter.Add("paymentId", entity.paymentId);
+                        jm.status = true;
+                        jm.msg = "创建JSAPI支付环境成功";
+                        jm.data = parameter;
+                        //jm.otherData = response;
+                    }
+                    //扫码支付
+                    else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.NATIVE.ToString())
+                    {
+                        jm.status = true;
+                        jm.msg = "创建微信扫码支付环境成功";
+                        jm.data = new
+                        {
+                            response,
+                            entity.paymentId
+                        };
+                        //确定是否存在扫码的图片，然后转成base64到前端进行扫码支付
+                        if (!string.IsNullOrEmpty(response.CodeUrl) && response.CodeUrl.Contains("weixin://wxpay/bizpayurl?pr="))
+                        {
+                            using var qrGenerator = new QRCodeGenerator();
+                            using var qrCodeData = qrGenerator.CreateQrCode(response.CodeUrl, QRCodeGenerator.ECCLevel.L);
+                            using var pngByteQrCode = new PngByteQRCode(qrCodeData);
+                            var pngBytes = pngByteQrCode.GetGraphic(20, false);
+                            var stringBase64Str = Convert.ToBase64String(pngBytes);
+                            jm.otherData = stringBase64Str;
+                        }
+                    }
+                    //H5支付
+                    else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.MWEB.ToString())
+                    {
+                        jm.status = true;
+                        jm.msg = "创建H5支付环境成功";
+                        jm.data = response;
                     }
-                    // 将参数(parameter)给 公众号前端 让他在微信内H5调起支付(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6)
-                    parameter.Add("paymentId", entity.paymentId);
-
-                    jm.status = true;
-                    //jm.msg = "创建支付环境成功";
-                    jm.data = parameter;
-                    jm.otherData = response;
                 }
                 else
                 {
                     jm.status = false;
                     jm.msg = "微信建立支付请求失败";
-                    jm.otherData = response;
+                    //jm.otherData = response;
                 }
                 return jm;
             }
diff --git a/CoreCms.Net.Services/Pintuan/CoreCmsPintuanGoodsServices.cs b/CoreCms.Net.Services/Pintuan/CoreCmsPintuanGoodsServices.cs
index 4e356693..4ad8bdb2 100644
--- a/CoreCms.Net.Services/Pintuan/CoreCmsPintuanGoodsServices.cs
+++ b/CoreCms.Net.Services/Pintuan/CoreCmsPintuanGoodsServices.cs
@@ -63,9 +63,7 @@ namespace CoreCms.Net.Services
             using var container = _serviceProvider.CreateScope();
 
             var goodsServices = container.ServiceProvider.GetService<ICoreCmsGoodsServices>();
-            var pinTuanRuleServices = container.ServiceProvider.GetService<ICoreCmsPinTuanRuleServices>();
             var pinTuanRecordServices = container.ServiceProvider.GetService<ICoreCmsPinTuanRecordServices>();
-            var pinTuanGoodsServices = container.ServiceProvider.GetService<ICoreCmsPinTuanGoodsServices>();
             var orderServices = container.ServiceProvider.GetService<ICoreCmsOrderServices>();
 
             var goodsInfo = await goodsServices.GetGoodsDetail(goodsId, userId, false, "goods", 0, needGoodSku);
@@ -83,14 +81,14 @@ namespace CoreCms.Net.Services
             {
                 goodsInfo.pinTuanRule.pinTuanStartStatus = (int)GlobalEnumVars.PinTuanRuleStatus.notBegun;
 
-                TimeSpan ts = goodsInfo.pinTuanRule.startTime.Subtract(dt);
+                var ts = goodsInfo.pinTuanRule.startTime.Subtract(dt);
                 goodsInfo.pinTuanRule.lastTime = (int)ts.TotalSeconds;
             }
             else if (goodsInfo.pinTuanRule.startTime <= dt && goodsInfo.pinTuanRule.endTime > dt)
             {
                 goodsInfo.pinTuanRule.pinTuanStartStatus = (int)GlobalEnumVars.PinTuanRuleStatus.begin;
 
-                TimeSpan ts = goodsInfo.pinTuanRule.endTime.Subtract(dt);
+                var ts = goodsInfo.pinTuanRule.endTime.Subtract(dt);
                 goodsInfo.pinTuanRule.lastTime = (int)ts.TotalSeconds;
             }
             else
diff --git a/CoreCms.Net.Services/Pintuan/CoreCmsPintuanRuleServices.cs b/CoreCms.Net.Services/Pintuan/CoreCmsPintuanRuleServices.cs
index 743f971d..a51ed146 100644
--- a/CoreCms.Net.Services/Pintuan/CoreCmsPintuanRuleServices.cs
+++ b/CoreCms.Net.Services/Pintuan/CoreCmsPintuanRuleServices.cs
@@ -14,6 +14,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using CoreCms.Net.Configuration;
+using CoreCms.Net.DTO;
 using CoreCms.Net.IRepository;
 using CoreCms.Net.IRepository.UnitOfWork;
 using CoreCms.Net.IServices;
@@ -23,6 +24,7 @@ using CoreCms.Net.Model.Entities.Expression;
 using CoreCms.Net.Model.ViewModels.Basics;
 using CoreCms.Net.Model.ViewModels.DTO;
 using CoreCms.Net.Model.ViewModels.UI;
+using Essensoft.Paylink.Alipay.Domain;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using SqlSugar;
@@ -65,15 +67,18 @@ namespace CoreCms.Net.Services
         /// 接口上获取拼团所有商品
         /// </summary>
         /// <returns></returns>
-        public async Task<WebApiCallBack> GetPinTuanList(int userId = 0)
+        public async Task<WebApiCallBack> GetPinTuanList(int userId = 0, int pageIndex = 1, int pageSize = 20)
         {
             var jm = new WebApiCallBack();
 
             using var container = _serviceProvider.CreateScope();
             var pinTuanGoodsServices = container.ServiceProvider.GetService<ICoreCmsPinTuanGoodsServices>();
             var pinTuanRuleServices = container.ServiceProvider.GetService<ICoreCmsPinTuanRuleServices>();
+            var goodsServices = container.ServiceProvider.GetService<ICoreCmsGoodsServices>();
 
-            var pinTuanRules = await pinTuanRuleServices.QueryListByClauseAsync(p => p.isStatusOpen == true, p => p.sort, OrderByType.Asc, true, true, 24 * 60);
+            //从缓存中获取有效的数据
+            var dt = DateTime.Now;
+            var pinTuanRules = await pinTuanRuleServices.QueryListByClauseAsync(p => p.isStatusOpen == true && p.startTime < dt && p.endTime > dt, p => p.sort, OrderByType.Asc, true, true, 24 * 60);
             if (pinTuanRules == null && !pinTuanRules.Any())
             {
                 jm.status = true;
@@ -81,30 +86,35 @@ namespace CoreCms.Net.Services
                 return jm;
             }
             //获取开启的规则集序列
-            var pinTuanRuleIds = pinTuanRules.Select(p => p.id).ToList();
-            //获取下级商品数据
-            var pinTuanGoods = await pinTuanGoodsServices.QueryListByClauseAsync(p => pinTuanRuleIds.Contains(p.ruleId), p => p.ruleId, OrderByType.Asc, true, true);
-            //从缓存中获取有效的数据
-            var dt = DateTime.Now;
-            var list = pinTuanRules.Where(p => p.startTime < dt && p.endTime > dt).OrderBy(p => p.sort).ToList();
+            var pinTuanRuleIds = pinTuanRules.Select(p => p.id).ToArray();
 
-            if (list.Any())
+
+            var dtoData = await _dal.GetPinTuanInfos(pinTuanRuleIds, p => p.sortId, OrderByType.Asc, pageIndex, pageSize);
+            foreach (var item in dtoData)
             {
-                var goods = new List<CoreCmsGoods>();
-                foreach (var item in list)
+                //判断拼团状态
+                var dtNow = DateTime.Now;
+                if (item.startTime > dt)
                 {
-                    var pinTuanGood = pinTuanGoods.Find(p => p.ruleId == item.id);
-                    if (pinTuanGood != null)
-                    {
-                        var g = await pinTuanGoodsServices.GetGoodsInfo(item, pinTuanGood.goodsId, userId, false,
-                            false, false);
-                        if (g == null) continue;
-                        goods.Add(g);
-                    }
+                    item.startStatus = (int)GlobalEnumVars.PinTuanRuleStatus.notBegun;
+                    var ts = item.startTime.Subtract(dt);
+                    item.timestamp = (int)ts.TotalSeconds;
                 }
-                jm.data = goods;
+                else if (item.startTime <= dt && item.endTime > dt)
+                {
+                    item.startStatus = (int)GlobalEnumVars.PinTuanRuleStatus.begin;
+                    var ts = item.endTime.Subtract(dt);
+                    item.timestamp = (int)ts.TotalSeconds;
+                }
+                else
+                {
+                    item.startStatus = (int)GlobalEnumVars.PinTuanRuleStatus.haveExpired;
+                }
+
+                item.pinTuanPrice -= item.discountAmount;
             }
 
+            jm.data = dtoData;
             jm.status = true;
             return jm;
         }
@@ -136,5 +146,25 @@ namespace CoreCms.Net.Services
         {
             return await _dal.GetPinTuanInfo(ruleId);
         }
+
+
+        /// <summary>
+        ///     根据规则ID数组获取拼团相关信息
+        /// </summary>
+        /// <param name="ruleIds">规则序列</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="orderByType"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <returns></returns>
+        public async Task<IPageList<PinTuanListDTO>> GetPinTuanInfos(int[] ruleIds,
+            Expression<Func<PinTuanListDTO, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20)
+        {
+
+            return await _dal.GetPinTuanInfos(ruleIds, orderByExpression, orderByType, pageIndex, pageSize);
+
+        }
+
     }
 }
diff --git a/CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs b/CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs
index e0f52059..d94d0023 100644
--- a/CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs
+++ b/CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs
@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using CoreCms.Net.Configuration;
+using CoreCms.Net.DTO;
 using CoreCms.Net.IRepository;
 using CoreCms.Net.IRepository.UnitOfWork;
 using CoreCms.Net.IServices;
@@ -175,17 +176,17 @@ namespace CoreCms.Net.Services
         #endregion
 
 
-
-
-
-
         #region 获取团购列表数据
         /// <summary>
         /// 获取团购列表数据
         /// </summary>
         /// <returns></returns>
-        public async Task<WebApiCallBack> GetGroupList(int type, int userId, int status, int pageIndex, int pageSize)
+        public async Task<WebApiCallBack> GetGroupList(int type, int status, int pageIndex, int pageSize)
         {
+            using var container = _serviceProvider.CreateScope();
+
+            var goodsServices = container.ServiceProvider.GetService<ICoreCmsGoodsServices>();
+            var orderServices = container.ServiceProvider.GetService<ICoreCmsOrderServices>();
 
             var jm = new WebApiCallBack { status = true };
 
@@ -207,51 +208,75 @@ namespace CoreCms.Net.Services
             {
                 where = where.And(p => p.endTime < dt);
             }
-
             var goods = new List<CoreCmsGoods>();
-            var list = await _dal.QueryPageAsync(where, p => p.endTime, OrderByType.Desc, pageIndex, pageSize);
-            if (list != null && list.Any())
+            var promotions = await _dal.QueryPageAsync(where, p => p.endTime, OrderByType.Desc, pageIndex, pageSize, true, true, 60);
+            var dtoData = new List<GroupPurchaseSeckillDTO>();
+            if (promotions != null && promotions.Any())
             {
-                foreach (var item in list)
+                //获取团购序列
+                var pIds = promotions.Select(p => p.id).ToList();
+                //获取规则参数
+                var conditions = await _promotionConditionServices.QueryListByClauseAsync(p => pIds.Contains(p.promotionId), p => p.id, OrderByType.Asc, true, true);
+                //获取规则结果集
+                var results = await _promotionResultServices.QueryListByClauseAsync(p => pIds.Contains(p.promotionId), p => p.id, OrderByType.Asc, true, true);
+
+                var goodIds = (from condition in conditions where condition != null && condition.parameters.Contains("goodsId") select (JObject)JsonConvert.DeserializeObject(condition.parameters) into parameters select parameters["goodsId"].ObjectToInt(0)).ToList();
+
+                var goodData = await goodsServices.QueryGoodWithDefaultProductAsync(p => goodIds.Contains(p.id), p => p.id, OrderByType.Asc, true);
+
+                foreach (var item in promotions)
                 {
-                    var promotionId = item.id;
-                    var condition = await _promotionConditionServices.QueryByClauseAsync(p => p.promotionId == promotionId);
+                    var dtNow = DateTime.Now;
+
+                    var dto = new GroupPurchaseSeckillDTO();
+
+                    //事物处理过程开始
+                    dto.id = item.id;
+                    dto.name = item.name;
+                    dto.type = item.type;
+                    dto.sort = item.sort;
+                    dto.maxNums = item.maxNums;
+                    dto.maxGoodsNums = item.maxGoodsNums;
+                    dto.maxRecevieNums = item.maxRecevieNums;
+                    dto.startTime = item.startTime;
+                    dto.endTime = item.endTime;
+                    dto.isEnable = item.isEnable;
+                    dto.isExclusive = item.isExclusive;
+                    dto.isAutoReceive = item.isAutoReceive;
+                    dto.effectiveDays = item.effectiveDays;
+                    dto.effectiveHours = item.effectiveHours;
+                    dto.startStatus = status;
+
+                    var condition = conditions.Find(p => p.promotionId == item.id);
                     if (condition != null && condition.parameters.Contains("goodsId"))
                     {
-                        JObject parameters = (JObject)JsonConvert.DeserializeObject(condition.parameters);
-
-
-                        var res = await GetGroupDetail(parameters["goodsId"].ObjectToInt(0), userId, type, item.id);
-                        if (res.status)
+                        var parameters = (JObject)JsonConvert.DeserializeObject(condition.parameters);
+                        var goodId = parameters["goodsId"].ObjectToInt(0);
+                        var good = goodData.Find(p => p.id == goodId);
+                        if (good != null)
                         {
-                            var good = res.data as CoreCmsGoods;
+                            dto.goodBrief = good.brief;
+                            dto.goodName = good.name;
+                            dto.goodThumbnail = good.image;
+                            dto.goodImages = good.images;
+                            dto.goodStock = good.stock;
+                            dto.goodViewCount = good.viewCount;
+                            dto.goodUnit = good.unit;
+                            dto.mktPrice = good.mktprice;
+                            dto.price = good.price;
 
-                            good.groupId = item.id;
-                            good.groupType = item.type;
-                            good.groupStatus = item.isEnable;
-                            good.groupTime = DateTime.Now;
-                            good.groupStartTime = item.startTime;
-                            good.groupEndTime = item.endTime;
-
-                            TimeSpan ts = item.endTime.Subtract(dt);
-                            good.groupTimestamp = (int)ts.TotalSeconds;
-
-                            goods.Add(good);
-                        }
-                        else
-                        {
-                            item.expression1 = res.msg;
+                            TimeSpan ts = item.endTime.Subtract(dtNow);
+                            dto.timestamp = (int)ts.TotalSeconds;
                         }
                     }
+                    dtoData.Add(dto);
                 }
             }
-
             jm.data = new
             {
-                goods,
-                list.TotalCount,
-                list.TotalPages,
-                list,
+                promotions.TotalCount,
+                promotions.TotalPages,
+                list = dtoData,
                 pageIndex,
                 pageSize
             };
@@ -266,7 +291,7 @@ namespace CoreCms.Net.Services
         /// </summary>
         /// <returns></returns>
 
-        public async Task<WebApiCallBack> GetGroupDetail(int goodId = 0, int userId = 0, int type = (int)GlobalEnumVars.PromotionType.Group, int groupId = 0, bool needSku = false)
+        public async Task<WebApiCallBack> GetGroupDetail(int groupId, int userId, int type, bool needSku)
         {
             using var container = _serviceProvider.CreateScope();
 
@@ -275,31 +300,40 @@ namespace CoreCms.Net.Services
 
             var jm = new WebApiCallBack() { msg = "关键参数丢失" };
 
-            if (goodId == 0)
+            if (groupId == 0)
             {
                 return jm;
             }
 
-            //判断商品是否参加团购
-            var isInGroup = _dal.IsInGroup(goodId, out var promotionId, type);
-            if (!isInGroup)
-            {
-                jm.msg = "商品未参加团购";
-                return jm;
-            }
-
-            var promotion = await _dal.QueryByClauseAsync(p => p.isDel == false && p.isEnable == true && p.id == promotionId);
+            var promotion = await _dal.QueryByClauseAsync(p => p.isDel == false && p.isEnable == true && p.id == groupId, true, true);
             if (promotion == null)
             {
                 jm.msg = "无此活动";
-                jm.otherData = promotionId;
+                jm.otherData = groupId;
+                return jm;
+            }
+
+            var goodId = 0;
+            var condition = await _promotionConditionServices.QueryByClauseAsync(p => p.promotionId == groupId, true, true);
+            if (condition != null)
+            {
+                var obj = (JObject)JsonConvert.DeserializeObject(condition.parameters);
+                if (obj.ContainsKey("goodsId") && obj["goodsId"].ObjectToInt(0) > 0)
+                {
+                    goodId = obj["goodsId"].ObjectToInt(0);
+                }
+            }
+
+            if (goodId == 0)
+            {
+                jm.msg = "未提交商品信息";
+                jm.otherData = groupId;
                 return jm;
             }
 
-            var goods = new CoreCmsGoods();
             string typeStr = type == (int)GlobalEnumVars.PromotionType.Group ? GlobalEnumVars.PromotionType.Group.ToString().ToLowerInvariant() : GlobalEnumVars.PromotionType.Seckill.ToString().ToLowerInvariant();
 
-            goods = await goodsServices.GetGoodsDetail(goodId, userId, true, typeStr, groupId, needSku);
+            var goods = await goodsServices.GetGoodsDetail(goodId, userId, true, typeStr, groupId, needSku);
             if (goods == null)
             {
                 jm.msg = "商品不存在";
@@ -315,8 +349,6 @@ namespace CoreCms.Net.Services
             //调整前台显示数量
             var checkOrder = orderServices.FindLimitOrder(goods.product.id, userId, promotion.startTime, promotion.endTime, promotion.type);
 
-            var productStock = goods.product.stock;
-
             //如果最大为设置值
             if (promotion.maxGoodsNums > 0)
             {
@@ -335,10 +367,8 @@ namespace CoreCms.Net.Services
                 goods.product.stock = checkOrder.TotalOrders - promotion.maxNums >= 0 ? 0 : promotion.maxNums - checkOrder.TotalOrders;
             }
 
-
             goods.buyPromotionCount = checkOrder.TotalOrders;
 
-
             var dt = DateTime.Now;
 
             goods.groupId = promotion.id;
@@ -351,7 +381,6 @@ namespace CoreCms.Net.Services
             TimeSpan ts = promotion.endTime.Subtract(dt);
             goods.groupTimestamp = (int)ts.TotalSeconds;
 
-
             //进行促销后要更换原销售价替换原市场价
             var originPrice = Math.Round(goods.product.price + goods.product.promotionAmount, 2);
             goods.product.mktprice = originPrice;
diff --git a/CoreCms.Net.Services/Share/CoreCmsShareServices.cs b/CoreCms.Net.Services/Share/CoreCmsShareServices.cs
index 0f88587d..98c95f18 100644
--- a/CoreCms.Net.Services/Share/CoreCmsShareServices.cs
+++ b/CoreCms.Net.Services/Share/CoreCmsShareServices.cs
@@ -532,9 +532,9 @@ namespace CoreCms.Net.Services
                     }
                     break;
                 case (int)GlobalEnumVars.UrlSharePageType.PinTuan:
-                    if (parameter.ContainsKey("goodsId") && parameter.ContainsKey("teamId") && parameter.ContainsKey("groupId"))
+                    if (parameter.ContainsKey("teamId") && parameter.ContainsKey("groupId"))
                     {
-                        str = parameter["goodsId"] + "_" + parameter["groupId"] + "_" + parameter["teamId"];
+                        str = parameter["groupId"] + "_" + parameter["teamId"];
                     }
                     else
                     {
@@ -565,9 +565,9 @@ namespace CoreCms.Net.Services
                     }
                     break;
                 case (int)GlobalEnumVars.UrlSharePageType.AddPinTuan:
-                    if (parameter.ContainsKey("goodsId") && parameter.ContainsKey("groupId") && parameter.ContainsKey("teamId"))
+                    if (parameter.ContainsKey("groupId") && parameter.ContainsKey("teamId"))
                     {
-                        str = parameter["goodsId"] + "_" + parameter["groupId"] + "_" + parameter["teamId"];
+                        str = parameter["groupId"] + "_" + parameter["teamId"];
                     }
                     else
                     {
@@ -598,24 +598,24 @@ namespace CoreCms.Net.Services
                     }
                     break;
                 case (int)GlobalEnumVars.UrlSharePageType.Group:
-                    if (parameter.ContainsKey("goodsId") || parameter.ContainsKey("groupId"))
+                    if (parameter.ContainsKey("groupId"))
                     {
-                        str = parameter["goodsId"] + "_" + parameter["groupId"];
+                        str = parameter["groupId"].ToString();
                     }
                     else
                     {
-                        jm.msg = "参数必须传goodsId,groupId";
+                        jm.msg = "参数必须传groupId";
                         return jm;
                     }
                     break;
                 case (int)GlobalEnumVars.UrlSharePageType.Seckill:
-                    if (parameter.ContainsKey("goodsId") || parameter.ContainsKey("groupId"))
+                    if (parameter.ContainsKey("groupId"))
                     {
-                        str = parameter["goodsId"] + "_" + parameter["groupId"];
+                        str = parameter["groupId"].ToString();
                     }
                     else
                     {
-                        jm.msg = "参数必须传goodsId,groupId";
+                        jm.msg = "参数必须传groupId";
                         return jm;
                     }
                     break;
@@ -641,6 +641,17 @@ namespace CoreCms.Net.Services
                         return jm;
                     }
                     break;
+                case (int)GlobalEnumVars.UrlSharePageType.ServiceGoods:
+                    if (parameter.ContainsKey("serviceGoodsId"))
+                    {
+                        str = parameter["serviceGoodsId"]?.ToString();
+                    }
+                    else
+                    {
+                        jm.msg = "参数必须传id";
+                        return jm;
+                    }
+                    break;
                 default:
                     jm.msg = GlobalErrorCodeVars.Code10000;
                     return jm;
@@ -682,9 +693,8 @@ namespace CoreCms.Net.Services
                     {
                         jm.data = new
                         {
-                            goodsId = arr[0],
-                            groupId = arr[1],
-                            teamId = arr[2]
+                            groupId = arr[0],
+                            teamId = arr[1]
                         };
                         jm.status = true;
                     }
@@ -712,9 +722,8 @@ namespace CoreCms.Net.Services
                     {
                         jm.data = new
                         {
-                            goodsId = arr[0],
-                            groupId = arr[1],
-                            teamId = arr[2]
+                            groupId = arr[0],
+                            teamId = arr[1]
                         };
                         jm.status = true;
                     }
@@ -734,23 +743,21 @@ namespace CoreCms.Net.Services
                     }
                     break;
                 case (int)GlobalEnumVars.UrlSharePageType.Group:
-                    if (arr.Length == 2)
+                    if (arr.Length == 1)
                     {
                         jm.data = new
                         {
-                            goodsId = arr[0],
-                            groupId = arr[1],
+                            groupId = arr[0],
                         };
                         jm.status = true;
                     }
                     break;
                 case (int)GlobalEnumVars.UrlSharePageType.Seckill:
-                    if (arr.Length == 2)
+                    if (arr.Length == 1)
                     {
                         jm.data = new
                         {
-                            goodsId = arr[0],
-                            groupId = arr[1],
+                            groupId = arr[0],
                         };
                         jm.status = true;
                     }
@@ -769,6 +776,13 @@ namespace CoreCms.Net.Services
                         jm.status = true;
                     }
                     break;
+                case (int)GlobalEnumVars.UrlSharePageType.ServiceGoods:
+                    if (arr.Length == 1)
+                    {
+                        jm.data = new { serviceGoodsId = arr[0] };
+                        jm.status = true;
+                    }
+                    break;
                 default:
                     jm.msg = GlobalErrorCodeVars.Code10000;
                     return jm;
diff --git a/CoreCms.Net.Services/Shop/CoreCmsNoticeServices.cs b/CoreCms.Net.Services/Shop/CoreCmsNoticeServices.cs
index 5a97bd3e..88436482 100644
--- a/CoreCms.Net.Services/Shop/CoreCmsNoticeServices.cs
+++ b/CoreCms.Net.Services/Shop/CoreCmsNoticeServices.cs
@@ -57,19 +57,13 @@ namespace CoreCms.Net.Services
 
 
         /// <summary>
-        ///     获取列表首页用
+        ///     获取首页组件数据
         /// </summary>
         /// <param name="predicate">判断集合</param>
-        /// <param name="orderByType">排序方式</param>
-        /// <param name="pageIndex">当前页面索引</param>
-        /// <param name="pageSize">分布大小</param>
-        /// <param name="orderByExpression"></param>
         /// <returns></returns>
-        public async Task<List<CoreCmsNotice>> QueryListAsync(Expression<Func<CoreCmsNotice, bool>> predicate,
-            Expression<Func<CoreCmsNotice, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
-            int pageSize = 20)
+        public async Task<List<dynamic>> QueryComponentAsync(Expression<Func<CoreCmsNotice, bool>> predicate)
         {
-            return await _dal.QueryListAsync(predicate, orderByExpression, orderByType, pageIndex, pageSize);
+            return await _dal.QueryComponentAsync(predicate);
         }
     }
 }
diff --git a/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs b/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs
index 2736f2f4..5ad1376b 100644
--- a/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs
+++ b/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs
@@ -23,6 +23,7 @@ using CoreCms.Net.Model.FromBody;
 using CoreCms.Net.Model.ViewModels.DTO;
 using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Utility.Extensions;
+using Essensoft.Paylink.Alipay.Domain;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SqlSugar;
@@ -43,6 +44,7 @@ namespace CoreCms.Net.Services
         private readonly ICoreCmsSettingServices _settingServices;
         private readonly ICoreCmsGoodsServices _goodsServices;
         private readonly ICoreCmsArticleServices _articleServices;
+        private readonly ICoreCmsArticleTypeServices _articleTypeServices;
         private readonly ICoreCmsPromotionConditionServices _promotionConditionServices;
         private readonly ICoreCmsPinTuanRuleServices _pinTuanRuleServices;
         private readonly ICoreCmsServicesServices _servicesServices;
@@ -51,7 +53,7 @@ namespace CoreCms.Net.Services
         private readonly IUnitOfWork _unitOfWork;
         public CoreCmsPagesServices(IUnitOfWork unitOfWork
             , ICoreCmsPagesRepository dal
-            , ICoreCmsPagesItemsRepository pagesItemsRepository, ICoreCmsPromotionServices promotionServices, ICoreCmsNoticeServices noticeServices, ICoreCmsGoodsCategoryServices goodsCategoryServices, ICoreCmsSettingServices settingServices, ICoreCmsGoodsServices goodsServices, ICoreCmsArticleServices articleServices, ICoreCmsPromotionConditionServices promotionConditionServices, ICoreCmsPinTuanRuleServices pinTuanRuleServices, ICoreCmsServicesServices servicesServices)
+            , ICoreCmsPagesItemsRepository pagesItemsRepository, ICoreCmsPromotionServices promotionServices, ICoreCmsNoticeServices noticeServices, ICoreCmsGoodsCategoryServices goodsCategoryServices, ICoreCmsSettingServices settingServices, ICoreCmsGoodsServices goodsServices, ICoreCmsArticleServices articleServices, ICoreCmsPromotionConditionServices promotionConditionServices, ICoreCmsPinTuanRuleServices pinTuanRuleServices, ICoreCmsServicesServices servicesServices, ICoreCmsArticleTypeServices articleTypeServices)
         {
             this._dal = dal;
             _pagesItemsRepository = pagesItemsRepository;
@@ -64,6 +66,7 @@ namespace CoreCms.Net.Services
             _promotionConditionServices = promotionConditionServices;
             _pinTuanRuleServices = pinTuanRuleServices;
             _servicesServices = servicesServices;
+            _articleTypeServices = articleTypeServices;
             base.BaseDal = dal;
             _unitOfWork = unitOfWork;
         }
@@ -136,13 +139,13 @@ namespace CoreCms.Net.Services
 
             wherePage = code == "mobile_home" ? wherePage.And(p => p.type == 1) : wherePage.And(p => p.code == code);
 
-            var model = await _dal.QueryByClauseAsync(wherePage);
+            var model = await _dal.QueryByClauseAsync(wherePage, true, true);
             if (model == null)
             {
                 return jm;
             }
             jm.status = true;
-            var items = await _pagesItemsRepository.QueryListByClauseAsync(p => p.pageCode == model.code, p => p.sort, OrderByType.Asc);
+            var items = await _pagesItemsRepository.QueryListByClauseAsync(p => p.pageCode == model.code, p => p.sort, OrderByType.Asc, true, true);
 
             var itemsDto = new List<PagesItemsDto>();
             foreach (var item in items)
@@ -156,143 +159,220 @@ namespace CoreCms.Net.Services
 
                 item.parameters = item.parameters.Replace("/images/empty-banner.png", "/static/images/common/empty-banner.png");
 
-                if (item.widgetCode == "search") //搜索
+                switch (item.widgetCode)
                 {
-                    dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-                }
-                else if (item.widgetCode == "tabBar")
-                {
-                    dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-                }
-                else if (item.widgetCode == "notice")
-                {
-                    JObject parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-
-                    if (parameters != null && parameters.ContainsKey("type") && parameters["type"].ToString() == "auto")
-                    {
-                        var list = await _noticeServices.QueryListAsync(p => p.isDel == false, p => p.createTime, OrderByType.Desc, 1, 20);
-                        if (list != null && list.Any())
+                    //搜索
+                    case "search":
+                    case "tabBar":
+                        dto.parameters = JsonConvert.DeserializeObject(item.parameters);
+                        break;
+                    case "notice":
                         {
-                            JArray result = JArray.FromObject(list);
-                            parameters.Remove("list");
-                            parameters.Add("list", result);
-                        }
-                    }
-                    else if (parameters != null && parameters.ContainsKey("type") && parameters["type"].ToString() == "choose")
-                    {
-
-                        var where = PredicateBuilder.True<CoreCmsNotice>();
-
-                        var orderBy = string.Empty;
-                        var noticeIdsStr = string.Empty;
-                        if (parameters != null && parameters.ContainsKey("list"))
-                        {
-                            JArray result = JArray.Parse(parameters["list"].ToString());
-                            var noticeIds = new List<int>();
-                            foreach (var ss in result)  //查找某个字段与值
+                            var parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
+                            if (parameters != null && parameters.ContainsKey("type") && parameters["type"].ToString() == "auto")
                             {
-                                var noticeId = ((JObject)ss)["id"].ObjectToInt(0);
-                                if (noticeId > 0)
+                                var list = await _noticeServices.QueryComponentAsync(p => p.isDel == false);
+                                if (list != null && list.Any())
                                 {
-                                    noticeIds.Add(noticeId);
+                                    var result = JArray.FromObject(list);
+                                    parameters.Remove("list");
+                                    parameters.Add("list", result);
                                 }
                             }
-                            where = where.And(p => noticeIds.Contains(p.id));
-                            if (noticeIds.Any())
+                            else if (parameters != null && parameters.ContainsKey("type") && parameters["type"].ToString() == "choose")
                             {
-                                noticeIdsStr = string.Join(",", noticeIdsStr);
-                                //按照固定的序列id进行排序
-                                if (AppSettingsConstVars.DbDbType == DbType.SqlServer.ToString())
+
+                                var where = PredicateBuilder.True<CoreCmsNotice>();
+
+                                var orderBy = string.Empty;
+                                var noticeIdsStr = string.Empty;
+                                if (parameters != null && parameters.ContainsKey("list"))
                                 {
-                                    orderBy = " CHARINDEX(RTRIM(CAST(id as NCHAR)),'" + noticeIdsStr + "') ";
+                                    var result = JArray.Parse(parameters["list"].ToString());
+                                    var noticeIds = result.Select(ss => ((JObject)ss)["id"].ObjectToInt(0)).Where(noticeId => noticeId > 0).ToList();
+                                    where = where.And(p => noticeIds.Contains(p.id));
+                                    if (noticeIds.Any())
+                                    {
+                                        noticeIdsStr = string.Join(",", noticeIdsStr);
+                                        //按照固定的序列id进行排序
+                                        if (AppSettingsConstVars.DbDbType == DbType.SqlServer.ToString())
+                                        {
+                                            orderBy = " CHARINDEX(RTRIM(CAST(id as NCHAR)),'" + noticeIdsStr + "') ";
+                                        }
+                                        else if (AppSettingsConstVars.DbDbType == DbType.MySql.ToString())
+                                        {
+                                            orderBy = " find_in_set(id,'" + noticeIdsStr + "') ";
+                                        }
+                                    }
                                 }
-                                else if (AppSettingsConstVars.DbDbType == DbType.MySql.ToString())
+                                var notices = await _noticeServices.QueryListByClauseAsync(where, orderBy);
+                                if (notices != null && notices.Any())
                                 {
-                                    orderBy = " find_in_set(id,'" + noticeIdsStr + "') ";
+                                    var result = JArray.FromObject(notices);
+                                    parameters.Remove("list");
+                                    parameters.Add("list", result);
+                                }
+                                else
+                                {
+                                    parameters.Remove("list");
+                                    parameters.Add("list", new JArray());
                                 }
                             }
-                        }
-                        var notices = await _noticeServices.QueryListByClauseAsync(where, orderBy);
-                        if (notices != null && notices.Any())
-                        {
-                            JArray result = JArray.FromObject(notices);
-                            parameters.Remove("list");
-                            parameters.Add("list", result);
-                        }
-                        else
-                        {
-                            parameters.Remove("list");
-                            parameters.Add("list", new JArray());
-                        }
-                    }
 
-                    dto.parameters = parameters;
-                }
-                else if (item.widgetCode == "imgSlide")
-                {
-                    dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-                }
-                else if (item.widgetCode == "coupon")
-                {
-                    JObject parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-
-                    if (parameters != null && parameters.ContainsKey("limit") && parameters["limit"].ObjectToInt(0) != 0)
-                    {
-                        var list = await _promotionServices.ReceiveCouponList(parameters["limit"].ObjectToInt(0));
-                        if (list != null && list.Any())
-                        {
-                            JArray result = JArray.FromObject(list);
-                            parameters.Remove("list");
-                            parameters.Add("list", result);
+                            dto.parameters = parameters;
+                            break;
                         }
-                    }
-
-                    dto.parameters = parameters;
-                }
-                else if (item.widgetCode == "blank")
-                {
-                    dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-                }
-                else if (item.widgetCode == "textarea")
-                {
-                    JObject parameters = new JObject();
-                    parameters["value"] = item.parameters;
-                    dto.parameters = parameters;
-                }
-                else if (item.widgetCode == "video")
-                {
-                    dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-                }
-                else if (item.widgetCode == "imgWindow")
-                {
-                    dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-                }
-                else if (item.widgetCode == "imgSingle")
-                {
-                    dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-                }
-                else if (item.widgetCode == "goodTabBar")
-                {
-                    JObject parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-
-                    if (parameters != null && parameters.ContainsKey("list"))
-                    {
-                        var list = JArray.Parse(parameters["list"].ToString());
-                        var newList = new JArray();
-                        var count = 0;
-                        foreach (var jToken in list)
+                    case "imgSlide":
+                        dto.parameters = JsonConvert.DeserializeObject(item.parameters);
+                        break;
+                    case "coupon":
                         {
-                            var child = (JObject)jToken;
+                            var parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
+                            if (parameters != null && parameters.ContainsKey("limit") && parameters["limit"].ObjectToInt(0) != 0)
+                            {
+                                var list = await _promotionServices.ReceiveCouponList(parameters["limit"].ObjectToInt(0));
+                                if (list != null && list.Any())
+                                {
+                                    var result = JArray.FromObject(list);
+                                    parameters.Remove("list");
+                                    parameters.Add("list", result);
+                                }
+                            }
+
+                            dto.parameters = parameters;
+                            break;
+                        }
+                    case "blank":
+                        dto.parameters = JsonConvert.DeserializeObject(item.parameters);
+                        break;
+                    case "textarea":
+                        {
+                            var parameters = new JObject();
+                            parameters["value"] = item.parameters;
+                            dto.parameters = parameters;
+                            break;
+                        }
+                    case "video":
+                    case "imgWindow":
+                    case "imgSingle":
+                        dto.parameters = JsonConvert.DeserializeObject(item.parameters);
+                        break;
+                    case "goodTabBar":
+                        {
+                            var parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
+                            if (parameters != null && parameters.ContainsKey("list"))
+                            {
+                                var list = JArray.Parse(parameters["list"].ToString());
+                                var newList = new JArray();
+                                foreach (var jToken in list)
+                                {
+                                    var child = (JObject)jToken;
+                                    var where = PredicateBuilder.True<CoreCmsGoods>();
+                                    where = where.And(p => p.isDel == false);
+                                    where = where.And(p => p.isMarketable == true);
+
+                                    if (child != null && child.ContainsKey("type") && child["type"].ToString() == "auto")
+                                    {
+                                        //商品分类,同时取所有子分类
+                                        if (child.ContainsKey("classifyId") && child["classifyId"].ObjectToInt(0) > 0)
+                                        {
+                                            var classifyId = child["classifyId"].ObjectToInt(0);
+                                            var gc = await _goodsCategoryServices.GetCaChe();
+                                            var childCats = gc.Where(p => p.parentId == classifyId).ToList();
+                                            var catIds = childCats != null && childCats.Any()
+                                                ? childCats.Select(p => p.id).ToList()
+                                                : new List<int>();
+                                            catIds.Add(classifyId);
+
+                                            where = where.And(p => catIds.Contains(p.goodsCategoryId));
+                                            //扩展分类 CoreCmsGoodsCategory
+                                        }
+                                        //品牌筛选
+                                        if (child.ContainsKey("brandId") && child["brandId"].ObjectToInt(0) > 0)
+                                        {
+                                            var brandId = child["brandId"].ObjectToInt(0);
+                                            where = where.And(p => p.brandId == brandId);
+                                        }
+
+                                        var limit = 0;
+                                        if (child.ContainsKey("limit") && child["limit"].ObjectToInt(0) > 0)
+                                        {
+                                            limit = child["limit"].ObjectToInt(0);
+                                        }
+                                        limit = limit > 0 ? limit : 10;
+
+                                        var goods = await _goodsServices.QueryListByClauseAsync(where, limit, p => p.createTime, OrderByType.Desc, true);
+                                        if (goods != null && goods.Any())
+                                        {
+                                            var result = JArray.FromObject(goods);
+                                            child.Remove("list");
+                                            child.Add("list", result);
+                                        }
+                                        else
+                                        {
+                                            child.Remove("list");
+                                            child.Add("list", new JArray());
+                                        }
+                                    }
+                                    else
+                                    {
+                                        var orderBy = string.Empty;
+                                        string goodidsStr;
+                                        if (child != null && child.ContainsKey("list"))
+                                        {
+                                            var result = JArray.Parse(child["list"].ToString());
+                                            var goodids = result.Select(ss => ((JObject)ss)["id"].ObjectToInt(0)).Where(goodid => goodid > 0).ToList();
+                                            where = where.And(p => goodids.Contains(p.id));
+                                            if (goodids.Any())
+                                            {
+                                                goodidsStr = string.Join(",", goodids);
+                                                //按照id序列打乱后的顺序排序
+                                                if (AppSettingsConstVars.DbDbType == DbType.SqlServer.ToString())
+                                                {
+                                                    orderBy = " CHARINDEX(RTRIM(CAST(id as NCHAR)),'" + goodidsStr + "') ";
+                                                }
+                                                else if (AppSettingsConstVars.DbDbType == DbType.MySql.ToString())
+                                                {
+                                                    orderBy = " find_in_set(id,'" + goodidsStr + "') ";
+                                                }
+                                            }
+                                        }
+                                        var goods = await _goodsServices.QueryListByClauseAsync(where, orderBy, true);
+                                        if (goods != null && goods.Any())
+                                        {
+                                            var result = JArray.FromObject(goods);
+                                            child.Remove("list");
+                                            child.Add("list", result);
+                                        }
+                                        else
+                                        {
+                                            child.Remove("list");
+                                            child.Add("list", new JArray());
+                                        }
+                                    }
+                                    newList.Add(child);
+                                }
+                                if (newList != null && newList.Any())
+                                {
+                                    parameters.Remove("list");
+                                    parameters.Add("list", newList);
+                                }
+                            }
+                            dto.parameters = parameters;
+                            break;
+                        }
+                    case "goods":
+                        {
+                            var parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
                             var where = PredicateBuilder.True<CoreCmsGoods>();
                             where = where.And(p => p.isDel == false);
                             where = where.And(p => p.isMarketable == true);
-
-                            if (child != null && child.ContainsKey("type") && child["type"].ToString() == "auto")
+                            if (parameters != null && parameters.ContainsKey("type") && parameters["type"].ToString() == "auto")
                             {
                                 //商品分类,同时取所有子分类
-                                if (child.ContainsKey("classifyId") && child["classifyId"].ObjectToInt(0) > 0)
+                                if (parameters.ContainsKey("classifyId") && parameters["classifyId"].ObjectToInt(0) > 0)
                                 {
-                                    var classifyId = child["classifyId"].ObjectToInt(0);
+                                    var classifyId = parameters["classifyId"].ObjectToInt(0);
                                     var gc = await _goodsCategoryServices.GetCaChe();
                                     var childCats = gc.Where(p => p.parentId == classifyId).ToList();
                                     var catIds = childCats != null && childCats.Any()
@@ -304,39 +384,39 @@ namespace CoreCms.Net.Services
                                     //扩展分类 CoreCmsGoodsCategory
                                 }
                                 //品牌筛选
-                                if (child.ContainsKey("brandId") && child["brandId"].ObjectToInt(0) > 0)
+                                if (parameters.ContainsKey("brandId") && parameters["brandId"].ObjectToInt(0) > 0)
                                 {
-                                    var brandId = child["brandId"].ObjectToInt(0);
+                                    var brandId = parameters["brandId"].ObjectToInt(0);
                                     where = where.And(p => p.brandId == brandId);
                                 }
-
+                                //数量
                                 var limit = 0;
-                                if (child.ContainsKey("limit") && child["limit"].ObjectToInt(0) > 0)
+                                if (parameters.ContainsKey("limit") && parameters["limit"].ObjectToInt(0) > 0)
                                 {
-                                    limit = child["limit"].ObjectToInt(0);
+                                    limit = parameters["limit"].ObjectToInt(0);
                                 }
                                 limit = limit > 0 ? limit : 10;
 
-                                var goods = await _goodsServices.QueryListByClauseAsync(where, limit, p => p.createTime, OrderByType.Desc, true);
+                                var goods = await _goodsServices.QueryPageAsync(where, " sort desc,id desc ", 1, limit, true);
                                 if (goods != null && goods.Any())
                                 {
-                                    JArray result = JArray.FromObject(goods);
-                                    child.Remove("list");
-                                    child.Add("list", result);
+                                    var result = JArray.FromObject(goods);
+                                    parameters.Remove("list");
+                                    parameters.Add("list", result);
                                 }
                                 else
                                 {
-                                    child.Remove("list");
-                                    child.Add("list", new JArray());
+                                    parameters.Remove("list");
+                                    parameters.Add("list", new JArray());
                                 }
                             }
                             else
                             {
                                 var orderBy = string.Empty;
                                 string goodidsStr;
-                                if (child != null && child.ContainsKey("list"))
+                                if (parameters != null && parameters.ContainsKey("list"))
                                 {
-                                    JArray result = JArray.Parse(child["list"].ToString());
+                                    JArray result = JArray.Parse(parameters["list"].ToString());
                                     var goodids = new List<int>();
                                     foreach (var ss in result)  //查找某个字段与值
                                     {
@@ -361,390 +441,294 @@ namespace CoreCms.Net.Services
                                         }
                                     }
                                 }
-                                var goods = await _goodsServices.QueryListByClauseAsync(where, orderBy);
+                                var goods = await _goodsServices.QueryListByClauseAsync(where, orderBy, true);
                                 if (goods != null && goods.Any())
                                 {
                                     JArray result = JArray.FromObject(goods);
-                                    child.Remove("list");
-                                    child.Add("list", result);
+                                    parameters.Remove("list");
+                                    parameters.Add("list", result);
                                 }
                                 else
                                 {
-                                    child.Remove("list");
-                                    child.Add("list", new JArray());
+                                    parameters.Remove("list");
+                                    parameters.Add("list", new JArray());
                                 }
                             }
-                            count++;
-                            newList.Add(child);
-                        }
 
-                        if (newList != null && newList.Any())
-                        {
-                            parameters.Remove("list");
-                            parameters.Add("list", newList);
+                            dto.parameters = parameters;
+                            break;
                         }
-                    }
-                    dto.parameters = parameters;
-                }
-                else if (item.widgetCode == "goods")
-                {
-                    JObject parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-
-                    var where = PredicateBuilder.True<CoreCmsGoods>();
-                    where = where.And(p => p.isDel == false);
-                    where = where.And(p => p.isMarketable == true);
-                    if (parameters != null && parameters.ContainsKey("type") && parameters["type"].ToString() == "auto")
-                    {
-                        //商品分类,同时取所有子分类
-                        if (parameters.ContainsKey("classifyId") && parameters["classifyId"].ObjectToInt(0) > 0)
+                    case "article":
+                        dto.parameters = JsonConvert.DeserializeObject(item.parameters);
+                        break;
+                    case "articleClassify":
                         {
-                            var classifyId = parameters["classifyId"].ObjectToInt(0);
-                            var gc = await _goodsCategoryServices.GetCaChe();
-                            var childCats = gc.Where(p => p.parentId == classifyId).ToList();
-                            var catIds = childCats != null && childCats.Any()
-                                ? childCats.Select(p => p.id).ToList()
-                                : new List<int>();
-                            catIds.Add(classifyId);
-
-                            where = where.And(p => catIds.Contains(p.goodsCategoryId));
-                            //扩展分类 CoreCmsGoodsCategory
-                        }
-                        //品牌筛选
-                        if (parameters.ContainsKey("brandId") && parameters["brandId"].ObjectToInt(0) > 0)
-                        {
-                            var brandId = parameters["brandId"].ObjectToInt(0);
-                            where = where.And(p => p.brandId == brandId);
-                        }
-
-                        var limit = 0;
-                        if (parameters.ContainsKey("limit") && parameters["limit"].ObjectToInt(0) > 0)
-                        {
-                            limit = parameters["limit"].ObjectToInt(0);
-                        }
-                        limit = limit > 0 ? limit : 10;
-
-                        var goods = await _goodsServices.QueryPageAsync(where, " sort desc,id desc ", 1, limit, true);
-                        if (goods != null && goods.Any())
-                        {
-                            JArray result = JArray.FromObject(goods);
-                            parameters.Remove("list");
-                            parameters.Add("list", result);
-                        }
-                        else
-                        {
-                            parameters.Remove("list");
-                            parameters.Add("list", new JArray());
-                        }
-                    }
-                    else
-                    {
-                        var orderBy = string.Empty;
-                        string goodidsStr;
-                        if (parameters != null && parameters.ContainsKey("list"))
-                        {
-                            JArray result = JArray.Parse(parameters["list"].ToString());
-                            var goodids = new List<int>();
-                            foreach (var ss in result)  //查找某个字段与值
+                            var parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
+                            if (parameters != null)
                             {
-                                var goodid = ((JObject)ss)["id"].ObjectToInt(0);
-                                if (goodid > 0)
+                                if (parameters.ContainsKey("articleClassifyId") && parameters["articleClassifyId"].ObjectToInt(0) > 0)
                                 {
-                                    goodids.Add(goodid);
-                                }
-                            }
-                            where = where.And(p => goodids.Contains(p.id));
-                            if (goodids.Any())
-                            {
-                                goodidsStr = string.Join(",", goodids);
-                                //按照id序列打乱后的顺序排序
-                                if (AppSettingsConstVars.DbDbType == DbType.SqlServer.ToString())
-                                {
-                                    orderBy = " CHARINDEX(RTRIM(CAST(id as NCHAR)),'" + goodidsStr + "') ";
-                                }
-                                else if (AppSettingsConstVars.DbDbType == DbType.MySql.ToString())
-                                {
-                                    orderBy = " find_in_set(id,'" + goodidsStr + "') ";
-                                }
-                            }
-                        }
-                        var goods = await _goodsServices.QueryListByClauseAsync(where, orderBy);
-                        if (goods != null && goods.Any())
-                        {
-                            JArray result = JArray.FromObject(goods);
-                            parameters.Remove("list");
-                            parameters.Add("list", result);
-                        }
-                        else
-                        {
-                            parameters.Remove("list");
-                            parameters.Add("list", new JArray());
-                        }
-                    }
+                                    var articleClassifyId = parameters["articleClassifyId"].ObjectToInt(0);
+                                    var limit = parameters["limit"].ObjectToInt(0);
+                                    limit = limit > 0 ? limit : 20;
+                                    var articleClassifyObj = await _articleTypeServices.QueryByClauseAsync(p => p.id == articleClassifyId, true, true);
+                                    var articleClassifyObjJson = JsonConvert.SerializeObject(articleClassifyObj);
 
-                    dto.parameters = parameters;
+                                    parameters.Add("articleClassifyObj", JToken.Parse(articleClassifyObjJson));
 
-                }
-                else if (item.widgetCode == "article")
-                {
-                    dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-                }
-                else if (item.widgetCode == "articleClassify")
-                {
-                    JObject parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-
-                    if (parameters != null)
-                    {
-                        if (parameters.ContainsKey("articleClassifyId") && parameters["articleClassifyId"].ObjectToInt(0) > 0)
-                        {
-                            var articleClassifyId = parameters["articleClassifyId"].ObjectToInt(0);
-                            var limit = parameters["limit"].ObjectToInt(0);
-                            limit = limit > 0 ? limit : 20;
-                            var list = await _articleServices.QueryPageAsync(p => p.typeId == articleClassifyId && p.isPub == true,
-                                p => p.createTime, OrderByType.Desc, 1, limit);
-                            if (list != null && list.Any())
-                            {
-                                JArray result = JArray.FromObject(list);
-                                parameters.Remove("list");
-                                parameters.Add("list", result);
-                            }
-                        }
-                    }
-
-                    dto.parameters = parameters;
-                }
-                else if (item.widgetCode == "navBar")
-                {
-                    dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-                }
-                else if (item.widgetCode == "groupPurchase")
-                {
-                    JObject parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-
-                    if (parameters != null && parameters.ContainsKey("list"))
-                    {
-                        JArray result = JArray.Parse(parameters["list"].ToString());
-                        var newReslut = new JArray();
-                        foreach (var jToken in result)
-                        {
-                            var ss = (JObject)jToken;
-                            if (ss.ContainsKey("id"))
-                            {
-                                //判断拼团状态
-                                var dt = DateTime.Now;
-
-                                var promotionId = ((JObject)ss)["id"].ObjectToInt(0);
-                                if (promotionId > 0)
-                                {
-                                    var promotionModel = await _promotionServices.QueryByClauseAsync(p => p.id == promotionId && p.isEnable == true && p.startTime <= dt && p.endTime > dt, true);
-                                    if (promotionModel != null)
+                                    var list = await _articleServices.QueryPageAsync(p => p.typeId == articleClassifyId && p.isPub == true, p => p.createTime, OrderByType.Desc, 1, limit, true, true);
+                                    if (list != null && list.Any())
                                     {
-                                        var condition = await _promotionConditionServices.QueryByClauseAsync(p => p.promotionId == promotionId, true);
-                                        if (condition != null)
-                                        {
-                                            var obj = (JObject)JsonConvert.DeserializeObject(condition.parameters);
-                                            if (obj.ContainsKey("goodsId") && obj["goodsId"].ObjectToInt(0) > 0)
-                                            {
-                                                var goodsId = obj["goodsId"].ObjectToInt(0);
-                                                var goods = await _promotionServices.GetGroupDetail(goodsId, 0, (int)GlobalEnumVars.PromotionType.Group, promotionId);
-                                                if (goods.status)
-                                                {
-                                                    var goodJson = JsonConvert.SerializeObject(goods.data);
-                                                    ((JObject)ss).Add("goods", JToken.Parse(goodJson));
-                                                }
-                                            }
-                                        }
-
-                                        var startStatus = 1;
-                                        int lastTime = 0;
-                                        bool isOverdue = false;
-
-                                        if (promotionModel.startTime > dt)
-                                        {
-                                            startStatus = (int)GlobalEnumVars.GroupSeckillStatus.Upcoming;
-
-                                            TimeSpan ts = promotionModel.startTime.Subtract(dt);
-                                            lastTime = (int)ts.TotalSeconds;
-                                            isOverdue = lastTime > 0;
-                                        }
-                                        else if (promotionModel.startTime <= dt && promotionModel.endTime > dt)
-                                        {
-                                            startStatus = (int)GlobalEnumVars.GroupSeckillStatus.InProgress;
-
-                                            TimeSpan ts = promotionModel.endTime.Subtract(dt);
-                                            lastTime = (int)ts.TotalSeconds;
-                                            isOverdue = lastTime > 0;
-                                        }
-                                        else
-                                        {
-                                            startStatus = (int)GlobalEnumVars.GroupSeckillStatus.Finished;
-                                        }
-
-                                        ((JObject)ss).Add("startStatus", startStatus);
-                                        ((JObject)ss).Add("lastTime", lastTime);
-                                        ((JObject)ss).Add("isOverdue", isOverdue);
-
-                                        newReslut.Add(ss);
+                                        var result = JArray.FromObject(list);
+                                        parameters.Remove("list");
+                                        parameters.Add("list", result);
                                     }
                                 }
                             }
+
+                            dto.parameters = parameters;
+                            break;
                         }
-                        parameters.Remove("list");
-                        parameters.Add("list", newReslut);
-                    }
-
-                    dto.parameters = parameters;
-                }
-                else if (item.widgetCode == "record")
-                {
-                    dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-                }
-                else if (item.widgetCode == "pinTuan")
-                {
-                    JObject parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-
-                    if (parameters != null && parameters.ContainsKey("list"))
-                    {
-                        JArray result = JArray.Parse(parameters["list"].ToString());
-                        var newReslut = new JArray();
-                        foreach (JObject ss in result)
+                    case "navBar":
+                        dto.parameters = JsonConvert.DeserializeObject(item.parameters);
+                        break;
+                    case "groupPurchase":
                         {
-                            if (ss.ContainsKey("goodsId"))
+                            var parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
+                            if (parameters != null && parameters.ContainsKey("list"))
                             {
-                                var ruleId = ((JObject)ss)["id"].ObjectToInt(0);
-                                if (ruleId > 0)
+                                var result = JArray.Parse(parameters["list"].ToString());
+                                var newReslut = new JArray();
+                                foreach (var jToken in result)
                                 {
-                                    var goodsInfo = await _pinTuanRuleServices.GetPinTuanInfo(ruleId);
-                                    if (goodsInfo != null)
+                                    var ss = (JObject)jToken;
+                                    if (ss.ContainsKey("id"))
+                                    {
+                                        //判断拼团状态
+                                        var dt = DateTime.Now;
+                                        var promotionId = ss["id"].ObjectToInt(0);
+                                        if (promotionId > 0)
+                                        {
+                                            var promotionModel = await _promotionServices.QueryByClauseAsync(p => p.id == promotionId && p.isEnable == true && p.startTime <= dt && p.endTime > dt, true, true);
+                                            if (promotionModel != null)
+                                            {
+                                                var condition = await _promotionConditionServices.QueryByClauseAsync(p => p.promotionId == promotionId, true, true);
+                                                if (condition != null)
+                                                {
+                                                    var goods = await _promotionServices.GetGroupDetail(promotionId, 0, (int)GlobalEnumVars.PromotionType.Group, false);
+                                                    if (goods.status)
+                                                    {
+                                                        var goodJson = JsonConvert.SerializeObject(goods.data);
+                                                        ss.Add("goods", JToken.Parse(goodJson));
+                                                    }
+                                                }
+                                                int startStatus;
+                                                var lastTime = 0;
+                                                if (promotionModel.startTime > dt)
+                                                {
+                                                    startStatus = (int)GlobalEnumVars.GroupSeckillStatus.Upcoming;
+                                                    var ts = promotionModel.startTime.Subtract(dt);
+                                                    lastTime = (int)ts.TotalSeconds;
+                                                }
+                                                else if (promotionModel.startTime <= dt && promotionModel.endTime > dt)
+                                                {
+                                                    startStatus = (int)GlobalEnumVars.GroupSeckillStatus.InProgress;
+                                                    var ts = promotionModel.endTime.Subtract(dt);
+                                                    lastTime = (int)ts.TotalSeconds;
+                                                }
+                                                else
+                                                {
+                                                    startStatus = (int)GlobalEnumVars.GroupSeckillStatus.Finished;
+                                                }
+
+                                                ss.Add("startStatus", startStatus);
+                                                ss.Add("lastTime", lastTime);
+                                                newReslut.Add(ss);
+                                            }
+                                        }
+                                    }
+                                }
+                                parameters.Remove("list");
+                                parameters.Add("list", newReslut);
+                            }
+
+                            dto.parameters = parameters;
+                            break;
+                        }
+                    case "seckill":
+                        {
+                            var parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
+                            if (parameters != null && parameters.ContainsKey("list"))
+                            {
+                                var result = JArray.Parse(parameters["list"].ToString());
+                                var newReslut = new JArray();
+                                foreach (var jToken in result)
+                                {
+                                    var ss = (JObject)jToken;
+                                    if (ss.ContainsKey("id"))
+                                    {
+                                        //判断拼团状态
+                                        var dt = DateTime.Now;
+                                        var promotionId = ss["id"].ObjectToInt(0);
+                                        if (promotionId > 0)
+                                        {
+                                            var promotionModel = await _promotionServices.QueryByClauseAsync(p => p.id == promotionId && p.isEnable == true && p.startTime <= dt && p.endTime > dt, true, true);
+                                            if (promotionModel != null)
+                                            {
+                                                var condition = await _promotionConditionServices.QueryByClauseAsync(p => p.promotionId == promotionId, true, true);
+                                                if (condition != null)
+                                                {
+                                                    var goods = await _promotionServices.GetGroupDetail(promotionId, 0, (int)GlobalEnumVars.PromotionType.Seckill, false);
+                                                    if (goods.status)
+                                                    {
+                                                        var goodJson = JsonConvert.SerializeObject(goods.data);
+                                                        ss.Add("goods", JToken.Parse(goodJson));
+                                                    }
+                                                }
+
+                                                int startStatus;
+                                                int lastTime = 0;
+
+                                                if (promotionModel.startTime > dt)
+                                                {
+                                                    startStatus = (int)GlobalEnumVars.GroupSeckillStatus.Upcoming;
+
+                                                    var ts = promotionModel.startTime.Subtract(dt);
+                                                    lastTime = (int)ts.TotalSeconds;
+                                                }
+                                                else if (promotionModel.startTime <= dt && promotionModel.endTime > dt)
+                                                {
+                                                    startStatus = (int)GlobalEnumVars.GroupSeckillStatus.InProgress;
+
+                                                    var ts = promotionModel.endTime.Subtract(dt);
+                                                    lastTime = (int)ts.TotalSeconds;
+                                                }
+                                                else
+                                                {
+                                                    startStatus = (int)GlobalEnumVars.GroupSeckillStatus.Finished;
+                                                }
+
+                                                ss.Add("startStatus", startStatus);
+                                                ss.Add("lastTime", lastTime);
+                                                newReslut.Add(ss);
+                                            }
+                                        }
+                                    }
+                                }
+                                parameters.Remove("list");
+                                parameters.Add("list", newReslut);
+                            }
+
+                            dto.parameters = parameters;
+                            break;
+                        }
+                    case "record":
+                        dto.parameters = JsonConvert.DeserializeObject(item.parameters);
+                        break;
+                    case "pinTuan":
+                        {
+                            var parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
+                            if (parameters != null && parameters.ContainsKey("list"))
+                            {
+                                var result = JArray.Parse(parameters["list"].ToString());
+                                var newReslut = new JArray();
+
+                                var ruleIdIds = (from JObject ss in result where ss.ContainsKey("goodsId") select ss["id"].ObjectToInt(0)).ToArray();
+
+                                if (ruleIdIds.Any())
+                                {
+                                    var dtoData = await _pinTuanRuleServices.GetPinTuanInfos(ruleIdIds, p => p.sortId, OrderByType.Asc, 1, result.Count);
+                                    foreach (var itemDto in dtoData)
                                     {
-                                        var pinTuanStartStatus = 1;
-                                        int lastTime = 0;
-                                        bool isOverdue = false;
                                         //判断拼团状态
                                         var dt = DateTime.Now;
 
-                                        if (goodsInfo.startTime > dt)
+                                        if (itemDto.startTime > dt)
                                         {
-                                            pinTuanStartStatus = (int)GlobalEnumVars.PinTuanRuleStatus.notBegun;
-
-                                            TimeSpan ts = goodsInfo.startTime.Subtract(dt);
-                                            lastTime = (int)ts.TotalSeconds;
-                                            isOverdue = lastTime > 0;
+                                            itemDto.startStatus = (int)GlobalEnumVars.PinTuanRuleStatus.notBegun;
+                                            itemDto.timestamp = (int)itemDto.startTime.Subtract(dt).TotalSeconds;
                                         }
-                                        else if (goodsInfo.startTime <= dt && goodsInfo.endTime > dt)
+                                        else if (itemDto.startTime <= dt && itemDto.endTime > dt)
                                         {
-                                            pinTuanStartStatus = (int)GlobalEnumVars.PinTuanRuleStatus.begin;
-
-                                            TimeSpan ts = goodsInfo.endTime.Subtract(dt);
-                                            lastTime = (int)ts.TotalSeconds;
-                                            isOverdue = lastTime > 0;
+                                            itemDto.startStatus = (int)GlobalEnumVars.PinTuanRuleStatus.begin;
+                                            itemDto.timestamp = (int)itemDto.endTime.Subtract(dt).TotalSeconds;
                                         }
                                         else
                                         {
-                                            pinTuanStartStatus = (int)GlobalEnumVars.PinTuanRuleStatus.haveExpired;
+                                            itemDto.startStatus = (int)GlobalEnumVars.PinTuanRuleStatus.haveExpired;
                                         }
 
-                                        decimal pinTuanPrice = goodsInfo.goodsPrice - goodsInfo.discountAmount;
-                                        if (pinTuanPrice < 0) pinTuanPrice = 0;
+                                        itemDto.pinTuanPrice -= itemDto.discountAmount;
+                                        if (itemDto.pinTuanPrice < 0) itemDto.pinTuanPrice = 0;
 
-                                        var obj = new JObject();
-                                        ((JObject)obj).Add("pinTuanStartStatus", pinTuanStartStatus);
-                                        ((JObject)obj).Add("lastTime", lastTime);
-                                        ((JObject)obj).Add("isOverdue", isOverdue);
-                                        ((JObject)obj).Add("pinTuanPrice", pinTuanPrice);
-
-                                        ((JObject)obj).Add("createTime", goodsInfo.createTime);
-                                        ((JObject)obj).Add("discountAmount", goodsInfo.discountAmount);
-                                        ((JObject)obj).Add("endTime", goodsInfo.endTime);
-                                        ((JObject)obj).Add("goodsId", goodsInfo.goodsId);
-                                        ((JObject)obj).Add("goodsImage", goodsInfo.goodsImage);
-                                        ((JObject)obj).Add("goodsName", goodsInfo.goodsName);
-                                        ((JObject)obj).Add("goodsPrice", goodsInfo.goodsPrice);
-                                        ((JObject)obj).Add("id", goodsInfo.id);
-                                        ((JObject)obj).Add("isStatusOpen", goodsInfo.isStatusOpen);
-                                        ((JObject)obj).Add("maxGoodsNums", goodsInfo.maxGoodsNums);
-                                        ((JObject)obj).Add("maxNums", goodsInfo.maxNums);
-                                        ((JObject)obj).Add("name", goodsInfo.name);
-                                        ((JObject)obj).Add("peopleNumber", goodsInfo.peopleNumber);
-                                        ((JObject)obj).Add("significantInterval", goodsInfo.significantInterval);
-                                        ((JObject)obj).Add("sort", goodsInfo.sort);
-                                        ((JObject)obj).Add("startTime", goodsInfo.startTime);
-                                        ((JObject)obj).Add("updateTime", goodsInfo.updateTime);
-
-                                        //((JObject)ss).Add("goodsInfo", JToken.FromObject(goodsInfo));
-                                        newReslut.Add(obj);
+                                        newReslut.Add(JObject.FromObject(itemDto));
                                     }
+                                    parameters.Remove("list");
+                                    parameters.Add("list", newReslut);
                                 }
                             }
+                            dto.parameters = parameters;
+                            break;
                         }
-                        parameters.Remove("list");
-                        parameters.Add("list", newReslut);
-                    }
-
-                    dto.parameters = parameters;
-
-                }
-                else if (item.widgetCode == "service")
-                {
-                    var parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-
-                    if (parameters != null && parameters.ContainsKey("list"))
-                    {
-                        var result = JArray.Parse(parameters["list"].ToString());
-                        var ids = (from JObject ss in result where ss.ContainsKey("id") select ((JObject)ss)["id"].ObjectToInt(0) into id where id > 0 select id).ToList();
-
-                        if (ids.Any())
+                    case "service":
                         {
-                            var serviceObj = await _servicesServices.QueryListByClauseAsync(p => ids.Contains(p.id));
-                            foreach (var jToken in result)
+                            var parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
+
+                            if (parameters != null && parameters.ContainsKey("list"))
                             {
-                                var ss = (JObject) jToken;
-                                var id = ((JObject)ss)["id"].ObjectToInt(0);
-                                var serviceInfo = serviceObj.Find(p => p.id == id);
-                                if (serviceInfo != null)
+                                var result = JArray.Parse(parameters["list"].ToString());
+                                var ids = (from JObject ss in result where ss.ContainsKey("id") select ((JObject)ss)["id"].ObjectToInt(0) into id where id > 0 select id).ToList();
+
+                                if (ids.Any())
                                 {
-                                    var openStatus = 1;
-                                    int lastTime = 0;
-                                    var dt = DateTime.Now;
-                                    if (serviceInfo.startTime > dt)
+                                    var serviceObj = await _servicesServices.QueryListByClauseAsync(p => ids.Contains(p.id), p => p.id, OrderByType.Asc, true, true);
+                                    foreach (var jToken in result)
                                     {
-                                        openStatus = (int)GlobalEnumVars.ServicesOpenStatus.notBegun;
-                                        TimeSpan ts = serviceInfo.startTime.Subtract(dt);
-                                        lastTime = (int)ts.TotalSeconds;
-                                    }
-                                    else if (serviceInfo.startTime <= dt && serviceInfo.endTime > dt)
-                                    {
-                                        openStatus = (int)GlobalEnumVars.ServicesOpenStatus.begin;
+                                        var ss = (JObject)jToken;
+                                        var id = ss["id"].ObjectToInt(0);
+                                        var serviceInfo = serviceObj.Find(p => p.id == id);
+                                        if (serviceInfo != null)
+                                        {
+                                            int openStatus;
+                                            int lastTime = 0;
+                                            var dt = DateTime.Now;
+                                            if (serviceInfo.startTime > dt)
+                                            {
+                                                openStatus = (int)GlobalEnumVars.ServicesOpenStatus.notBegun;
+                                                var ts = serviceInfo.startTime.Subtract(dt);
+                                                lastTime = (int)ts.TotalSeconds;
+                                            }
+                                            else if (serviceInfo.startTime <= dt && serviceInfo.endTime > dt)
+                                            {
+                                                openStatus = (int)GlobalEnumVars.ServicesOpenStatus.begin;
 
-                                        TimeSpan ts = serviceInfo.endTime.Subtract(dt);
-                                        lastTime = (int)ts.TotalSeconds;
+                                                var ts = serviceInfo.endTime.Subtract(dt);
+                                                lastTime = (int)ts.TotalSeconds;
+                                            }
+                                            else
+                                            {
+                                                openStatus = (int)GlobalEnumVars.ServicesOpenStatus.haveExpired;
+                                            }
+                                            ss.Add("openStatus", openStatus);
+                                            ss.Add("lastTime", lastTime);
+                                        }
                                     }
-                                    else
-                                    {
-                                        openStatus = (int)GlobalEnumVars.ServicesOpenStatus.haveExpired;
-                                    }
-                                    ss.Add("openStatus", openStatus);
-                                    ss.Add("lastTime", lastTime);
                                 }
+
+                                parameters.Remove("list");
+                                parameters.Add("list", result);
                             }
+
+                            dto.parameters = parameters;
+                            break;
                         }
-
-                        parameters.Remove("list");
-                        parameters.Add("list", result);
-                    }
-
-                    dto.parameters = parameters;
-                }
-                else if (item.widgetCode == "adpop")
-                {
-                    dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-                }
-                else if (item.widgetCode == "topImgSlide")
-                {
-                    dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
-                }
-                else
-                {
-                    dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
+                    case "adpop":
+                    case "topImgSlide":
+                        dto.parameters = JsonConvert.DeserializeObject(item.parameters);
+                        break;
+                    default:
+                        dto.parameters = JsonConvert.DeserializeObject(item.parameters);
+                        break;
                 }
                 itemsDto.Add(dto);
             }
diff --git a/CoreCms.Net.Uni-App/CoreShop/App.vue b/CoreCms.Net.Uni-App/CoreShop/App.vue
index ec6d6dc6..7c3b8ab9 100644
--- a/CoreCms.Net.Uni-App/CoreShop/App.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/App.vue
@@ -10,6 +10,14 @@
             showLoginTip: false,
         },
         onLaunch() {
+
+            // 此版本发布于2022-10-23
+            const version = '0.6.4'
+            // 开发环境才提示，生产环境不会提示
+            if (process.env.NODE_ENV === 'development') {
+                console.log(`\n %c \u6838\u5fc3\u5546\u57ce\u7cfb\u7edf\u0020\u0043\u006f\u0072\u0065\u0053\u0068\u006f\u0070 V${version} %c \u0068\u0074\u0074\u0070\u0073\u003a\u002f\u002f\u0077\u0077\u0077\u002e\u0063\u006f\u0072\u0065\u0073\u0068\u006f\u0070\u002e\u0063\u006e\u002f \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #f1f1f1; padding:5px 0;');
+            }
+
             // #ifdef MP-WEIXIN
             this.autoUpdate();
             // #endif
@@ -21,14 +29,6 @@
             // 获取店铺配置信息  全局只请求一次
             this.$u.api.shopConfigV2().then(res => {
                 this.$store.commit('config', res.data)
-                // #ifdef H5
-                //百度统计
-                if (res.data.statistics) {
-                    var script = document.createElement("script");
-                    script.innerHTML = res.data.statistics;
-                    document.getElementsByTagName("body")[0].appendChild(script);
-                }
-                // #endif
             })
             //获取三级联动城市信息
             this.$u.api.getAreaList().then(res => {
@@ -36,12 +36,11 @@
                     this.$db.set('areaList', res.data)
                 }
             });
-
         },
         onShow: function (obj) {
             // #ifdef MP-WEIXIN
             this.$store.commit('scene', obj.scene)
-            console.log(obj);
+            //console.log(obj);
             // #endif
             //console.log('App Show')
         },
@@ -170,7 +169,7 @@
 
     // vue App的样式
     /* #ifdef APP-PLUS */
-    @import "@/static/style/style.vue.scss";
+    @import "@/static/style/style.app.scss";
     /* #endif */
 
     // 小程序特有的样式
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/mixins/mixinsHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/mixins/mixinsHelper.js
index afa00815..97569ef2 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/mixins/mixinsHelper.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/mixins/mixinsHelper.js
@@ -160,21 +160,25 @@ module.exports = {
             this.$u.route(url)
         },
         // 秒杀详情
-        goSeckillDetail(id, groupId) {
-            this.$u.route('/pages/activity/seckill/seckillDetails/seckillDetails', { id: id, groupId: groupId, });
+        goSeckillDetail(id) {
+            this.$u.route('/pages/activity/seckill/seckillDetails/seckillDetails', { id: id });
         },
         // 团购详情
-        goGroupBuyingDetail(id, groupId) {
-            this.$u.route('/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails', { id: id, groupId: groupId, });
+        goGroupBuyingDetail(id) {
+            this.$u.route('/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails', { id: id });
         },
         //拼团详情页
-        goPinTuanDetail(id, pinTuanId, teamId) {
+        goPinTuanDetail(id, teamId) {
             if (teamId) {
-                this.$u.route('/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails', { id: id, pinTuanId: pinTuanId, teamId: teamId, });
+                this.$u.route('/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails', { id: id, teamId: teamId, });
             } else {
-                this.$u.route('/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails', { id: id, pinTuanId: pinTuanId });
+                this.$u.route('/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails', { id: id });
             }
         },
+        // 查看团购列表
+        goGroupPurchase() {
+            this.$u.route('/pages/activity/groupBuying/list/list')
+        },
         // 查看秒杀列表
         goSeckillList() {
             this.$u.route('/pages/activity/seckill/list/list')
@@ -189,7 +193,10 @@ module.exports = {
          * 文章接口
          */
 
-        // 查看文章总列表
+        // 查看文章分类
+        goArticleClassify(id) {
+            this.$u.route('/pages/article/list/list', { id: id });
+        },
         goArticleList() {
             this.$u.route('/pages/article/list/list')
         },
@@ -231,7 +238,7 @@ module.exports = {
          * 接龙接口信息
          */
 
-        // 查看服务详情
+        // 查看接龙详情
         goSolitaireDetail(id) {
             this.$u.route('/pages/activity/solitaire/solitaireDetails/solitaireDetails', { id: id });
         },
@@ -241,7 +248,6 @@ module.exports = {
         },
 
         //服务接口信息
-        // 查看服务详情
         goServicesDetail(serviceId) {
             this.$u.route('/pages/serviceGoods/details/details', { id: serviceId });
         },
@@ -266,14 +272,11 @@ module.exports = {
             }
             if (type == navLinkType.urlLink) {
                 if (val.indexOf('http') != -1) {
-                    // #ifdef H5
-                    window.location.href = val
-                    // #endif
-                    // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
+                    // #ifdef APP-PLUS || APP-PLUS-NVUE || MP
                     this.$u.route('/pages/webview/webview', { src: val });
                     // #endif
                 } else {
-                    // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
+                    // #ifdef APP-PLUS || APP-PLUS-NVUE || MP
                     if (val == '/pages/index/default/default' || val == '/pages/category/index/index' || val == '/pages/index/cart/cart' || val == '/pages/index/member/member') {
                         this.$u.route({ type: 'switchTab', url: val });
                         return;
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/request/http.api.js b/CoreCms.Net.Uni-App/CoreShop/common/request/http.api.js
index 25658444..26c03d1e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/request/http.api.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/request/http.api.js
@@ -5,7 +5,6 @@
 const install = (Vue, vm) => {
 
     // 获取店铺配置
-    //let shopConfig = (params, config = {}) => http.post('/Api/Common/GetConfig', params, { custom: { methodName: 'common.shopConfig', needToken: false } });
     let shopConfigV2 = (params, config = {}) => http.post('/Api/Common/GetConfigV2', params, { custom: { methodName: 'common.shopConfigV2', needToken: false } });
     //获取商城关键词说明
     let getServiceDescription = (params, config = {}) => http.post('/Api/Common/GetServiceDescription', params, { custom: { methodName: 'common.getServiceDescription', needToken: false } });
@@ -399,24 +398,11 @@ const install = (Vue, vm) => {
     let serviceVerificationTicket = (params, config = {}) => http.post('/Api/Service/VerificationTicket', params, { custom: { methodName: 'service.verificationTicket', needToken: true } });
 
 
-
     //获取接龙列表
     let getSolitairePageList = (params, config = {}) => http.post('/Api/Solitaire/GetList', params, { custom: { methodName: 'solitaire.getList', needToken: false } });
     let getSolitaireDetail = (params, config = {}) => http.post('/Api/Solitaire/GetDetail', params, { custom: { methodName: 'solitaire.getDetail', needToken: false } });
 
 
-
-    // 用户注册（废弃，改为自动获取app数据及使用短信验证码登录）建议直接使用smsLogin接口
-    //let reg  = (params, config = {}) => http.post('/Api/Common/InterFaceTest', params, { custom: { methodName: 'user.reg', needToken: true } });
-    // 用户登录(废弃，改为短信验证码登录)
-    //let login  = (params, config = {}) => http.post('/Api/Common/InterFaceTest', params, { custom: { methodName: 'user.login', needToken: true } });
-    // 获取用户信息(废弃)
-    // let trustLogin  = (params, config = {}) => http.post('/Api/Common/InterFaceTest', params, { custom: { methodName: 'user.trustcallback', needToken: true } });
-    // 订单售后状态(废弃方法，建议直接用order.details接口)
-    // let afterSalesStatus  = (params, config = {}) => http.post('/Api/Common/InterFaceTest', params, { custom: { methodName: 'order.aftersalesstatus', needToken: true } });
-    // 我的积分（弃用）
-    //let myPoint  = (params, config = {}) => http.post('/Api/Common/InterFaceTest', params, { custom: { methodName: 'user.mypoint', needToken: true } });
-
     // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
     vm.$u.api = {
         shopConfigV2,
@@ -485,8 +471,7 @@ const install = (Vue, vm) => {
         paymentInfo,
         pay,
         orderEvaluate,
-        //isSign,
-        //sign,
+
         userCheckIn,
         getUserCheckByMonth,
         getUserCheckCount,
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/request/request.js b/CoreCms.Net.Uni-App/CoreShop/common/request/request.js
index dd08fca9..63f5879f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/request/request.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/request/request.js
@@ -17,16 +17,12 @@ module.exports = (vm) => {
         // #endif
         // 注：如果局部custom与全局custom有同名属性，则后面的属性会覆盖前面的属性，相当于Object.assign(全局，局部)
         //defaultConfig.custom = {}; // 全局自定义参数默认值
-        // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+        // #ifdef APP-PLUS || MP-ALIPAY || MP-WEIXIN
         defaultConfig.timeout = 60000;
         // #endif
         // #ifdef APP-PLUS
         defaultConfig.sslVerify = true;
         // #endif
-        // #ifdef H5
-        // 跨域请求时是否携带凭证（cookies）仅H5支持（HBuilderX 2.6.15+）
-        defaultConfig.withCredentials = false;
-        // #endif
         // #ifdef APP-PLUS
         defaultConfig.firstIpv4 = false; // DNS解析时优先使用ipv4 仅 App-Android 支持 (HBuilderX 2.8.0+)
         // #endif
@@ -84,7 +80,7 @@ module.exports = (vm) => {
             //console.log(page.route);
             // 登录信息过期或者未登录
             if (data.data === 14007 || data.data === 14006) {
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
+                // #ifdef APP-PLUS || APP-PLUS-NVUE
                 if (page.route.indexOf('pages/login/loginBySMS/loginBySMS') < 0) {
                     db.del("userToken");
                     uni.showToast({
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
index 6fa977b1..5e1bab94 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
@@ -1,20 +1,14 @@
 /**
  *  全局配置文件
- *  @version 0.6.2
+ *  @version 1.0.0
  */
 
 //接口请求地址，如果需要不部署接口端的情况下测试uni-app，可以直接替换为官方测试接口：https://api.demo.coreshop.cn
-//export const apiBaseUrl = 'https://api.pro.coreshop.cn';
-export const apiBaseUrl = 'http://localhost:2015';
+export const apiBaseUrl = process.env.NODE_ENV === 'development' ? 'https://api.nsts.mvccms.cn' : 'https://api.nsts.mvccms.cn';
+
 //项目静态资源请求地址，如果使用官方的静态文件地址可以直接替换为：https://files.cdn.coreshop.cn
 export const apiFilesUrl = 'https://files.cdn.coreshop.cn';
 
-export const h5Url = apiBaseUrl + "/wap/"; //H5端网站地址,
-
-// #ifdef H5
-export const baseUrl = process.env.NODE_ENV === 'development' ? window.location.origin + '/' : apiBaseUrl
-// #endif
-
 //支付单类型
 export const paymentType = {
     //普通订单
@@ -25,7 +19,6 @@ export const paymentType = {
     group: 3,
     //秒杀订单
     seckill: 4,
-
     //砍价
     bargain: 6,
     //赠品
@@ -34,10 +27,8 @@ export const paymentType = {
     solitaire: 8,
     //交易组件
     transactionComponent: 10,
-
     //充值
     recharge: 201,
-
     //服务订单
     serviceOrder: 501,
     //表单付款码
@@ -46,7 +37,6 @@ export const paymentType = {
     formOrder: 302,
 };
 
-
 //分享链接及海报类型
 export const shareType = {
     // 首页
@@ -55,7 +45,7 @@ export const shareType = {
     goods: 2,
     // 3拼团详情页
     pinTuan: 3,
-    // 4店铺邀请
+    // 4分销店铺
     inv: 4,
     // 5文章页面
     article: 5,
@@ -69,15 +59,54 @@ export const shareType = {
     group: 9,
     // 10秒杀
     seckill: 10,
-    // 11代理
+    // 11代理店铺
     agent: 11,
     // 12接龙
     solitaire: 12,
+    // 13 服务商品
+    serviceGoods: 13
+};
+
+//分享终端
+export const shareClient = {
+    // 普通h5
+    h5: 1,
+    // 微信小程序
+    wxMiNiProgram: 2,
+    // 微信公众号（h5）
+    wxOfficial: 3,
+    // 头条系小程序
+    ttMiNiProgram: 4,
+    // 电脑pc端
+    pc: 5,
+    // 阿里小程序
+    aLiMiNiProgram: 6,
+};
+
+
+//分享终端
+export const shareModel = {
+    // 链接分享
+    url: 1,
+    // 二维码
+    qrCode: 2,
+    // 海报
+    poster: 3,
 };
 
 export const shareUrl = 'pages/share/jump/jump'; //分享初始化地址
 
 
+//列表加载状态
+export const loadStatus = {
+    // 加载前的状态
+    loadMore: 'loadmore',
+    // 加载中的状态
+    loading: 'loading',
+    // 没有更多的状态
+    noMore: 'nomore',
+};
+
 
 //nav页面导航类型
 export const navLinkType = {
@@ -87,3 +116,5 @@ export const navLinkType = {
     articleCategory: 4,// "文章分类",
     intelligentForms: 5// "智能表单"
 };
+
+
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/setting/coreThemeHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/setting/coreThemeHelper.js
deleted file mode 100644
index 900f00c7..00000000
--- a/CoreCms.Net.Uni-App/CoreShop/common/setting/coreThemeHelper.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- *  很多无法css实现的换肤效果，通过此模块实现
- *  使用方法，在代码中直接使用 this.$coreTheme.mainNabBar.background
- *  @version 1.0.0
- */
-
-//通用头部背景样式
-export const mainNabBar = {
-    background: {
-        //颜色
-        backgroundColor: '#e54d42',
-        // 导航栏背景图
-        // background: 'url(https://cdn.uviewui.com/uview/swiper/1.jpg) no-repeat',
-        // 还可以设置背景图size属性
-        // backgroundSize: 'cover',
-
-        // 渐变色
-        //backgroundImage: 'linear-gradient(45deg, rgb(28, 187, 180), rgb(141, 198, 63))'
-    },
-    //通用头部文字颜色
-    titleColor: "#fff",
-    //通用头部文字颜色
-    backIconColor: "#fff",
-};
-
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/utils/commonHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/utils/commonHelper.js
index c2518ec8..cc42459d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/utils/commonHelper.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/utils/commonHelper.js
@@ -29,26 +29,8 @@ function modelShow(
 };
 
 
-//时间差转倒计时数据
-function timeToDateObj(micro_second) {
-    var time = {}
-    // 总秒数
-    var second = Math.floor(micro_second)
-    // 天数
-    time.day = Math.floor(second / 3600 / 24)
-    // 小时
-    time.hour = Math.floor((second / 3600) % 24)
-    // 分钟
-    time.minute = Math.floor((second / 60) % 60)
-    // 秒
-    time.second = Math.floor(second % 60)
-    return time
-};
-
 //货币格式化
 function formatMoney(number, places, symbol, thousand, decimal) {
-    // console.log(number)
-    // console.log(places)
     number = number || 0
     places = !isNaN((places = Math.abs(places))) ? places : 2
     symbol = symbol !== undefined ? symbol : '￥'
@@ -71,41 +53,6 @@ function formatMoney(number, places, symbol, thousand, decimal) {
     )
 }
 
-/**
- * 获取url参数
- *
- * @param {*} name
- * @param {*} [url=window.location.serach]
- * @returns
- */
-function getQueryString(name, url) {
-    var url = url || window.location.href
-    var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
-    var r = url.substr(1).match(reg)
-    if (r != null) {
-        return r[2]
-    }
-    return null
-}
-
-/**
- *
- *  判断是否在微信浏览器 true是
- */
-function isWeiXinBrowser() {
-    // #ifdef H5
-    // window.navigator.userAgent属性包含了浏览器类型、版本、操作系统类型、浏览器引擎类型等信息，这个属性可以用来判断浏览器类型
-    let ua = window.navigator.userAgent.toLowerCase()
-    // 通过正则表达式匹配ua中是否含有MicroMessenger字符串
-    if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-        return true
-    } else {
-        return false
-    }
-    // #endif
-    return false
-}
-
 /**
  * 金额相加
  * @param {Object} value1
@@ -125,29 +72,9 @@ function moneySub(value1, value2) {
 }
 
 
-//设置手机通知栏字体颜色
-function setBarColor(black = false) {
-    if (black) {
-        uni.setNavigationBarColor({
-            frontColor: '#000000',
-            backgroundColor: '#FAFAFA'
-        });
-    } else {
-        uni.setNavigationBarColor({
-            frontColor: '#ffffff',
-            backgroundColor: '#FAFAFA'
-        });
-    }
-}
-
-
 export {
     formatMoney,
     modelShow,
-    isWeiXinBrowser,
-    getQueryString,
-    timeToDateObj,
     moneySum,
     moneySub,
-    setBarColor
 }
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
index 729c025f..0f4356b1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
@@ -98,7 +98,7 @@
      * @property {Boolean} value=showLoginTip - 由v-model控制显示隐藏。
      * @property {Boolean} forceOauth - 小程序端特制的全屏登录提示。
      */
-    import { mapMutations, mapActions, mapState } from 'vuex';
+    import { mapState } from 'vuex';
     export default {
         name: 'coreshopLoginModal',
         components: {},
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-article.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-article.vue
index ac7b79e8..68c59a28 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-article.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-article.vue
@@ -1,33 +1,57 @@
 <template>
-    <view class='coreshop-index-article coreshop-margin-left-10 coreshop-margin-right-10 coreshop-margin-bottom-10  coreshop-margin-top-10  coreshop-bg-white' v-if="coreshopdata.parameters.list && count">
-        <view class='coreshop-cell-item' v-for="item in coreshopdata.parameters.list" :key="item.id" @click="articleDetail(item.id)">
-            <view class="coreshop-cell-item-bd">
-                <view class="article-title ">
-                    {{ item.title }}
+
+    <view class="coreshop-padding-10 coreshop-margin-10 coreshop-bg-white coreshop-border-radius-trbl-18" v-if="count">
+        <u-toast ref="uToast" />
+        <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-min-height-30">
+            <view class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">{{title}}</view>
+            <u-icon name="arrow-right-double" size="12" label="查看更多" labelSize="12" labelPos="left" @click="articleDetail(id)"></u-icon>
+        </view>
+        <view class="coreshop-divider">
+            <view class="complete"></view>
+        </view>
+        <view class="coreshop-margin-bottom-10 coreshop-bg-main coreshop-text-black coreshop-index-article">
+            <view class='coreshop-cell-item'>
+                <view class="coreshop-cell-item-bd">
+                    <view class="article-des u-line-5">
+                        {{ brief }}
+                    </view>
                 </view>
-                <view class="article-des u-line-2">
-                    {{ item.brief }}
+                <view class="cell-title-img">
+                    <image :src="coverImage" mode="aspectFill" class="coverImage"></image>
                 </view>
             </view>
-            <view class="cell-title-img">
-                <image :src="item.coverImage" mode="aspectFill" class="coverImage"></image>
-            </view>
         </view>
     </view>
 </template>
 
 <script>
     export default {
-        name: "coreshoparticle",
+        name: "coreshopArticle",
         props: {
-            coreshopdata: {
+            coreshopData: {
                 // type: Array,
                 required: true,
             }
         },
+        data() {
+            return {
+                title: "",
+                brief: "",
+                coverImage: "",
+                id: 0
+            }
+        },
+        created() {
+            if (this.coreshopData.parameters.list.length > 0) {
+                this.title = this.coreshopData.parameters.list[0].title;
+                this.brief = this.coreshopData.parameters.list[0].brief;
+                this.coverImage = this.coreshopData.parameters.list[0].coverImage;
+                this.id = this.coreshopData.parameters.list[0].id;
+            }
+        },
         computed: {
             count() {
-                return (this.coreshopdata.parameters.list.length > 0)
+                return (this.coreshopData.parameters.list.length > 0)
             }
         },
         methods: {
@@ -40,14 +64,13 @@
 </script>
 
 <style scoped lang="scss">
-    .coreshop-index-article { border-radius: 8px; padding: 0px 10px; background: #FFFFFF !important; color: #333333 !important; overflow: hidden;
+    .coreshop-index-article { background: #FFFFFF !important; color: #333333 !important; overflow: hidden;
         .coreshop-cell-item { padding: 5px 0px 5px 0; float: left; width: 100%; border-bottom: 1px solid #f3f3f3;
             .coreshop-cell-item-bd { float: left; width: calc(100% - 100px);
-                .article-title { font-size: 14px; color: #333; width: 100%; overflow: hidden; float: left; margin-bottom: 5px; }
                 .article-des { font-size: 14px; color: #999; overflow: hidden; float: left; line-height: 20px; }
             }
             .cell-title-img { width: 80px; height: 80px; float: right;
-                .coverImage { width: 80px; height: 80px; }
+                .coverImage { width: 80px; height: 80px; border-radius: 2px; }
             }
         }
     }
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-articleClassify.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-articleClassify.vue
index 93a37859..2c179ec3 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-articleClassify.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-articleClassify.vue
@@ -1,16 +1,27 @@
 <template>
-    <view class='coreshop-index-article coreshop-cell-group coreshop-margin-left-10 coreshop-margin-right-10 coreshop-margin-bottom-10  coreshop-margin-top-10  coreshop-bg-white' v-if="coreshopdata.parameters.list && count">
-        <view class='coreshop-cell-item' v-for="item in coreshopdata.parameters.list" :key="item.id" @click="articleDetail(item.id)">
-            <view class="coreshop-cell-item-bd">
-                <view class="article-title">
-                    {{ item.title }}
+    <view class="coreshop-padding-10 coreshop-margin-10 coreshop-bg-white coreshop-border-radius-trbl-18" v-if="count">
+        <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-min-height-30">
+            <view class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">{{coreshopData.parameters.articleClassifyObj.name}}</view>
+            <u-icon name="arrow-right-double" size="12" label="查看更多" labelSize="12" labelPos="left"  @click="goArticleClassify(coreshopData.parameters.articleClassifyObj.id)"></u-icon>
+        </view>
+        <view class="coreshop-divider">
+            <view class="complete"></view>
+        </view>
+        <view class="coreshop-bg-main coreshop-text-black">
+            <view class='coreshop-index-article coreshop-cell-group coreshop-margin-bottom-10  coreshop-margin-top-10  coreshop-bg-white' v-if="coreshopData.parameters.list && count">
+                <view class='coreshop-cell-item' v-for="item in coreshopData.parameters.list" :key="item.id" @click="articleDetail(item.id)">
+                    <view class="coreshop-cell-item-bd">
+                        <view class="article-title">
+                            {{ item.title }}
+                        </view>
+                        <view class="article-des u-line-2">
+                            {{ item.brief }}
+                        </view>
+                    </view>
+                    <view class="cell-title-img">
+                        <image :src="item.coverImage" mode="aspectFill" class="coverImage"></image>
+                    </view>
                 </view>
-                <view class="article-des u-line-2">
-                    {{ item.brief }}
-                </view>
-            </view>
-            <view class="cell-title-img">
-                <image :src="item.coverImage" mode="aspectFill" class="coverImage"></image>
             </view>
         </view>
     </view>
@@ -18,19 +29,19 @@
 
 <script>
     export default {
-        name: "coreshoparticleclassify",
+        name: "coreshopArticleclassify",
         props: {
-            coreshopdata: {
+            coreshopData: {
                 // type: Array,
                 required: true,
             }
         },
         computed: {
             count() {
-                if (!this.coreshopdata.parameters.list) {
+                if (!this.coreshopData.parameters.list) {
                     return false;
                 }
-                return (this.coreshopdata.parameters.list.length > 0)
+                return (this.coreshopData.parameters.list.length > 0)
             }
         },
         methods: {
@@ -43,14 +54,14 @@
 </script>
 
 <style lang="scss" scoped>
-    .coreshop-index-article { border-radius: 8px; padding: 0px 10px; background: #FFFFFF !important; color: #333333 !important; overflow: hidden;
-        .coreshop-cell-item { padding: 5px 0px 5px 0; float: left; width: 100%; border-bottom: 1px solid #f3f3f3;
+    .coreshop-index-article { border-radius: 8px; background: #FFFFFF !important; color: #333333 !important; overflow: hidden;
+        .coreshop-cell-item { padding: 8px 0px 8px 0; float: left; width: 100%; border-bottom: 1px solid #f3f3f3;
             .coreshop-cell-item-bd { float: left; display: flex; flex-direction: column;
                 .article-title { font-size: 14px; color: #333; width: 100%; overflow: hidden; float: left; margin-bottom: 5px; }
                 .article-des { font-size: 12px; color: #999; overflow: hidden; float: left; line-height: 20px; }
             }
             .cell-title-img { width: 80px; height: 80px; float: right;
-                .coverImage { width: 80px; height: 80px; }
+                .coverImage { width: 80px; height: 80px; border-radius: 2px; }
             }
         }
     }
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-blank.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-blank.vue
index 417cf26b..cdf596b6 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-blank.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-blank.vue
@@ -1,14 +1,14 @@
 <template>
-    <view class="coreshop-padding-10 coreshop-margin-left-10 coreshop-margin-right-10 coreshop-margin-bottom-10  coreshop-margin-top-10  coreshop-bg-white">
-        <u-gap :height="coreshopdata.parameters.height * 2" :bg-color="coreshopdata.parameters.backgroundColor"></u-gap>
+    <view>
+        <u-gap :height="coreshopData.parameters.height * 2" :bg-color="coreshopData.parameters.backgroundColor"></u-gap>
     </view>
 </template>
 
 <script>
     export default {
-        name: "coreshopblank",
+        name: "coreshopBlank",
         props: {
-            coreshopdata: {
+            coreshopData: {
                 // type: Array,
                 required: true,
             }
@@ -17,7 +17,4 @@
 
         }
     }
-</script>
-
-<style scoped lang="scss">
-</style>
+</script>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-content.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-content.vue
index 4d31b9a2..f121485b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-content.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-content.vue
@@ -12,15 +12,6 @@
             content: {
                 required: true,
             }
-        },
-        created() { },
-        methods: {
-            preview(src, e) {
-                // do something
-            },
-            navigate(href, e) {
-                // do something
-            }
         }
     }
 </script>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-coupon.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-coupon.vue
index 9803076a..40757c7c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-coupon.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-coupon.vue
@@ -1,94 +1,71 @@
 <template>
-    <!-- 首页优惠券卡片 -->
-    <view class="coupon-box coreshop-margin-bottom-5 coreshop-padding-10" v-if="count">
-        <!--提示框组件-->
+    <view class="coreshop-padding-10 coreshop-margin-10 coreshop-bg-white coreshop-border-radius-trbl-18" v-if="count">
         <u-toast ref="uToast" />
-        <view class="head-box coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-margin-bottom-10">
-            <view class="head-title u-ellipsis-1">领券专区</view>
-            <u-icon name="arrow-right-double" size="12" label="查看更多" labelSize="12" labelPos="left"  @tap="$u.route('/pages/coupon/coupon')"></u-icon>
+        <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-min-height-30">
+            <view class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">领券专区</view>
+            <u-icon name="arrow-right-double" size="12" label="查看更多" labelSize="12" labelPos="left" @tap="$u.route('/pages/coupon/coupon')"></u-icon>
         </view>
-        <scroll-view class="groupon-scroll" enable-flex scroll-anchoring scroll-x scroll-with-animation>
-            <view class="groupon-card-wrap coreshop-flex coreshop-align-center">
-                <view v-for="(item, index) in coreshopdata.parameters.list" :key="item.id">
-                    <!-- mini -->
-                    <!--<view class="coupon-card u-flex u-row-between u-m-r-16" v-if="couponType === 2" :style="{ background: `linear-gradient(to right, ${bgColor1}, ${bgColor2})` }">
-                        <view class="card-left u-flex-col u-row-center u-p-l-30">
-                            <view class="price coreshop-margin-bottom-10" :style="{ color: priceColor }">{{ item.amount }}</view>
-                            <view class="notice" :style="{ color: color }">满{{ item.enough }}元可用</view>
-                            <view class="notice coreshop-margin-bottom-10" :style="{ color: color }">仅剩{{ item.stock }}张</view>
-                        </view>
-                        <view class="card-right u-p-y-20 u-p-r-10 u-flex-col u-row-center u-col-center">
-                            <button class="u-reset-button get-btn coreshop-margin-bottom-10" :style="{ color: color }" @tap="getCoupon(item.id, index)">
-                                {{ item.status_code === 'cannot_get' ? '不可领取' : '领券购买' }}
-                            </button>
-                        </view>
-                    </view>-->
-                    <!-- big -->
-                    <view class="coreshop-padding-right-5">
-                        <view class="coupon-wrap " :style="{ background: `linear-gradient(to right, ${bgColor1}, ${bgColor2})` }">
-                            <view class="coupon-item coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between">
-                                <view class="coupon-left coreshop-flex coreshop-flex-direction">
-                                    <view class="sum-box">
-                                        <text class="unit" style="color: #6b3f12">￥</text>
-                                        <!--<text class="sum " style="color: #6b3f12">{{ item.name }}</text>-->
-                                        <text class="sub" style="color: #6b3f12">{{ item.name }}</text>
+        <view class="coreshop-divider">
+            <view class="complete"></view>
+        </view>
+        <view class="coreshop-margin-bottom-10 coreshop-bg-main coreshop-text-black">
+            <scroll-view class="groupon-scroll" enable-flex scroll-anchoring scroll-x scroll-with-animation>
+                <view class="groupon-card-wrap coreshop-flex coreshop-align-center">
+                    <view v-for="(item, index) in coreshopData.parameters.list" :key="item.id">
+                        <view class="coreshop-padding-right-5">
+                            <view class="coupon-wrap " :style="{ background: `linear-gradient(to right, ${bgColor1}, ${bgColor2})` }">
+                                <view class="coupon-item coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between">
+                                    <view class="coupon-left coreshop-flex coreshop-flex-direction">
+                                        <view class="sum-box">
+                                            <text class="unit" style="color: #6b3f12">￥</text>
+                                            <text class="sub" style="color: #6b3f12">{{ item.name }}</text>
+                                        </view>
+                                        <view class="notice " style="color: #9d6d25">
+                                            <text v-for="(itemCondition, index) in item.conditions" :key="index">【{{itemCondition}}】</text>
+                                        </view>
+                                        <view class="notice" style="color: #9d6d25">
+                                            有效期：{{$u.timeFormat(item.startTime, 'yyyy-mm-dd')}} 至 {{$u.timeFormat(item.endTime, 'yyyy-mm-dd')}}
+                                        </view>
                                     </view>
-                                    <view class="notice " style="color: #9d6d25">
-                                        <text v-for="(itemCondition, index) in item.conditions" :key="index">【{{itemCondition}}】</text>
-                                    </view>
-                                    <view class="notice" style="color: #9d6d25">
-                                        有效期：{{$u.timeFormat(item.startTime, 'yyyy-mm-dd')}} 至 {{$u.timeFormat(item.endTime, 'yyyy-mm-dd')}}
-                                    </view>
-                                </view>
-                                <view class="coupon-right coreshop-flex coreshop-flex-direction">
-                                    <button class="get-btn" :style="{ color: bgColor1 }" @tap.stop="receiveCoupon(item.id)">立即领取</button>
-                                    <view class="surplus-num" style="color: #9d6d25">
-                                        <text v-for="(itemResult, index) in item.results" :key="index">{{itemResult}}</text>
+                                    <view class="coupon-right coreshop-flex coreshop-flex-direction">
+                                        <button class="get-btn" :style="{ color: bgColor1 }" @tap.stop="receiveCoupon(item.id)">立即领取</button>
+                                        <view class="surplus-num" style="color: #9d6d25">
+                                            <text v-for="(itemResult, index) in item.results" :key="index">{{itemResult}}</text>
+                                        </view>
                                     </view>
                                 </view>
                             </view>
                         </view>
                     </view>
                 </view>
-            </view>
-        </scroll-view>
+            </scroll-view>
+        </view>
     </view>
 </template>
 
 <script>
     export default {
-        name: "coreshopcoupon",
+        name: "coreshopCoupon",
         components: {
         },
         props: {
-            coreshopdata: {
-                // type: Array,
+            coreshopData: {
+                type: Object,
                 required: true,
             }
         },
         computed: {
             count() {
-                if (!this.coreshopdata) {
+                if (!this.coreshopData) {
                     return false;
                 }
-                if (!this.coreshopdata.parameters) {
+                if (!this.coreshopData.parameters) {
                     return false;
                 }
-                if (!this.coreshopdata.parameters.list) {
+                if (!this.coreshopData.parameters.list) {
                     return false;
                 }
-                return (this.coreshopdata.parameters.list.length > 0)
-            }
-        },
-        data() {
-            return {
-                coupons: [
-                    {
-                        color: '#9F6DFA', ltBg: "#FFFFFF", height: '90px',
-                        unit: "￥", number: 5, txt: "满50元可用", title: "全场通用券", desc: "有效期至 2018-05-20",
-                        btn: "领取", drawed: "已抢2100张"
-                    }
-                ]
+                return (this.coreshopData.parameters.list.length > 0)
             }
         },
         created() {
@@ -99,32 +76,6 @@
 </script>
 
 <style lang="scss" scoped>
-    // 失效
-    .gray-wrap { filter: progid:DXImageTransform.Microsoft.BasicImage(grayscale=1) !important; -webkit-filter: grayscale(100%) !important; -moz-filter: grayscale(100%) !important; -ms-filter: grayscale(100%) !important; -o-filter: grayscale(100%) !important; filter: grayscale(100%) !important; filter: gray !important; }
-    .groupon-scroll { height: 100px;
-        .groupon-card-wrap { height: 100px; }
-    }
-    .coupon-box { background-color: #fff;
-        .head-box {
-            .head-title { width: 150px; font-size: 16px; font-weight: bold; color: #333333; }
-            .head-more {
-                .more-text { font-size: 11px; font-weight: 500; color: #333333; }
-                .more-icon { color: #333333; font-size: 12px; }
-            }
-        }
-        .coupon-card { width: 171.5px; height: 100px; background: linear-gradient(90deg, #f8dca5, #efc480); border-radius: 5px; mask: url($apiFilesUrl+'/static/images/coupon/coupon_mini_bg.png'); -webkit-mask-box-image: url($apiFilesUrl+'/static/images/coupon/coupon_mini_bg.png'); mask-size: 100% 100%;
-            .card-left { height: 100%; width: 130px;
-                .price { color: #4f3a1e; font-size: 15px; font-weight: bold;
-                    &::before { content: '￥'; font-size: 10px; }
-                }
-                .notice { font-size: 11px; font-weight: 500; color: #a8700d; }
-            }
-            .card-right { height: 100%; width: 30px;
-                .get-btn { font-size: 12px; font-weight: 500; text-align: right; color: #a8700d; writing-mode: vertical-lr; /*从左向右 从右向左是 writing-mode: vertical-rl;*/ writing-mode: tb-lr; /*IE浏览器的从左向右 从右向左是 writing-mode: tb-rl；*/ }
-            }
-        }
-    }
-    // 未领取，已领取
     .coupon-wrap { mask: url($apiFilesUrl+'/static/images/coupon/coupon_bg1.png'); -webkit-mask-box-image: url($apiFilesUrl+'/static/images/coupon/coupon_bg1.png'); mask-size: 100% 100%; position: relative; border-radius: 5px; width: 355px; height: 100px; background: linear-gradient(to right, $u-type-warning-disabled, $u-type-warning);
         .coupon-item { width: 100%; height: 100%; border-radius: 5px;
             .coupon-left { justify-content: center; padding-left: 10px; padding-right: 5px;
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goodTabBar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goodTabBar.vue
index d5b17ce9..497e8ed5 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goodTabBar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goodTabBar.vue
@@ -1,91 +1,135 @@
 <template>
-    <view>
+    <view class="coreshop-padding-10 coreshop-margin-10 coreshop-bg-white coreshop-border-radius-trbl-18">
+        <u-tabs :list="nameList" :current="current" @change="onChange"></u-tabs>
+        <view class="coreshop-divider">
+            <view class="complete"></view>
+        </view>
 
-        <u-tabs :list="nameList" :current="current" @change="change"></u-tabs>
-
-        <view v-for="(child,indexP) in newData.parameters.list" :key="indexP">
-            <view class="goodsBox" v-show="child.isShow==true">
-                <!-- 列表平铺两列三列 -->
-                <view v-if="child.column == '2' || child.column == '3' " v-bind:class="'column'+child.column">
-                    <view class="" v-if="child.list">
-                        <u-grid :col="child.column" :border="false" align="left">
-                            <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in child.list" :key="index" @click="goGoodsDetail(item.id)">
-                                <view class="good_box">
-                                    <u--image :src="item.image" mode="widthFix" width="100%" :height="child.column==2?'164px':'104px'" radius="10"></u--image>
-                                    <view class="good_title u-line-2">
-                                        {{item.name}}
-                                    </view>
-                                    <view class="good-price coreshop-display-block">
-                                        {{item.price}}元 <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-5 coreshop-text-gray">{{item.mktprice}}元</span>
-                                    </view>
-                                    <view class="good-tag-recommend" v-if="item.isRecommend">
-                                        推荐
-                                    </view>
-                                    <view class="good-tag-hot" v-if="item.isHot">
-                                        热门
-                                    </view>
-                                </view>
-                            </u-grid-item>
-                        </u-grid>
-                    </view>
-                    <view v-else-if="!count && !child.listAjax">
-                        <u-grid col="3" border="false" align="center">
-                            <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="item in 3" :key="item" @click="goGoodsDetail(item.id)">
-                                <view class="good_box">
-                                    <u--image src="/static/images/common/empty.png"  mode="widthFix" width="100%" radius="10"></u--image>
-                                    <view class="good_title u-line-2">
-                                        无
-                                    </view>
-                                    <view class="good-price">
-                                        0元
-                                    </view>
-                                    <view class="good-tag-recommend">
-                                        推荐
-                                    </view>
-                                    <view class="good-tag-hot">
-                                        热门
-                                    </view>
-                                </view>
-                            </u-grid-item>
-                        </u-grid>
+        <view class="coreshop-text-black">
+            <custom-waterfalls-flow :value="newData.list" :column="newData.column" @wapperClick="wapperClick" @imageClick="imageClick" v-if="newData.column>1">
+                <!-- #ifdef MP-WEIXIN -->
+                <view class="goods coreshop-padding-bottom-10 coreshop-bg-main" v-for="(item,index) in newData.list" :key="index" slot="slot{{index}}">
+                    <view class="coreshop-padding-top-6 coreshop-padding-bottom-3 coreshop-padding-left-8 coreshop-padding-right-8 coreshop-bg-main coreshop-border-radius-bl-18">
+                        <view class="coreshop-multiple-line-clamp">
+                            <text class="coreshop-font-14">{{item.name}}</text>
+                        </view>
+                        <view class="coreshop-margin-top-8 coreshop-flex coreshop-justify-between coreshop-align-center coreshop-margin-bottom-5">
+                            <view class="coreshop-text-red coreshop-font-weight-bold">
+                                <text class="coreshop-font-12">¥</text>
+                                <text class="coreshop-font-16">{{item.price}}</text>
+                                <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-6 coreshop-text-gray" v-if="newData.column==2">{{item.mktprice}}元</span>
+                            </view>
+                            <view>
+                                <text class="coreshop-font-10 coreshop-text-gray">{{item.buyCount+'人付款'}}</text>
+                            </view>
+                        </view>
+                        <view class="coreshop-divider" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
+                            <view class="complete"></view>
+                        </view>
+                        <view class="coreshop-flex coreshop-font-11 coreshop-margin-top-10 coreshop-margin-bottom-5" :class="newData.column>2?'coreshop-flex-direction-column':'coreshop-flex-direction-row'" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
+                            <view>
+                                {{ pointShowName}}兑换价:
+                            </view>
+                            <view class="coreshop-text-red">
+                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
+                            </view>
+                        </view>
+                        <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5 coreshop-margin-bottom-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
+                            <view>
+                                购买赠送:
+                            </view>
+                            <view class="coreshop-text-red">
+                                {{item.points}}{{ pointShowName}}
+                            </view>
+                        </view>
                     </view>
                 </view>
-
-                <!-- 列表平铺单列 -->
-                <view v-if="child.column == '1'">
-                    <view v-if="child.list">
-                        <u-grid :col="1" :border="false" align="left">
-                            <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="item in child.list" :key="item.id" @click="goGoodsDetail(item.id)">
-                                <view class="good_box">
-                                    <u-row gutter="5" justify="space-between">
-                                        <u-col span="4">
-                                            <u--image :src="item.image"  mode="widthFix" width="100%" radius="10"></u--image>
-                                            <view class="good-tag-recommend2" v-if="item.isRecommend">
-                                                推荐
-                                            </view>
-                                            <view class="good-tag-hot" v-if="item.isHot">
-                                                热门
-                                            </view>
-                                        </u-col>
-                                        <u-col span="8">
-                                            <view class="good_title-xl u-line-3 u-padding-10">
-                                                {{item.name}}
-                                            </view>
-                                            <view class="good-price u-padding-10">
-                                                {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
-                                            </view>
-                                        </u-col>
-                                    </u-row>
+                <!-- #endif -->
+                <!-- #ifndef MP-WEIXIN -->
+                <template v-slot:default="item">
+                    <view class="goods">
+                        <view class="coreshop-padding-top-6 coreshop-padding-bottom-3 coreshop-padding-left-8 coreshop-padding-right-8 coreshop-bg-white coreshop-border-radius-bl-18">
+                            <view class="coreshop-multiple-line-clamp">
+                                <text class="coreshop-font-14">{{item.name}}</text>
+                            </view>
+                            <view class="coreshop-margin-top-8 coreshop-flex coreshop-justify-between coreshop-align-center coreshop-margin-bottom-5">
+                                <view class="coreshop-text-red coreshop-font-weight-bold">
+                                    <text class="coreshop-font-12">¥</text>
+                                    <text class="coreshop-font-16">{{item.price}}</text>
+                                    <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-6 coreshop-text-gray" v-if="newData.column==2">{{item.mktprice}}元</span>
                                 </view>
-                            </u-grid-item>
-                        </u-grid>
+                                <view>
+                                    <text class="coreshop-font-10 coreshop-text-gray">{{item.buyCount+'人付款'}}</text>
+                                </view>
+                            </view>
+                            <view class="coreshop-divider" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
+                                <view class="complete"></view>
+                            </view>
+                            <view class="coreshop-flex coreshop-font-11 coreshop-margin-top-10 coreshop-margin-bottom-5" :class="newData.column>2?'coreshop-flex-direction-column':'coreshop-flex-direction-row'" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
+                                <view>
+                                    {{ pointShowName}}兑换价:
+                                </view>
+                                <view class="coreshop-text-red">
+                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
+                                </view>
+                            </view>
+                            <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5  coreshop-margin-bottom-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
+                                <view>
+                                    购买赠送:
+                                </view>
+                                <view class="coreshop-text-red">
+                                    {{item.points}}{{ pointShowName}}
+                                </view>
+                            </view>
+                        </view>
                     </view>
-                    <view class="order-none" v-else>
-                        <u-empty :icon="$globalConstVars.apiFilesUrl+'/static/images/empty/order.png'" icon-size="150" text="暂无" mode="list"></u-empty>
+                </template>
+                <!-- #endif -->
+            </custom-waterfalls-flow>
+
+            <view class="coreshop-text-black" v-for="(item, index) in newData.list" :key="item.id" v-if="newData.column==1">
+                <view class="coreshop-flex coreshop-justify-start coreshop-padding-top-10 coreshop-padding-bottom-10" v-if="newData.list.length">
+                    <view>
+                        <u--image :src="item.image" mode="widthFix" width="130px" height="130px" radius="8"></u--image>
                     </view>
+                    <view class="coreshop-flex coreshop-flex-direction  coreshop-padding-left-10">
+                        <view class="coreshop-font-14 u-line-2 coreshop-text-black">{{ item.name }}</view>
+                        <view class="coreshop-font-11 coreshop-padding-top-5 coreshop-padding-bottom-3 u-line-2 coreshop-text-brown">{{ item.brief }}</view>
+                        <view class="coreshop-flex coreshop-align-center coreshop-padding-top-10  coreshop-padding-bottom-10">
+                            <view class="coreshop-font-11 coreshop-bg-orange coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10">已售{{item.buyCount}}{{item.unit}}</view>
+                            <view class="coreshop-font-11 coreshop-bg-olive coreshop-padding-2 coreshop-border-radius-4">{{item.viewCount}}人访问</view>
+                        </view>
+                        <view class="coreshop-flex coreshop-justify-between  coreshop-flex-direction-row coreshop-align-center">
+                            <view class="coreshop-flex coreshop-align-center">
+                                <view class="coreshop-font-14 coreshop-text-red">￥{{ item.price  }}</view>
+                                <view class="coreshop-font-12 coreshop-text-gray coreshop-text-through">￥{{ item.mktprice }}</view>
+                            </view>
+                            <view class="coreshop-buy-btn" @tap="goPinTuanDetail(item.id,item.pinTuanRule.id)">立即购</view>
+                        </view>
+                    </view>
+                    <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
+                        <view>
+                            {{ pointShowName}}兑换价:
+                        </view>
+                        <view class="coreshop-text-red">
+                            {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
+                        </view>
+                    </view>
+                    <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
+                        <view>
+                            购买赠送:
+                        </view>
+                        <view class="coreshop-text-red">
+                            {{item.points}}{{ pointShowName}}
+                        </view>
+                    </view>
+                </view>
+                <view class="order-none" v-else>
+                    <u-empty :icon="$globalConstVars.apiFilesUrl+'/static/images/empty/order.png'" icon-size="150" text="暂无" mode="list"></u-empty>
                 </view>
             </view>
         </view>
+
     </view>
 </template>
 
@@ -98,41 +142,55 @@
                 newData: {}
             };
         },
-        name: "coreshopgoodTabBar",
+        name: "coreshopGoodTabBar",
         props: {
-            coreshopdata: {
+            coreshopData: {
                 // type: Array,
                 required: true,
             }
         },
         mounted() {
             var _this = this;
-            this.newData = this.coreshopdata;
-            for (var i = 0; i < this.newData.parameters.list.length; i++) {
+            this.newData = this.coreshopData;
+            for (var i = 0; i < this.coreshopData.parameters.list.length; i++) {
                 let item = {
-                    name: this.newData.parameters.list[i].title
+                    name: this.coreshopData.parameters.list[i].title
                 }
                 this.nameList.push(item);
-
                 if (_this.current == i) {
-                    _this.newData.parameters.list[i].isShow = true;
-                } else {
-                    _this.newData.parameters.list[i].isShow = false;
+                    _this.newData = this.coreshopData.parameters.list[i];
                 }
-
             }
         },
         computed: {
+            pointSwitch() { return this.$store.state.config.pointSwitch },
+            pointShowExchangePrice() { return this.$store.state.config.pointShowExchangePrice },
+            pointDiscountedProportion() { return this.$store.state.config.pointDiscountedProportion },
+            pointExchangeModel() { return this.$store.state.config.pointExchangeModel },
+            pointShowName() { return this.$store.state.config.pointShowName },
+            pointGetModel() { return this.$store.state.config.pointGetModel },
+            pointShowPoint() { return this.$store.state.config.pointShowPoint },
         },
         methods: {
-            change(item) {
+            wapperClick(item) {
+                this.goGoodsDetail(item.id)
+            },
+            imageClick(item) {
+                this.goGoodsDetail(item.id)
+            },
+            onChange(item) {
+                uni.showLoading({
+                    title: '加载中',
+                    mask: true
+                });
                 var _this = this;
                 this.current = item.index;
-                for (var i = 0; i < _this.newData.parameters.list.length; i++) {
+                for (var i = 0; i < _this.coreshopData.parameters.list.length; i++) {
                     if (_this.current == i) {
-                        _this.newData.parameters.list[i].isShow = true;
-                    } else {
-                        _this.newData.parameters.list[i].isShow = false;
+                        _this.newData = this.coreshopData.parameters.list[i];
+                        setTimeout(function () {
+                            uni.hideLoading();
+                        }, 300);
                     }
                 }
             }
@@ -156,4 +214,5 @@
             .indicator-dots-active { background-color: $u-type-primary; }
         }
     }
+
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goods.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goods.vue
index 7fe5767e..8a4bb129 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goods.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goods.vue
@@ -1,16 +1,19 @@
 <template>
-
-    <view class="goodsBox coreshop-margin-bottom-10 coreshop-padding-top-5">
+    <view>
         <!-- 列表平铺两列三列 -->
-        <view v-if="coreshopdata.parameters.column == '2' && coreshopdata.parameters.display == 'list' || coreshopdata.parameters.column == '3' && coreshopdata.parameters.display == 'list'" v-bind:class="'column'+coreshopdata.parameters.column">
-            <view class="coreshop-margin-left-5 coreshop-margin-right-5 coreshop-margin-top-10 coreshop-margin-bottom-10 " v-if="coreshopdata.parameters.lookTitle == 'true'">
-                <coreshop-section font-size="15" :title="coreshopdata.parameters.title" v-if="coreshopdata.parameters.title != '' && coreshopdata.parameters.lookTitle == 'true'" @click="coreshopdata.parameters.lookMore == 'true' ? goGoodsList({catId: coreshopdata.parameters.classifyId,brandId:coreshopdata.parameters.brandId}) :''" :arrow="coreshopdata.parameters.lookMore == 'true'" :sub-title="coreshopdata.parameters.lookMore == 'true'?'更多':''"></coreshop-section>
+        <view class="coreshop-padding-10 coreshop-margin-10 coreshop-bg-white coreshop-border-radius-trbl-18" v-if="coreshopData.parameters.column == '2' && coreshopData.parameters.display == 'list' || coreshopData.parameters.column == '3' && coreshopData.parameters.display == 'list'">
+            <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-min-height-30" v-if="coreshopData.parameters.lookTitle == 'true'">
+                <view class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">{{coreshopData.parameters.title}}</view>
+                <u-icon name="arrow-right-double" size="12" label="查看更多" labelSize="12" labelPos="left" v-if="coreshopData.parameters.lookMore == 'true'" @click="goGoodsList({catId: coreshopData.parameters.classifyId,brandId:coreshopData.parameters.brandId})"></u-icon>
             </view>
-            <view class=" coreshop-margin-bottom-10 coreshop-margin-top-10" v-if="count">
-                <custom-waterfalls-flow :value="coreshopdata.parameters.list" :column="coreshopdata.parameters.column" @wapperClick="wapperClick" @imageClick="imageClick">
+            <view class="coreshop-divider">
+                <view class="complete"></view>
+            </view>
+            <view class="coreshop-text-black">
+                <custom-waterfalls-flow :value="coreshopData.parameters.list" :column="coreshopData.parameters.column" @wapperClick="wapperClick" @imageClick="imageClick">
                     <!-- #ifdef MP-WEIXIN -->
-                    <view class="goods" v-for="(item,index) in coreshopdata.parameters.list" :key="index" slot="slot{{index}}">
-                        <view class="coreshop-padding-top-6 coreshop-padding-bottom-3 coreshop-padding-left-8 coreshop-padding-right-8 coreshop-bg-white coreshop-border-radius-bl-18">
+                    <view class="goods coreshop-padding-bottom-10 coreshop-bg-main" v-for="(item,index) in coreshopData.parameters.list" :key="index" slot="slot{{index}}">
+                        <view class="coreshop-padding-top-6 coreshop-padding-bottom-3 coreshop-padding-left-8 coreshop-padding-right-8 coreshop-bg-main coreshop-border-radius-bl-18">
                             <view class="coreshop-multiple-line-clamp">
                                 <text class="coreshop-font-14">{{item.name}}</text>
                             </view>
@@ -18,18 +21,21 @@
                                 <view class="coreshop-text-red coreshop-font-weight-bold">
                                     <text class="coreshop-font-12">¥</text>
                                     <text class="coreshop-font-16">{{item.price}}</text>
-                                    <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-6 coreshop-text-gray" v-if="coreshopdata.parameters.column==2">{{item.mktprice}}元</span>
+                                    <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-6 coreshop-text-gray" v-if="coreshopData.parameters.column==2">{{item.mktprice}}元</span>
                                 </view>
                                 <view>
                                     <text class="coreshop-font-10 coreshop-text-gray">{{item.buyCount+'人付款'}}</text>
                                 </view>
                             </view>
-                            <view class="coreshop-flex coreshop-font-11 coreshop-margin-top-10 coreshop-padding-top-10 coreshop-solid-top coreshop-margin-bottom-5" :class="coreshopdata.parameters.column>2?'coreshop-flex-direction-column':'coreshop-flex-direction-row'" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
+                            <view class="coreshop-divider" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
+                                <view class="complete"></view>
+                            </view>
+                            <view class="coreshop-flex coreshop-font-11 coreshop-margin-top-10 coreshop-margin-bottom-5" :class="coreshopData.parameters.column>2?'coreshop-flex-direction-column':'coreshop-flex-direction-row'" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
                                 <view>
                                     {{ pointShowName}}兑换价:
                                 </view>
                                 <view class="coreshop-text-red">
-                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ $common.formatMoney(item.price - item.pointsDeduction, 2, '')}}元
+                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}}元
                                 </view>
                             </view>
                             <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5 coreshop-margin-bottom-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -54,18 +60,21 @@
                                     <view class="coreshop-text-red coreshop-font-weight-bold">
                                         <text class="coreshop-font-12">¥</text>
                                         <text class="coreshop-font-16">{{item.price}}</text>
-                                        <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-6 coreshop-text-gray" v-if="coreshopdata.parameters.column==2">{{item.mktprice}}元</span>
+                                        <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-6 coreshop-text-gray" v-if="coreshopData.parameters.column==2">{{item.mktprice}}元</span>
                                     </view>
                                     <view>
                                         <text class="coreshop-font-10 coreshop-text-gray">{{item.buyCount+'人付款'}}</text>
                                     </view>
                                 </view>
-                                <view class="coreshop-flex coreshop-font-11 coreshop-margin-top-10 coreshop-padding-top-10 coreshop-solid-top coreshop-margin-bottom-5" :class="coreshopdata.parameters.column>2?'coreshop-flex-direction-column':'coreshop-flex-direction-row'" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
+                                <view class="coreshop-divider" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
+                                    <view class="complete"></view>
+                                </view>
+                                <view class="coreshop-flex coreshop-font-11 coreshop-margin-top-10 coreshop-margin-bottom-5" :class="coreshopData.parameters.column>2?'coreshop-flex-direction-column':'coreshop-flex-direction-row'" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
                                     <view>
                                         {{ pointShowName}}兑换价:
                                     </view>
                                     <view class="coreshop-text-red">
-                                        {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ $common.formatMoney(item.price - item.pointsDeduction, 2, '')}}元
+                                        {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}}元
                                     </view>
                                 </view>
                                 <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5  coreshop-margin-bottom-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -81,54 +90,55 @@
                     </template>
                     <!-- #endif -->
                 </custom-waterfalls-flow>
-
-
-            </view>
-            <view v-else-if="!count && !coreshopdata.parameters.listAjax">
             </view>
         </view>
 
         <!-- 列表平铺单列 -->
-        <view v-if="coreshopdata.parameters.column == '1' && coreshopdata.parameters.display == 'list'">
-            <view class="coreshop-margin-left-5 coreshop-margin-right-5 coreshop-margin-top-10 coreshop-margin-bottom-10 ">
-                <coreshop-section font-size="15" :title="coreshopdata.parameters.title" v-if="coreshopdata.parameters.title != '' && coreshopdata.parameters.lookTitle == 'true'" @click="coreshopdata.parameters.lookMore == 'true' ? goGoodsList({catId: coreshopdata.parameters.classifyId,brandId:coreshopdata.parameters.brandId}) :''" :arrow="coreshopdata.parameters.lookMore == 'true'" :sub-title="coreshopdata.parameters.lookMore == 'true'?'更多':''"></coreshop-section>
+        <view class="coreshop-padding-10 coreshop-margin-10 coreshop-bg-white coreshop-border-radius-trbl-18" v-if="coreshopData.parameters.column == '1' && coreshopData.parameters.display == 'list'">
+            <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-min-height-30" v-if="coreshopData.parameters.lookTitle == 'true'">
+                <view class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">{{coreshopData.parameters.title}}</view>
+                <u-icon name="arrow-right-double" size="12" label="查看更多" labelSize="12" labelPos="left" v-if="coreshopData.parameters.lookMore == 'true'" @click="goGoodsList({catId: coreshopData.parameters.classifyId,brandId:coreshopData.parameters.brandId})"></u-icon>
             </view>
-            <view v-if="count">
-                <u-grid :col="1" :border="false" align="left">
-                    <u-grid-item :custom-style="{padding: '0px'}" v-for="item in coreshopdata.parameters.list" :key="item.id">
-                        <view class="good_box" @click="goGoodsDetail(item.id)">
-                            <u--image :src="item.image" width="100%" radius="10"></u--image>
-                            <view class="good_title u-line-2">
-                                {{item.name}}
-                            </view>
-                            <view class="good-price coreshop-display-block">
-                                {{item.price}}元 <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-5 coreshop-text-gray">{{item.mktprice}}元</span>
-                            </view>
-                            <view class="good-tag-recommend" v-if="item.isRecommend">
-                                推荐
-                            </view>
-                            <view class="good-tag-hot" v-if="item.isHot">
-                                热门
-                            </view>
-                            <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
-                                <view>
-                                    {{ pointShowName}}兑换价:
-                                </view>
-                                <view class="coreshop-text-red">
-                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元
-                                </view>
-                            </view>
-                            <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
-                                <view>
-                                    购买赠送:
-                                </view>
-                                <view class="coreshop-text-red">
-                                    {{item.points}}{{ pointShowName}}
-                                </view>
-                            </view>
+            <view class="coreshop-divider">
+                <view class="complete"></view>
+            </view>
+            <view class="coreshop-text-black" v-for="(item, index) in coreshopData.parameters.list" :key="item.id" v-if="count">
+                <view class="coreshop-flex coreshop-justify-start coreshop-padding-top-10 coreshop-padding-bottom-10">
+                    <view>
+                        <u--image :src="item.image" mode="widthFix" width="130px" height="130px" radius="8"></u--image>
+                    </view>
+                    <view class="coreshop-flex coreshop-flex-direction  coreshop-padding-left-10  coreshop-percent-100">
+                        <view class="coreshop-font-14 u-line-2 coreshop-text-black">{{ item.name }}</view>
+                        <view class="coreshop-font-11 coreshop-padding-top-5 coreshop-padding-bottom-3 u-line-2 coreshop-text-brown">{{ item.brief }}</view>
+                        <view class="coreshop-flex coreshop-align-center coreshop-padding-top-10  coreshop-padding-bottom-10">
+                            <view class="coreshop-font-11 coreshop-bg-orange coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10">已售{{item.buyCount}}{{item.unit}}</view>
+                            <view class="coreshop-font-11 coreshop-bg-olive coreshop-padding-2 coreshop-border-radius-4">{{item.viewCount}}人访问</view>
                         </view>
-                    </u-grid-item>
-                </u-grid>
+                        <view class="coreshop-flex coreshop-justify-between  coreshop-flex-direction-row coreshop-align-center">
+                            <view class="coreshop-flex coreshop-align-center">
+                                <view class="coreshop-font-14 coreshop-text-red">￥{{ item.price  }}</view>
+                                <view class="coreshop-font-12 coreshop-text-gray coreshop-text-through">￥{{ item.mktprice }}</view>
+                            </view>
+                            <view class="coreshop-buy-btn" @tap="goGoodsDetail(item.id)">马上抢</view>
+                        </view>
+                    </view>
+                    <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
+                        <view>
+                            {{ pointShowName}}兑换价:
+                        </view>
+                        <view class="coreshop-text-red">
+                            {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
+                        </view>
+                    </view>
+                    <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
+                        <view>
+                            购买赠送:
+                        </view>
+                        <view class="coreshop-text-red">
+                            {{item.points}}{{ pointShowName}}
+                        </view>
+                    </view>
+                </view>
             </view>
             <view class="order-none" v-else>
                 <u-empty :icon="$globalConstVars.apiFilesUrl+'/static/images/empty/order.png'" icon-size="150" text="暂无" mode="list"></u-empty>
@@ -136,18 +146,21 @@
         </view>
 
         <!-- 横向滚动 -->
-        <block v-if="coreshopdata.parameters.display == 'slide'"
-               v-bind:class="'slide'+coreshopdata.parameters.column">
-            <view class="coreshop-margin-left-15 coreshop-margin-right-15 coreshop-margin-top-15 coreshop-margin-bottom-15" v-if="coreshopdata.parameters.lookTitle == 'true'">
-                <coreshop-section font-size="15" :title="coreshopdata.parameters.title" v-if="coreshopdata.parameters.title != '' && coreshopdata.parameters.lookTitle == 'true'" @click="coreshopdata.parameters.lookMore == 'true' ? goGoodsList({catId: coreshopdata.parameters.classifyId,brandId:coreshopdata.parameters.brandId}) :''" :arrow="coreshopdata.parameters.lookMore == 'true'" :sub-title="coreshopdata.parameters.lookMore == 'true'?'更多':''"></coreshop-section>
+        <view class="coreshop-padding-10 coreshop-margin-10 coreshop-bg-white coreshop-border-radius-trbl-18" v-if="coreshopData.parameters.display == 'slide'">
+            <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-min-height-30" v-if="coreshopData.parameters.lookTitle == 'true'">
+                <view class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">{{coreshopData.parameters.title}}</view>
+                <u-icon name="arrow-right-double" size="12" label="查看更多" labelSize="12" labelPos="left" v-if="coreshopData.parameters.lookMore == 'true'" @click="goGoodsList({catId: coreshopData.parameters.classifyId,brandId:coreshopData.parameters.brandId})"></u-icon>
             </view>
-            <block v-if="count">
-                <swiper :class="coreshopdata.parameters.column==3?'swiper3':coreshopdata.parameters.column==2?'swiper2':''" @change="change">
+            <view class="coreshop-divider">
+                <view class="complete"></view>
+            </view>
+            <view v-if="count">
+                <swiper :class="coreshopData.parameters.column==3?'swiper3':coreshopData.parameters.column==2?'swiper2':''" @change="change">
                     <swiper-item v-for="no of pageCount" :key="no">
-                        <u-grid :col="coreshopdata.parameters.column" :border="false" align="left" :data-id="no">
-                            <u-grid-item v-for="(item, index)  in coreshopdata.parameters.list" v-if="index >=coreshopdata.parameters.column*no && index <coreshopdata.parameters.column*(no+1)" :key="index" @click="goGoodsDetail(item.id)">
+                        <u-grid :col="coreshopData.parameters.column" :border="false" align="left" :data-id="no">
+                            <u-grid-item v-for="(item, index)  in coreshopData.parameters.list" v-if="index >=coreshopData.parameters.column*no && index <coreshopData.parameters.column*(no+1)" :key="index" @click="goGoodsDetail(item.id)">
                                 <view class="good_box">
-                                    <u-image :src="item.image" :index="item.id" mode="widthFit" width="100%" :height="coreshopdata.parameters.column==3?'104px':coreshopdata.parameters.column==2?'164px':'104px'" radius="10">
+                                    <u-image :src="item.image" :index="item.id" mode="widthFit" width="100%" :height="coreshopData.parameters.column==3?'104px':coreshopData.parameters.column==2?'164px':'104px'" radius="10">
                                     </u-image>
                                     <view class="good_title u-line-2">
                                         {{item.name}}
@@ -166,7 +179,7 @@
                                             {{ pointShowName}}兑换价:
                                         </view>
                                         <view class="coreshop-text-red">
-                                            {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元
+                                            {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
                                         </view>
                                     </view>
                                     <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -186,12 +199,15 @@
                     <view class="indicator-dots-item" v-for="no of pageCount" :key="no" :class="[current == no ? 'indicator-dots-active' : '']">
                     </view>
                 </view>
-            </block>
+            </view>
             <view v-else="">
                 <scroll-view class='swiper-list' scroll-x="true"></scroll-view>
             </view>
 
-        </block>
+        </view>
+
+
+
     </view>
 </template>
 
@@ -204,20 +220,9 @@
                 count: false
             };
         },
-        filters: {
-            substr(val) {
-                if (val.length == 0 || val == undefined) {
-                    return false;
-                } else if (val.length > 13) {
-                    return val.substring(0, 13) + "...";
-                } else {
-                    return val;
-                }
-            }
-        },
-        name: "coreshopgoods",
+        name: "coreshopGoods",
         props: {
-            coreshopdata: {
+            coreshopData: {
                 // type: Array,
                 required: true,
             }
@@ -243,9 +248,9 @@
             },
         },
         created() {
-            this.count = this.coreshopdata.parameters.list.length > 0;
-            var page = Number(this.coreshopdata.parameters.list.length / this.coreshopdata.parameters.column).toFixed(0);
-            if (this.coreshopdata.parameters.column * page < this.coreshopdata.parameters.list.length) {
+            this.count = this.coreshopData.parameters.list.length > 0;
+            var page = Number(this.coreshopData.parameters.list.length / this.coreshopData.parameters.column).toFixed(0);
+            if (this.coreshopData.parameters.column * page < this.coreshopData.parameters.list.length) {
                 page = Number(page) + 1;
             }
             for (var i = 0; i < page; i++) {
@@ -256,20 +261,17 @@
 </script>
 
 <style scoped lang="scss">
-    .goodsBox { color: #333333 !important; padding: 0 5px; overflow: hidden;
-        .good_box { border-radius: 8px; margin: 3px; background-color: #ffffff; padding: 5px; position: relative; width: 100%;
-            .good_title { font-size: 13px; margin-top: 5px; color: $u-main-color; }
-            .good_title-xl { font-size: 14px; margin-top: 5px; color: $u-main-color; }
-            .good-tag-hot { display: flex; margin-top: 5px; position: absolute; top: 7.5px; left: 7.5px; background-color: $u-type-error; color: #FFFFFF; display: flex; align-items: center; padding: 2px 7px; border-radius: 25px; font-size: 10px; line-height: 1; }
-            .good-tag-recommend { display: flex; margin-top: 5px; position: absolute; top: 7.5px; right: 7.5px; background-color: $u-type-primary; color: #FFFFFF; margin-left: 10px; border-radius: 25px; line-height: 1; padding: 2px 7px; display: flex; align-items: center; border-radius: 25px; font-size: 10px; }
-            .good-tag-recommend2 { display: flex; margin-top: 5px; position: absolute; bottom: 7.5px; left: 7.5px; background-color: $u-type-primary; color: #FFFFFF; border-radius: 25px; line-height: 1; padding: 2px 7px; display: flex; align-items: center; border-radius: 25px; font-size: 10px; }
-            .good-price { font-size: 15px; color: $u-type-error; margin-top: 5px; }
-        }
+    .good_box { border-radius: 8px; background-color: #ffffff; padding: 5px; position: relative; width: 100%;
+        .good_title { font-size: 14px; margin-top: 5px; color: $u-main-color; }
+        .good-tag-hot { display: flex; margin-top: 5px; position: absolute; top: 7.5px; left: 7.5px; background-color: $u-type-error; color: #FFFFFF; display: flex; align-items: center; padding: 2px 7px; border-radius: 25px; font-size: 10px; line-height: 1; }
+        .good-tag-recommend { display: flex; margin-top: 5px; position: absolute; top: 7.5px; right: 7.5px; background-color: $u-type-primary; color: #FFFFFF; margin-left: 10px; border-radius: 25px; line-height: 1; padding: 2px 7px; display: flex; align-items: center; border-radius: 25px; font-size: 10px; }
+        .good-tag-recommend2 { display: flex; margin-top: 5px; position: absolute; bottom: 7.5px; left: 7.5px; background-color: $u-type-primary; color: #FFFFFF; border-radius: 25px; line-height: 1; padding: 2px 7px; display: flex; align-items: center; border-radius: 25px; font-size: 10px; }
+        .good-price { font-size: 15px; color: $u-type-error; margin-top: 5px; }
+    }
 
-        .indicator-dots { margin-top: 10px; margin-bottom: 10px; display: flex; justify-content: center; align-items: center; flex-direction: row;
-            .indicator-dots-item { background-color: $u-tips-color; height: 6px; width: 6px; border-radius: 10px; margin: 0 3px; }
-            .indicator-dots-active { background-color: $u-type-primary; }
-        }
+    .indicator-dots { margin-top: 10px; margin-bottom: 10px; display: flex; justify-content: center; align-items: center; flex-direction: row;
+        .indicator-dots-item { background-color: $u-tips-color; height: 6px; width: 6px; border-radius: 10px; margin: 0 3px; }
+        .indicator-dots-active { background-color: $u-type-primary; }
     }
     .swiper3 { height: 200px; }
     .swiper2 { height: 270px; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
index 75ac7dab..264f0fc7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
@@ -1,75 +1,132 @@
 <template>
-    <!-- 团购秒杀 -->
-    <view v-if="count">
-        <view class="coreshop-margin-left-10 coreshop-margin-right-10 coreshop-margin-top-10 coreshop-margin-bottom-10">
-            <coreshop-section font-size="15" :title="coreshopdata.parameters.title" @click="goSeckillList()"></coreshop-section>
+    <view class="coreshop-padding-10 coreshop-margin-10 coreshop-bg-white coreshop-border-radius-trbl-18" v-if="listData && count">
+        <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-min-height-30">
+            <view class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">{{coreshopData.parameters.title}}</view>
+            <u-icon name="arrow-right-double" size="12" label="查看更多" labelSize="12" labelPos="left" @tap="goGroupPurchase()"></u-icon>
         </view>
-        <view class="coreshop-margin-left-15  coreshop-margin-right-15" v-if="coreshopdata.parameters.list && count">
-            <view class="img-list-item" v-if="item.id !== 'undefined' && item.id" v-for="(item, key) in coreshopdata.parameters.list" :key="key" @click="goSeckillDetail(item.goods.id, item.goods.groupId)">
-                <view class="img-list-item-l">
-                    <u-image :src="item.goods.image" :index="item.id" :showLoading="true"  width="100%" height="96px"></u-image>
+        <view class="coreshop-divider">
+            <view class="complete"></view>
+        </view>
+        <view class="coreshop-flex-direction-row coreshop-margin-bottom-10 coreshop-text-black" v-for="(item, key) in listData" :key="key">
+            <view class="coreshop-flex coreshop-justify-start">
+                <view>
+                    <u--image :src="item.goods.image" mode="widthFix" width="96px" height="96px" radius="8"></u--image>
                 </view>
-                <view class="img-list-item-r">
-                    <view class="coreshop-font-18 u-line-1">{{item.name}}</view>
-                    <view class="u-line-2 coreshop-margin-top-5 coreshop-margin-bottom-5">{{item.goods.name}}</view>
-                    <view class="item-c coreshop-flex coreshop-justify-between">
-                        <view class="red-price coreshop-justify-between">
-                            ￥{{item.goods.product.price}}
-                            <span class="coreshop-font-xs coreshop-text-through coreshop-margin-left-5">{{item.goods.product.mktprice}}元</span>
+                <view class="coreshop-flex coreshop-flex-direction coreshop-padding-left-10 coreshop-percent-100">
+                    <view class="coreshop-font-15 u-line-2 coreshop-text-black">{{ item.name }}</view>
+                    <view class="coreshop-font-11 coreshop-padding-top-5 coreshop-padding-bottom-3 u-line-2 coreshop-text-brown">{{ item.goods.name }}</view>
+                    <!--<view class="coreshop-flex coreshop-align-center coreshop-padding-top-10  coreshop-padding-bottom-5">
+                        <view class="coreshop-font-11 coreshop-bg-orange coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.maxBuyNumber>0">限购{{item.maxBuyNumber}}</view>
+                        <view class="coreshop-font-11 coreshop-bg-green coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.maxBuyNumber==0">不限购</view>
+                        <view class="coreshop-font-11 coreshop-bg-olive coreshop-padding-2 coreshop-border-radius-4">{{item.ticketNumber}}张券</view>
+                    </view>-->
+                    <view class="coreshop-flex coreshop-justify-between  coreshop-flex-direction-row coreshop-align-center" v-if="(item.startStatus == 1) && item.lastTime">
+                        <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="(item.startStatus == 1) && item.lastTime">
+                            <u-count-down :time="item.lastTime*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                                <view class="time coreshop-font-11">
+                                    <view class="coreshop-font-12">仅剩：</view>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.days }}</text>
+                                    </view>
+                                    <text class="time__doc">天</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.hours >= 10 ? item.timeData.hours :'0' +item.timeData.hours}}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.minutes }}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.seconds }}</text>
+                                    </view>
+                                </view>
+                            </u-count-down>
                         </view>
-                        <view class="coreshop-flex coreshop-flex-direction-row coreshop-justify-between">
-                            <view class="red-price coreshop-font-15 coreshop-flex-direction-row" v-if="(item.startStatus == 1) && item.lastTime">
-                                <u-count-down :time="item.lastTime" format="HH:mm:ss"></u-count-down>
-                            </view>
-                            <view class="coreshop-font-12 red-price" v-if="item.startStatus == 3">已结束</view>
-                            <view class="coreshop-font-12 red-price" v-if="item.startStatus == 2">即将开始</view>
-                            <u-icon name="shopping-cart" color="#2979ff" size="25" class="btnCart"></u-icon>
+                        <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="(item.startStatus == 2) && item.lastTime">
+                            <u-count-down :time="item.lastTime*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                                <view class="time">
+                                    <view class="coreshop-font-12">即将开始：</view>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.days }}</text>
+                                    </view>
+                                    <text class="time__doc">天</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.hours>=10?item.timeData.hours:'0'+item.timeData.hours}}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.minutes }}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.seconds }}</text>
+                                    </view>
+                                </view>
+                            </u-count-down>
                         </view>
                     </view>
+                    <view class="coreshop-flex coreshop-justify-between coreshop-flex-direction-row coreshop-align-center coreshop-margin-top-10">
+                        <view class="coreshop-flex coreshop-align-center">
+                            <view class="coreshop-font-14 coreshop-text-red">￥{{item.goods.product.price}}</view>
+                            <view class="coreshop-font-xs coreshop-text-through coreshop-margin-left-5">{{item.goods.product.mktprice}}元</view>
+                        </view>
+                        <view class="coreshop-groupPurchase-btn" v-if="item.startStatus == 1" @click="goGroupBuyingDetail(item.id)">立即团</view>
+                        <view class="coreshop-groupPurchase-btn" v-if="item.startStatus == 0">即将开始</view>
+                        <view class="coreshop-buy-btn-disabled" v-if="item.startStatus == 2">已结束</view>
+                    </view>
                 </view>
             </view>
-            <view class="img-list-item" v-if="!item.id" v-for="(item, key) in coreshopdata.parameters.list" :key="key">
-                <image class="img-list-item-l" :src="item.image== '/images/empty-banner.png'? '/static/images/common/empty-banner.png':item.image" mode='aspectFill'></image>
-                <view class="img-list-item-r">
-                    <view class="goods-name list-goods-name">{{item.name}}</view>
-                    <view class="item-c">
-                        <view class=" red-price">{{item.price}}</view>
-                    </view>
+            <view v-if="key+1 < listData.length">
+                <view class="coreshop-divider">
+                    <view class="groupPurchase"></view>
+                    <view class="dot">●</view>
+                    <view class="groupPurchase"></view>
                 </view>
             </view>
         </view>
-
     </view>
 </template>
 
 <script>
     export default {
-        name: "coreshopgrouppurchase",
+        name: "coreshopGroupPurchase",
         props: {
-            coreshopdata: {
+            coreshopData: {
                 // type: Array,
                 required: false,
             }
         },
+        data() {
+            return {
+                listData: [],
+            }
+        },
+        mounted() {
+            this.listData = uni.$u.deepClone(this.coreshopData.parameters.list);
+        },
         computed: {
             count() {
-                if (!this.coreshopdata) {
+                if (!this.coreshopData) {
                     return false;
                 }
-                if (!this.coreshopdata.parameters) {
+                if (!this.coreshopData.parameters) {
                     return false;
                 }
-                if (!this.coreshopdata.parameters.list) {
+                if (!this.coreshopData.parameters.list) {
                     return false;
                 }
-                return (this.coreshopdata.parameters.list.length > 0)
+                return (this.coreshopData.parameters.list.length > 0)
             }
         },
         methods: {
             end(index) {
                 let _that = this;
                 _that.list.splice(index, 1)
-            }
+            },
+            onChange(e, key) {
+                this.$set(this.listData[key], 'timeData', e)
+            },
         },
     }
 </script>
@@ -80,7 +137,6 @@
         .img-list-item-r { width: calc(100% - 120px); display: inline-block; margin-left: 7.5px; float: left; position: relative;
             .description { font-size: 12px; color: #929292; }
             .item-c { width: 100%; margin-top: 0;
-                .red-price { color: #FF7159 !important; }
                 .btnCart { float: right; }
             }
         }
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSingle.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSingle.vue
index f50a9c45..9928f8a5 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSingle.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSingle.vue
@@ -1,7 +1,7 @@
 <template>
     <!-- 单图 -->
-    <view class="coreshop-imgsingle coreshop-bg-white" v-if="coreshopdata.parameters.list && coreshopdata.parameters.list.length > 0">
-        <view class="" v-for="child in coreshopdata.parameters.list">
+    <view class="coreshop-imgsingle coreshop-bg-white" v-if="listData && listData.length > 0">
+        <view class="" v-for="child in listData">
             <view @click="taped(child)">
                 <image class="ad-img" :src="child.image" mode="widthFix"></image>
             </view>
@@ -14,19 +14,21 @@
 
 <script>
     export default {
-        name: "coreshopimgsingle",
+        name: "coreshopImgSingle",
         props: {
-            coreshopdata: {
-                // type: Object,
+            coreshopData: {
+                type: Array,
                 required: true,
             }
         },
-        computed: {
-            count() {
-                // console.log(coreshopdata)
-                return (this.coreshopdata.parameters.list.length > 0)
+        data() {
+            return {
+                count: 0,
+                listData: [],
             }
-
+        },
+        created() {
+            this.listData = this.coreshopData;
         },
         methods: {
             taped(item) {
@@ -40,7 +42,7 @@
     .coreshop-imgsingle { overflow: hidden; position: relative;
         .ad-img { width: 100%; float: left; }
         .ad-img:last-child { margin-bottom: 0; }
-        .imgup-btn { position: absolute; z-index: 668; bottom: 40px; left: 20px;
+        .imgup-btn { position: absolute; z-index: 1; bottom: 10px; width: 100%; min-height: 30px; text-align: center;
             .coreshop-btn { line-height: 2; font-size: 14px; padding: 0 25px; border-radius: 25px; }
         }
     }
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSlide.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSlide.vue
index 76227a7f..17395ef3 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSlide.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSlide.vue
@@ -1,15 +1,15 @@
 <template>
-    <view class="coreshop-margin-left-10 coreshop-margin-right-10 coreshop-margin-bottom-10  coreshop-margin-top-10  coreshop-bg-white">
-        <u-swiper :list="swiperItems" :height="swiperHeight" :interval="swiperDuration" keyName="image" @click="taped" indicator indicatorMode="line" circular></u-swiper>
+    <view class="coreshop-bg-white">
+        <u-swiper :list="swiperItems" :height="swiperHeight" :interval="swiperDuration" keyName="image" @click="onClicked" indicator indicatorMode="line" circular radius="0"></u-swiper>
     </view>
 </template>
 
 <script>
     export default {
-        name: "coreshopimgSlide",
+        name: "coreshopImgSlide",
         props: {
-            coreshopdata: {
-                // type: Object,
+            coreshopData: {
+                type: Object,
                 required: true,
             }
         },
@@ -22,15 +22,14 @@
         },
         computed: {
             count() {
-                return (this.coreshopdata.parameters.list.length > 0)
+                return (this.coreshopData.list.length > 0)
             }
         },
-        components: {},
         created() {
-            var data = this.coreshopdata.parameters.list;
+            var data = this.coreshopData.list;
             for (var i = 0; i < data.length; i++) {
                 let moder = {
-                    image: data[i].image == '/images/empty-banner.png' ? '/static/images/common/empty-banner.png' : data[i].image,
+                    image: data[i].image,
                     opentype: 'click',
                     url: '',
                     title: data[i].linkType,
@@ -39,12 +38,11 @@
                 }
                 this.swiperItems.push(moder);
             }
-            this.swiperHeight = this.coreshopdata.parameters.height;
-            this.swiperDuration = this.coreshopdata.parameters.duration;
+            this.swiperHeight = this.coreshopData.height;
+            this.swiperDuration = this.coreshopData.duration;
         },
-        watch: {},
         methods: {
-            taped: function (e) {
+            onClicked: function (e) {
                 this.showSliderInfo(this.swiperItems[e].linkType, this.swiperItems[e].linkValue);
             },
         }
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgWindow.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgWindow.vue
index be6ae40c..9e454b2a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgWindow.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgWindow.vue
@@ -1,48 +1,55 @@
-<template>
+<template>
     <view class="coreshop-margin-left-10 coreshop-margin-right-10 coreshop-margin-bottom-10  coreshop-margin-top-10">
-        <u-grid :border="false" align="left" :col="coreshopdata.parameters.style" v-if="coreshopdata.parameters.style == '2' ||coreshopdata.parameters.style == '3' ||coreshopdata.parameters.style == '4'">
-            <u-grid-item bg-color="transparent" v-for="(item, index) in coreshopdata.parameters.list" :key="index" :custom-style="{padding:coreshopdata.parameters.margin+'px'}">
-                <image :src="item.image" mode="widthFix" @click="showSliderInfo(item.linkType, item.linkValue)" style="width:100%;"></image>
+        <u-grid :border="false" align="left" :col="coreshopData.parameters.style" v-if="coreshopData.parameters.style == '2' ||coreshopData.parameters.style == '3' ||coreshopData.parameters.style == '4'">
+            <u-grid-item bg-color="transparent" v-for="(item, index) in coreshopData.parameters.list" :key="index" :custom-style="{padding:coreshopData.parameters.margin+'px'}">
+                <image :src="item.image" mode="widthFix" @click="showSliderInfo(item.linkType, item.linkValue)" style="width: 100%;"></image>
             </u-grid-item>
         </u-grid>
-        <u-grid :border="false" align="left" :col="2" v-if="coreshopdata.parameters.style == '0'">
-            <u-grid-item bg-color="transparent" :custom-style="{padding:coreshopdata.parameters.margin+'px'}">
-                <image :src="coreshopdata.parameters.list[0].image" mode="widthFix" v-if="coreshopdata.parameters.list[0]" @click="showSliderInfo(coreshopdata.parameters.list[0].linkType, coreshopdata.parameters.list[0].linkValue)" class="coreshop-percent-100"></image>
-            </u-grid-item>
-            <u-grid-item bg-color="transparent" :custom-style="{padding:coreshopdata.parameters.margin+'px'}">
-                <image :src="coreshopdata.parameters.list[1].image" mode="widthFix" v-if="coreshopdata.parameters.list[1]" @click="showSliderInfo(coreshopdata.parameters.list[1].linkType, coreshopdata.parameters.list[1].linkValue)" class="coreshop-percent-100"></image>
-                <u-grid :border="false" align="left" :col="2">
-                    <u-grid-item bg-color="transparent" :custom-style="{padding:coreshopdata.parameters.margin+'px'}">
-                        <image :src="coreshopdata.parameters.list[2].image" mode="widthFix" v-if="coreshopdata.parameters.list[2]" @click="showSliderInfo(coreshopdata.parameters.list[2].linkType, coreshopdata.parameters.list[2].linkValue)" class="coreshop-percent-100"></image>
-                    </u-grid-item>
-                    <u-grid-item bg-color="transparent" :custom-style="{padding:coreshopdata.parameters.margin+'px'}">
-                        <image :src="coreshopdata.parameters.list[3].image" mode="widthFix" v-if="coreshopdata.parameters.list[3]" @click="showSliderInfo(coreshopdata.parameters.list[3].linkType, coreshopdata.parameters.list[3].linkValue)" class="coreshop-percent-100"></image>
-                    </u-grid-item>
-                </u-grid>
-            </u-grid-item>
-        </u-grid>
-
+        <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between mainWindow" v-if="coreshopData.parameters.style == '0'">
+            <view class="left"  :style="{paddingRight:coreshopData.parameters.margin+'px'}">
+                <u--image :src="coreshopData.parameters.list[0].image" height="200px" width="100%" v-if="coreshopData.parameters.list[0]" @click="showSliderInfo(coreshopData.parameters.list[0].linkType, coreshopData.parameters.list[0].linkValue)"></u--image>
+            </view>
+            <view class="right" :style="{paddingLeft:coreshopData.parameters.margin+'px'}">
+                <view>
+                    <u--image :src="coreshopData.parameters.list[1].image" height="120px" width="100%" v-if="coreshopData.parameters.list[1]" @click="showSliderInfo(coreshopData.parameters.list[1].linkType, coreshopData.parameters.list[1].linkValue)"></u--image>
+                </view>
+                <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between" :style="{marginTop:coreshopData.parameters.margin +'px'}">
+                    <view :style="{paddingRight:coreshopData.parameters.margin / 2+'px'}" class="minBox">
+                        <u--image :src="coreshopData.parameters.list[2].image" :height="(200-120-coreshopData.parameters.margin)+'px'" width="100%" v-if="coreshopData.parameters.list[2]" @click="showSliderInfo(coreshopData.parameters.list[2].linkType, coreshopData.parameters.list[2].linkValue)"></u--image>
+                    </view>
+                    <view :style="{paddingLeft:coreshopData.parameters.margin / 2+'px'}" class="minBox">
+                        <u--image :src="coreshopData.parameters.list[3].image" :height="(200-120-coreshopData.parameters.margin)+'px'" width="100%" v-if="coreshopData.parameters.list[3]" @click="showSliderInfo(coreshopData.parameters.list[3].linkType, coreshopData.parameters.list[3].linkValue)"></u--image>
+                    </view>
+                </view>
+            </view>
+        </view>
     </view>
 </template>
 
 <script>
     export default {
-        name: "coreshopimgwindow",
+        name: "coreshopImgWindow",
         props: {
-            coreshopdata: {
+            coreshopData: {
                 // type: Object,
                 required: true,
             }
         },
         data() {
             return {
-                padding: '3'
+                height: 0
             }
         },
+        onLoad() {
+        },
         methods: {
         }
     }
 </script>
 <style lang="scss" scoped>
-    
-</style>
+    .mainWindow { width: 100%; height: 200px;
+        .left { width: 50%; height: 200px; }
+        .right { width: 50%; height: 200px; }
+        .minBox { width: 50%; }
+    }
+    </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-navBar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-navBar.vue
index 6c47f3a2..3d4eabed 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-navBar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-navBar.vue
@@ -1,9 +1,9 @@
 <template>
-    <view class=" coreshop-margin-bottom-5 coreshop-padding-top-10 coreshop-padding-bottom-10 coreshop-bg-white">
+    <view class=" coreshop-margin-bottom-10 coreshop-padding-top-10 coreshop-padding-bottom-10 coreshop-bg-white">
         <u-grid :col="limit" :border="false">
             <u-grid-item v-for="(item, index) in ListData" :key="index" @click="showSliderInfo(item.linkType, item.linkValue)">
                <view class="coreshop-padding-bottom-10 coreshop-padding-top-10">
-                   <u-icon :name="item.image" width="40" height="40" :label="item.text" :labelSize="13" labelPos="bottom" :top="25" space="10"></u-icon>
+                   <u-icon :name="item.image" width="50" height="50" :label="item.text" :labelSize="13" labelPos="bottom" :top="25" space="10"></u-icon>
                </view>
             </u-grid-item>
         </u-grid>
@@ -11,12 +11,11 @@
 </template>
 
 <script>
-    import { navLinkType } from '@/common/setting/constVarsHelper.js';
     export default {
-        name: "coreshopnavbar",
+        name: "coreshopData",
         components: {},
         props: {
-            coreshopdata: {
+            coreshopData: {
                 // type: Object,
                 required: true,
             }
@@ -35,8 +34,8 @@
 
         },
         created() {
-            this.ListData = this.coreshopdata.parameters.list;
-            this.limit = this.coreshopdata.parameters.limit;
+            this.ListData = this.coreshopData.parameters.list;
+            this.limit = this.coreshopData.parameters.limit;
         },
         methods: {
         }
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-notice.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-notice.vue
index 9bd536b7..86e1553f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-notice.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-notice.vue
@@ -1,37 +1,35 @@
 <template>
     <view class="coreshop-margin-left-10 coreshop-margin-right-10 coreshop-margin-bottom-10  coreshop-margin-top-10  coreshop-bg-white" v-if="count > 0">
-        <u-notice-bar :text="model.text" @click="goNoticeList()"></u-notice-bar>
+        <u-notice-bar :text="notcieText" url="/pages/notice/list/list" bgColor="#ffffff" color="#333333"></u-notice-bar>
     </view>
 </template>
 
 <script>
     export default {
-        name: "coreshopnotice",
+        name: "coreshopNotice",
         components: {
         },
         props: {
-            coreshopdata: {
+            coreshopData: {
+                type: Array,
                 required: true,
             }
         },
         data() {
             return {
-                model: {
-                    text: "",
-                },
+                notcieText: "",
             }
         },
         created() {
-            var data = this.coreshopdata.parameters.list;
-            if (data.length > 0) {
-                this.model.text = data[0].title;
+            if (this.coreshopData.length > 0) {
+                for (var i = 0; i < this.coreshopData.length; i++) {
+                    this.notcieText += this.coreshopData[i].title + '【' + this.$u.timeFormat(this.coreshopData[i].createTime, 'yyyy年mm月dd日') + '】' + '\u00A0\u00A0\u00A0\u00A0\u00A0';
+                }
             };
         },
-        methods: {
-        },
         computed: {
             count() {
-                return (this.coreshopdata.parameters.list.length > 0)
+                return (this.coreshopData.length > 0)
             }
         }
     }
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
index fb4152a9..f9d64fdf 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
@@ -1,99 +1,105 @@
 <template>
     <view>
         <block v-for="(item,index) in coreshopdata" :key="index">
-            <!--搜索（修复）-->
-            <coreshopsearch :coreshopdata="item" v-if="item.widgetCode=='search' "></coreshopsearch>
-            <!--切换-->
-            <coreshoptabbar :coreshopdata="item" v-if="item.widgetCode=='tabBar' "></coreshoptabbar>
-            <!--公告（修复）-->
-            <coreshopnotice :coreshopdata="item" v-if="item.widgetCode=='notice' "></coreshopnotice>
-            <!--图片轮播（修复）-->
-            <coreshopimgSlide :coreshopdata="item" v-if="item.widgetCode=='imgSlide' "></coreshopimgSlide>
-            <!--优惠券（修复）-->
-            <coreshopcoupon :coreshopdata="item" v-if="item.widgetCode=='coupon' "></coreshopcoupon>
-            <!--空格（修复）-->
-            <coreshopblank :coreshopdata="item" v-if="item.widgetCode=='blank' "></coreshopblank>
-            <!--多行文本输入区（修复）-->
-            <coreshoptextarea :coreshopdata="item" v-if="item.widgetCode=='textarea' "></coreshoptextarea>
-            <!--视频（修复）-->
-            <coreshopvideo :coreshopdata="item" v-if="item.widgetCode=='video' "></coreshopvideo>
-            <!--图片集（修复）-->
-            <coreshopimgWindow :coreshopdata="item" v-if="item.widgetCode=='imgWindow' "></coreshopimgWindow>
-            <!--图片--（修复）-->
-            <coreshopimgSingle :coreshopdata="item" v-if="item.widgetCode=='imgSingle' "></coreshopimgSingle>
-            <!--商品（修复）-->
-            <coreshopgoods :coreshopdata="item" v-if="item.widgetCode=='goods' "></coreshopgoods>
-            <!--商品选项卡（修复）-->
-            <coreshopgoodTabBar :coreshopdata="item" v-if="item.widgetCode=='goodTabBar' "></coreshopgoodTabBar>
-            <!--文章（修复）-->
-            <coreshoparticle :coreshopdata="item" v-if="item.widgetCode=='article' "></coreshoparticle>
-            <!--文章分类（修复）-->
-            <coreshoparticleClassify :coreshopdata="item" v-if="item.widgetCode=='articleClassify' "></coreshoparticleClassify>
-            <!--宫格自定义导航（修复）-->
-            <coreshopnavBar :coreshopdata="item" v-if="item.widgetCode=='navBar' "></coreshopnavBar>
-            <!--团购（修复）-->
-            <coreshopgroupPurchase :coreshopdata="item" v-if="item.widgetCode=='groupPurchase' "></coreshopgroupPurchase>
-            <!--浏览记录（修复）-->
-            <coreshoprecord :coreshopdata="item" v-if="item.widgetCode=='record' "></coreshoprecord>
-            <!--拼团（修复）-->
-            <coreshoppinTuan :coreshopdata="item" v-if="item.widgetCode=='pinTuan' "></coreshoppinTuan>
-            <!--服务（修复）-->
-            <coreshopservice :coreshopdata="item" v-if="item.widgetCode=='service' "></coreshopservice>
+            <!--图片-->
+            <coreshopImgSingle :coreshopData="item.parameters.list" v-if="item.widgetCode=='imgSingle' "></coreshopImgSingle>
+            <!--服务商品-->
+            <coreshopServiceGood :coreshopData="item" v-if="item.widgetCode=='service' "></coreshopServiceGood>
+            <!--图片轮播-->
+            <coreshopImgSlide :coreshopData="item.parameters" v-if="item.widgetCode=='imgSlide' "></coreshopImgSlide>
+            <!--公告-->
+            <coreshopNotice :coreshopData="item.parameters.list" v-if="item.widgetCode=='notice' "></coreshopNotice>
+            <!--优惠券-->
+            <coreshopCoupon :coreshopData="item" v-if="item.widgetCode=='coupon' "></coreshopCoupon>
+            <!--拼团-->
+            <coreshopPinTuan :coreshopData="item" v-if="item.widgetCode=='pinTuan' "></coreshopPinTuan>
+            <!--搜索-->
+            <coreshopSearch :coreshopData="item" v-if="item.widgetCode=='search' "></coreshopSearch>
+            <!--宫格自定义导航-->
+            <coreshopNavBar :coreshopData="item" v-if="item.widgetCode=='navBar' "></coreshopNavBar>
+            <!--商品选项卡-->
+            <coreshopGoodTabBar :coreshopData="item" v-if="item.widgetCode=='goodTabBar' "></coreshopGoodTabBar>
+            <!--文章-->
+            <coreshopArticle :coreshopData="item" v-if="item.widgetCode=='article' "></coreshopArticle>
+            <!--文章分类-->
+            <coreshopArticleClassify :coreshopData="item" v-if="item.widgetCode=='articleClassify' "></coreshopArticleClassify>
+            <!--视频-->
+            <coreshopVideo :coreshopData="item" v-if="item.widgetCode=='video' "></coreshopVideo>
+            <!--商品-->
+            <coreshopGoods :coreshopData="item" v-if="item.widgetCode=='goods' "></coreshopGoods>
+            <!--浏览记录-->
+            <coreshopRecord :coreshopData="item" v-if="item.widgetCode=='record' "></coreshopRecord>
+            <!--空格-->
+            <coreshopBlank :coreshopData="item" v-if="item.widgetCode=='blank' "></coreshopBlank>
+            <!--多行文本输入区-->
+            <coreshopTextArea :coreshopData="item" v-if="item.widgetCode=='textarea' "></coreshopTextArea>
+            <!--图片集-->
+            <coreshopImgWindow :coreshopData="item" v-if="item.widgetCode=='imgWindow' "></coreshopImgWindow>
+            <!--文本内容-->
+            <coreshopContent :coreshopData="item" v-if="item.widgetCode=='content' "></coreshopContent>
+            <!--团购-->
+            <coreshopGroupPurchase :coreshopData="item" v-if="item.widgetCode=='groupPurchase' "></coreshopGroupPurchase>
+            <!--秒杀-->
+            <coreshopSeckill :coreshopData="item" v-if="item.widgetCode=='seckill' "></coreshopSeckill>
+
+
+
             <!--弹窗广告-->
             <coreshopadpop :coreshopdata="item" v-if="item.widgetCode=='adpop' "></coreshopadpop>
-            <!--文本内容（修复）-->
-            <coreshopContent :coreshopdata="item" v-if="item.widgetCode=='content' "></coreshopContent>
+
         </block>
     </view>
 </template>
 
 <script>
-    import coreshopimgSlide from '@/components/coreshop-page/coreshop-imgSlide.vue'
-    import coreshopsearch from '@/components/coreshop-page/coreshop-search.vue'
-    import coreshopnotice from '@/components/coreshop-page/coreshop-notice.vue'
-    import coreshopcoupon from '@/components/coreshop-page/coreshop-coupon.vue'
-    import coreshopblank from '@/components/coreshop-page/coreshop-blank.vue'
-    import coreshoptextarea from '@/components/coreshop-page/coreshop-textarea.vue'
-    import coreshopvideo from '@/components/coreshop-page/coreshop-video.vue'
-    import coreshopimgWindow from '@/components/coreshop-page/coreshop-imgWindow.vue'
-    import coreshopimgSingle from '@/components/coreshop-page/coreshop-imgSingle.vue'
-    import coreshopgoods from '@/components/coreshop-page/coreshop-goods.vue'
-    import coreshopgoodTabBar from '@/components/coreshop-page/coreshop-goodTabBar.vue'
-    import coreshoparticle from '@/components/coreshop-page/coreshop-article.vue'
-    import coreshoparticleClassify from '@/components/coreshop-page/coreshop-articleClassify.vue'
-    import coreshopnavBar from '@/components/coreshop-page/coreshop-navBar.vue'
-    import coreshopgroupPurchase from '@/components/coreshop-page/coreshop-groupPurchase.vue'
-    import coreshoprecord from '@/components/coreshop-page/coreshop-record.vue'
-    import coreshoppinTuan from '@/components/coreshop-page/coreshop-pinTuan.vue'
-    import coreshopservice from '@/components/coreshop-page/coreshop-service.vue'
-    import coreshoptabbar from '@/components/coreshop-page/coreshop-tabbar.vue'
-    import coreshopadpop from '@/components/coreshop-page/coreshop-adpop.vue'
+    import coreshopImgSingle from '@/components/coreshop-page/coreshop-imgSingle.vue'
+    import coreshopServiceGood from '@/components/coreshop-page/coreshop-serviceGood.vue'
+    import coreshopImgSlide from '@/components/coreshop-page/coreshop-imgSlide.vue'
+    import coreshopNotice from '@/components/coreshop-page/coreshop-notice.vue'
+    import coreshopCoupon from '@/components/coreshop-page/coreshop-coupon.vue'
+    import coreshopPinTuan from '@/components/coreshop-page/coreshop-pinTuan.vue'
+    import coreshopSearch from '@/components/coreshop-page/coreshop-search.vue'
+    import coreshopNavBar from '@/components/coreshop-page/coreshop-navBar.vue'
+    import coreshopArticle from '@/components/coreshop-page/coreshop-article.vue'
+    import coreshopArticleClassify from '@/components/coreshop-page/coreshop-articleClassify.vue'
+    import coreshopGoodTabBar from '@/components/coreshop-page/coreshop-goodTabBar.vue'
+    import coreshopVideo from '@/components/coreshop-page/coreshop-video.vue'
+    import coreshopGoods from '@/components/coreshop-page/coreshop-goods.vue'
+    import coreshopRecord from '@/components/coreshop-page/coreshop-record.vue'
+    import coreshopBlank from '@/components/coreshop-page/coreshop-blank.vue'
+    import coreshopTextArea from '@/components/coreshop-page/coreshop-textarea.vue'
+    import coreshopImgWindow from '@/components/coreshop-page/coreshop-imgWindow.vue'
     import coreshopContent from '@/components/coreshop-page/coreshop-content.vue'
+    import coreshopGroupPurchase from '@/components/coreshop-page/coreshop-groupPurchase.vue'
+    import coreshopSeckill from '@/components/coreshop-page/coreshop-seckill.vue'
+
+    import coreshopadpop from '@/components/coreshop-page/coreshop-adpop.vue'
 
     export default {
         name: 'coreshop-page',
         components: {
-            coreshopimgSlide,
-            coreshopsearch,
-            coreshopnotice,
-            coreshopcoupon,
-            coreshopblank,
-            coreshoptextarea,
-            coreshopvideo,
-            coreshopimgWindow,
-            coreshopimgSingle,
-            coreshopgoods,
-            coreshopgoodTabBar,
-            coreshoparticle,
-            coreshoparticleClassify,
-            coreshopnavBar,
-            coreshopgroupPurchase,
-            coreshoprecord,
-            coreshoppinTuan,
-            coreshopservice,
-            coreshoptabbar,
+            coreshopImgSingle,
+            coreshopServiceGood,
+            coreshopImgSlide,
+            coreshopNotice,
+            coreshopCoupon,
+            coreshopPinTuan,
+            coreshopSearch,
+            coreshopNavBar,
+            coreshopArticle,
+            coreshopArticleClassify,
+            coreshopGoodTabBar,
+            coreshopVideo,
+            coreshopGoods,
+            coreshopRecord,
+            coreshopBlank,
+            coreshopTextArea,
+            coreshopImgWindow,
+            coreshopContent,
+            coreshopGroupPurchase,
+            coreshopSeckill,
+
             coreshopadpop,
-            coreshopContent
         },
         props: {
             coreshopdata: {
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue
index 93612093..97d2afee 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue
@@ -1,37 +1,43 @@
 <template>
-    <!-- 活动商品 -->
-    <view class="activity-wrap coreshop-padding-left-10 coreshop-padding-right-10 coreshop-padding-bottom-10  coreshop-margin-bottom-5 groupon-card" v-if="count">
-        <!-- 标题栏 -->
-        <view class="title-box coreshop-flex coreshop-justify-between coreshop-padding-top-10 coreshop-padding-bottom-10 groupon-title">
-            <view class="coreshop-flex coreshop-flex-direction coreshop-align-center">
-                <view class="title-text coreshop-margin-right-10 u-line-1">每日拼团</view>
+    <view class="activity-wrap coreshop-padding-10 coreshop-margin-10 coreshop-bg-white coreshop-border-radius-trbl-18" v-if="count">
+        <view class="coreshop-padding-bottom-10 coreshop-padding-top-10 groupon-title coreshop-min-height-30">
+            <view class="title-box coreshop-flex coreshop-justify-between">
+                <view class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">每日拼团</view>
+                <u-icon name="arrow-right-double" size="12" label="查看更多" labelSize="12" labelPos="left" @tap="goPinTuanList()"></u-icon>
             </view>
-            <u-icon name="arrow-right-double" size="12" label="查看更多" labelSize="12" labelPos="left" @tap="goPinTuanList()"></u-icon>
         </view>
-        <!-- 活动商品 -->
+        <view class="coreshop-divider">
+            <view class="complete"></view>
+        </view>
         <scroll-view class="scroll-box" scroll-x scroll-anchoring>
-            <view class="goods-box coreshop-flex">
-                <view class="min-goods coreshop-margin-right-6" v-for="mgoods in coreshopdata.parameters.list" :key="mgoods.id" @tap="goPinTuanDetail(mgoods.goodsId,mgoods.id)">
+            <view class="goods-box coreshop-flex  coreshop-justify-between coreshop-text-black">
+                <view class="min-goods" v-for="item in coreshopData.parameters.list" :key="item.id" @tap="goPinTuanDetail(item.id)">
                     <view class="img-box">
-                        <image class="img" :src="mgoods.goodsImage" mode=""></image>
+                        <image class="img" :src="item.goodThumbnail" mode=""></image>
                     </view>
-                    <view class="mgoods-card-bottom coreshop-padding-10">
-                        <view class="goods-title coreshop-margin-bottom-5 u-line-1">{{ mgoods.name }}</view>
-                        <view class="price coreshop-margin-bottom-5">{{mgoods.pinTuanPrice}}</view>
-                        <view class="original-price">￥{{ mgoods.pinTuanPrice + mgoods.discountAmount }}</view>
+                    <view class="item-card-bottom coreshop-padding-10">
+                        <view class="goods-title u-line-1">{{ item.name }}</view>
+                        <view class="price coreshop-margin-bottom-5">{{item.pinTuanPrice}}</view>
+
+                        <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between">
+                            <view class="original-price">￥{{ item.pinTuanPrice + item.discountAmount }}</view>
+                            <view class="coreshop-font-10">
+                                <u-tag :text="'限购'+item.maxNums" type="warning" plain plainFill size="mini" v-if="item.maxNums>0"></u-tag>
+                                <u-tag text="不限购" type="success" plain plainFill size="mini" v-if="item.maxNums==0"></u-tag>
+                            </view>
+                        </view>
                     </view>
                 </view>
             </view>
         </scroll-view>
-
     </view>
 </template>
 
 <script>
     export default {
-        name: "coreshoppinTuan",
+        name: "coreshopPinTuan",
         props: {
-            coreshopdata: {
+            coreshopData: {
                 required: false,
             }
         },
@@ -43,14 +49,14 @@
         },
         created() {
             let that = this;
-            if (that.coreshopdata.parameters.list.length > 0) {
-                let arr = that.sortData(that.coreshopdata.parameters.list, 4);
+            if (that.coreshopData.parameters.list.length > 0) {
+                let arr = that.sortData(that.coreshopData.parameters.list, 4);
                 that.goodsList = arr;
             }
         },
         computed: {
             count() {
-                return (this.coreshopdata.parameters.list.length > 0)
+                return (this.coreshopData.parameters.list.length > 0)
             }
         },
         methods: {
@@ -77,32 +83,29 @@
 </script>
 
 <style lang="scss" scoped>
-    .groupon-card { background: linear-gradient(#faecca 20%, #ffffff 30%, #ffffff 100%); }
-
-    .groupon-title { background: url($apiFilesUrl+'/static/images/pinTuan/groupon_title_bg.png') no-repeat; background-position: center top; background-size: 100% auto; }
-    .activity-wrap { background-color: #fff; min-height: 300rpx;
+    .activity-wrap { background-color: #fff; min-height: 150px; background: linear-gradient(#faecca 20%, #ffffff 30%, #ffffff 100%);
+        .groupon-title { background: url($apiFilesUrl+'/static/images/pinTuan/groupon_title_bg.png') no-repeat; background-position: center top; background-size: 100% auto; }
         .title-box {
-            .title-text { font-size: 32rpx; font-weight: bold; color: #333333; }
+            .title-text { font-size: 16px; font-weight: bold; color: #333333; }
             .more-box {
-                .more-text { font-size: 22rpx; font-weight: 500; color: #333333; }
-                .more-icon { font-size: 24rpx; color: #333333; }
+                .more-text { font-size: 11px; font-weight: 500; color: #333333; }
+                .more-icon { font-size: 12px; color: #333333; }
             }
         }
 
         .scroll-box,
-        .goods-box { height: 380rpx; width: 100%; }
+        .goods-box { min-height: 190px; width: 100%; }
     }
 
-    // 小商品卡片
-    .min-goods { width: 220rpx; height: 380rpx; background: #fffaef; box-shadow: 0px 7rpx 8rpx 1rpx rgba(162, 117, 27, 0.24); border-radius: 10rpx;
-        .img-box { width: 220rpx; height: 220rpx; overflow: hidden; position: relative; border-radius: 10rpx 10rpx 0 0;
-            .img { width: 220rpx; height: 220rpx; background-color: #ccc; }
+    // 商品卡片
+    .min-goods { background: #fffaef; box-shadow: 0px 3.5px 4px 0.5px rgba(162, 117, 27, 0.24); border-radius: 5px; margin-right: 15px !important;
+        .img-box { width: 140px; height: 140px; overflow: hidden; position: relative; border-radius: 5px 5px 0 0;
+            .img { width: 140px; height: 140px; background-color: #ccc; }
         }
-        .mgoods-card-bottom { height: 160rpx; background: url($apiFilesUrl+'/static/images/pinTuan/groupon_goods_bg.png') no-repeat; background-position: bottom center; background-size: 100% 100%; }
-        .goods-title { font-size: 26rpx; font-weight: 500; color: #000000; width: 180rpx; line-height: 26rpx; }
-
-        .price { font-size: 30rpx; font-weight: 500; color: #ff0000;
-            &::before { content: '￥'; font-size: 24rpx; }
+        .item-card-bottom { min-height: 75px; background: url($apiFilesUrl+'/static/images/pinTuan/groupon_goods_bg.png') no-repeat; background-position: bottom center; background-size: 100% 100%; }
+        .goods-title { font-size: 13px; font-weight: 500; color: #000000; line-height: 13px; margin-bottom: 5px; }
+        .price { font-size: 15px; font-weight: 500; color: #ff0000;
+            &::before { content: '￥'; font-size: 12px; }
         }
         .original-price { font-size: 20rpx; font-weight: 500; text-decoration: line-through; color: #c4c4c4; }
         .groupon-num-box {
@@ -112,29 +115,4 @@
             .groupon-num-text { font-size: 18rpx; font-weight: 500; color: #e9b461; }
         }
     }
-
-    // 大商品卡片
-    .big-goods { width: 710rpx; min-height: 260rpx; background: #ffffff; box-shadow: 0px 7rpx 8rpx 1rpx #fffaef; border-radius: 20rpx;
-        .goods-img { width: 220rpx; height: 220rpx; border-radius: 6rpx; }
-        .card-right { width: 430rpx; height: 100%; }
-        .goods-title { font-size: 26rpx; font-weight: 600; width: 400rpx; color: #000000; vertical-align: middle;
-            .title-tag { transform: scale(0.9); }
-        }
-        .subtitle-text { font-size: 22rpx; width: 400rpx; font-weight: 500; color: #666666; }
-        .buy-btn { width: 120rpx; line-height: 50rpx; background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%); border-radius: 25rpx; font-size: 24rpx; font-weight: 500; color: #ffffff; }
-
-        .sell-box { background: rgba(#f9efd6, 0.3); border-radius: 16rpx; line-height: 32rpx;
-            .sell-num { font-size: 20rpx; font-weight: 400; color: #ff6904; }
-
-            .hot-icon { font-size: 26rpx; color: #ff6904; margin-right: 8rpx; }
-        }
-        .group-num { font-size: 20rpx; font-weight: 500; color: rgba(153, 153, 153, 1); margin-left: 20rpx; }
-
-        .price { color: #ff0000; font-weight: 600;
-            &::before { content: '￥'; font-size: 20rpx; }
-        }
-        .origin-price { color: #c4c4c4; font-size: 24rpx; text-decoration: line-through;
-            &::before { content: '￥'; font-size: 20rpx; }
-        }
-    }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-record.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-record.vue
index 4070fc19..13e2b583 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-record.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-record.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="adbrathing" v-show="adbshow" v-bind:class="['adbrathing'+coreshopdata.parameters.style.align,!hideanimation?'pc':hideanimation?'hc':'']" :style="{top:coreshopdata.parameters.style.top+'%'}">
+    <view class="adbrathing" v-show="adbshow" v-bind:class="['adbrathing'+coreshopData.parameters.style.align,!hideanimation?'pc':hideanimation?'hc':'']" :style="{top:coreshopData.parameters.style.top+'%'}">
         <view class="adbrathing-c coreshop-flex-direction-row">
             <view class="adbrathing-l">
                 <image class="user-head-img" :src="log.avatar" mode="aspectFill"></image>
@@ -16,9 +16,9 @@
 
 <script>
     export default {
-        name: "coreshoprecord",
+        name: "coreshopRecord",
         props: {
-            coreshopdata: {
+            coreshopData: {
                 // type: Object,
                 required: true,
             },
@@ -57,12 +57,12 @@
                     _this.hideanimation = !_this.hideanimation;
                     clearInterval(_this.times);
                     _this.times = setInterval(function () {
-                        _this.getRecod();
+                        _this.getRecord();
                     }, 5000);
                 }, 3000)
             },
             //获取日志
-            getRecod() {
+            getRecord() {
                 var _this = this;
                 if (_this.times != {}) {
                     clearInterval(_this.times);
@@ -72,7 +72,7 @@
                     value: _this.lvalue,
                 };
                 uni.request({
-                    url: this.$globalConstVars.apiBaseUrl + '/Api/Page/GetRecod',
+                    url: this.$globalConstVars.apiBaseUrl + '/Api/Page/GetRecord',
                     data: data,
                     header: {
                         'Accept': 'application/json',
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-search.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-search.vue
index cb24fd24..1116111f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-search.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-search.vue
@@ -1,15 +1,15 @@
 <template>
     <!-- 搜索组件宽度自适应于外层 -->
-    <view class="coreshop-padding-left-10 coreshop-padding-right-10 coreshop-padding-bottom-10  coreshop-padding-top-10 coreshop-margin-left-10 coreshop-margin-right-10 coreshop-margin-bottom-10  coreshop-margin-top-10 coreshop-bg-white" v-bind:class="coreshopdata.parameters.style">
+    <view class="coreshop-padding-left-10 coreshop-padding-right-10 coreshop-padding-bottom-10  coreshop-padding-top-10 coreshop-margin-left-10 coreshop-margin-right-10 coreshop-margin-bottom-10  coreshop-margin-top-10 coreshop-bg-white" v-bind:class="coreshopData.parameters.style">
         <u-toast ref="uToast"></u-toast>
-        <u-search :placeholder="coreshopdata.parameters.keywords" v-model="keyword" shape="square" :show-action="true" action-text="搜索" @custom="goSearch" @search="goSearch"></u-search>
+        <u-search :placeholder="coreshopData.parameters.keywords" v-model="keyword" shape="square" :show-action="true" action-text="搜索" @custom="goSearch" @search="goSearch"></u-search>
     </view>
 </template>
 <script>
     export default {
-        name: "coreshopsearch",
+        name: "coreshopSearch",
         props: {
-            coreshopdata: {
+            coreshopData: {
                 required: true,
             }
         },
@@ -22,22 +22,11 @@
             };
         },
         created() {
-            //#ifdef H5
-            this.$nextTick(() => {
-                this.searchTop = this.$refs.searchBar.$el.offsetTop;
-            })
-            // #endif
             this.searchStyle()
         },
-        mounted() {
-            // #ifdef H5
-            window.addEventListener('scroll', this.handleScroll)
-            // #endif
-        },
         methods: {
             searchStyle() {
-                this.$store.commit('searchStyle', this.coreshopdata.parameters.style)
-                // console.log(this.data.parameters.style)
+                this.$store.commit('searchStyle', this.coreshopData.parameters.style)
             },
             change(value) {
                 // 搜索框内容变化时，会触发此事件，value值为输入框的内容
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue
new file mode 100644
index 00000000..73a65c38
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue
@@ -0,0 +1,141 @@
+<template>
+    <view class="coreshop-padding-10 coreshop-margin-10 coreshop-bg-white coreshop-border-radius-trbl-18" v-if="listData && count">
+        <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-min-height-30">
+            <view class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">{{coreshopData.parameters.title}}</view>
+            <u-icon name="arrow-right-double" size="12" label="查看更多" labelSize="12" labelPos="left" @tap="goSeckillList()"></u-icon>
+        </view>
+        <view class="coreshop-divider">
+            <view class="complete"></view>
+        </view>
+        <view class="coreshop-flex-direction coreshop-margin-bottom-10 coreshop-text-black" v-for="(item, key) in listData" :key="key" @click="goSeckillDetail(item.id)">
+            <view class="coreshop-flex">
+                <view>
+                    <u--image :src="item.goods.image" mode="widthFix" width="96px" height="96px" radius="8"></u--image>
+                </view>
+                <view class="coreshop-flex coreshop-flex-direction coreshop-padding-left-10 coreshop-percent-100">
+                    <view class="coreshop-font-15 u-line-2 coreshop-text-black">{{ item.name }}</view>
+                    <view class="coreshop-font-11 coreshop-padding-top-5 coreshop-padding-bottom-3 u-line-2 coreshop-text-brown">{{ item.goods.name }}</view>
+                    <view class="coreshop-flex coreshop-justify-between coreshop-flex-direction-row coreshop-align-center" v-if="(item.startStatus == 1) && item.lastTime">
+                        <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="(item.startStatus == 1) && item.lastTime">
+                            <u-count-down :time="item.lastTime*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                                <view class="time coreshop-font-11">
+                                    <view class="coreshop-font-12">仅剩：</view>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.days }}</text>
+                                    </view>
+                                    <text class="time__doc">天</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.hours >= 10 ? item.timeData.hours :'0' +item.timeData.hours}}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.minutes }}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.seconds }}</text>
+                                    </view>
+                                </view>
+                            </u-count-down>
+                        </view>
+                        <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="(item.startStatus == 2) && item.lastTime">
+                            <u-count-down :time="item.lastTime*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                                <view class="time">
+                                    <view class="coreshop-font-12">即将开始：</view>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.days }}</text>
+                                    </view>
+                                    <text class="time__doc">天</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.hours>=10?item.timeData.hours:'0'+item.timeData.hours}}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.minutes }}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.seconds }}</text>
+                                    </view>
+                                </view>
+                            </u-count-down>
+                        </view>
+                    </view>
+                    <view class="coreshop-flex coreshop-justify-between coreshop-flex-direction-row coreshop-align-center coreshop-margin-top-10">
+                        <view class="coreshop-flex coreshop-align-center">
+                            <view class="coreshop-font-14 coreshop-text-red">￥{{item.goods.product.price}}</view>
+                            <view class="coreshop-font-xs coreshop-text-through coreshop-margin-left-5">{{item.goods.product.mktprice}}元</view>
+                        </view>
+                        <view class="coreshop-seckill-btn" v-if="item.startStatus == 1" @click="goSeckillDetail(item.id)">马上秒</view>
+                        <view class="coreshop-seckill-btn" v-if="item.startStatus == 0">即将开始</view>
+                        <view class="coreshop-buy-btn-disabled" v-if="item.startStatus == 2">已结束</view>
+                    </view>
+                </view>
+            </view>
+            <view v-if="key+1 < listData.length">
+                <view class="coreshop-divider">
+                    <view class="seckill"></view>
+                    <view class="dot">●</view>
+                    <view class="seckill"></view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: "coreshopGroupPurchase",
+        props: {
+            coreshopData: {
+                // type: Array,
+                required: false,
+            }
+        },
+        data() {
+            return {
+                listData: [],
+            }
+        },
+        mounted() {
+            this.listData = uni.$u.deepClone(this.coreshopData.parameters.list);
+        },
+        computed: {
+            count() {
+                if (!this.coreshopData) {
+                    return false;
+                }
+                if (!this.coreshopData.parameters) {
+                    return false;
+                }
+                if (!this.coreshopData.parameters.list) {
+                    return false;
+                }
+                return (this.coreshopData.parameters.list.length > 0)
+            }
+        },
+        methods: {
+            end(index) {
+                let _that = this;
+                _that.list.splice(index, 1)
+            },
+            onChange(e, key) {
+                this.$set(this.listData[key], 'timeData', e)
+            },
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+    .img-list-item { border-radius: 8px; margin: 2.5px 2.5px 10px 2.5px; background-color: #ffffff; padding: 5px; position: relative; overflow: hidden; flex-direction: row;
+        .img-list-item-l { width: 100px; height: 100px; display: inline-block; float: left; }
+        .img-list-item-r { width: calc(100% - 120px); display: inline-block; margin-left: 7.5px; float: left; position: relative;
+            .description { font-size: 12px; color: #929292; }
+            .item-c { width: 100%; margin-top: 0;
+                .btnCart { float: right; }
+            }
+        }
+    }
+
+    .u-count-down__text { font-size: 12px; }
+</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-serviceGood.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-serviceGood.vue
new file mode 100644
index 00000000..a50f6d57
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-serviceGood.vue
@@ -0,0 +1,125 @@
+<template>
+    <view class="coreshop-padding-10 coreshop-margin-10 coreshop-bg-white coreshop-border-radius-trbl-18" v-if="listData && count">
+        <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-min-height-30">
+            <view class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">{{coreshopData.parameters.title}}</view>
+            <u-icon name="arrow-right-double" size="12" label="查看更多" labelSize="12" labelPos="left" @tap="goServicesList()"></u-icon>
+        </view>
+        <view class="coreshop-divider">
+            <view class="complete"></view>
+        </view>
+        <view class="coreshop-flex-direction-row coreshop-margin-bottom-10 coreshop-text-black" v-for="(item, key) in listData" :key="key" @click="goServicesDetail(item.id)">
+            <view class="coreshop-flex">
+                <view>
+                    <u--image :src="item.thumbnail" mode="widthFix" width="96px" height="96px" radius="8"></u--image>
+                </view>
+                <view class="coreshop-flex coreshop-flex-direction coreshop-padding-left-10">
+                    <view class="coreshop-font-15 u-line-2 coreshop-text-black">{{ item.title }}</view>
+                    <view class="coreshop-font-11 coreshop-padding-top-5 coreshop-padding-bottom-3 u-line-2 coreshop-text-brown">{{ item.description }}</view>
+                    <view class="coreshop-flex coreshop-align-center coreshop-padding-top-10  coreshop-padding-bottom-5">
+                        <view class="coreshop-font-11 coreshop-bg-orange coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.maxBuyNumber>0">限购{{item.maxBuyNumber}}</view>
+                        <view class="coreshop-font-11 coreshop-bg-green coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.maxBuyNumber==0">不限购</view>
+                        <view class="coreshop-font-11 coreshop-bg-olive coreshop-padding-2 coreshop-border-radius-4">{{item.ticketNumber}}张券</view>
+                    </view>
+                    <view class="coreshop-flex coreshop-justify-between  coreshop-flex-direction-row coreshop-align-center" v-if="item.openStatus != 3">
+                        <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="item.openStatus == 1 && item.lastTime > 0">
+                            <u-count-down :time="item.lastTime*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                                <view class="time coreshop-font-11">
+                                    <view class="coreshop-font-12">仅剩：</view>
+                                    <view class="time__custom" v-if="item.timeData.days>0">
+                                        <text class="time__custom__item">{{ item.timeData.days }}</text>
+                                    </view>
+                                    <text class="time__doc" v-if="item.timeData.days>0">天</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.hours >= 10 ? item.timeData.hours :'0' +item.timeData.hours}}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.minutes }}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.seconds }}</text>
+                                    </view>
+                                </view>
+                            </u-count-down>
+                        </view>
+                        <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="item.openStatus == 2 && item.lastTime > 0">
+                            <u-count-down :time="item.lastTime*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                                <view class="time">
+                                    <view class="coreshop-font-12">即将开始：</view>
+                                    <view class="time__custom" v-if="item.timeData.days>0">
+                                        <text class="time__custom__item">{{ item.timeData.days }}</text>
+                                    </view>
+                                    <text class="time__doc" v-if="item.timeData.days>0">天</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.hours>=10?item.timeData.hours:'0'+item.timeData.hours}}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.minutes }}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.seconds }}</text>
+                                    </view>
+                                </view>
+                            </u-count-down>
+                        </view>
+                    </view>
+                    <view class="coreshop-flex coreshop-justify-between coreshop-flex-direction-row coreshop-align-center coreshop-margin-top-10">
+                        <view class="coreshop-flex coreshop-align-center">
+                            <view class="coreshop-font-14 coreshop-text-red">￥{{ item.money  }}</view>
+                        </view>
+                        <view class="coreshop-buy-btn" v-if="item.openStatus != 3">马上抢</view>
+                        <view class="coreshop-buy-btn-disabled" v-if="item.openStatus == 3">已结束</view>
+                    </view>
+                </view>
+            </view>
+            <view v-if="key+1 < listData.length">
+                <view class="coreshop-divider">
+                    <view class="serviceGood"></view>
+                    <view class="dot">●</view>
+                    <view class="serviceGood"></view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: "coreshopServiceGood",
+        data() {
+            return {
+                listData: [],
+            }
+        },
+        props: {
+            coreshopData: {
+                type: Object,
+                required: false,
+            }
+        },
+        mounted() {
+            this.listData = uni.$u.deepClone(this.coreshopData.parameters.list);
+        },
+        computed: {
+            count() {
+                return (this.listData.length > 0)
+            }
+        },
+        methods: {
+            onChange(e, key) {
+                this.$set(this.listData[key], 'timeData', e)
+            },
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+    .time { display: flex; align-items: center;
+        .time__custom { min-width: 18px; height: 18px; background-color: #3c9cff; border-radius: 4px; display: flex; justify-content: center; align-items: center;
+            .time__custom__item { color: #fff; font-size: 10px; text-align: center; }
+        }
+    }
+</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-tabbar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-tabbar.vue
index 7075f4b1..7047349b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-tabbar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-tabbar.vue
@@ -28,22 +28,13 @@
             };
         },
         created() {
-            //#ifdef H5
-            this.$nextTick(() => {
-                this.searchTop = this.$refs.tabBar.$el.offsetTop - 52;
-            })
-            // #endif
             this.searchStyle()
         },
         mounted() {
-            // #ifdef H5
-            window.addEventListener('scroll', this.handleScroll)
-            // #endif
         },
         methods: {
             searchStyle() {
                 this.$store.commit('searchStyle', this.coreshopdata.parameters.style)
-                // console.log(this.data.parameters.style)
             },
             handleScroll() {
                 this.scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-textarea.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-textarea.vue
index 479e646c..da330fc7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-textarea.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-textarea.vue
@@ -1,6 +1,6 @@
 <template>
-    <view class="textarea coreshop-margin-left-10 coreshop-margin-right-10 coreshop-padding-10">
-        <coreshopContent :content="coreshopdata.parameters.value" v-if="coreshopdata.parameters.value"></coreshopContent>
+    <view class="textarea coreshop-margin-10 coreshop-padding-10">
+        <coreshopContent :content="coreshopData.parameters.value" v-if="coreshopData.parameters.value"></coreshopContent>
     </view>
 </template>
 
@@ -10,20 +10,12 @@
         components: {
             coreshopContent
         },
-        name: "coreshoptextarea",
+        name: "coreshopTextArea",
         props: {
-            coreshopdata: {
+            coreshopData: {
                 // type: Object,
                 required: true,
             }
-        },
-        created() {
-        },
-        onLoad() {
-
-        },
-        methods: {
-
         }
     }
 </script>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue
index b3ba070b..8dbf7139 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue
@@ -1,14 +1,14 @@
 <template>
     <view class="video coreshop-margin-left-10 coreshop-margin-right-10  coreshop-margin-bottom-10">
-        <video class="videoCT" id="myVideo" :src="coreshopdata.parameters.list[0].url" :autoplay="autoplay" :poster="coreshopdata.parameters.list[0].image"></video>
+        <video class="videoCT" id="myVideo" :src="coreshopData.parameters.list[0].url" :autoplay="autoplay" :poster="coreshopData.parameters.list[0].image"></video>
     </view>
 </template>
 
 <script>
     export default {
-        name: "coreshopvideo",
+        name: "coreshopVideo",
         props: {
-            coreshopdata: {
+            coreshopData: {
                 type: Object,
                 required: true,
             }
@@ -19,7 +19,7 @@
             }
         },
         created() {
-            if (this.coreshopdata.parameters.autoplay == 'true' || this.coreshopdata.parameters.autoplay == true) {
+            if (this.coreshopData.parameters.autoplay == 'true' || this.coreshopData.parameters.autoplay == true) {
                 this.autoplay = true;
             }
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-h5/coreshop-share-h5.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-h5/coreshop-share-h5.vue
deleted file mode 100644
index cdb64a1c..00000000
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-h5/coreshop-share-h5.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-    <view class="coreshop-share-Box">
-        <u-toast ref="uToast" />
-        <view class="coreshop-share-pop">
-            <view class="coreshop-share-item" @click="copyUrl()" v-show="!ifwx">
-                <button class="coreshop-btn">
-                    <u-icon label="复制链接" labelPos="bottom" size="40" name="/static/images/common/share-friend.png"></u-icon>
-                </button>
-            </view>
-            <view class="coreshop-share-item" @click="$u.throttle(createPoster, 500)">
-                <button class="coreshop-btn">
-                    <u-icon label="生成海报" labelPos="bottom" size="40" name="/static/images/common/share-poster.png"></u-icon>
-                </button>
-            </view>
-        </view>
-        <view class="coreshop-bottomBox">
-            <button class="coreshop-btn coreshop-btn-w coreshop-btn-square" @click="close()">关闭</button>
-        </view>
-    </view>
-</template>
-
-<script>
-    import { h5Url } from '@/common/setting/constVarsHelper.js'
-    export default {
-        props: {
-            // 商品id
-            goodsId: {
-                type: Number,
-                default: 0
-            },
-            // 分享的图片
-            shareImg: {
-                type: String,
-                default: ''
-            },
-            // 分享标题
-            shareTitle: {
-                type: String,
-                default: ''
-            },
-            // 分享内容
-            shareContent: {
-                type: String,
-                default: ''
-            },
-            // 分享链接
-            shareHref: {
-                type: String,
-                default: ''
-            },
-            //分享类型
-            shareType: {
-                type: Number,
-                default: 1
-            },
-            //拼团id
-            groupId: {
-                type: Number,
-                default: 0
-            },
-            //拼团的团队id
-            teamId: {
-                type: Number,
-                default: 0
-            },
-            ifwx: {
-                type: Boolean
-            }
-        },
-        mounted() {
-            /**
-             *
-             * H5端分享两种 (微信浏览器内引导用户去分享, 其他浏览器)
-             *
-             */
-        },
-        methods: {
-            // 关闭弹出层
-            close() {
-                this.$emit('close')
-            },
-            // 生成海报
-            createPoster() {
-                let data = {};
-                if (this.shareType == 1) {
-                    //商品
-                    data = {
-                        page: 2, //商品
-                        url: h5Url + this.$globalConstVars.shareUrl,
-                        params: {
-                            goodsId: this.goodsId
-                        },
-                        type: 3,//海报
-                        client: 1
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                } else if (this.shareType == 3) {
-                    //拼团
-                    data = {
-                        page: 3, //商品
-                        url: h5Url + this.$globalConstVars.shareUrl,
-                        params: {
-                            goodsId: this.goodsId,
-                            groupId: this.groupId,
-                            teamId: this.teamId
-                        },
-                        type: 3,//海报
-                        client: 1
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                }
-                this.$u.api.share(data).then(res => {
-                    if (res.status) {
-                        this.close()
-                        this.$u.route('/pages/share/sharePoster/sharePoster?poster=' + encodeURIComponent(res.data))
-                    } else {
-                        this.$u.toast(res.msg)
-                    }
-                });
-            },
-            copyUrl() {
-                let data = {};
-                if (this.shareType == 1) {
-                    data = {
-                        page: 2, //商品
-                        url: h5Url + this.$globalConstVars.shareUrl,
-                        params: {
-                            goodsId: this.goodsId
-                        },
-                        type: 1,//URL
-                        client: 1
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                } else if (this.shareType == 3) {
-                    data = {
-                        page: 3, //拼团
-                        url: h5Url + this.$globalConstVars.shareUrl,
-                        params: {
-                            goodsId: this.goodsId,
-                            groupId: this.groupId,
-                            teamId: this.teamId
-                        },
-                        type: 1,//URL
-                        client: 1
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                }
-                let _this = this;
-                _this.$u.api.share(data).then(res => {
-                    if (res.status) {
-                        uni.setClipboardData({
-                            data: res.data,
-                            success: function (data) {
-                                _this.$refs.uToast.show({ message: '复制成功', type: 'success' })
-                            },
-                            fail: function (err) {
-                                _this.$u.toast('复制分享URL失败');
-                            }
-                        })
-                    } else {
-                        _this.$u.toast('复制分享URL失败');
-                    }
-                });
-            },
-            // 分享操作
-            share() {
-                // h5分享 判断是否是微信浏览器 引导用户完成分享操作
-
-                // 其他浏览器的分享
-            }
-        }
-    }
-</script>
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 81d8c567..5297ea64 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
@@ -96,8 +96,8 @@
                         params: {
                             goodsId: this.goodsId
                         },
-                        type: 3,//海报
-                        client: 2 //终端
+                        type: this.$globalConstVars.shareModel.poster,
+                        client: this.$globalConstVars.shareClient.wxMiNiProgram
                     }
                     let userToken = this.$db.get('userToken')
                     if (userToken) {
@@ -112,31 +112,43 @@
                             goodsId: this.goodsId,
                             teamId: this.teamId
                         },
-                        type: 3,//海报
-                        client: 2
+                        type: this.$globalConstVars.shareModel.poster,
+                        client: this.$globalConstVars.shareClient.wxMiNiProgram
                     }
                     let userToken = this.$db.get('userToken')
                     if (userToken) {
                         data.token = userToken
                     }
-                    console.log(data);
                 }
-                else if (this.shareType == this.$globalConstVars.shareType.group || this.shareType == this.$globalConstVars.shareType.seckill) {
+                else if (this.shareType == this.$globalConstVars.shareType.group) {
                     data = {
                         page: this.shareType,
                         url: this.$globalConstVars.shareUrl,
                         params: {
-                            goodsId: this.goodsId,
                             groupId: this.groupId
                         },
-                        type: 3,//海报
-                        client: 2
+                        type: this.$globalConstVars.shareModel.poster,
+                        client: this.$globalConstVars.shareClient.wxMiNiProgram
+                    }
+                    let userToken = this.$db.get('userToken')
+                    if (userToken) {
+                        data.token = userToken
+                    }
+                }
+                else if (this.shareType == this.$globalConstVars.shareType.seckill) {
+                    data = {
+                        page: this.shareType,
+                        url: this.$globalConstVars.shareUrl,
+                        params: {
+                            groupId: this.groupId
+                        },
+                        type: this.$globalConstVars.shareModel.poster,
+                        client: this.$globalConstVars.shareClient.wxMiNiProgram
                     }
                     let userToken = this.$db.get('userToken')
                     if (userToken) {
                         data.token = userToken
                     }
-                    console.log(data);
                 }
                 else if (this.shareType == this.$globalConstVars.shareType.goods) {
                     data = {
@@ -145,14 +157,13 @@
                         params: {
                             goodsId: this.goodsId,
                         },
-                        type: 3,//海报
-                        client: 2
+                        type: this.$globalConstVars.shareModel.poster,
+                        client: this.$globalConstVars.shareClient.wxMiNiProgram
                     }
                     let userToken = this.$db.get('userToken')
                     if (userToken) {
                         data.token = userToken
                     }
-                    console.log(data);
                 }
                 else if (this.shareType == this.$globalConstVars.shareType.addPinTuan) {
                     data = {
@@ -163,14 +174,13 @@
                             groupId: this.groupId,
                             teamId: this.teamId
                         },
-                        type: 3,//海报
-                        client: 2
+                        type: this.$globalConstVars.shareModel.poster,
+                        client: this.$globalConstVars.shareClient.wxMiNiProgram
                     }
                     let userToken = this.$db.get('userToken')
                     if (userToken) {
                         data.token = userToken
                     }
-                    console.log(data);
                 } else if (this.shareType == this.$globalConstVars.shareType.solitaire) {
                     data = {
                         page: this.shareType,
@@ -178,8 +188,22 @@
                         params: {
                             id: this.objectId
                         },
-                        type: 3,//海报
-                        client: 2
+                        type: this.$globalConstVars.shareModel.poster,
+                        client: this.$globalConstVars.shareClient.wxMiNiProgram
+                    }
+                    let userToken = this.$db.get('userToken')
+                    if (userToken) {
+                        data.token = userToken
+                    }
+                } else if (this.shareType == this.$globalConstVars.shareType.serviceGoods) {
+                    data = {
+                        page: this.shareType,
+                        url: this.$globalConstVars.shareUrl,
+                        params: {
+                            serviceGoodsId: this.objectId
+                        },
+                        type: this.$globalConstVars.shareModel.poster,
+                        client: this.$globalConstVars.shareClient.wxMiNiProgram
                     }
                     let userToken = this.$db.get('userToken')
                     if (userToken) {
@@ -191,7 +215,10 @@
                         uni.hideLoading();
                         if (
                             this.shareType == this.$globalConstVars.shareType.goods ||
-                            this.shareType == this.$globalConstVars.shareType.pinTuan
+                            this.shareType == this.$globalConstVars.shareType.pinTuan ||
+                            this.shareType == this.$globalConstVars.shareType.seckill ||
+                            this.shareType == this.$globalConstVars.shareType.group ||
+                            this.shareType == this.$globalConstVars.shareType.serviceGoods
                         ) {
                             //data.posterUrl = encodeURIComponent(res.data);
                             data.params.posterUrl = res.data;
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/fy-dropdown/fy-dropdown.vue b/CoreCms.Net.Uni-App/CoreShop/components/fy-dropdown/fy-dropdown.vue
index 7eea62a2..dc3a506d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/fy-dropdown/fy-dropdown.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/fy-dropdown/fy-dropdown.vue
@@ -205,16 +205,7 @@
                 });
                 // #endif
 
-                // #ifdef H5
-                uni.createSelectorQuery().in(this).select('#fy_dropdown__menu').boundingClientRect().exec(rect => {
-                    const data = rect[0];
-                    const top = data.top + this.titleHeight + this.H5NavBarHeight + 'px';
-                    this.maskClass.top = top;
-                    this.transClass.top = top;
-                });
-                // #endif
-
-                // #ifndef APP-NVUE || H5
+                // #ifndef APP-NVUE
                 uni.createSelectorQuery().in(this).select('.fy_dropdown__menu').boundingClientRect(rect => {
                     const top = rect.top + this.titleHeight + 'px';
                     this.maskClass.top = top;
diff --git a/CoreCms.Net.Uni-App/CoreShop/main.js b/CoreCms.Net.Uni-App/CoreShop/main.js
index 9e7aa684..0d58b4b1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/main.js
+++ b/CoreCms.Net.Uni-App/CoreShop/main.js
@@ -9,9 +9,6 @@ import * as Db from '@/common/utils/dbHelper.js'
 //全局常量配置
 import * as GlobalConstVars from '@/common/setting/constVarsHelper.js'
 
-//全局常量配置
-import * as CoreTheme from '@/common/setting/coreThemeHelper.js'
-
 import store from '@/common/store'
 
 //引入全局uView
@@ -44,7 +41,6 @@ Vue.prototype.$upload = Upload;
 Vue.prototype.$common = Common;
 Vue.prototype.$db = Db;
 Vue.prototype.$globalConstVars = GlobalConstVars;
-Vue.prototype.$coreTheme = CoreTheme;
 Vue.prototype.$store = store;
 
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/manifest.json b/CoreCms.Net.Uni-App/CoreShop/manifest.json
index b0ee0991..4b0686c0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/manifest.json
+++ b/CoreCms.Net.Uni-App/CoreShop/manifest.json
@@ -1,182 +1,179 @@
 {
-  "name": "南山田舍",
-  "appid": "__UNI__EAACF14",
-  "description": "核心商城系统（CoreShop）是基于uni-app框架开发的商城应用程序",
-  "versionName": "1.0",
-  "versionCode": 1,
-  "transformPx": false,
-  "app-plus": {
-    /* 5+App特有相关 */
-    "modules": {
-      "Payment": {},
-      "VideoPlayer": {},
-      "Maps": {}
-    },
-    /* 模块配置 */
-    "distribute": {
-      /* 应用发布信息 */
-      "android": {
-        /* android打包配置 */
-        "permissions": [
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-          "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-        ],
-        "abiFilters": [ "armeabi-v7a", "arm64-v8a", "x86" ]
-      },
-      "ios": {},
-      /* ios打包配置 */
-      "sdkConfigs": {
-        "payment": {
-          "weixin": {
-            "appid": "wx11d95cdaee6058f6"
-          }
+    "name" : "核心商城系统",
+    "appid" : "__UNI__EAACF14",
+    "description" : "核心商城系统（CoreShop）是基于uni-app框架开发的商城应用程序",
+    "versionName" : "1.0",
+    "versionCode" : 1,
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "modules" : {
+            "Payment" : {},
+            "VideoPlayer" : {},
+            "Maps" : {}
         },
-        "ad": {},
-        "maps": {
-          "amap": {
-            "appkey_ios": "91b94ecb48605c4e048aa1971459eca7",
-            "appkey_android": "91b94ecb48605c4e048aa1971459eca7"
-          }
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+            },
+            "ios" : {},
+            /* ios打包配置 */
+            "sdkConfigs" : {
+                "payment" : {
+                    "weixin" : {
+                        "appid" : "wx11d95cdaee6058f6"
+                    }
+                },
+                "ad" : {},
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "91b94ecb48605c4e048aa1971459eca7",
+                        "appkey_android" : "91b94ecb48605c4e048aa1971459eca7"
+                    }
+                },
+                "oauth" : {
+                    "univerify" : {}
+                },
+                "share" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "",
+                    "xhdpi" : "",
+                    "xxhdpi" : "",
+                    "xxxhdpi" : ""
+                },
+                "ios" : {
+                    "appstore" : "",
+                    "ipad" : {
+                        "app" : "",
+                        "app@2x" : "",
+                        "notification" : "",
+                        "notification@2x" : "",
+                        "proapp@2x" : "",
+                        "settings" : "",
+                        "settings@2x" : "",
+                        "spotlight" : "",
+                        "spotlight@2x" : ""
+                    },
+                    "iphone" : {
+                        "app@2x" : "",
+                        "app@3x" : "",
+                        "notification@2x" : "",
+                        "notification@3x" : "",
+                        "settings@2x" : "",
+                        "settings@3x" : "",
+                        "spotlight@2x" : "",
+                        "spotlight@3x" : ""
+                    }
+                }
+            }
         },
-        "oauth": {
-          "univerify": {}
-        },
-        "share": {}
-      },
-      "icons": {
-        "android": {
-          "hdpi": "unpackage/res/icons/72x72.png",
-          "xhdpi": "unpackage/res/icons/96x96.png",
-          "xxhdpi": "unpackage/res/icons/144x144.png",
-          "xxxhdpi": "unpackage/res/icons/192x192.png"
-        },
-        "ios": {
-          "appstore": "unpackage/res/icons/1024x1024.png",
-          "ipad": {
-            "app": "unpackage/res/icons/76x76.png",
-            "app@2x": "unpackage/res/icons/152x152.png",
-            "notification": "unpackage/res/icons/20x20.png",
-            "notification@2x": "unpackage/res/icons/40x40.png",
-            "proapp@2x": "unpackage/res/icons/167x167.png",
-            "settings": "unpackage/res/icons/29x29.png",
-            "settings@2x": "unpackage/res/icons/58x58.png",
-            "spotlight": "unpackage/res/icons/40x40.png",
-            "spotlight@2x": "unpackage/res/icons/80x80.png"
-          },
-          "iphone": {
-            "app@2x": "unpackage/res/icons/120x120.png",
-            "app@3x": "unpackage/res/icons/180x180.png",
-            "notification@2x": "unpackage/res/icons/40x40.png",
-            "notification@3x": "unpackage/res/icons/60x60.png",
-            "settings@2x": "unpackage/res/icons/58x58.png",
-            "settings@3x": "unpackage/res/icons/87x87.png",
-            "spotlight@2x": "unpackage/res/icons/80x80.png",
-            "spotlight@3x": "unpackage/res/icons/120x120.png"
-          }
+        "splashscreen" : {
+            "waiting" : true
         }
-      }
     },
-    "splashscreen": {
-      "waiting": true
-    }
-  },
-  /* SDK配置 */
-  "quickapp": {},
-  /* 快应用特有相关 */
-  "mp-weixin": {
-    "appid": "wx6fc139d4de0b470f",
-    "setting": {
-      "urlCheck": true,
-      "postcss": true,
-      "minified": true,
-      "es6": true,
-      "checkSiteMap": false
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx6fc139d4de0b470f",
+        "setting" : {
+            "urlCheck" : true,
+            "postcss" : true,
+            "minified" : true,
+            "es6" : true,
+            "checkSiteMap" : false
+        },
+        "plugins" : {
+            "chooseLocation" : {
+                "version" : "1.0.9",
+                "provider" : "wx76a9a06e5b4e693e"
+            }
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序定位"
+            }
+        },
+        "optimization" : {
+            "subPackages" : true
+        },
+        "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ]
     },
-    "plugins": {
-      "chooseLocation": {
-        "version": "1.0.9",
-        "provider": "wx76a9a06e5b4e693e"
-      }
-    },
-    "permission": {
-      "scope.userLocation": {
-        "desc": "你的位置信息将用于小程序定位"
-      }
-    },
-    "optimization": {
-      "subPackages": true
-    },
-    "requiredPrivateInfos": [
-      "getLocation",
-      "chooseAddress"
-    ]
-  },
-  "h5": {
-    "title": "南山田舍",
-    "domain": "https://h5.coreshop.coreshop.net",
-    "router": {
-      "base": "./",
-      "mode": "hash"
-    },
-    "template": "index.html",
-    "devServer": {
-      "port": 80,
-      "disableHostCheck": true,
-      "https": true
-    },
-    "sdkConfigs": {
-      "maps": {
-        "qqmap": {
-          "key": "AEIBZ-H5TRI-A6VGA-5KRNA-QKKK6-JGB33"
+    "h5" : {
+        "title" : "南山田舍",
+        "domain" : "https://h5.coreshop.coreshop.net",
+        "router" : {
+            "base" : "./",
+            "mode" : "hash"
+        },
+        "template" : "index.html",
+        "devServer" : {
+            "port" : 80,
+            "disableHostCheck" : true,
+            "https" : true
+        },
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "AEIBZ-H5TRI-A6VGA-5KRNA-QKKK6-JGB33"
+                }
+            }
+        },
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : false
+            }
         }
-      }
     },
-    "optimization": {
-      "treeShaking": {
-        "enable": false
-      }
-    }
-  },
-  "mp-toutiao": {
-    "setting": {
-      "es6": true,
-      "postcss": true,
-      "minified": true
+    "mp-toutiao" : {
+        "setting" : {
+            "es6" : true,
+            "postcss" : true,
+            "minified" : true
+        },
+        "appid" : ""
     },
-    "appid": ""
-  },
-  "mp-qq": {
-    "setting": {
-      "es6": true,
-      "postcss": true,
-      "minified": true
+    "mp-qq" : {
+        "setting" : {
+            "es6" : true,
+            "postcss" : true,
+            "minified" : true
+        },
+        "optimization" : {
+            "subPackages" : true
+        }
     },
-    "optimization": {
-      "subPackages": true
-    }
-  },
-  "mp-alipay": {},
-  "mp-baidu": {}
+    "mp-alipay" : {},
+    "mp-baidu" : {}
 }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages.json b/CoreCms.Net.Uni-App/CoreShop/pages.json
index bddfacd6..78eb5461 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages.json
+++ b/CoreCms.Net.Uni-App/CoreShop/pages.json
@@ -195,13 +195,6 @@
             "navigationBarTitleText": "支付"
           }
         },
-        {
-          "path": "waiting/waiting",
-          "style": {
-            "navigationBarTextStyle": "black",
-            "navigationBarTitleText": "等待支付"
-          }
-        },
         {
           "path": "result/result",
           "style": {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/checkIn/checkIn/checkIn.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/checkIn/checkIn/checkIn.vue
index 8965ce90..0ca47b1e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/checkIn/checkIn/checkIn.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/checkIn/checkIn/checkIn.vue
@@ -82,7 +82,7 @@
 </template>
 
 <script>
-    import { mapMutations, mapActions, mapState } from 'vuex';
+    import { mapState } from 'vuex';
     export default {
         data() {
             return {
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 37c31f48..5cf8429b 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
@@ -6,8 +6,6 @@
                 <u-icon name="arrow-left" size="19" @click="goNavigateBack"></u-icon>
                 <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
                 <u-icon name="home" size="22" @click="goHome"></u-icon>
-                <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
-                <u-icon name="share-fill" size="22" @click="goShare"></u-icon>
             </view>
             <view slot="right">
             </view>
@@ -24,7 +22,7 @@
                     <text class="coreshop-font-16">¥</text>
                     <text class="coreshop-font-24">{{ product.price || '0.00' }}</text>
                 </view>
-                <view class="coreshop-flex-sub coreshop-flex coreshop-text-left coreshop-justify-center coreshop-align-center">
+                <view class="coreshop-flex coreshop-text-left coreshop-justify-center coreshop-align-center">
                     <view class="coreshop-text-right coreshop-time-right">
                         <u-count-down :time="goodsInfo.groupTimestamp*1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange">
                             <view class="time">
@@ -34,7 +32,7 @@
                                 </view>
                                 <text class="time__doc">天</text>
                                 <view class="time__custom">
-                                    <text class="time__custom__item">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}</text>
+                                    <text class="time__custom__item">{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours}}</text>
                                 </view>
                                 <text class="time__doc">:</text>
                                 <view class="time__custom">
@@ -48,10 +46,6 @@
                         </u-count-down>
                     </view>
                 </view>
-                <view class="coreshop-flex coreshop-align-center">
-                    <u-icon name="star-fill" :size="20" label="收藏" :labelSize="14" labelPos="right" @click="collection" v-if="isfav"></u-icon>
-                    <u-icon name="star" :size="20" label="收藏" :labelSize="14" labelPos="right" @click="collection" v-else></u-icon>
-                </view>
             </view>
             <view class="coreshop-margin-top-12 coreshop-multiple-line-clamp">
                 <text class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">{{ goodsInfo.name || '' }}</text>
@@ -71,12 +65,11 @@
                     <text class="font-color-orange">{{ goodsInfo.buyCount || '0' }}</text>
                 </view>
                 <view class="coreshop-font-12">
-                    <text>累计销售：</text>
-                    <text>{{ goodsInfo.buyCount || '0' }}</text>
+                    <u-icon name="share-fill" size="18" label="分享" :labelSize="12" labelPos="right" @click="goShare"></u-icon>
                 </view>
                 <view class="coreshop-font-12">
-                    <text>库存：</text>
-                    <text>{{product.stock}}</text>
+                    <u-icon name="star-fill" :size="18" label="收藏" :labelSize="12" labelPos="right" @click="collection" v-if="isfav"></u-icon>
+                    <u-icon name="star" :size="18" label="收藏" :labelSize="12" labelPos="right" @click="collection" v-else></u-icon>
                 </view>
             </view>
         </view>
@@ -193,13 +186,9 @@
             </view>
         </view>
 
-
         <!-- 分享弹窗 -->
         <view class="coreshop-padding-0">
             <u-popup mode="bottom" :show="shareBox" ref="share">
-                <!-- #ifdef H5 -->
-                <coreshop-share-h5 :shareType='$globalConstVars.shareType.group' :groupId="groupId" :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-h5>
-                <!-- #endif -->
                 <!-- #ifdef MP-WEIXIN -->
                 <coreshop-share-wx :shareType='$globalConstVars.shareType.group' :groupId="groupId" :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-wx>
                 <!-- #endif -->
@@ -258,7 +247,7 @@
                                 {{ pointShowName}}兑换价:
                             </view>
                             <view class="coreshop-text-red">
-                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
+                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
                             </view>
                         </view>
                         <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -295,7 +284,7 @@
                                     {{ pointShowName}}兑换价:
                                 </view>
                                 <view class="coreshop-text-red">
-                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
+                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
                                 </view>
                             </view>
                             <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -354,7 +343,7 @@
             <view class="tabbar">
                 <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-start coreshop-basis-4">
                     <!-- 客服按钮 -->
-                    <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
+                    <!-- #ifdef APP-PLUS-NVUE || APP-PLUS -->
                     <view class="action" @click="showChat()">
                         <button class="noButtonStyle">
                             <u-icon name="server-fill" :size="20" label="找客服" :labelSize="12" labelPos="bottom"></u-icon>
@@ -442,9 +431,8 @@
             };
         },
         onLoad(e) {
-            this.goodsId = e.id;
-            this.groupId = e.groupId;
-            if (this.goodsId && this.groupId) {
+            this.groupId = e.id;
+            if (this.groupId) {
                 this.getServiceDescription();
                 this.getGoodsInfo();
                 this.getGoodsParams();
@@ -517,7 +505,7 @@
             shareHref() {
                 let pages = getCurrentPages();
                 let page = pages[pages.length - 1];
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
+                // #ifdef MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
                 return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
                 // #endif
             }
@@ -593,8 +581,7 @@
             },
             getGoodsInfo() {
                 let data = {
-                    id: this.goodsId,
-                    groupId: this.groupId,
+                    id: this.groupId,
                     type: this.cartType,
                     needSku: true,
                 };
@@ -626,6 +613,7 @@
                             let info = res.data;
                             _this.product = res.data.product;
                             _this.goodsInfo = info;
+                            _this.goodsId = info.id;
                             this.goodsSkuInfo = res.data.skuList;
 
                             if (_this.goodsInfo.album) {
@@ -751,7 +739,6 @@
                 this.submitStatus = true;
                 this.buyNow();
             },
-            // 跳转到h5分享页面
             goShare() {
                 this.shareBox = true;
             },
@@ -768,8 +755,6 @@
             },
             //在线客服
             showChat() {
-                // #ifdef H5
-                // #endif
                 // #ifdef APP-PLUS || APP-PLUS-NVUE
                 this.$u.route('/pages/member/customerService/index');
                 // #endif
@@ -777,18 +762,17 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 9,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.group,
                     params: {
-                        goodsId: this.goodsId,
                         groupId: this.groupId
                     }
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
-                    data['token'] = userToken;
+                    data.token = userToken
                 }
                 this.$u.api.share(data).then(res => {
                     this.shareUrl = res.data
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue
index 971433aa..00c90674 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue
@@ -9,35 +9,89 @@
             <view slot="right">
             </view>
         </u-navbar>
-        <view class="goods-item" v-for="item in goodsList" :key="item.id" v-if="goodsList.length>0">
-            <view class="activity-goods-box coreshop-flex coreshop-justify-between">
-                <view class="img-box">
-                    <slot name="tag"></slot>
-                    <image class="img" :src="item.image" mode="aspectFill"></image>
-                </view>
-                <view class="goods-right coreshop-flex coreshop-justify-between coreshop-flex-direction">
-                    <view class="title u-line-2">{{ item.name }}</view>
-                    <view class="tip u-line-1">{{ item.brief }}</view>
-                    <view class="slod-end">
-                        <view class="coreshop-flex coreshop-align-center">
-                            <u-line-progress :percentage="getPercent(item.buyPromotionCount, item.stock)"></u-line-progress>
-                            <view class="progress-text">已抢{{ getProgress(item.buyPromotionCount, item.stock) }}</view>
-                        </view>
-                    </view>
-                    <view class="coreshop-flex coreshop-justify-between coreshop-margin-top-10">
-                        <view class="coreshop-flex coreshop-align-center">
-                            <view class="current">￥{{ item.price }}</view>
-                            <view class="original">￥{{ item.mktprice }}</view>
-                        </view>
-                        <view class="coreshop-width-fit-content">
-                            <u-button type="error" size="mini" v-if="tabCurrent=='ing'" @click="goGroupBuyingDetail(item.id, item.groupId)">{{ btnType[tabCurrent].name }}</u-button>
-                            <u-button type="error" size="mini" v-else>{{ btnType[tabCurrent].name }}</u-button>
-                        </view>
-                    </view>
 
+        <view class="coreshop-flex-direction coreshop-padding-10 coreshop-margin-10 coreshop-bg-white coreshop-text-black" v-for="(item, key) in goodsList" :key="key" v-if="goodsList.length>0">
+            <view class="coreshop-flex">
+                <view>
+                    <u--image :src="item.goodThumbnail" mode="widthFix" width="96px" height="96px"></u--image>
+                </view>
+                <view class="coreshop-flex coreshop-flex-direction coreshop-padding-left-10 coreshop-percent-100">
+                    <view class="coreshop-font-15 u-line-2 coreshop-text-black">{{ item.name }}</view>
+                    <view class="coreshop-font-11 coreshop-padding-top-5 coreshop-padding-bottom-3 u-line-2 coreshop-text-brown">{{ item.goodName }}</view>
+                    <view class="coreshop-flex coreshop-align-center coreshop-padding-top-10  coreshop-padding-bottom-5">
+                        <view class="coreshop-font-11 coreshop-bg-orange coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.maxNums>0">限购{{item.maxNums}}{{item.goodUnit}}</view>
+                        <view class="coreshop-font-11 coreshop-bg-green coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.maxNums==0">不限购</view>
+                        <view class="coreshop-font-11 coreshop-bg-orange coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.maxGoodsNums>0">总量{{item.maxGoodsNums}}{{item.goodUnit}}</view>
+                        <view class="coreshop-font-11 coreshop-bg-green coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.maxGoodsNums==0">不限总量</view>
+
+                        <view class="coreshop-font-11 coreshop-bg-olive coreshop-padding-2 coreshop-border-radius-4">{{item.goodViewCount}}人浏览</view>
+                    </view>
+                    <view class="coreshop-flex coreshop-justify-between coreshop-flex-direction-row coreshop-align-center" v-if="item.timestamp">
+                        <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="(item.startStatus == 1) && item.timestamp">
+                            <u-count-down :time="item.timestamp*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                                <view class="time coreshop-font-11">
+                                    <view class="coreshop-font-12">仅剩：</view>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.days }}</text>
+                                    </view>
+                                    <text class="time__doc">天</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.hours >= 10 ? item.timeData.hours :'0' +item.timeData.hours}}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.minutes }}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.seconds }}</text>
+                                    </view>
+                                </view>
+                            </u-count-down>
+                        </view>
+                        <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="(item.startStatus == 0) && item.timestamp">
+                            <u-count-down :time="item.timestamp*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                                <view class="time">
+                                    <view class="coreshop-font-12">即将开始：</view>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.days }}</text>
+                                    </view>
+                                    <text class="time__doc">天</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.hours>=10?item.timeData.hours:'0'+item.timeData.hours}}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.minutes }}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.seconds }}</text>
+                                    </view>
+                                </view>
+                            </u-count-down>
+                        </view>
+                    </view>
+                    <view class="coreshop-flex coreshop-justify-between coreshop-flex-direction-row coreshop-align-center coreshop-margin-top-10">
+                        <view class="coreshop-flex coreshop-align-center">
+                            <view class="coreshop-font-14 coreshop-text-red">￥{{item.price}}</view>
+                            <view class="coreshop-font-xs coreshop-text-through coreshop-margin-left-5">{{item.mktPrice}}元</view>
+                        </view>
+                        <view class="coreshop-groupPurchase-btn" v-if="item.startStatus == 1" @click="goGroupBuyingDetail(item.id)">立即团</view>
+                        <view class="coreshop-groupPurchase-btn" v-if="item.startStatus == 0">即将开始</view>
+                        <view class="coreshop-buy-btn-disabled" v-if="item.startStatus == 2">已结束</view>
+                    </view>
+                </view>
+            </view>
+            <view v-if="key+1 < listData.length">
+                <view class="coreshop-divider">
+                    <view class="seckill"></view>
+                    <view class="dot">●</view>
+                    <view class="seckill"></view>
                 </view>
             </view>
         </view>
+
         <!-- 无数据时默认显示 -->
         <view class="coreshop-emptybox" v-else>
             <u-empty :icon="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="150" text="暂无团购信息" mode="list"></u-empty>
@@ -50,9 +104,9 @@
 </template>
 
 <script>
-    
+
     export default {
-        
+
         data() {
             return {
                 loadStatus: 'loadmore',
@@ -126,7 +180,7 @@
                 this.$u.api.getGroup(data).then(res => {
                     if (res.status) {
                         if (res.data) {
-                            let _goodsList = res.data.goods;
+                            let _goodsList = res.data.list;
                             _this.goodsList = [..._this.goodsList, ..._goodsList]
                         }
                         _this.lastPage = res.data.totalPages;
@@ -141,7 +195,10 @@
                     }
                 });
 
-            }
+            },
+            onChange(e, key) {
+                this.$set(this.goodsList[key], 'timeData', e)
+            },
         }
     }
 </script>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue
index 3b6e4db7..daadd6e0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue
@@ -17,36 +17,36 @@
                         <text class="group-head__title">爆款推荐</text>
                         <text class="group-head__notice">省钱省心限时拼</text>
                     </view>
-                    <view class="group-box">
-                        <view class="goods-item" v-for="(item, index) in goodsList" :key="item.id" v-if="goodsList.length>0">
+                    <view class="group-box" v-if="list.length>0">
+                        <view class="goods-item" v-for="(item, index) in list" :key="item.id">
                             <view class="coreshop-flex coreshop-justify-start coreshop-padding-left-10 coreshop-padding-top-10  coreshop-padding-bottom-10">
                                 <view>
                                     <view class="tag" v-if="index < 3">TOP{{ index + 1 }}</view>
-                                    <u--image :src="item.image" mode="widthFix" width="100px" height="100px" radius="10"></u--image>
+                                    <u--image :src="item.goodThumbnail" mode="widthFix" width="100px" height="100px" radius="10"></u--image>
                                 </view>
-                                <view class="goods-right coreshop-flex coreshop-flex-direction  coreshop-padding-left-10 coreshop-padding-right-10">
-                                    <view class="title u-line-2 coreshop-text-black">{{ item.pinTuanRule.name }}</view>
-                                    <view class="tip u-line-2 coreshop-text-grey">{{ item.name }}</view>
+                                <view class="goods-right coreshop-flex coreshop-flex-direction  coreshop-padding-left-10 coreshop-padding-right-10 coreshop-percent-100">
+                                    <view class="title u-line-2 coreshop-text-black">{{ item.name }}</view>
+                                    <view class="tip u-line-2 coreshop-text-grey">{{ item.goodName }}</view>
                                     <view class="coreshop-flex coreshop-align-center coreshop-padding-top-10  coreshop-padding-bottom-10">
-                                        <u-tag :text="'已拼'+item.pinTuanRecordNums+'单'" type="warning coreshop-margin-right-5 coreshop-font-10" shape="circle" size="mini"></u-tag>
-                                        <u-tag :text="'已售'+item.buyCount+ item.unit" type="warning coreshop-margin-right-5 coreshop-font-10" shape="circle" size="mini"></u-tag>
-                                        <u-tag :text="(item.pinTuanRule.peopleNumber || 0) +'人团'" type="success coreshop-font-10" shape="circle" size="mini"></u-tag>
+                                        <view class="coreshop-font-11 coreshop-bg-green coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10">已拼{{item.buyPinTuanCount}}单</view>
+                                        <view class="coreshop-font-11 coreshop-bg-orange coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10">已售{{item.pinTuanRecordNums}}{{item.goodUnit}}</view>
+                                        <view class="coreshop-font-11 coreshop-bg-olive coreshop-padding-2 coreshop-border-radius-4">{{item.peopleNumber}}人团</view>
                                     </view>
                                     <view class="coreshop-flex coreshop-justify-between  coreshop-flex-direction-row coreshop-align-center">
                                         <view class="coreshop-flex coreshop-align-center">
                                             <view class="current">￥{{ item.pinTuanPrice  }}</view>
-                                            <view class="original">￥{{ item.price }}</view>
+                                            <view class="original">￥{{ item.mktPrice }}</view>
                                         </view>
-                                        <view class="cu-btn buy-btn" @tap="goPinTuanDetail(item.id,item.pinTuanRule.id)">马上拼</view>
+                                        <view class="coreshop-buy-btn" @tap="goPinTuanDetail(item.id)">马上拼</view>
                                     </view>
                                 </view>
                             </view>
                         </view>
-                        <!-- 无数据时默认显示 -->
-                        <view class="coreshop-emptybox" v-else>
-                            <u-empty :icon="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="150" text="暂无提现明细" mode="list"></u-empty>
-                        </view>
-
+                        <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
+                    </view>
+                    <!-- 无数据时默认显示 -->
+                    <view class="coreshop-emptybox" v-else>
+                        <u-empty :icon="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="150" text="暂无提现明细" mode="list"></u-empty>
                     </view>
                 </view>
                 <!-- 空白 -->
@@ -62,7 +62,9 @@
     export default {
         data() {
             return {
-                goodsList: [],
+                page: 1,
+                limit: 10,
+                list: [],
                 status: 'loadmore',
                 iconType: 'flower',
                 loadText: {
@@ -72,12 +74,41 @@
                 }
             };
         },
-        //加载执行
-        onShow: function () {
-            _this = this
-            _this.getGoods();
+        onLoad() {
+            this.getPinTuanlist()
+        },
+        onShow() {
+        },
+        onReachBottom() {
+            if (this.status === 'loadmore') {
+                this.getPinTuanlist()
+            }
         },
         methods: {
+            getPinTuanlist() {
+                let _this = this;
+                let data = {
+                    page: this.page,
+                    limit: this.limit
+                }
+                this.status = 'loading'
+                this.$u.api.pinTuanList(data).then(res => {
+                    if (res.status) {
+                        if (res.data) {
+                            let _list = res.data
+                            this.list = [...this.list, ..._list]
+                        }
+                        if (res.code >= _this.list.length) {
+                            _this.page++
+                            _this.status = 'loadmore'
+                        } else {
+                            _this.status = 'nomore'
+                        }
+                    } else {
+                        _this.$u.toast(res.msg)
+                    }
+                })
+            },
             //取得列表数据
             getGoods: function () {
                 uni.showLoading({
@@ -93,7 +124,7 @@
                                 if (item.pinTuanPrice <= 0) {
                                     item.pinTuanPrice = '0.00';
                                 } else {
-                                    item.pinTuanPrice = _this.$common.moneySub(item.price, item.pinTuanRule.discountAmount);
+                                    item.pinTuanPrice = parseFloat(item.price - item.pinTuanRule.discountAmount).toFixed(2);
                                 }
                             });
                         }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/details.scss b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/details.scss
index bdff3fd9..c8636c30 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/details.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/details.scss
@@ -1,7 +1,7 @@
 .groupHeight { height: 61px !important; }
 
 .group-swiper-c { height: 121px; }
-    .group-swiper-c .swiper-item .coreshop-cell-item { height: 50%; }
+    .group-swiper-c .swiper-item .coreshop-cell-item { height: 50%; padding: 10px 0px; }
         .group-swiper-c .swiper-item .coreshop-cell-item .user-head-img { width: 40px; height: 40px; border-radius: 50%; }
         .group-swiper-c .swiper-item .coreshop-cell-item .coreshop-cell-hd-title { max-width: 100px; width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; flex: 1; }
         .group-swiper-c .swiper-item .coreshop-cell-item .coreshop-cell-item-bd { min-width: 75px; text-align: center; display: block; }
@@ -33,3 +33,8 @@
     .coreshop-lower-shelf .coreshop-cell-item-bd { opacity: 0.4; }
     .coreshop-lower-shelf .coreshop-cell-item-ft { opacity: 0.4; }
     .coreshop-lower-shelf .coreshop-lower-box { position: absolute; height: calc(100% - 20px); width: calc(100% - 10px); background-color: rgba(0, 0, 0, 0.6); text-align: center; font-size: 14px; color: #dedede; -webkit-transition: left .15s; transition: left .15s; z-index: 999; -webkit-transition: all .15s; transition: all .15s; line-height: 40px; }
+
+
+.u-count-down {
+    .u-count-down__text { font-size: 12px; }
+}
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 8177e1c4..ef6299c7 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
@@ -5,9 +5,7 @@
             <view class="coreshop-navbar-left-slot" slot="left">
                 <u-icon name="arrow-left" size="19" @click="goNavigateBack"></u-icon>
                 <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
-                <u-icon name="home" size="22" @click="goHome"></u-icon>
-                <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
-                <u-icon name="share-fill" size="22" @click="goShare"></u-icon>
+                <u-icon name="home" size="22" @click="goHome"></u-icon>                
             </view>
             <view slot="right">
             </view>
@@ -24,7 +22,7 @@
                     <text class="coreshop-font-16">¥</text>
                     <text class="coreshop-font-24">{{ price || '0.00' }}</text>
                 </view>
-                <view class="coreshop-flex-sub coreshop-flex coreshop-text-left coreshop-justify-center coreshop-align-center">
+                <view class="coreshop-flex coreshop-text-left coreshop-justify-center coreshop-align-center">
                     <view class="coreshop-text-right coreshop-time-right" v-if="goodsInfo.pinTuanRule && goodsInfo.pinTuanRule.pinTuanStartStatus == 1">
                         <u-count-down :time="goodsInfo.pinTuanRule.lastTime*1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange">
                             <view class="time">
@@ -34,7 +32,7 @@
                                 </view>
                                 <text class="time__doc">天</text>
                                 <view class="time__custom">
-                                    <text class="time__custom__item">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}</text>
+                                    <text class="time__custom__item">{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours}}</text>
                                 </view>
                                 <text class="time__doc">:</text>
                                 <view class="time__custom">
@@ -56,7 +54,7 @@
                                 </view>
                                 <text class="time__doc">天</text>
                                 <view class="time__custom">
-                                    <text class="time__custom__item">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}</text>
+                                    <text class="time__custom__item">{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours}}</text>
                                 </view>
                                 <text class="time__doc">:</text>
                                 <view class="time__custom">
@@ -70,12 +68,7 @@
                         </u-count-down>
                     </view>
                 </view>
-                <view class="coreshop-flex coreshop-align-center">
-                    <u-icon name="star-fill" :size="20" label="收藏" :labelSize="14" labelPos="right" @click="collection" v-if="isfav"></u-icon>
-                    <u-icon name="star" :size="20" label="收藏" :labelSize="14" labelPos="right" @click="collection" v-else></u-icon>
-                </view>
             </view>
-
             <view class="coreshop-margin-top-12 coreshop-multiple-line-clamp">
                 <text class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">{{ goodsInfo.name || '' }}</text>
             </view>
@@ -94,12 +87,11 @@
                     <text class="font-color-orange">{{ goodsInfo.buyPinTuanCount || '0' }}</text>
                 </view>
                 <view class="coreshop-font-12">
-                    <text>累计销售：</text>
-                    <text>{{ goodsInfo.buyCount || '0' }}</text>
+                    <u-icon name="share-fill" size="18"  label="分享" :labelSize="12" labelPos="right" @click="goShare"></u-icon>
                 </view>
                 <view class="coreshop-font-12">
-                    <text>库存：</text>
-                    <text>{{product.stock}}</text>
+                    <u-icon name="star-fill" :size="18" label="收藏" :labelSize="12" labelPos="right" @click="collection" v-if="isfav"></u-icon>
+                    <u-icon name="star" :size="18" label="收藏" :labelSize="12" labelPos="right" @click="collection" v-else></u-icon>
                 </view>
             </view>
         </view>
@@ -140,76 +132,70 @@
             <view class="coreshop-margin-bottom-16">
                 <text class="coreshop-text-black coreshop-font-weight-bold coreshop-font-15">开团信息</text>
             </view>
-            <view class="tuan">
-                <view class="coreshop-cell-group coreshop-margin-top-10 coreshop-margin-bottom-10" v-if="pinTuanRecord.length > 0">
-                    <view class="coreshop-cell-item right-img">
-                        <view class="coreshop-cell-item-hd">
-                            <view class="coreshop-cell-hd-title">{{ teamCount || '0' }}人在拼单，可直接参与</view>
-                        </view>
-                    </view>
-                    <view class="group-swiper">
-                        <swiper class="group-swiper-c" :class="swiperSet.groupHeight" :indicator-dots="swiperSet.indicatorDots" :autoplay="swiperSet.autoplay" vertical="true" circular="true" :interval="swiperSet.interval" :duration="swiperSet.duration">
-                            <swiper-item v-for="(item, index) in pinTuanRecord" :key="index">
-                                <view class="swiper-item">
-                                    <view class="coreshop-cell-item" :class="item[0].isOverdue?'coreshop-lower-shelf':''">
-                                        <view class="img-lower-box" :class="item[0].isOverdue?'coreshop-lower-box':''" v-if="item[0].isOverdue">已结束</view>
-                                        <view class="coreshop-cell-item-hd">
-                                            <u--image width="35px" height="35px" :src="item[0].userAvatar" shape="circle"></u--image>
-                                            <view class="coreshop-cell-hd-title coreshop-margin-left-8">{{ item[0].nickName || '' }}</view>
-                                        </view>
-                                        <view class="coreshop-cell-item-bd">
-                                            <view class="coreshop-cell-bd-view">
-                                                <text class="coreshop-cell-bd-text coreshop-font-xs">
-                                                    还差
-                                                    <text class="coreshop-text-red">{{ item[0].teamNums || '' }}人</text>
-                                                    拼成
-                                                </text>
-                                            </view>
-                                            <view class="coreshop-cell-bd-view coreshop-text-center coreshop-flex coreshop-flex-nowrap coreshop-justify-center coreshop-align-center">
-                                                <text class="coreshop-font-xs">剩余：</text>
-                                                <u-count-down :time="item[0].lastTime * 1000 " class="coreshop-font-12"></u-count-down>
-                                            </view>
-                                        </view>
-                                        <view class="coreshop-cell-item-ft">
-                                            <u-button type="success" size="mini" @click="selectTap(2, item[0].teamId)" v-if="!item[0].isOverdue">去拼单</u-button>
-                                            <u-button type="default" size="mini" v-if="item[0].isOverdue">已结束</u-button>
-                                        </view>
-                                    </view>
-                                    <view class="coreshop-cell-item" v-if="item[1]" :class="item[1].isOverdue?'coreshop-lower-shelf':''">
-                                        <view class="img-lower-box" :class="item[1].isOverdue?'coreshop-lower-box':''" v-if="item[1].isOverdue">已结束</view>
-                                        <view class="coreshop-cell-item-hd">
-                                            <u--image width="40px" height="40px" :src="item[1].userAvatar" shape="circle" class="coreshop-margin-right-8"></u--image>
-                                            <view class="coreshop-cell-hd-title">{{ item[1].nickName || '' }}</view>
-                                        </view>
-                                        <view class="coreshop-cell-item-bd">
-                                            <view class="coreshop-cell-bd-view">
-                                                <text class="coreshop-cell-bd-text coreshop-font-xs">
-                                                    还差
-                                                    <text class="coreshop-text-red">{{ item[1].teamNums || '' }}人</text>
-                                                    拼成
-                                                </text>
-                                            </view>
-                                            <view class="coreshop-cell-bd-view">
-                                                <view class="commodity-day">
-                                                    <text class="coreshop-font-xs">剩余：</text>
-                                                    <u-count-down :timestamp="item[1].lastTime" separator="zh" :show-days="true" :show-hours="true" :show-minutes="true" :show-seconds="true" font-size="22" separator-size="22" color="#ff7300" bg-color="#ffd4b0" @end="end(index,1)"></u-count-down>
-                                                </view>
-                                            </view>
-                                        </view>
-                                        <view class="coreshop-cell-item-ft">
-                                            <u-button type="success" size="mini" @click="selectTap(2, item[1].teamId)" v-if="!item[1].isOverdue">去拼单</u-button>
-                                            <u-button type="default" size="mini" v-if="item[1].isOverdue">已结束</u-button>
-                                        </view>
-                                    </view>
-                                </view>
-                            </swiper-item>
-                        </swiper>
+            <view class="coreshop-cell-group coreshop-margin-top-10 coreshop-margin-bottom-10" v-if="pinTuanRecord.length > 0">
+                <view class="coreshop-cell-item right-img">
+                    <view class="coreshop-cell-item-hd">
+                        <view class="coreshop-cell-hd-title">{{ teamCount || '0' }}人在拼单，可直接参与</view>
                     </view>
                 </view>
-                <view class="coreshop-cell-group coreshop-margin-top-10 coreshop-margin-bottom-10" v-else>
-                    <view class="coreshop-cell-item right-img">
-                        <view class="coreshop-cell-item-hd"><view class="coreshop-cell-hd-title">暂无开团信息</view></view>
-                    </view>
+                <view class="group-swiper">
+                    <swiper class="group-swiper-c" :class="swiperSet.groupHeight" :indicator-dots="swiperSet.indicatorDots" :autoplay="swiperSet.autoplay" vertical="true" circular="true" :interval="swiperSet.interval" :duration="swiperSet.duration">
+                        <swiper-item v-for="(item, index) in pinTuanRecord" :key="index">
+                            <view class="swiper-item">
+                                <view class="coreshop-cell-item" :class="item[0].isOverdue?'coreshop-lower-shelf':''">
+                                    <view class="coreshop-cell-item-bd">
+                                        <view class="coreshop-cell-bd-view">
+                                            <text class="coreshop-cell-bd-text coreshop-font-xs">
+                                                还差
+                                                <text class="coreshop-text-red">{{ item[0].teamNums || '' }}人</text>
+                                                拼成
+                                            </text>
+                                        </view>
+                                        <view class="coreshop-cell-bd-view coreshop-text-center coreshop-flex coreshop-flex-nowrap coreshop-justify-center coreshop-align-center">
+                                            <text class="coreshop-font-xs">剩余：</text>
+                                            <u-count-down :time="item[0].lastTime * 1000 " class="coreshop-font-11"></u-count-down>
+                                        </view>
+                                    </view>
+                                    <view class="img-lower-box" :class="item[0].isOverdue?'coreshop-lower-box':''" v-if="item[0].isOverdue">已结束</view>
+                                    <view class="coreshop-cell-item-hd">
+                                        <u-avatar-group :urls="item[0].teams" keyName="userAvatar" size="35" gap="0.2" random-bg-color="true"></u-avatar-group>
+                                    </view>
+                                    <view class="coreshop-cell-item-ft">
+                                        <u-button type="success" size="mini" @click="selectTap(2, item[0].teamId)" v-if="!item[0].isOverdue">去拼单</u-button>
+                                        <u-button type="default" size="mini" v-if="item[0].isOverdue">已结束</u-button>
+                                    </view>
+                                </view>
+                                <view class="coreshop-cell-item" v-if="item[1]" :class="item[1].isOverdue?'coreshop-lower-shelf':''">
+                                    <view class="coreshop-cell-item-bd">
+                                        <view class="coreshop-cell-bd-view">
+                                            <text class="coreshop-cell-bd-text coreshop-font-xs">
+                                                还差
+                                                <text class="coreshop-text-red">{{ item[1].teamNums || '' }}人</text>
+                                                拼成
+                                            </text>
+                                        </view>
+                                        <view class="coreshop-cell-bd-view coreshop-text-center coreshop-flex coreshop-flex-nowrap coreshop-justify-center coreshop-align-center">
+                                            <text class="coreshop-font-xs">剩余：</text>
+                                            <u-count-down :time="item[1].lastTime * 1000 " class="coreshop-font-11" @end="end(index,1)"></u-count-down>
+                                        </view>
+                                    </view>
+                                    <view class="img-lower-box" :class="item[1].isOverdue?'coreshop-lower-box':''" v-if="item[1].isOverdue">已结束</view>
+                                    <view class="coreshop-cell-item-hd">
+                                        <u-avatar-group :urls="item[1].teams" keyName="userAvatar" size="35"  gap="0.2" random-bg-color="true"></u-avatar-group>
+                                    </view>
+                                    <view class="coreshop-cell-item-ft">
+                                        <u-button type="success" size="mini" @click="selectTap(2, item[1].teamId)" v-if="!item[1].isOverdue">去拼单</u-button>
+                                        <u-button type="default" size="mini" v-if="item[1].isOverdue">已结束</u-button>
+                                    </view>
+                                </view>
+                            </view>
+                        </swiper-item>
+                    </swiper>
+                </view>
+            </view>
+            <view class="coreshop-cell-group coreshop-margin-top-10 coreshop-margin-bottom-10" v-else>
+                <view class="coreshop-cell-item right-img">
+                    <view class="coreshop-cell-item-hd"><view class="coreshop-cell-hd-title">暂无开团信息</view></view>
                 </view>
             </view>
         </view>
@@ -306,7 +292,7 @@
                 <view class="ig-top-b">
                     <view class="igtb-top">
                         还差
-                        <text class="red-price">{{ teamInfo.teamNums || '' }}</text>
+                        <text class="coreshop-text-red">{{ teamInfo.teamNums || '' }}</text>
                         人，赶快拼单吧
                     </view>
                     <view class="igtb-mid"><button class="coreshop-btn" @click="selectTap(2, teamInfo.id)">参与拼团</button></view>
@@ -317,9 +303,6 @@
         <!-- 分享弹窗 -->
         <view class="coreshop-padding-0">
             <u-popup mode="bottom" :show="shareBox" ref="share">
-                <!-- #ifdef H5 -->
-                <coreshop-share-h5 :shareType='$globalConstVars.shareType.pinTuan' :goodsId="goodsInfo.id" :groupId="pinTuanId" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-h5>
-                <!-- #endif -->
                 <!-- #ifdef MP-WEIXIN -->
                 <coreshop-share-wx :shareType='$globalConstVars.shareType.pinTuan' :goodsId="goodsInfo.id" :groupId="pinTuanId" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-wx>
                 <!-- #endif -->
@@ -378,7 +361,7 @@
                                 {{ pointShowName}}兑换价:
                             </view>
                             <view class="coreshop-text-red">
-                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
+                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
                             </view>
                         </view>
                         <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -415,7 +398,7 @@
                                     {{ pointShowName}}兑换价:
                                 </view>
                                 <view class="coreshop-text-red">
-                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
+                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
                                 </view>
                             </view>
                             <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -440,7 +423,7 @@
             <view class="tabbar">
                 <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-start coreshop-basis-4">
                     <!-- 客服按钮 -->
-                    <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
+                    <!-- #ifdef APP-PLUS-NVUE || APP-PLUS -->
                     <view class="action" @click="showChat()">
                         <button class="noButtonStyle">
                             <u-icon name="server-fill" :size="20" label="找客服" :labelSize="12" labelPos="bottom"></u-icon>
@@ -533,7 +516,7 @@
 
 </template>
 <script>
-    import { mapMutations, mapActions, mapState } from 'vuex';
+    import { mapState } from 'vuex';
 
 
     export default {
@@ -546,7 +529,6 @@
                 // 后端返回的商品信息
                 goodsSkuInfo: {},
                 discountsGoodsSkuInfo: {},
-
                 goodsId: 0, // 商品id
                 pinTuanId: 0, // 拼团ID
                 goodsInfo: {}, // 商品详情
@@ -594,13 +576,12 @@
             };
         },
         onLoad(e) {
-            this.goodsId = e.id;
-            this.pinTuanId = e.pinTuanId;
+            this.pinTuanId = e.id;
             if (e.teamId && e.teamId > 0) {
                 this.teamId = e.teamId;
                 this.getTeam(this.teamId);
             }
-            if (this.goodsId) {
+            if (this.pinTuanId) {
                 this.getServiceDescription();
                 this.getGoodsInfo();
                 this.getGoodsParams();
@@ -681,7 +662,7 @@
             shareHref() {
                 let pages = getCurrentPages();
                 let page = pages[pages.length - 1];
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
+                // #ifdef MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
                 return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&pinTuanId=' + this.pinTuanId;
                 // #endif
             },
@@ -777,7 +758,7 @@
                 // 如果用户已经登录 要传用户token
                 let userToken = this.$db.get('userToken');
                 if (userToken) {
-                    data['token'] = userToken;
+                    data.token = userToken
                 }
                 let _this = this;
                 _this.$u.api.pinTuanGoodsInfo(data).then(res => {
@@ -801,7 +782,7 @@
                         } else {
                             let info = res.data;
                             this.product = res.data.product;
-
+                            this.goodsId = info.id;
                             _this.goodsInfo = info;
                             this.goodsSkuInfo = res.data.skuList;
 
@@ -836,8 +817,9 @@
                             _this.discountAmount = parseFloat(info.pinTuanRule.discountAmount).toFixed(2);
 
                             _this.isfav = _this.goodsInfo.isfav;
-                            _this.price = _this.pinTuanPrice = _this.$common.moneySub(_this.product.price, _this.discountAmount);
+                            _this.price = _this.pinTuanPrice = parseFloat(_this.product.price - _this.discountAmount).toFixed(2);
 
+                            // 获取拼团记录
                             // 获取拼团记录
                             let pinTuanData = info.pinTuanRecord;
                             let newData = new Array();
@@ -852,6 +834,9 @@
                                 }
                             }
                             pinTuanData.length < 2 ? (_this.swiperSet.groupHeight = 'groupHeight') : (_this.swiperSet.groupHeight = '');
+                            if (pinTuanData.length > 1) {
+                                _this.swiperSet.autoplay = true;
+                            }
                             _this.pinTuanRecord = newData;
                             _this.teamCount = info.pinTuanRecordNums;
                             // 判断如果登录用户添加商品浏览足迹
@@ -968,7 +953,6 @@
             end(index, number) {
                 this.pinTuanRecord[index][number].isOverdue = true;
             },
-            // 跳转到h5分享页面
             goShare() {
                 this.shareBox = true;
             },
@@ -989,8 +973,6 @@
             },
             //在线客服
             showChat() {
-                // #ifdef H5
-                // #endif
                 // #ifdef APP-PLUS || APP-PLUS-NVUE
                 this.$u.route('/pages/member/customerService/index');
                 // #endif
@@ -998,10 +980,10 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 3,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.pinTuan,
                     params: {
                         groupId: this.pinTuanId,
                         goodsId: this.goodsId,
@@ -1028,7 +1010,7 @@
                 if (teamId) {
                     this.teamId = teamId;
                 } else {
-                    this.teamId == 0;
+                    this.teamId = 0;
                 }
                 if (this.pinTuanType == 2) {
                     this.price = this.pinTuanPrice;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue
index 71cbb4dc..662ca752 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue
@@ -17,36 +17,88 @@
         </view>
         <view class="content-box">
             <scroll-view scroll-y="true" enable-back-to-top @scrolltolower="loadMore" class="scroll-box">
-                <view class="goods-item" v-for="item in goodsList" :key="item.id" v-if="goodsList.length>0">
-                    <view class="activity-goods-box coreshop-flex coreshop-justify-between">
-                        <view class="img-box">
-                            <slot name="tag"></slot>
-                            <image class="img" :src="item.image" mode="aspectFill"></image>
+                <view class="coreshop-flex-direction coreshop-padding-10 coreshop-margin-10 coreshop-bg-white coreshop-text-black" v-for="(item, key) in goodsList" :key="key" v-if="goodsList.length>0">
+                    <view class="coreshop-flex">
+                        <view>
+                            <u--image :src="item.goodThumbnail" mode="widthFix" width="96px" height="96px"></u--image>
                         </view>
-                        <view class="goods-right coreshop-flex coreshop-justify-between coreshop-flex-direction">
-                            <view class="title u-line-2">{{ item.name }}</view>
-                            <view class="tip u-line-1">{{ item.brief }}</view>
-                            <view class="slod-end">
-                                <view class="coreshop-flex coreshop-align-center">
-                                    <u-line-progress :percentage="getPercent(item.buyPromotionCount, item.stock)"></u-line-progress>
-                                    <view class="progress-text">已抢{{ getProgress(item.buyPromotionCount, item.stock) }}</view>
-                                </view>
-                            </view>
-                            <view class="coreshop-flex coreshop-justify-between coreshop-margin-top-10">
-                                <view class="coreshop-flex coreshop-align-center">
-                                    <view class="current">￥{{ item.price }}</view>
-                                    <view class="original">￥{{ item.mktprice }}</view>
-                                </view>
-                                <view class="coreshop-width-fit-content">
-                                    <u-button type="error" class="buy-btn" size="mini" v-if="tabCurrent=='ing'" @click="goSeckillDetail(item.id, item.groupId)">{{ btnType[tabCurrent].name }}</u-button>
-                                    <u-button type="error" class="buy-btn" size="mini" v-else>{{ btnType[tabCurrent].name }}</u-button>
-                                </view>
-                            </view>
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-padding-left-10 coreshop-percent-100">
+                            <view class="coreshop-font-15 u-line-2 coreshop-text-black">{{ item.name }}</view>
+                            <view class="coreshop-font-11 coreshop-padding-top-5 coreshop-padding-bottom-3 u-line-2 coreshop-text-brown">{{ item.goodName }}</view>
+                            <view class="coreshop-flex coreshop-align-center coreshop-padding-top-10  coreshop-padding-bottom-5">
+                                <view class="coreshop-font-11 coreshop-bg-orange coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.maxNums>0">限购{{item.maxNums}}{{item.goodUnit}}</view>
+                                <view class="coreshop-font-11 coreshop-bg-green coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.maxNums==0">不限购</view>
+                                <view class="coreshop-font-11 coreshop-bg-orange coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.maxGoodsNums>0">总量{{item.maxGoodsNums}}{{item.goodUnit}}</view>
+                                <view class="coreshop-font-11 coreshop-bg-green coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.maxGoodsNums==0">不限总量</view>
 
+                                <view class="coreshop-font-11 coreshop-bg-olive coreshop-padding-2 coreshop-border-radius-4">{{item.goodViewCount}}人浏览</view>
+                            </view>
+                            <view class="coreshop-flex coreshop-justify-between coreshop-flex-direction-row coreshop-align-center" v-if="item.timestamp">
+                                <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="(item.startStatus == 1) && item.timestamp">
+                                    <u-count-down :time="item.timestamp*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                                        <view class="time coreshop-font-11">
+                                            <view class="coreshop-font-12">仅剩：</view>
+                                            <view class="time__custom">
+                                                <text class="time__custom__item">{{ item.timeData.days }}</text>
+                                            </view>
+                                            <text class="time__doc">天</text>
+                                            <view class="time__custom">
+                                                <text class="time__custom__item">{{ item.timeData.hours >= 10 ? item.timeData.hours :'0' +item.timeData.hours}}</text>
+                                            </view>
+                                            <text class="time__doc">:</text>
+                                            <view class="time__custom">
+                                                <text class="time__custom__item">{{ item.timeData.minutes }}</text>
+                                            </view>
+                                            <text class="time__doc">:</text>
+                                            <view class="time__custom">
+                                                <text class="time__custom__item">{{ item.timeData.seconds }}</text>
+                                            </view>
+                                        </view>
+                                    </u-count-down>
+                                </view>
+                                <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="(item.startStatus == 0) && item.timestamp">
+                                    <u-count-down :time="item.timestamp*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                                        <view class="time">
+                                            <view class="coreshop-font-12">即将开始：</view>
+                                            <view class="time__custom">
+                                                <text class="time__custom__item">{{ item.timeData.days }}</text>
+                                            </view>
+                                            <text class="time__doc">天</text>
+                                            <view class="time__custom">
+                                                <text class="time__custom__item">{{ item.timeData.hours>=10?item.timeData.hours:'0'+item.timeData.hours}}</text>
+                                            </view>
+                                            <text class="time__doc">:</text>
+                                            <view class="time__custom">
+                                                <text class="time__custom__item">{{ item.timeData.minutes }}</text>
+                                            </view>
+                                            <text class="time__doc">:</text>
+                                            <view class="time__custom">
+                                                <text class="time__custom__item">{{ item.timeData.seconds }}</text>
+                                            </view>
+                                        </view>
+                                    </u-count-down>
+                                </view>
+                            </view>
+                            <view class="coreshop-flex coreshop-justify-between coreshop-flex-direction-row coreshop-align-center coreshop-margin-top-10">
+                                <view class="coreshop-flex coreshop-align-center">
+                                    <view class="coreshop-font-14 coreshop-text-red">￥{{item.price}}</view>
+                                    <view class="coreshop-font-xs coreshop-text-through coreshop-margin-left-5">{{item.mktPrice}}元</view>
+                                </view>
+                                <view class="coreshop-seckill-btn" v-if="item.startStatus == 1" @click="goSeckillDetail(item.id)">马上秒</view>
+                                <view class="coreshop-seckill-btn" v-if="item.startStatus == 0">即将开始</view>
+                                <view class="coreshop-buy-btn-disabled" v-if="item.startStatus == 2">已结束</view>
+                            </view>
+                        </view>
+                    </view>
+                    <view v-if="key+1 < listData.length">
+                        <view class="coreshop-divider">
+                            <view class="seckill"></view>
+                            <view class="dot">●</view>
+                            <view class="seckill"></view>
                         </view>
                     </view>
-
                 </view>
+
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-else>
                     <u-empty :icon="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="150" text="暂无秒杀信息" mode="list"></u-empty>
@@ -61,9 +113,9 @@
 </template>
 
 <script>
-    
+
     export default {
-        
+
         data() {
             return {
                 loadStatus: 'loadmore',
@@ -80,20 +132,6 @@
                 status: 1,
                 tabCurrent: 'ing',
                 goodsList: [],
-                btnType: {
-                    ing: {
-                        name: '立即抢购',
-                        color: 'btn-ing'
-                    },
-                    nostart: {
-                        name: '尚未开始',
-                        color: 'btn-nostart'
-                    },
-                    ended: {
-                        name: '已结束',
-                        color: 'btn-end',
-                    },
-                },
                 tabList: [
                     {
                         id: 'ing',
@@ -115,16 +153,13 @@
             };
         },
         onLoad() {
-            setTimeout(() => {
-                this.loading = true;
-            }, 500);
             this.getGoodsList();
         },
-        //onReachBottom() {
-        //    if (this.loadStatus === 'loadmore') {
-        //        this.getGoodsList()
-        //    }
-        //},
+        onReachBottom() {
+            if (this.loadStatus === 'loadmore') {
+                this.getGoodsList()
+            }
+        },
         methods: {
             onTab(id, status) {
                 this.tabCurrent = id;
@@ -132,7 +167,7 @@
                 this.goodsList = [];
                 this.page = 1;
                 this.loadStatus = 'loading';
-                this.$u.debounce(this.getGoodsList, 500);
+                this.getGoodsList();
             },
             // 百分比
             getProgress(sales, stock) {
@@ -168,14 +203,14 @@
                 let data = {
                     page: this.page,
                     limit: this.limit,
-                    type: 4, //秒杀
+                    type: this.$globalConstVars.paymentType.seckill,
                     status: this.status
                 }
                 this.loadStatus = 'loading';
                 this.$u.api.getGroup(data).then(res => {
                     if (res.status) {
                         if (res.data) {
-                            let _goodsList = res.data.goods;
+                            let _goodsList = res.data.list;
                             _this.goodsList = [..._this.goodsList, ..._goodsList]
                         }
                         _this.lastPage = res.data.totalPages;
@@ -190,7 +225,10 @@
                     }
                 });
 
-            }
+            },
+            onChange(e, key) {
+                this.$set(this.goodsList[key], 'timeData', e)
+            },
         }
     }
 </script>
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 a29647ba..abcbb465 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
@@ -6,8 +6,6 @@
                 <u-icon name="arrow-left" size="19" @click="goNavigateBack"></u-icon>
                 <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
                 <u-icon name="home" size="22" @click="goHome"></u-icon>
-                <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
-                <u-icon name="share-fill" size="22" @click="goShare"></u-icon>
             </view>
             <view slot="right">
             </view>
@@ -24,7 +22,7 @@
                     <text class="coreshop-font-16">¥</text>
                     <text class="coreshop-font-24">{{ product.price || '0.00' }}</text>
                 </view>
-                <view class="coreshop-flex-sub coreshop-flex coreshop-text-left coreshop-justify-center coreshop-align-center">
+                <view class="coreshop-flex coreshop-text-left coreshop-justify-center coreshop-align-center">
                     <view class="coreshop-text-right coreshop-time-right">
                         <u-count-down :time="goodsInfo.groupTimestamp*1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange">
                             <view class="time">
@@ -34,7 +32,7 @@
                                 </view>
                                 <text class="time__doc">天</text>
                                 <view class="time__custom">
-                                    <text class="time__custom__item">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}</text>
+                                    <text class="time__custom__item">{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours}}</text>
                                 </view>
                                 <text class="time__doc">:</text>
                                 <view class="time__custom">
@@ -48,10 +46,6 @@
                         </u-count-down>
                     </view>
                 </view>
-                <view class="coreshop-flex coreshop-align-center">
-                    <u-icon name="star-fill" :size="20" label="收藏" :labelSize="14" labelPos="right" @click="collection" v-if="isfav"></u-icon>
-                    <u-icon name="star" :size="20" label="收藏" :labelSize="14" labelPos="right" @click="collection" v-else></u-icon>
-                </view>
             </view>
             <view class="coreshop-margin-top-12 coreshop-multiple-line-clamp">
                 <text class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">{{ goodsInfo.name || '' }}</text>
@@ -66,17 +60,16 @@
                 </view>
             </view>
             <view class="coreshop-margin-top-16 coreshop-padding-top-16 coreshop-solid-top coreshop-flex coreshop-justify-between coreshop-align-center coreshop-text-gray">
-                <view class="coreshop-font-12">
-                    <text>运费：</text>
-                    <text class="font-color-orange">包邮</text>
-                </view>
                 <view class="coreshop-font-12">
                     <text>销量：</text>
-                    <text>{{ goodsInfo.buyCount || '0' }}</text>
+                    <text class="font-color-orange">{{ goodsInfo.buyCount || '0' }}</text>
                 </view>
                 <view class="coreshop-font-12">
-                    <text>库存：</text>
-                    <text>{{product.stock}}</text>
+                    <u-icon name="share-fill" size="18" label="分享" :labelSize="12" labelPos="right" @click="goShare"></u-icon>
+                </view>
+                <view class="coreshop-font-12">
+                    <u-icon name="star-fill" :size="18" label="收藏" :labelSize="12" labelPos="right" @click="collection" v-if="isfav"></u-icon>
+                    <u-icon name="star" :size="18" label="收藏" :labelSize="12" labelPos="right" @click="collection" v-else></u-icon>
                 </view>
             </view>
         </view>
@@ -201,14 +194,11 @@
         <!-- 分享弹窗 -->
         <view class="coreshop-padding-0">
             <u-popup mode="bottom" :show="shareBox" ref="share">
-                <!-- #ifdef H5 -->
-                <coreshop-share-h5 :shareType='$globalConstVars.shareType.seckill' :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-h5>
-                <!-- #endif -->
                 <!-- #ifdef MP-WEIXIN -->
-                <coreshop-share-wx :shareType='$globalConstVars.shareType.seckill' :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-wx>
+                <coreshop-share-wx :shareType='$globalConstVars.shareType.seckill' :groupId="groupId" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-wx>
                 <!-- #endif -->
                 <!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
-                <coreshop-share-app :shareType='$globalConstVars.shareType.seckill' :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-app>
+                <coreshop-share-app :shareType='$globalConstVars.shareType.seckill' :groupId="groupId" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-app>
                 <!-- #endif -->
             </u-popup>
             <div id="qrCode" ref="qrCodeDiv"></div>
@@ -261,7 +251,7 @@
                                 {{ pointShowName}}兑换价:
                             </view>
                             <view class="coreshop-text-red">
-                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
+                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
                             </view>
                         </view>
                         <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -298,7 +288,7 @@
                                     {{ pointShowName}}兑换价:
                                 </view>
                                 <view class="coreshop-text-red">
-                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
+                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
                                 </view>
                             </view>
                             <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -357,7 +347,7 @@
             <view class="tabbar">
                 <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-start coreshop-basis-4">
                     <!-- 客服按钮 -->
-                    <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
+                    <!-- #ifdef APP-PLUS-NVUE || APP-PLUS -->
                     <view class="action" @click="showChat()">
                         <button class="noButtonStyle">
                             <u-icon name="server-fill" :size="20" label="找客服" :labelSize="12" labelPos="bottom"></u-icon>
@@ -378,11 +368,6 @@
                         </button>
                     </view>
                 </view>
-                <!--<view class="coreshop-border-radius-20 coreshop-flex coreshop-align-end">
-                    <view class="btn-buy" @click="openSkuPopup">
-                        <text>立即秒杀</text>
-                    </view>
-                </view>-->
                 <view class="btn-group coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-basis-5">
                     <u-button type="error" size="normal" @click="openSkuPopup" shape="circle">立即秒杀</u-button>
                 </view>
@@ -407,7 +392,7 @@
     </view>
 </template>
 <script>
-    import { mapMutations, mapActions, mapState } from 'vuex';
+    import { mapState } from 'vuex';
     export default {
 
         data() {
@@ -441,7 +426,6 @@
                 selectType: '',
                 shareUrl: this.$globalConstVars.shareUrl,
                 shareBox: false,
-                shareType: 10,
                 serviceDescription: {
                     commonQuestion: [],
                     delivery: [],
@@ -451,11 +435,10 @@
             };
         },
         onLoad(e) {
-            this.goodsId = e.id;
-            this.groupId = e.groupId;
-            if (this.goodsId && this.groupId) {
+            this.groupId = e.id;
+            if (this.groupId) {
                 this.getServiceDescription();
-                this.getGoodsInfo();
+                this.getGroupInfo();
                 this.getGoodsParams();
                 this.getGoodsComments();
             } else {
@@ -526,8 +509,8 @@
             shareHref() {
                 let pages = getCurrentPages();
                 let page = pages[pages.length - 1];
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
-                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
+                // #ifdef MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
+                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.groupId;
                 // #endif
             },
         },
@@ -600,17 +583,16 @@
                     }
                 })
             },
-            getGoodsInfo() {
+            getGroupInfo() {
                 let data = {
-                    id: this.goodsId,
-                    groupId: this.groupId,
+                    id: this.groupId,
                     type: this.cartType,
                     needSku: true
                 };
                 // 如果用户已经登录 要传用户token
                 let userToken = this.$db.get('userToken');
                 if (userToken) {
-                    data['token'] = userToken;
+                    data.token = userToken
                 }
                 let _this = this;
                 this.$u.api.groupInfo(data).then(res => {
@@ -635,7 +617,7 @@
                         } else {
                             let info = res.data;
                             this.product = res.data.product;
-
+                            _this.goodsId = info.id;
                             _this.goodsInfo = info;
                             this.goodsSkuInfo = res.data.skuList;
                             if (_this.goodsInfo.album) {
@@ -771,8 +753,6 @@
             },
             //在线客服
             showChat() {
-                // #ifdef H5
-                // #endif
                 // #ifdef APP-PLUS || APP-PLUS-NVUE
                 this.$u.route('/pages/member/customerService/index');
                 // #endif
@@ -780,12 +760,11 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: this.shareType,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.seckill,
                     params: {
-                        goodsId: this.goodsId,
                         groupId: this.groupId
                     }
                 };
@@ -809,7 +788,6 @@
             },
             showModal() {
                 this.bottomModal = true;
-                console.log("打开弹窗");
             },
             hideModal(e) {
                 this.bottomModal = false;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/list/list.vue
index e93023db..7b80dda5 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/list/list.vue
@@ -35,17 +35,22 @@
                 </view>
                 <view class="item">
                     <view class="left">
-                        <u--image :showLoading="true" :src="item.thumbnail && item.thumbnail!='null' ?  item.thumbnail : '/static/images/common/empty-banner.png'" width="80px" height="80px" mode="aspectFill"></u--image>
+                        <u--image :showLoading="true" :src="item.thumbnail" width="80px" height="80px" mode="aspectFill"></u--image>
                     </view>
                     <view class="content">
-                        <view class="type u-line-4">{{item.description}}</view>
+                        <view class="type u-line-2">{{item.description}}</view>
                         <view class="delivery-time">截止时间：{{ $u.timeFormat(item.endTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
+                        <view class="coreshop-flex coreshop-align-center coreshop-padding-top-10  coreshop-padding-bottom-5">
+                            <view class="coreshop-font-11 coreshop-bg-orange coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.minDeliveryPrice>0">{{item.minDeliveryPrice}}元起送</view>
+                            <view class="coreshop-font-11 coreshop-bg-olive coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="item.startBuyPrice>0">{{item.startBuyPrice}}元起购</view>
+                            <!--<view class="coreshop-font-11 coreshop-bg-olive coreshop-padding-2 coreshop-border-radius-4">{{item.ticketNumber}}张券</view>-->
+                        </view>
                     </view>
                 </view>
                 <view class="bottom coreshop-margin-top-10">
                     <view class="more">正在接龙中</view>
                     <view class="coreshop-flex">
-                        <view class='logistics coreshop-btn' @click="goSolitaireDetail(item.id)">查看详情</view>
+                        <view class='coreshop-solitaire-btn' @click="goSolitaireDetail(item.id)">立即接龙</view>
                     </view>
                 </view>
             </view>
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 2ccb49a2..cbb303f2 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
@@ -38,7 +38,11 @@
                 </view>
             </view>
             <view class="coreshop-font-11 coreshop-text-gray coreshop-margin-bottom-10 ">
-                {{$u.timeFormat(model.createTime, 'mm月dd日')}}发布截至{{$u.timeFormat(model.endTime, 'mm月dd日 hh:MM:ss')}}
+                {{$u.timeFormat(model.createTime, 'yyyy年mm月dd日')}}发布截至{{$u.timeFormat(model.endTime, 'yyyy年mm月dd日 hh:MM:ss')}}
+            </view>
+            <view class="coreshop-flex coreshop-align-center coreshop-padding-bottom-5">
+                <view class="coreshop-font-11 coreshop-bg-orange coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="model.minDeliveryPrice>0">{{model.minDeliveryPrice}}元起送</view>
+                <view class="coreshop-font-11 coreshop-bg-olive coreshop-padding-2 coreshop-border-radius-4 coreshop-margin-right-10" v-if="model.startBuyPrice>0">{{model.startBuyPrice}}元起购</view>
             </view>
             <view class="coreshop-padding-10 coreshop-content">
                 <u-parse :content="model.contentBody" :selectable="true" v-if="model.contentBody"></u-parse>
@@ -80,15 +84,19 @@
             <view class="coreshop-font-md coreshop-padding-top-10 coreshop-padding-bottom-10 coreshop-padding-left-10 coreshop-padding-right-10 coreshop-flex-direction-row">
                 <u-icon name="more-circle" color="#e54d42" label="接龙清单" labelSize="15px" label-pos="right"></u-icon>
             </view>
-            <view class="coreshop-padding-top-10">
+            <view class="coreshop-padding-bottom-10">
                 <!--接龙记录-->
-                <view class="coreshop-padding-left-10 coreshop-padding-right-10 coreshop-padding-top-10 coreshop-padding-bottom-10" v-if="records.length>0">
-                    <view class="coreshop-flex coreshop-flex-nowrap coreshop-justify-between coreshop-margin-bottom-10" v-for="(item, index) in records" :key="index">
+                <view v-if="records.length>0">
+                    <view class="coreshop-flex coreshop-flex-nowrap coreshop-justify-between coreshop-padding-5 coreshop-margin-10 coreshop-bg-main" v-for="(item, index) in records" :key="index">
                         <view class="coreshop-flex coreshop-flex-nowrap coreshop-justify-between coreshop-align-center">
-                            <text class="coreshop-text-black coreshop-margin-right-10 coreshop-font-12">{{ records.length-index}}</text>
-                            <u-avatar :src="item.avatarImage" :size="30"></u-avatar>
-                            <text class="coreshop-text-black coreshop-font-12 u-line-1">{{ item.nickName}}</text>
-                            <view class="coreshop-margin-left-10  coreshop-width-max-content">
+                            <text class="coreshop-text-black coreshop-font-12">{{ records.length-index}}</text>
+                            <view class="coreshop-margin-left-10 coreshop-width-max-content">
+                                <view class="coreshop-flex coreshop-flex-nowrap coreshop-justify-between ">
+                                    <view class="coreshop-margin-right-5">
+                                        <u-avatar :src="item.avatarImage" :size="20"></u-avatar>
+                                    </view>
+                                    <text class="coreshop-text-black coreshop-font-12 u-line-1">{{ item.nickName==null ?'佚名': item.nickName}}</text>
+                                </view>
                                 <text class="coreshop-text-gray coreshop-font-10">{{$u.timeFormat(item.create, 'mm月dd日')}}</text>
                             </view>
                         </view>
@@ -108,9 +116,6 @@
         <!-- 分享弹窗 -->
         <view class="coreshop-padding-10">
             <u-popup mode="bottom" :show="shareBox" ref="share">
-                <!-- #ifdef H5 -->
-                <coreshop-share-h5 :objectId="model.id" :shareType="12" @close="closeShare()"></coreshop-share-h5>
-                <!-- #endif -->
                 <!-- #ifdef MP-WEIXIN -->
                 <coreshop-share-wx :objectId="model.id" :shareType="12" @close="closeShare()"></coreshop-share-wx>
                 <!-- #endif -->
@@ -312,20 +317,14 @@
                     this.$u.toast('请先选择商品')
                     return true
                 }
-                var totalprice = parseFloat(this.totalprice);
-                var startBuyPrice = parseFloat(this.model.startBuyPrice);
-                console.log('商品价格：' + this.totalprice);
-                console.log('起购价格：' + this.model.startBuyPrice);
+                //var totalprice = parseFloat(this.totalprice);
+                //var startBuyPrice = parseFloat(this.model.startBuyPrice);
+                //console.log('商品价格：' + this.totalprice);
+                //console.log('起购价格：' + this.model.startBuyPrice);
                 if (this.totalprice < this.model.startBuyPrice) {
                     this.$u.toast('最小购买价格为' + this.model.startBuyPrice + '元,请增加购买产品')
                     return true
                 }
-                //let userToken = this.$db.get('userToken');
-                //let obj = {
-                //    cart: this.cart,
-                //    id: this.id,
-                //    token: userToken
-                //}
                 this.submitStatus = true;
                 let newData = '';
                 for (var i = 0; i < this.cart.length; i++) {
@@ -337,7 +336,9 @@
                     newData = newData.substr(1);
                 }
                 if (newData.length > 0) {
-                    this.$u.route('/pages/placeOrder/index/index?orderType=' + this.cartType + '&objectId=' + this.id + '&cartIds=' + JSON.stringify(newData));
+                    var str = '/pages/placeOrder/index/index?orderType=' + this.cartType + '&objectId=' + this.id + '&cartIds=' + JSON.stringify(newData);
+                    console.log(str);
+                    this.$u.route(str);
                     return true;
                 } else {
                     //没有选择不跳转
@@ -353,17 +354,17 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 12,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.solitaire,
                     params: {
                         id: this.model.id,
                     }
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
-                    data['token'] = userToken;
+                    data.token = userToken
                 }
                 this.$u.api.share(data).then(res => {
                     this.shareUrl = res.data
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.vue
index 7e61e25c..4c676e95 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.vue
@@ -13,7 +13,7 @@
         </u-navbar>
 
         <view class="coreshop-bg-white coreshop-padding-10 coreshop-margin-10">
-            <u--image width="100%" height="150px" v-if="info.coverImage" :src="info.coverImage && info.coverImage!='null' ?  info.coverImage+'?x-oss-process=image/resize,m_lfit,h_320,w_240' : '/static/images/common/empty-banner.png'"></u--image>
+            <u--image width="100%" height="150px" v-if="info.coverImage" :src="info.coverImage"></u--image>
             <view class="article-title">
                 {{ info.title }}
             </view>
@@ -117,10 +117,10 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 5,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.article,
                     params: {
                         articleId: this.id,
                         articleType: this.idType
@@ -128,7 +128,7 @@
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
-                    data['token'] = userToken;
+                    data.token = userToken
                 }
                 this.$u.api.share(data).then(res => {
                     this.shareUrl = res.data
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.scss
index fa8e0e63..07ec54a1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.scss
@@ -1,5 +1,5 @@
 
-.u-wrap { height: calc(100vh); /* #ifdef H5 */ height: calc(100vh - var(--window-top)); /* #endif */ }
+.u-wrap { height: calc(100vh); }
 .u-menu-wrap { flex: 1; display: flex; overflow: hidden;
     .u-tab-view { width: 100px; height: 100%; background: #f6f6f6;
         .u-tab-item { height: 55px; background: #f6f6f6; box-sizing: border-box; display: flex; align-items: center; justify-content: center; font-size: 13px; color: #444; font-weight: 400; line-height: 1; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue
index 0e8a5eee..a3f03368 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue
@@ -121,7 +121,7 @@
     </view>
 </template>
 <script>
-    import { mapMutations, mapActions, mapState } from 'vuex';
+    import { mapState } from 'vuex';
     export default {
 
         data() {
@@ -190,7 +190,7 @@
                 return this.$store.state.config.cateStyle ? this.$store.state.config.cateStyle : 3;
             }
         },
-        onLoad() {
+        onShow() {
             uni.getSystemInfo({
                 success: (e) => {
                     // #ifndef MP
@@ -205,10 +205,16 @@
                 }
             })
 
-            this.categories();
             // 获取购物车数量
             if (this.$store.state.config.cateStyle == 4) {
+                this.goodsList = [];
+                this.page = 1;
+                this.limit = 10;
+
+                this.categories();
                 this.getCartNums();
+            } else {
+                this.categories();
             }
         },
         onReachBottom() {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue
index 0f1393fa..0bf8be75 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue
@@ -87,8 +87,16 @@
                 <!-- #ifdef MP-WEIXIN -->
                 <view class="goods" v-for="(item,index) in goodsList" :key="index" slot="slot{{index}}">
                     <view class="coreshop-padding-top-6 coreshop-padding-bottom-3 coreshop-padding-left-8 coreshop-padding-right-8 coreshop-bg-white coreshop-border-radius-bl-18">
+                        
                         <view class="coreshop-title-294 coreshop-multiple-line-clamp">
-                            <!--<image class="coreshop-image-price-tags" src="https://files.cdn.coreshop.cn/static/icon/icon-tag-vip-discount.png"></image>-->
+                            <image class="coreshop-image-price-tags" src="https://files.cdn.coreshop.cn/static/icon/icon-tag-vip-discount.png"></image>
+                            <image class="coreshop-image-price-tags" src="https://files.cdn.coreshop.cn/static/icon/icon-tag-vip-discount.png"></image>
+                            <!--<view class="good-tag-recommend2" v-if="item.isRecommend">
+                                推荐
+                            </view>
+                            <view class="good-tag-hot" v-if="item.isHot">
+                                热门
+                            </view>-->
                             <text class="coreshop-font-14">{{item.name}}</text>
                         </view>
                         <view class="coreshop-margin-top-8 coreshop-flex coreshop-justify-between coreshop-align-center">
@@ -106,7 +114,7 @@
                                 {{ pointShowName}}兑换价:
                             </view>
                             <view class="coreshop-text-red">
-                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元
+                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}}元
                             </view>
                         </view>
                         <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -143,7 +151,7 @@
                                     {{ pointShowName}}兑换价:
                                 </view>
                                 <view class="coreshop-text-red">
-                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元
+                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
                                 </view>
                             </view>
                             <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -504,7 +512,7 @@
             goSearch() {
                 let pages = getCurrentPages();
                 let prevPage = pages[pages.length - 2];
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO
+                // #ifdef MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO
                 if (prevPage && prevPage.route) {
                     let search_flag = prevPage.route;
                     if (search_flag == 'pages/search/search') {
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 f3ff6c2f..3184f24e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue
@@ -303,10 +303,10 @@
 </view>
 </template>
 <script>
-    
-    import { mapMutations, mapActions, mapState } from 'vuex';
+
+    import { mapState } from 'vuex';
     export default {
-        
+
         data() {
             return {
                 formBoxId: '',
@@ -557,12 +557,6 @@
             },
             picChoose(e, item, index) {
                 var that = this
-                //var pages = getCurrentPages()
-                //if (pages.length > 1) {
-                //    var items = pages[1].$vm.form.items;
-                //} else {
-                //    var items = pages[0].$vm.form.items;
-                //}
                 var items = this.form.items;
                 if (!item.pics) {
                     item.pics = []
@@ -575,15 +569,10 @@
                 this.$upload.uploadImage(1, res => {
                     if (res.status) {
                         item.pics.push(res.data.src);
-                        // #ifdef H5
-                        that.$set(that.form.items, index, item)
-                        // #endif
-                        // #ifndef H5
                         items[index] = item;
                         setTimeout(() => {
                             that.form.items = items;
                         }, 500)
-                        // #endif
                         that.$refs.uToast.show({ message: res.msg, type: 'success' })
                     } else {
                         that.$refs.uToast.show({ message: res.msg, type: 'error' })
@@ -838,17 +827,17 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 8,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.form,
                     params: {
                         id: this.formBoxId
                     }
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
-                    data['token'] = userToken;
+                    data.token = userToken
                 }
                 this.$u.api.share(data).then(res => {
                     this.shareUrl = res.data
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodComments/goodComments.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodComments/goodComments.vue
index 316bb4a6..3e4de979 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodComments/goodComments.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodComments/goodComments.vue
@@ -27,7 +27,7 @@
                                 <view class="coreshop-text-gray coreshop-margin-top-10">
                                     <u-rate v-model="item.score" :count="5" size="15"></u-rate>
                                 </view>
-                                <view class="coreshop-margin-top-10">
+                                <view class="coreshop-margin-top-10" v-if="item.imagesArr">
                                     <u-album :urls="item.imagesArr" rowCount="4"></u-album>
                                 </view>
                                 <view class="coreshop-text-gray coreshop-margin-top-5 coreshop-font-12">{{ item.createTime || ''}} {{ item.addon || ''}}</view>
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 4a6c766a..ed32b4cc 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
@@ -6,8 +6,6 @@
                 <u-icon name="arrow-left" size="19" @click="goNavigateBack"></u-icon>
                 <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
                 <u-icon name="home" size="22" @click="goHome"></u-icon>
-                <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
-                <u-icon name="share-fill" size="22" @click="goShare"></u-icon>
             </view>
             <view slot="right">
             </view>
@@ -21,28 +19,21 @@
                     <text class="coreshop-font-16">¥</text>
                     <text class="coreshop-font-24">{{ product.price || '0.00' }}</text>
                 </view>
-                <view class="coreshop-flex-sub coreshop-flex coreshop-text-left coreshop-margin-left-12 coreshop-margin-top-6  coreshop-justify-start coreshop-align-center">
+                <view class="coreshop-flex coreshop-text-left coreshop-margin-left-12 coreshop-margin-top-6  coreshop-justify-start coreshop-align-center">
                     <view class="coreshop-font-16 coreshop-text-gray coreshop-text-through">{{ priceSection }}</view>
                 </view>
-                <view class="coreshop-flex coreshop-align-center">
-                    <u-icon name="star-fill" :size="20" label="收藏" :labelSize="14" labelPos="right" @click="collection" v-if="isfav"></u-icon>
-                    <u-icon name="star" :size="20" label="收藏" :labelSize="14" labelPos="right" @click="collection" v-else></u-icon>
+            </view>
+            <view class="coreshop-flex coreshop-flex-wrap coreshop-flex-direction-row coreshop-margin-top-12" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && product.pointsDeduction > 0">
+                <view class="coreshop-padding-bottom-5 coreshop-font-12">
+                    兑换价：{{pointDiscountedProportion * product.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(product.price-product.pointsDeduction).toFixed(2)}}元
+                </view>
+                <view class="coreshop-font-12 coreshop-margin-left-12" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && product.points > 0">买就送：{{product.points}}{{ pointShowName}}</view>
+            </view>
+            <view class="coreshop-flex coreshop-flex-wrap coreshop-flex-direction-column coreshop-margin-left-12" v-else>
+                <view class="coreshop-flex coreshop-flex-wrap coreshop-flex-direction-row">
+                    <view class="coreshop-font-12" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && product.points > 0">买就送：{{product.points}}{{ pointShowName}}</view>
                 </view>
             </view>
-            <view>
-                <view class="coreshop-flex coreshop-flex-wrap coreshop-flex-direction-row coreshop-margin-top-12" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && product.pointsDeduction > 0">
-                    <view class="coreshop-padding-bottom-5 coreshop-font-12">
-                        兑换价：{{pointDiscountedProportion * product.pointsDeduction }}{{ pointShowName}}+{{ product.price - product.pointsDeduction}}元
-                    </view>
-                    <view class="coreshop-font-12 coreshop-margin-left-12" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && product.points > 0">买就送：{{product.points}}{{ pointShowName}}</view>
-                </view>
-                <view class="coreshop-flex coreshop-flex-wrap coreshop-flex-direction-column coreshop-margin-left-12" v-else>
-                    <view class="coreshop-flex coreshop-flex-wrap coreshop-flex-direction-row">
-                        <view class="coreshop-font-12" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && product.points > 0">买就送：{{product.points}}{{ pointShowName}}</view>
-                    </view>
-                </view>
-            </view>
-
             <view class="coreshop-margin-top-12 coreshop-multiple-line-clamp">
                 <text class="coreshop-font-16 coreshop-text-black coreshop-font-weight-bold">{{ goodsInfo.name || '' }}</text>
             </view>
@@ -56,20 +47,18 @@
                 </view>
             </view>
             <view class="coreshop-margin-top-16 coreshop-padding-top-16 coreshop-solid-top coreshop-flex coreshop-justify-between coreshop-align-center coreshop-text-gray">
-                <view class="coreshop-font-12">
-                    <text>运费：</text>
-                    <text class="font-color-orange">包邮</text>
-                </view>
                 <view class="coreshop-font-12">
                     <text>销量：</text>
-                    <text>{{ goodsInfo.buyCount || '0' }}</text>
+                    <text class="font-color-orange">{{ goodsInfo.buyCount || '0' }}</text>
                 </view>
                 <view class="coreshop-font-12">
-                    <text>库存：</text>
-                    <text>{{product.stock}}</text>
+                    <u-icon name="share-fill" size="18" label="分享" :labelSize="12" labelPos="right" @click="goShare"></u-icon>
+                </view>
+                <view class="coreshop-font-12">
+                    <u-icon name="star-fill" :size="18" label="收藏" :labelSize="12" labelPos="right" @click="collection" v-if="isfav"></u-icon>
+                    <u-icon name="star" :size="18" label="收藏" :labelSize="12" labelPos="right" @click="collection" v-else></u-icon>
                 </view>
             </view>
-
         </view>
 
         <!--促销-->
@@ -211,9 +200,6 @@
         <!-- 分享弹窗 -->
         <view class="coreshop-padding-0">
             <u-popup mode="bottom" :show="shareBox" ref="share">
-                <!-- #ifdef H5 -->
-                <coreshop-share-h5 :shareType='$globalConstVars.shareType.goods' :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-h5>
-                <!-- #endif -->
                 <!-- #ifdef MP-WEIXIN -->
                 <coreshop-share-wx :shareType='$globalConstVars.shareType.goods' :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-wx>
                 <!-- #endif -->
@@ -271,7 +257,7 @@
                                 {{ pointShowName}}兑换价:
                             </view>
                             <view class="coreshop-text-red">
-                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
+                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
                             </view>
                         </view>
                         <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -308,7 +294,7 @@
                                     {{ pointShowName}}兑换价:
                                 </view>
                                 <view class="coreshop-text-red">
-                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
+                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
                                 </view>
                             </view>
                             <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -334,7 +320,7 @@
             <view class="tabbar">
                 <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-start coreshop-basis-4">
                     <!-- 客服按钮 -->
-                    <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
+                    <!-- #ifdef APP-PLUS-NVUE || APP-PLUS -->
                     <view class="action" @click="showChat()">
                         <button class="noButtonStyle">
                             <u-icon name="server-fill" :size="20" label="找客服" :labelSize="12" labelPos="bottom"></u-icon>
@@ -420,11 +406,8 @@
 
 </template>
 <script>
-    import { mapMutations, mapActions, mapState } from 'vuex';
-
-
+    import { mapState } from 'vuex';
     export default {
-
         data() {
             return {
                 // 是否打开SKU弹窗
@@ -555,7 +538,7 @@
             shareHref() {
                 let pages = getCurrentPages()
                 let page = pages[pages.length - 1]
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
+                // #ifdef MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
                 return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId;
                 // #endif
             },
@@ -583,8 +566,6 @@
             },
             // 加入购物车按钮
             addCart(selectShop) {
-                //console.log("监听 - 加入购物车");
-                //console.log(selectShop);
                 var that = this;
                 uni.showLoading({
                     title: '加载中'
@@ -615,8 +596,6 @@
             },
             // 立即购买
             buyNow(selectShop) {
-                //console.log("监听 - 立即购买");
-                //console.log(selectShop);
                 var that = this;
                 uni.showLoading({
                     title: '加载中'
@@ -847,7 +826,6 @@
                         });
                         this.goodsComments = [...this.goodsComments, ..._list];
                     } else {
-                        console.log("错误2");
                         this.$u.toast(res.msg);
                     }
                 })
@@ -876,8 +854,6 @@
             },
             //在线客服
             showChat() {
-                // #ifdef H5
-                // #endif
                 // #ifdef APP-PLUS || APP-PLUS-NVUE
                 this.$u.route('/pages/member/customerService/index');
                 // #endif
@@ -885,17 +861,17 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 2,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.goods,
                     params: {
                         goodsId: this.goodsInfo.id,
                     }
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
-                    data['token'] = userToken;
+                    data.token = userToken
                 }
                 this.$u.api.share(data).then(res => {
                     this.shareUrl = res.data
@@ -913,7 +889,6 @@
             },
             showModal() {
                 this.bottomModal = true;
-                console.log("打开弹窗");
             },
             hideModal(e) {
                 this.bottomModal = false;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/cart/cart.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/cart/cart.vue
index e4798568..037699dc 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/index/cart/cart.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/cart/cart.vue
@@ -20,7 +20,7 @@
                         <view class="cart-shoppingcard-goods-checkbtn">
                             <u-checkbox active-color="red" :name="item.id"></u-checkbox>
                         </view>
-                        <image class="cart-shoppingcard-goods-image" :src="item.products.images && item.products.images!='null' ?  item.products.images+'?x-oss-process=image/resize,m_lfit,h_320,w_240' : '/static/images/common/empty-banner.png'" mode="widthFix"></image>
+                        <image class="cart-shoppingcard-goods-image" :src="item.products.images" mode="widthFix"></image>
                         <view class="cart-shoppingcard-goods-body">
                             <view class="cart-shoppingcard-goods-title" v-if="item.products.spesDesc">{{ item.products.spesDesc }}</view>
                             <view class="cart-shoppingcard-goods-title" v-if="item.products.promotionList">
@@ -55,7 +55,7 @@
                                 {{ pointShowName}}兑换价：
                             </view>
                             <view class="coreshop-text-red">
-                                {{pointDiscountedProportion * item.products.pointsDeduction }}{{ pointShowName}}+{{ item.products.price - item.products.pointsDeduction}}元
+                                {{pointDiscountedProportion * item.products.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.products.price - item.products.pointsDeduction).toFixed(2)}}元
                             </view>
                         </view>
                         <view v-else></view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue
index 73120632..88c0cd73 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue
@@ -12,7 +12,7 @@
         <!--版权组件-->
         <coreshop-copyright v-if="copy"></coreshop-copyright>
         <!--客服组件-->
-        <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
+        <!-- #ifdef APP-PLUS-NVUE || APP-PLUS -->
         <view class="floatingButton" @click="showChat()">
             <u-icon name="server-man" color="#e54d42" size="60"></u-icon>
         </view>
@@ -31,23 +31,16 @@
     </view>
 </template>
 <script>
-    import { mapMutations, mapActions, mapState } from 'vuex';
-    
+    import { mapState } from 'vuex';
     export default {
-        
         data() {
             return {
-                background: this.$coreTheme.mainNabBar.background,
-                titleColor: this.$coreTheme.mainNabBar.titleColor,
-
                 swiperItems: [],
                 currentIndex: 0,
                 opacity: 0,
                 scrollTop: 0,
-                imageUrl: '/static/images/ShareImage.png', //店铺分享图片
                 pageData: [],
                 pageCode: 'mobile_home', //页面布局编码
-                //userInfo: {}, // 用户信息
                 kefupara: '', //客服传递资料
                 copy: false,
                 shareUrl: this.$globalConstVars.shareUrl,
@@ -92,12 +85,8 @@
                 this.pageCode = e.pageCode;
             }
             this.initData();
-            console.log("数据：" + this.$globalConstVars.apiFilesUrl);
         },
         methods: {
-            about() {
-
-            },
             imgTap() {
                 this.modalShow = false;
                 uni.navigateTo({
@@ -128,8 +117,8 @@
                                     var data = res.data.items[i].parameters.list;
                                     for (var i = 0; i < data.length; i++) {
                                         let moder = {
-                                            image: data[i].image == '/images/empty-banner.png' ? '/static/images/common/empty-banner.png' : data[i].image,
-                                            bg: data[i].bg == '/images/empty-banner.png' ? '/static/images/common/empty-banner.png' : data[i].bg,
+                                            image: data[i].image,
+                                            bg: data[i].bg,
                                             opentype: 'click',
                                             url: '',
                                             title: data[i].linkType,
@@ -171,8 +160,6 @@
             },
             //在线客服
             showChat() {
-                // #ifdef H5
-                // #endif
                 // #ifdef APP-PLUS || APP-PLUS-NVUE
                 this.$u.route('/pages/member/customerService/index');
                 // #endif
@@ -180,14 +167,14 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 1,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.index,
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
-                    data['token'] = userToken;
+                    data.token = userToken
                 }
                 this.$u.api.share(data).then(res => {
                     this.shareUrl = res.data
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 e9eef819..c6105d44 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue
@@ -12,7 +12,7 @@
         <!--版权组件-->
         <coreshop-copyright v-if="copy"></coreshop-copyright>
         <!--客服组件-->
-        <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
+        <!-- #ifdef APP-PLUS-NVUE || APP-PLUS -->
         <view class="floatingButton" @click="showChat()">
             <u-icon name="server-man" color="#e54d42" size="45"></u-icon>
         </view>
@@ -31,7 +31,7 @@
     </view>
 </template>
 <script>
-    import { mapMutations, mapActions, mapState } from 'vuex';
+    import { mapState } from 'vuex';
     export default {
         data() {
             return {
@@ -41,7 +41,6 @@
                 imageUrl: '/static/images/ShareImage.png', //店铺分享图片
                 pageData: [],
                 pageCode: 'mobile_home', //页面布局编码
-                //userInfo: {}, // 用户信息
                 kefupara: '', //客服传递资料
                 copy: false,
                 shareUrl: this.$globalConstVars.shareUrl,
@@ -54,7 +53,6 @@
             this.copy = true;
         },
         mounted() {
-            console.log(this.$store.state.config.showIndexPopupWindow);
             this.modalShow = this.$store.state.config.showIndexPopupWindow == 1;
         },
         computed: {
@@ -93,8 +91,7 @@
         methods: {
             imgTap() {
                 this.modalShow = false;
-                this.$u.toast('你点击了弹窗')
-
+                this.$refs.uToast.show({ message: "你点了海报了。", type: 'success', back: false });
             },
             closeTap() {
                 this.modalShow = false;
@@ -135,8 +132,6 @@
             },
             //在线客服
             showChat() {
-                // #ifdef H5
-                // #endif
                 // #ifdef APP-PLUS || APP-PLUS-NVUE
                 this.$u.route('/pages/member/customerService/index');
                 // #endif
@@ -144,14 +139,14 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 1,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.index,
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
-                    data['token'] = userToken;
+                    data.token = userToken
                 }
                 this.$u.api.share(data).then(res => {
                     this.shareUrl = res.data
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue
index 49be5060..00c39e18 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue
@@ -10,7 +10,7 @@
             <view class="user-info-box">
                 <!--未登陆-->
                 <view class="login-user-view" v-if="!hasLogin">
-                    <!-- #ifdef H5 || APP-PLUS -->
+                    <!-- #ifdef APP-PLUS -->
                     <view class="login-user-avatar-view">
                         <u-avatar :src="$store.state.config.shopLogo" size="60"></u-avatar>
                     </view>
@@ -202,7 +202,7 @@
                         <u-grid-item v-for="(item,i) in other" :key="i" v-if="item.showItem" @click="navigateToHandle(item.router)">
                             <u-icon :name="item.icon" :size="25" color="#666" :label="item.name" labelPos="bottom" labelSize="13" space="25" top="15"></u-icon>
                         </u-grid-item>
-                        <!-- #ifdef H5 || APP-PLUS || APP-PLUS-NVUE -->
+                        <!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
                         <u-grid-item @click="showChat">
                             <u-icon name="server-man" :size="25" color="#666" label="联系客服" labelPos="bottom" labelSize="13" space="25" top="15"></u-icon>
                         </u-grid-item>
@@ -223,7 +223,7 @@
 
 <script>
 
-    import { mapMutations, mapActions, mapState } from 'vuex';
+    import { mapState } from 'vuex';
 
     export default {
 
@@ -518,11 +518,8 @@
                 if (this.$db.get('userToken')) {
                     this.hasLogin = true
                     this.$u.api.userInfo().then(res => {
-                        console.log(res);
                         if (res.status) {
                             _this.userInfo = res.data
-                            // #ifdef MP-WEIXIN
-                            // #endif
                             // 获取订单不同状态的数量
                             let data = {
                                 ids: '0,1,2,3,4',
@@ -570,8 +567,6 @@
             },
             //在线客服
             showChat() {
-                // #ifdef H5
-                // #endif
                 // #ifdef APP-PLUS || APP-PLUS-NVUE
                 this.$u.route('/pages/member/customerService/index');
                 // #endif
@@ -585,7 +580,6 @@
                         console.log(e)
                         if (e.errMsg == 'getUserProfile:ok') {
                             _this.$u.api.syncWeChatInfo(e.userInfo).then(res => {
-                                console.log(res);
                                 if (res.status) {
                                     _this.$refs.uToast.show({ message: '同步成功', type: 'success', });
                                     if (res.data) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue b/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue
index a0591adc..3e21e662 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue
@@ -70,9 +70,7 @@
                 timer: 60, // 定义初始时间为60s
                 btnb: 'coreshop-btn coreshop-btn-square coreshop-btn-c coreshop-btn-all', //按钮背景
                 type: '', // 有值是第三方登录账号绑定
-                isWeixinBrowser: this.$common.isWeiXinBrowser(),
                 showCodeBox: false,
-
                 maxlength: 6,
                 value: '',
                 error: false,
@@ -175,7 +173,7 @@
             // 输入完验证码最后一位执行
             finish(value) {
                 this.code = value;
-                // #ifdef H5|APP-PLUS|APP-PLUS-NVUE
+                // #ifdef APP-PLUS|APP-PLUS-NVUE
                 if (this.sessionAuthId) {
                     this.toBind();
                 } else {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue
index ee5cf117..20fdbe38 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue
@@ -85,7 +85,7 @@
                     this.$db.set('addressUserShip', data, true);
                     // #endif
 
-                    // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
+                    // #ifdef APP-PLUS || APP-PLUS-NVUE
                     this.$store.commit("userShip", data)
                     // #endif
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/map/map.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/map/map.vue
index 7d890b62..ff1fc94e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/map/map.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/map/map.vue
@@ -337,24 +337,7 @@
                     })
                     // #endif
 
-                    // #ifdef H5
-                    // ======================== jsonp跨域 ======================== 
-                    const KEY = this.qqMapKey;
-                    let locationObj = addressObj.latitude + ',' + addressObj.longitude
-                    let url = 'https://apis.map.qq.com/ws/geocoder/v1?coord_type=5&get_poi=1&output=jsonp&poi_options=page_size=1;page_index=1';
-                    this.$jsonp(url, {
-                        key: KEY,
-                        location: locationObj
-                    }).then(e => {
-                        res(e.result.formatted_addresses.recommend);
-                    })
-                        .catch(err => {
-                            res(err);
-                        })
-                    // #endif
-
                     // #ifdef MP-WEIXIN
-                    //console.log(addressObj, '======================');
                     qqmapsdk.reverseGeocoder({
                         location: {
                             latitude: addressObj.latitude,
@@ -427,11 +410,6 @@
                 this.mapW = uni.getSystemInfoSync().windowWidth
                 this.mapH = uni.getSystemInfoSync().windowHeight;
                 // #endif
-
-                // #ifdef MP-WEIXIN
-                this.mapW = uni.getSystemInfoSync().windowWidth
-                this.mapH = uni.getSystemInfoSync().windowHeight;
-                // #endif
             },
             // 移动到我的位置
             toMyLocation() {
@@ -439,11 +417,7 @@
             },
             // 提交
             submitAdress() {
-                //console.log(this.addressObj);
                 this.controls = []
-                //setTimeout(() => {
-                //    this.$emit('updateAddress', this.addressObj)
-                //}, 100)
 
                 let pages = getCurrentPages();//当前页
                 let beforePage = pages[pages.length - 2];//上个页面
@@ -452,7 +426,7 @@
                 this.$db.set('addressObj', this.addressObj, true);
                 // #endif
 
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
+                // #ifdef APP-PLUS || APP-PLUS-NVUE
                 this.$store.commit("addressObj", this.addressObj)
                 // #endif
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list/list.vue
index 6c0687ce..4988dc2b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list/list.vue
@@ -21,7 +21,7 @@
                 </view>
                 <view class="item" v-for="(v, k) in item.items" :key="k" @click="showOrder(item.aftersalesId)">
                     <view class="left">
-                        <u--image :showLoading="true" :src="v.imageUrl && v.imageUrl!='null' ?  v.imageUrl+'?x-oss-process=image/resize,m_lfit,h_320,w_240' : '/static/images/common/empty-banner.png'" width="80px" height="80px" mode="aspectFill"></u--image>
+                        <u--image :showLoading="true" :src="v.imageUrl" width="80px" height="80px" mode="aspectFill"></u--image>
                     </view>
                     <view class="content">
                         <view class="title u-line-2">{{v.name}}</view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue
index 0f545039..ff560658 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue
@@ -114,7 +114,7 @@
                                 <view class='coreshop-cell-hd-title'>退款金额</view>
                             </view>
                             <view class='coreshop-cell-item-ft'>
-                                <input type="digit" class='coreshop-cell-bd-input red-price' v-model="refund" @focus="refundFocus" ref="refund"></input>
+                                <input type="digit" class='coreshop-cell-bd-input coreshop-text-red' v-model="refund" @focus="refundFocus" ref="refund"></input>
                             </view>
 
                         </view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue
index 427eae4b..782af45b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue
@@ -51,16 +51,9 @@
             <!-- 收藏弹出窗 -->
             <u-popup mode="top" v-model="lvvpopref">
                 <view class="collect-pop">
-                    <image v-if="isWeixinBrowser" src="/static/images/distribution/wxh5.png" mode="widthFix"></image>
                     <!-- #ifdef MP-WEIXIN -->
                     <image src="/static/images/distribution/wxxcx.png" mode="widthFix"></image>
                     <!-- #endif -->
-                    <!-- #ifdef H5 -->
-                    <view class="h5-tip color-f fsz38">
-                        <view>请将此页面添加浏览器书签</view>
-                        <view>方便下次浏览</view>
-                    </view>
-                    <!-- #endif -->
                 </view>
             </u-popup>
         </view>
@@ -130,7 +123,6 @@
                 store_banner: '',
                 storeDesc: '', //店铺介绍
                 storeBanner: [],
-                isWeixinBrowser: this.$common.isWeiXinBrowser(), //判断是否是微信浏览器
                 totalGoods: 0,
                 page: 1, //默认页码
                 searchKey: '请输入关键字搜索',
@@ -167,7 +159,7 @@
             goSearch() {
                 let pages = getCurrentPages();
                 let prevPage = pages[pages.length - 2];
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO
+                // #ifdef MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO
                 if (prevPage && prevPage.route) {
                     let search_flag = prevPage.route;
                     if (search_flag == 'pages/search/search') {
@@ -251,32 +243,15 @@
             // 生成邀请海报
             createPoster() {
                 let data = {
-                    type: 3,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
+                    url: this.$globalConstVars.shareUrl,
+                    type: this.$globalConstVars.shareModel.poster,
+                    page: this.$globalConstVars.shareType.agent,
                     params: {
                         store: this.storeCode
                     },
-                    page: 11,
+                    
                 }
-                let pageUrl = this.$globalConstVars.shareUrl;
-                // #ifdef H5
-                data.client = 1;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-WEIXIN
-                data.client = 2;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef MP-ALIPAY
-                data.client = 3;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                data.client = 5;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-TOUTIAO
-                data.client = 6;
-                // #endif
                 let userToken = this.$db.get('userToken')
                 if (userToken && userToken != '') {
                     data.token = userToken
@@ -292,17 +267,17 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 11,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.agent,
                     params: {
                         store: this.storeCode
                     }
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
-                    data['token'] = userToken;
+                    data.token = userToken
                 }
                 this.$u.api.share(data).then(res => {
                     this.shareUrl = res.data
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue
index a8f5fe8b..06de51db 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue
@@ -169,10 +169,10 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 1,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.agent,
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
@@ -185,32 +185,14 @@
             // 生成邀请海报
             createPoster() {
                 let data = {
-                    type: 3,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
+                    url: this.$globalConstVars.shareUrl,
+                    type: this.$globalConstVars.shareModel.poster,
                     params: {
                         store: this.info.store
                     },
-                    page: 11,
+                    page: this.$globalConstVars.shareType.agent,
                 }
-                let pageUrl = this.$globalConstVars.shareUrl;
-                // #ifdef H5
-                data.client = 1;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-WEIXIN
-                data.client = 2;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef MP-ALIPAY
-                data.client = 3;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                data.client = 5;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-TOUTIAO
-                data.client = 6;
-                // #endif
                 let userToken = this.$db.get('userToken')
                 if (userToken && userToken != '') {
                     data.token = userToken
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue
index b1210dd4..d7c468ea 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue
@@ -130,7 +130,7 @@
                 let pages = getCurrentPages();//当前页
                 let beforePage = pages[pages.length - 2];//上个页面
 
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
+                // #ifdef APP-PLUS || APP-PLUS-NVUE
                 beforePage.cardInfo = this.cards[index]
                 // #endif
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue
index 08862e5b..351b1599 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue
@@ -51,16 +51,9 @@
             <!-- 收藏弹出窗 -->
             <u-popup mode="top" v-model="lvvpopref">
                 <view class="collect-pop">
-                    <image v-if="isWeixinBrowser" src="/static/images/distribution/wxh5.png" mode="widthFix"></image>
                     <!-- #ifdef MP-WEIXIN -->
                     <image src="/static/images/distribution/wxxcx.png" mode="widthFix"></image>
                     <!-- #endif -->
-                    <!-- #ifdef H5 -->
-                    <view class="h5-tip color-f fsz38">
-                        <view>请将此页面添加浏览器书签</view>
-                        <view>方便下次浏览</view>
-                    </view>
-                    <!-- #endif -->
                 </view>
             </u-popup>
         </view>
@@ -70,7 +63,7 @@
                 <u-grid col="2" :border="false" align="left">
                     <u-grid-item bg-color="transparent" :custom-style="{padding: '0px'}" v-for="(item, index) in goodsData" :key="index" @click="goGoodsDetail(item.id)">
                         <view class="good_box">
-                            <u--image :src="item.image"  mode="widthFix" width="100%" radius="10"></u--image>
+                            <u--image :src="item.image" mode="widthFix" width="100%" radius="10"></u--image>
                             <view class="good_title u-line-2">
                                 {{item.name}}
                             </view>
@@ -96,10 +89,10 @@
     </view>
 </template>
 <script>
-    
+
 
     export default {
-        
+
         data() {
             return {
                 goodsData: [],
@@ -129,7 +122,6 @@
                 store_banner: '',
                 storeDesc: '', //店铺介绍
                 storeBanner: [],
-                isWeixinBrowser: this.$common.isWeiXinBrowser(), //判断是否是微信浏览器
                 totalGoods: 0,
                 page: 1, //默认页码
                 searchKey: '请输入关键字搜索',
@@ -166,7 +158,7 @@
             goSearch() {
                 let pages = getCurrentPages();
                 let prevPage = pages[pages.length - 2];
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO
+                // #ifdef MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO
                 if (prevPage && prevPage.route) {
                     let search_flag = prevPage.route;
                     if (search_flag == 'pages/search/search') {
@@ -249,34 +241,14 @@
             // 生成邀请海报
             createPoster() {
                 let data = {
-                    type: 3,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
+                    url: this.$globalConstVars.shareUrl,
+                    type: this.$globalConstVars.shareModel.poster,
+                    page: this.$globalConstVars.shareType.inv,
                     params: {
                         store: this.storeCode
                     },
-                    page: 4,
                 }
-                let pages = getCurrentPages()
-                let page = pages[pages.length - 1]
-                let pageUrl = this.$globalConstVars.shareUrl;
-                // #ifdef H5
-                data.client = 1;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-WEIXIN
-                data.client = 2;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef MP-ALIPAY
-                data.client = 3;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                data.client = 5;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-TOUTIAO
-                data.client = 6;
-                // #endif
                 let userToken = this.$db.get('userToken')
                 if (userToken && userToken != '') {
                     data.token = userToken
@@ -292,10 +264,10 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 4,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.inv,
                     params: {
                         store: this.storeCode
                     }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue
index b6d6f3e2..fb28c59b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue
@@ -116,7 +116,6 @@
                 },
                 info: {}, //分销商信息
                 userInfo: {}, // 用户信息
-                shareUrl: this.$globalConstVars.shareUrl
             }
         },
         onShow() {
@@ -168,10 +167,10 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 1,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.inv,
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
@@ -184,32 +183,14 @@
             // 生成邀请海报
             createPoster() {
                 let data = {
-                    type: 3,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
+                    url: this.$globalConstVars.shareUrl,
+                    type: this.$globalConstVars.shareModel.poster,
+                    page: this.$globalConstVars.shareType.inv,
                     params: {
                         store: this.info.store
                     },
-                    page: 4,
                 }
-                let pageUrl = this.$globalConstVars.shareUrl;
-                // #ifdef H5
-                data.client = 1;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-WEIXIN
-                data.client = 2;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef MP-ALIPAY
-                data.client = 3;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                data.client = 5;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-TOUTIAO
-                data.client = 6;
-                // #endif
                 let userToken = this.$db.get('userToken')
                 if (userToken && userToken != '') {
                     data.token = userToken
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue
index cb0a543b..2a1f3f49 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue
@@ -42,13 +42,6 @@
                     </u-button>
                 </view>
                 <!-- #endif -->
-                <!-- #ifdef H5 -->
-                <view class="coreshop-padding-10">
-                    <u-button class='' size="small" color="linear-gradient(to right, rgb(66, 83, 216), rgb(213, 51, 186))" @click="copyUrl()" v-show="!ifwx">
-                        <u-icon name="zhuanfa" size="18" labelSize="13" label="一键转发" color="#fff" labelColor="#fff"></u-icon>
-                    </u-button>
-                </view>
-                <!-- #endif -->
                 <view class="coreshop-padding-10">
                     <u-button class='' size="small" color="linear-gradient(to right, rgb(66, 83, 216), rgb(213, 51, 186))" @click="createPoster()">
                         <u-icon name="moments" size="18" labelSize="13" label="二维码分享" color="#fff" labelColor="#fff"></u-icon>
@@ -60,7 +53,6 @@
 
 </template>
 <script>
-    import { h5Url } from '@/common/setting/constVarsHelper.js'
     export default {
         data() {
             return {
@@ -80,13 +72,8 @@
         },
         onShow() {
             this.getInviteData();
-            this.ifwxl()
         },
         methods: {
-            // 判断是不是微信浏览器
-            ifwxl() {
-                this.ifwx = this.$common.isWeiXinBrowser()
-            },
             //获取数据
             getInviteData() {
                 this.$u.api.myInvite(null).then(res => {
@@ -122,91 +109,34 @@
             // 生成邀请海报
             createPoster() {
                 let data = {
-                    page: 1,//首页
-                    type: 3,//海报
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
+                    url: this.$globalConstVars.shareUrl,
+                    type: this.$globalConstVars.shareModel.poster,
+                    page: this.$globalConstVars.shareType.index,
                 }
                 let userToken = this.$db.get('userToken')
-                if (userToken) {
+                if (userToken && userToken != '') {
                     data.token = userToken
                 }
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-                data.client = 1;
-                data.url = h5Url + this.$globalConstVars.shareUrl
-                // #endif
-                // #ifdef MP-WEIXIN
-                data.client = 2;
-                data.url = this.$globalConstVars.shareUrl
-                // #endif
-                // #ifdef MP-TOUTIAO
-                data.client = 4;
-                data.url = this.$globalConstVars.shareUrl
-                // #endif
-                // #ifdef MP-ALIPAY
-                data.client = 6;
-                data.url = this.$globalConstVars.shareUrl
-                // #endif
                 this.$u.api.share(data).then(res => {
                     if (res.status) {
                         this.$u.route('/pages/share/sharePoster/sharePoster?poster=' + encodeURIComponent(res.data))
                     } else {
                         this.$u.toast(res.msg)
                     }
-                });
-            },
-            //复制URL链接
-            copyUrl() {
-                let data = {
-                    page: 1,//首页
-                    type: 1,//海报
-                }
-                let userToken = this.$db.get('userToken')
-                if (userToken) {
-                    data.token = userToken
-                }
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-                data.client = 1;
-                data.url = h5Url + this.$globalConstVars.shareUrl
-                // #endif
-                // #ifdef MP-WEIXIN
-                data.client = 2;
-                data.url = this.$globalConstVars.shareUrl
-                // #endif
-                // #ifdef MP-TOUTIAO
-                data.client = 4;
-                data.url = this.$globalConstVars.shareUrl
-                // #endif
-                // #ifdef MP-ALIPAY
-                data.client = 6;
-                data.url = this.$globalConstVars.shareUrl
-                // #endif
-                let _this = this;
-                this.$u.api.share(data).then(res => {
-                    if (res.status) {
-                        uni.setClipboardData({
-                            data: res.data,
-                            success: function (data) {
-                                _this.$refs.uToast.show({ message: '复制成功', type: 'success' })
-                            },
-                            fail: function (err) {
-                                _this.$u.toast('复制分享URL失败');
-                            }
-                        })
-                    } else {
-                        _this.$u.toast('复制分享URL失败');
-                    }
-                });
+                })
             },
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 1,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.index,
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
-                    data['token'] = userToken;
+                    data.token = userToken
                 }
                 this.$u.api.share(data).then(res => {
                     this.shareUrl = res.data
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.vue
index b8fb3476..c8976e00 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.vue
@@ -135,13 +135,13 @@
                     <view class="coreshop-text-black title-view">
                         <view class="title">提货码：</view>
                         <view class="coreshop-text-right">
-                            <text class="red-price">{{ladingItem.id|| ''}}</text>
+                            <text class="coreshop-text-red">{{ladingItem.id|| ''}}</text>
                         </view>
                     </view>
                     <view class="coreshop-text-black title-view">
                         <view class="title">提货说明：</view>
                         <view class="coreshop-text-right">
-                            <text class="red-price coreshop-margin-right-10">{{ladingItem.statusName|| ''}}</text>
+                            <text class="coreshop-text-red coreshop-margin-right-10">{{ladingItem.statusName|| ''}}</text>
                             <view class="coreshop-width-fit-content">
                                 <u-button type="success" size="mini" v-if="ladingItem.status == false" @click="ladingWrite(ladingItem.id)">立即核销</u-button>
                             </view>
@@ -150,7 +150,7 @@
                     <view class="coreshop-text-black title-view" v-if="ladingItem.pickUpTime">
                         <view class="title">提货时间：</view>
                         <view class="coreshop-text-right">
-                            <text class="red-price">{{ladingItem.pickUpTime|| ''}}</text>
+                            <text class="coreshop-text-red">{{ladingItem.pickUpTime|| ''}}</text>
                         </view>
                     </view>
                 </view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/index/index.vue
index db5322f6..4c7ecc76 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/index/index.vue
@@ -7,12 +7,7 @@
             <view class="head-box">
                 <view class="head-wrap">
                     <view class="titleNav coreshop-padding-left-15 coreshop-padding-right-15">
-                        <!-- #ifndef H5 -->
                         <view class="status-bar"></view>
-                        <!-- #endif -->
-                        <!-- #ifdef H5 -->
-                        <view class="status-H5bar"></view>
-                        <!-- #endif -->
                         <text class="nav-title coreshop-flex coreshop-align-center">商家中心</text>
                     </view>
                     <view class="coreshop-padding-top-25 coreshop-flex coreshop-justify-between">
@@ -243,9 +238,7 @@
         computed: {},
         onLoad(options) {
             if (options.storeId) {
-                //uni.setStorageSync('storeId', options.storeId);
                 this.storeId = options.storeId;
-                console.log("获取到storeId：" + this.storeId);
             }
             this.getStoreDetail();
             this.getStoreOrder();
@@ -336,12 +329,9 @@
                     }
                 });
             },
-
             // 切换核销分类
             onNav(type) {
-                //this.isShowDropDown = this.cancelType == type ? false : true;
                 this.cancelType = this.cancelType == type ? '' : type;
-                console.log('cancelType：' + this.cancelType);
             },
             // 选择日期
             selDate(e) {
@@ -354,7 +344,6 @@
             },
             // 下拉筛选
             onHideDropDown() {
-                //this.isShowDropDown = false;
                 this.cancelType = '';
             },
             // 选择筛选
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/search/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/search/index.vue
index ebed5419..efe452e0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/search/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/search/index.vue
@@ -95,7 +95,7 @@
             return {
                 keyword: '',
                 storeOrderList: [], //订单商品列表
-                loadStatus: 'loadmore', //loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
+                loadStatus: this.$globalConstVars.loadStatus.loadMore, //loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
                 currentPage: 1,
                 lastPage: 1,
             }
@@ -141,7 +141,7 @@
             // 门店订单列表
             getStoreOrder() {
                 let that = this;
-                that.loadStatus = 'loading';
+                that.loadStatus = this.$globalConstVars.loadStatus.loading;
                 let data = {
                     keyword: this.keyword,
                     page: that.currentPage,
@@ -154,9 +154,9 @@
                         that.storeOrderList = [...that.storeOrderList, ...res.data.pages];
                         that.lastPage = res.data.totalPages;
                         if (that.currentPage < res.data.totalPages) {
-                            that.loadStatus = 'loadmore';
+                            that.loadStatus = this.$globalConstVars.loadStatus.loadMore;
                         } else {
-                            that.loadStatus = 'nomore';
+                            that.loadStatus = this.$globalConstVars.loadStatus.noMore;
                         }
                     } else {
                         this.uToast.show({
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 fbe4a9c5..b870f941 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
@@ -36,7 +36,7 @@
                         </view>
                         <view class="item">
                             <view class="left">
-                                <u--image :showLoading="true" :src="service.thumbnail && service.thumbnail!='null' ?  service.thumbnail : '/static/images/common/empty-banner.png'" width="80px" height="80px" mode="aspectFill"></u--image>
+                                <u--image :showLoading="true" :src="service.thumbnail" width="80px" height="80px" mode="aspectFill"></u--image>
                             </view>
                             <view class="content">
                                 <view class="title u-line-2">{{service.title}}</view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/index.vue
index aebf266d..5417b447 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/index.vue
@@ -31,7 +31,7 @@
                         </view>
                         <view class="item" v-for="(v, key) in item.orderItems" :key="key">
                             <view class="left">
-                                <u--image :showLoading="true" :src="v.imageUrl && v.imageUrl!='null' ?  v.imageUrl : '/static/images/common/empty-banner.png'" width="80px" height="80px" mode="aspectFill"></u--image>
+                                <u--image :showLoading="true" :src="v.imageUrl" width="80px" height="80px" mode="aspectFill"></u--image>
                             </view>
                             <view class="content">
                                 <view class="title u-line-2">{{v.name}}</view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/list.vue
index 73cdb84a..92e93a4a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/list.vue
@@ -24,7 +24,7 @@
                 </view>
                 <view class="item" v-for="(v, k) in item.orderItems" :key="k">
                     <view class="left">
-                        <u--image :showLoading="true" :src="v.imageUrl && v.imageUrl!='null' ?  v.imageUrl : '/static/images/common/empty-banner.png'" width="80px" height="80px" mode="aspectFill"></u--image>
+                        <u--image :showLoading="true" :src="v.imageUrl" width="80px" height="80px" mode="aspectFill"></u--image>
                     </view>
                     <view class="content">
                         <view class="title u-line-2">{{v.name}}</view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.scss
index c67e7f4b..812f989f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.scss
@@ -1,2 +1,3 @@
 .coreshop-cell-group .coreshop-cell-item .coreshop-cell-item-ft .coreshop-cell-ft-view { position: relative; overflow: hidden; color: #666; font-size: 12px; text-align: left; white-space: nowrap; }
 
+.user-head-img-c { position: relative; width: 40px; height: 40px; border-radius: 50%; margin-right: 10px; box-sizing: border-box; display: inline-block; border: 1px solid #f3f3f3; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue
index 2d5f20d1..be4ff7e8 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue
@@ -92,11 +92,18 @@
                                     <view class="uhihn" v-for="n in teamInfo.teamNums" :key="n">?</view>
                                 </view>
                             </view>
-                            <view class="coreshop-cell-item-ft" v-if="teamInfo.status==1">
-                                <u-button type="success" size="mini" @click="goInvition()">邀请拼单</u-button>
-                            </view>
                         </view>
                     </view>
+                    <view class="coreshop-margin-bottom-10 coreshop-percent-100 coreshop-flex coreshop-flex-direction coreshop-align-center coreshop-justify-center">
+                        <view class="coreshop-width-fit-content">
+                            <u-button type="success" size="small" @click="goInvition">
+                                <u-icon name="share-fill" color="#fff" label="立即邀请好友拼单" labelColor="#fff"></u-icon>
+                            </u-button>
+                        </view>
+                    </view>
+                    <!--<view class="coreshop-cell-item-ft" v-if="teamInfo.status==1">
+                        <u-button type="success" size="mini" @click="goInvition()">邀请拼单</u-button>
+                    </view>-->
                 </view>
             </view>
         </view>
@@ -180,7 +187,7 @@
                 <view class="coreshop-text-black title-view" v-if="lading.status">
                     <view class="title">提货码：</view>
                     <view class="coreshop-text-right"  @click="showQrcodeBox(lading.code)">
-                        <text class="red-price">{{lading.code|| ''}}</text>
+                        <text class="coreshop-text-red">{{lading.code|| ''}}</text>
                     </view>
                 </view>
             </view>
@@ -206,12 +213,9 @@
                         </view>
                     </view>
                 </view>
-
             </view>
         </view>
 
-
-
         <!--发票信息-->
         <view class="coreshop-bg-white coreshop-card-box" v-if="orderInfo.invoice && orderInfo.invoice.type != 1">
             <view class="coreshop-card-view coreshop-order-view">
@@ -315,7 +319,7 @@
 
                 <view class="coreshop-text-black coreshop-text-center">
                     <view class="coreshop-width-fit-content contact-btn">
-                        <u-button type="primary" size="mini" open-type="contact" bindcontact="showChat">联系客服</u-button>
+                        <u-button type="primary" size="small" open-type="contact" bindcontact="showChat">联系客服</u-button>
                     </view>
 
                 </view>
@@ -432,22 +436,22 @@
 
         <view class="coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom" v-if="orderInfo.status == 1 || orderInfo.status == 2">
             <view class="coreshop-width-fit-content coreshop-padding-left-10 coreshop-padding-right-10" v-if="orderInfo.status == 1 && orderInfo.payStatus == 1 && orderInfo.shipStatus == 1">
-                <u-button class='coreshop-margin-left-10 coreshop-margin-right-10' type="warning" size="mini" @click="cancelOrder(orderInfo.orderId)">取消订单</u-button>
+                <u-button class='coreshop-margin-left-10 coreshop-margin-right-10' type="warning" size="small" @click="cancelOrder(orderInfo.orderId)">取消订单</u-button>
             </view>
             <view class="coreshop-width-fit-content coreshop-padding-left-10 coreshop-padding-right-10" v-if="orderInfo.status == 1 && orderInfo.payStatus == 1" @click="goToPay(orderInfo.orderId)">
-                <u-button class='coreshop-margin-left-10 coreshop-margin-right-10' type="primary" size="mini">立即支付</u-button>
+                <u-button class='coreshop-margin-left-10 coreshop-margin-right-10' type="primary" size="small">立即支付</u-button>
             </view>
             <view class="coreshop-width-fit-content coreshop-padding-left-10 coreshop-padding-right-10" v-if="orderInfo.status == 1 && orderInfo.payStatus >= 2 && orderInfo.shipStatus >= 3 && orderInfo.confirmStatus == 1">
-                <u-button class='coreshop-margin-left-10 coreshop-margin-right-10' type="success" size="mini" @click="tackDeliery(orderInfo.orderId)">确认收货</u-button>
+                <u-button class='coreshop-margin-left-10 coreshop-margin-right-10' type="success" size="small" @click="tackDeliery(orderInfo.orderId)">确认收货</u-button>
             </view>
             <view class="coreshop-width-fit-content coreshop-padding-left-10 coreshop-padding-right-10" v-if="orderInfo.status === 1 && orderInfo.payStatus >= 2 && orderInfo.shipStatus >= 3 && orderInfo.confirmStatus >= 2 && orderInfo.isComment == false">
-                <u-button class='coreshop-margin-left-10 coreshop-margin-right-10' type="success" size="mini" @click="toEvaluate(orderInfo.orderId)">立即评价</u-button>
+                <u-button class='coreshop-margin-left-10 coreshop-margin-right-10' type="success" size="small" @click="toEvaluate(orderInfo.orderId)">立即评价</u-button>
             </view>
             <view class="coreshop-width-fit-content coreshop-padding-left-10 coreshop-padding-right-10" v-if="orderInfo.addAftersalesStatus">
-                <u-button class='coreshop-margin-left-10 coreshop-margin-right-10' type="warning " size="mini" @click="customerService(orderInfo.orderId)">申请售后</u-button>
+                <u-button class='coreshop-margin-left-10 coreshop-margin-right-10' type="warning " size="small" @click="customerService(orderInfo.orderId)">申请售后</u-button>
             </view>
             <view class="coreshop-width-fit-content coreshop-padding-left-10 coreshop-padding-right-10" v-if="orderInfo.billAftersalesId && orderInfo.billAftersalesId != false">
-                <u-button class='coreshop-bg-red coreshop-margin-left-10 coreshop-margin-right-10' size="mini" @click="showCustomerService(orderInfo)">查看售后</u-button>
+                <u-button class='coreshop-bg-red coreshop-margin-left-10 coreshop-margin-right-10' size="small" @click="showCustomerService(orderInfo)">查看售后</u-button>
             </view>
         </view>
 
@@ -630,7 +634,7 @@
                                         // #ifdef MP-WEIXIN
                                         beforePage.$vm.isReload = true
                                         // #endif
-                                        // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
+                                        // #ifdef APP-PLUS || APP-PLUS-NVUE
                                         beforePage.isReload = true
                                         // #endif
                                         // #ifdef MP-ALIPAY || MP-TOUTIAO
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.vue
index 94122b47..7dc92f48 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.vue
@@ -20,8 +20,7 @@
                             <view class="orderList coreshop-padding-0">
                                 <view class="item" @click="goGoodsDetail(item.goodsId)">
                                     <view class="left">
-                                        <u--image :showLoading="true" :src="item.imageUrl && item.imageUrl!='null' ?  item.imageUrl : '/static/images/common/empty-banner.png'" width="80px" height="80px" mode="aspectFill"></u--image>
-                                        <!--<image :src="item.imageUrl && item.imageUrl!='null' ?  item.imageUrl : '/static/images/common/empty-banner.png'" mode="aspectFill"></image>-->
+                                        <u--image :showLoading="true" :src="item.imageUrl" width="80px" height="80px" mode="aspectFill"></u--image>
                                     </view>
                                     <view class="content">
                                         <view class="title u-line-4">{{item.name}}</view>
@@ -191,9 +190,6 @@
                                     // #ifdef MP-WEIXIN
                                     beforePage.$vm.isReload = true
                                     // #endif
-                                    // #ifdef H5
-                                    beforePage.isReload = true
-                                    // #endif
                                     // #ifdef MP-ALIPAY || MP-TOUTIAO
                                     _this.$db.set('orderUserEvaluate', true, true);
                                     // #endif
@@ -204,9 +200,6 @@
                                     // #ifdef MP-WEIXIN
                                     before.$vm.isReload = true
                                     // #endif
-                                    // #ifdef H5
-                                    before.isReload = true
-                                    // #endif
                                     // #ifdef MP-ALIPAY || MP-TOUTIAO
                                     _this.$db.set('orderUserEvaluate', true, true);
                                     // #endif
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue
index 16e19a40..d12870d8 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue
@@ -26,7 +26,7 @@
                     </view>
                     <view class="item" v-for="(goods, indexGoods) in order.items" :key="indexGoods">
                         <view class="left">
-                            <u--image :showLoading="true" :src="goods.imageUrl && goods.imageUrl!='null' ?  goods.imageUrl : '/static/images/common/empty-banner.png'" width="80px" height="80px" mode="aspectFill"></u--image>
+                            <u--image :showLoading="true" :src="goods.imageUrl" width="80px" height="80px" mode="aspectFill"></u--image>
                         </view>
                         <view class="content">
                             <view class="title u-line-2">{{goods.name}}</view>
@@ -233,7 +233,4 @@
 
 
 <style lang="scss">
-    /* #ifndef H5 */
-    page { height: 100%; background-color: #f2f2f2; }
-    /* #endif */
 </style>
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 3638971e..698cd96b 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
@@ -40,14 +40,11 @@
             <!-- 弹出层 -->
             <view class="coreshop-padding-10">
                 <u-popup mode="bottom" :show="shareBox" ref="share">
-                    <!-- #ifdef H5 -->
-                    <coreshop-share-h5 :shareType='$globalConstVars.shareType.addPinTuan' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId" :shareImg="goodsInfo.imageUrl" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.addon" :shareHref="shareHref" @close="closeShare()"></coreshop-share-h5>
-                    <!-- #endif -->
                     <!-- #ifdef MP-WEIXIN -->
-                    <coreshop-share-wx :shareType='$globalConstVars.shareType.addPinTuan' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId" :shareImg="goodsInfo.imageUrl" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.addon" :shareHref="shareHref" @close="closeShare()"></coreshop-share-wx>
+                    <coreshop-share-wx :shareType='$globalConstVars.shareType.addPinTuan' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId" :shareImg="goodsInfo.imageUrl" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.addon" @close="closeShare()"></coreshop-share-wx>
                     <!-- #endif -->
                     <!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
-                    <coreshop-share-app :shareType='$globalConstVars.shareType.addPinTuan' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId" :shareImg="goodsInfo.imageUrl" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.addon" :shareHref="shareHref" @close="closeShare()"></coreshop-share-app>
+                    <coreshop-share-app :shareType='$globalConstVars.shareType.addPinTuan' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId" :shareImg="goodsInfo.imageUrl" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.addon" @close="closeShare()"></coreshop-share-app>
                     <!-- #endif -->
                 </u-popup>
             </view>
@@ -108,19 +105,6 @@
             this.orderDetail();
             this.getTeam();
         },
-        computed: {
-            shareHref() {
-                let pages = getCurrentPages()
-                let page = pages[pages.length - 1]
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO
-                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?scene=' + this.query;
-                // #endif
-
-                // #ifdef MP-ALIPAY
-                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?scene=' + this.query;
-                // #endif
-            }
-        },
         methods: {
             //拼团信息
             getTeam() {
@@ -200,9 +184,9 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
+                    type: this.$globalConstVars.shareModel.url,
                     page: this.$globalConstVars.shareType.addPinTuan,
                     params: {
                         goodsId: this.goodsInfo.goodsId,
@@ -212,7 +196,7 @@
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
-                    data['token'] = userToken;
+                    data.token = userToken
                 }
                 this.$u.api.share(data).then(res => {
                     this.shareUrl = res.data
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/index/index.vue
index ef897996..68ba9b92 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/index/index.vue
@@ -22,7 +22,7 @@
                     </view>
                     <view class="item">
                         <view class="left">
-                            <u--image :showLoading="true" :src="item.service.thumbnail && item.service.thumbnail!='null' ?  item.service.thumbnail : '/static/images/common/empty-banner.png'" width="80px" height="80px" mode="aspectFill"></u--image>
+                            <u--image :showLoading="true" :src="item.service.thumbnail" width="80px" height="80px" mode="aspectFill"></u--image>
                         </view>
                         <view class="content">
                             <view class="title u-line-2">{{item.service.title}}</view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/notice/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/notice/details/details.vue
index 36da0968..ad9a08dc 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/notice/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/notice/details/details.vue
@@ -13,7 +13,7 @@
         </u-navbar>
 
         <view class="coreshop-bg-white coreshop-padding-10 coreshop-margin-10">
-            <u--image width="100%" height="150px" v-if="info.coverImage" :src="info.coverImage && info.coverImage!='null' ?  info.coverImage+'?x-oss-process=image/resize,m_lfit,h_320,w_240' : '/static/images/common/empty-banner.png'"></u--image>
+            <u--image width="100%" height="150px" v-if="info.coverImage" :src="info.coverImage"></u--image>
             <view class="article-title">
                 {{ info.title }}
             </view>
@@ -61,17 +61,17 @@
             //获取分享URL
             getShareUrl() {
                 let data = {
-                    client: 2,
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
                     url: this.$globalConstVars.shareUrl,
-                    type: 1,
-                    page: 5,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.article,
                     params: {
                         noticeId: this.id,
                     }
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
-                    data['token'] = userToken;
+                    data.token = userToken
                 }
                 this.$u.api.share(data).then(res => {
                     this.shareUrl = res.data
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/payment/components/coreshop-paymentsByApp.vue b/CoreCms.Net.Uni-App/CoreShop/pages/payment/components/coreshop-paymentsByApp.vue
index e183fd8a..efaa3419 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/payment/components/coreshop-paymentsByApp.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/payment/components/coreshop-paymentsByApp.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-    import { mapMutations, mapActions, mapState } from 'vuex';
+    import { mapState } from 'vuex';
     export default {
         props: {
             // 如果是商品订单此参数必须
@@ -78,7 +78,6 @@
             }
         },
         mounted() {
-
             this.getPayments()
         },
         computed: {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/payment/components/coreshop-paymentsByH5.vue b/CoreCms.Net.Uni-App/CoreShop/pages/payment/components/coreshop-paymentsByH5.vue
deleted file mode 100644
index 79967628..00000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/payment/components/coreshop-paymentsByH5.vue
+++ /dev/null
@@ -1,334 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" />
-        <view v-for="item in payments" :key="item.code" @click="toPayHandler(item.code)" v-if="!(type == 2 && item.code == 'balancepay')">
-            <view class="u-reset-button coreshop-list menu-avatar  padding-xl radius shadow shadow-lg bg-blue margin-top">
-                <view class="coreshop-list-item">
-                    <view class="coreshop-avatar radius">
-                        <u--image width="34px" height="34px" :src="item.icon" :lazy-load="false" :fade="false" duration="0"></u--image>
-                    </view>
-                    <view class="content">
-                        <view class="coreshop-text-grey">{{ item.name }}</view>
-                        <view class="coreshop-text-gray coreshop-font-sm flex coreshop-text-left">
-                            <view class="u-line-1">
-                                {{ item.memo }}
-                            </view>
-                        </view>
-                    </view>
-                    <view class="action">
-                        <u-tag text="选择此支付方式" mode="dark" type="error" shape="circle" />
-                    </view>
-                </view>
-            </view>
-        </view>
-
-        <view class="payment-pop" v-show="popShow">
-            <view class="payment-pop-c">
-                <image src="/static/images/payments/wait-pay.png" style="width: 30px;height: 30px;"></image>
-                <view class="text">支付中，请稍后...</view>
-            </view>
-            <view class="payment-pop-b">
-                <button class="coreshop-btn coreshop-btn-c" @click="popHide">支付失败</button>
-                <button class="coreshop-btn coreshop-btn-o" @click="popHide">支付成功</button>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        props: {
-            // 如果是商品订单此参数必须
-            orderId: {
-                type: String,
-                default() {
-                    return ''
-                }
-            },
-            // 如果是充值订单此参数必须
-            recharge: {
-                type: Number,
-                default() {
-                    return 0
-                }
-            },
-            // 用户id
-            uid: {
-                type: Number,
-                default() {
-                    return 0
-                }
-            },
-            // 订单类型
-            type: {
-                type: Number,
-                default() {
-                    return 1
-                }
-            }
-        },
-        data() {
-            return {
-                payments: [],
-                openid: '',
-                popShow: false
-            }
-        },
-        mounted() {
-            this.getPayments()
-        },
-        methods: {
-            // 获取可用支付方式列表
-            getPayments() {
-                this.$u.api.paymentList().then(res => {
-                    if (res.status) {
-                        this.payments = this.formatPayments(res.data)
-                    }
-                })
-            },
-            // 支付方式处理
-            formatPayments(payments) {
-                // h5支付并且是在微信浏览器内 过滤支付宝支付
-                if (this.$common.isWeiXinBrowser()) {
-                    payments = payments.filter(item => item.code !== 'alipay')
-                }
-
-                // 如果是充值订单 过滤余额支付 过滤非线上支付方式
-                if (this.type === 2) {
-                    payments = payments.filter(
-                        item => item.code !== 'balancepay' || item.is_online === 1
-                    )
-                }
-
-                // 设置logo图片
-                payments.forEach(item => {
-                    this.$set(item, 'icon', '/static/images/payments/' + item.code + '.png')
-                })
-
-                return payments
-            },
-            checkWXJSBridge(data) {
-                let that = this
-                let interval = setInterval(() => {
-                    if (typeof window.WeixinJSBridge != 'undefined') {
-                        clearTimeout(interval)
-                        that.onBridgeReady(data)
-                    }
-                }, 200)
-            },
-            onBridgeReady(data) {
-                var _this = this
-                window.WeixinJSBridge.invoke(
-                    'getBrandWCPayRequest', {
-                    appId: data.appid, // 公众号名称，由商户传入
-                    timeStamp: data.timeStamp, // 时间戳，自1970年以来的秒数
-                    nonceStr: data.nonceStr, // 随机串
-                    package: data.package,
-                    signType: data.signType, // 微信签名方式：
-                    paySign: data.paySign // 微信签名
-                },
-                    function (res) {
-                        if (res.err_msg === 'get_brand_wcpay_request:ok') {
-                            _this.$common.successToShow('支付成功')
-                        } else if (res.err_msg === 'get_brand_wcpay_request:cancel') {
-                            _this.$u.toast('取消支付')
-                        } else {
-                            _this.$u.toast('支付失败')
-                        }
-                        setTimeout(() => {
-                            _this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?id=' + data.paymentId });
-                        }, 1000)
-                    }
-                )
-            },
-            // 用户点击支付方式处理
-            toPayHandler(code) {
-                this.popShow = true;
-                let data = {
-                    payment_code: code,
-                    payment_type: this.type
-                }
-                data['ids'] = (this.type == 1 || this.type == 5 || this.type == 6) ? this.orderId : this.uid
-                switch (code) {
-                    case 'alipay':
-                        /**
-                         * 支付宝支付需要模拟GET提交数据
-                         */
-                        if (this.type == 1 && this.orderId) {
-                            data['params'] = {
-                                trade_type: 'WAP',
-                                return_url: baseUrl +
-                                    'wap/pages/payment/result/result'
-                            }
-                        } else if (this.type == 2 && this.recharge) {
-                            data['params'] = {
-                                money: this.recharge,
-                                return_url: baseUrl + 'wap/pages/payment/result/result'
-                            }
-                        } else if ((this.type == 5 || this.type == 6) && this.recharge) {
-                            data['params'] = {
-                            }
-                        }
-
-                        this.$u.api.pay(data).then(res => {
-                            if (res.status) {
-                                const url = res.data.url
-                                const data = res.data.data
-
-                                // 模拟GET提交
-                                let tempForm = document.createElement('form')
-                                tempForm.id = 'aliPay'
-                                tempForm.methods = 'post'
-                                tempForm.action = url
-                                tempForm.target = '_self'
-                                let input = []
-                                for (let k in data) {
-                                    input[k] = document.createElement('input')
-                                    input[k].type = 'hidden'
-                                    input[k].name = k
-                                    input[k].value = data[k]
-                                    tempForm.appendChild(input[k])
-                                }
-                                tempForm.addEventListener('submit', function () { }, false)
-                                document.body.appendChild(tempForm)
-                                tempForm.dispatchEvent(new Event('submit'))
-                                tempForm.submit()
-                                document.body.removeChild(tempForm)
-                            }
-                        })
-                        break
-                    case 'wechatpay':
-
-                        /**
-                         * 微信支付有两种
-                         * 判断是否在微信浏览器
-                         * 	微信jsapi支付
-                         */
-                        let isWeiXin = this.$common.isWeiXinBrowser()
-
-                        if (isWeiXin) {
-                            var transitUrl =
-                                baseUrl +
-                                'wap/pages/payment/waiting/waiting?orderId=' +
-                                this.orderId +
-                                '&type=' +
-                                this.type;
-
-                            if (this.type == 1 && this.orderId) {
-                                // 微信jsapi支付
-                                // if (this.openid) {
-                                //   data['params'] = {
-                                //     trade_type: 'JSAPI_OFFICIAL',
-                                //     openid: this.openid
-                                //   }
-                                // } else {
-                                //   data['params'] = {
-                                //     trade_type: 'JSAPI_OFFICIAL',
-                                //     url: window.location.href
-                                //   }
-                                // }
-                                data['params'] = {
-                                    trade_type: 'JSAPI_OFFICIAL',
-                                    url: transitUrl
-                                }
-                            } else if (this.type == 2 && this.recharge) {
-                                data['params'] = {
-                                    trade_type: 'JSAPI_OFFICIAL',
-                                    money: this.recharge,
-                                    url: transitUrl + '&uid=' + this.uid + '&money=' + this.recharge
-                                }
-                                // if (this.openid) {
-                                //   data['params'] = {
-                                //     money: this.recharge,
-                                //     openid: this.openid
-                                //   }
-                                // } else {
-                                //   data['params'] = {
-                                //     money: this.recharge,
-                                //     url: window.location.href
-                                //   }
-                                // }
-                            } else if ((this.type == 5 || this.type == 6) && this.recharge) {
-                                data['params'] = {
-                                }
-                            }
-                            this.$u.api.pay(data).then(res => {
-                                if (!res.status && res.data == '10066') {
-                                    window.location.href = res.msg
-                                    return;
-                                }
-                                const data = res.data
-                                this.checkWXJSBridge(data)
-                            })
-                        } else {
-                            // 微信 H5支付
-                            if (this.type == 1 && this.orderId) {
-                                data['params'] = {
-                                    trade_type: 'MWEB',
-                                    return_url: baseUrl +
-                                        'wap/pages/payment/result/result'
-                                }
-                            } else if (this.type == 2 && this.recharge) {
-                                data['params'] = {
-                                    trade_type: 'MWEB',
-                                    money: this.recharge,
-                                    return_url: baseUrl + 'wap/pages/payment/result/result'
-                                }
-                            } else if ((this.type == 5 || this.type == 6) && this.recharge) {
-                                data['params'] = {
-                                }
-                            }
-                            // 微信h5支付
-                            this.$u.api.pay(data).then(res => {
-                                if (res.status) {
-                                    location.href = res.data.mweb_url
-                                } else {
-                                    this.$u.toast(res.msg)
-                                    this.popHide();
-                                }
-                            })
-                        }
-                        break
-                    case 'balancepay':
-                        /**
-                         *  用户余额支付
-                         *
-                         */
-                        if ((this.type == 5 || this.type == 6) && this.recharge) {
-                            data['params'] = {
-                            }
-                        }
-                        this.$u.api.pay(data).then(res => {
-                            if (res.status) {
-                                this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?id=' + res.data.paymentId });
-                            } else {
-                                this.$u.toast(res.msg)
-                                this.popHide();
-                            }
-                        })
-                        break
-                    case 'offline':
-                        /**
-                         * 线下支付
-                         */
-                        this.$common.modelShow(
-                            '线下支付说明',
-                            '请联系客服进行线下支付',
-                            () => { },
-                            false,
-                            '取消',
-                            '确定'
-                        )
-                        break
-                }
-            },
-            // 支付中显示隐藏
-            popHide() {
-                this.popShow = false
-            }
-        }
-    }
-</script>
-<style lang="scss">
-    .coreshop-avatar { background: #fff; }
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/payment/components/coreshop-paymentsByWx.vue b/CoreCms.Net.Uni-App/CoreShop/pages/payment/components/coreshop-paymentsByWx.vue
index 03b4acd8..66286a61 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/payment/components/coreshop-paymentsByWx.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/payment/components/coreshop-paymentsByWx.vue
@@ -13,7 +13,7 @@
                         <view class="coreshop-text-gray coreshop-font-sm flex coreshop-text-left">
                             <view class="u-line-1 coreshop-text-red" v-if="item.code == 'balancepay'">
                                 当前余额：{{userInfo.balance}}元
-                            </view> 
+                            </view>
                             <view class="u-line-1" v-else>
                                 {{item.memo}}
                             </view>
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-    import { mapMutations, mapActions, mapState } from 'vuex';
+    import { mapState } from 'vuex';
     export default {
         props: {
             // 如果是商品订单此参数必须
@@ -133,8 +133,9 @@
                 let data = {
                     payment_code: code,
                     payment_type: this.type,
-                    params: {}
-                }
+                    params: {
+                        trade_type: 'NATIVE',
+                    }                }
                 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.seckill || 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.type == this.$globalConstVars.paymentType.serviceOrder) ? this.orderId : this.uid
 
                 // 判断订单支付类型
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 5793e618..6276a275 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue
@@ -92,9 +92,6 @@
 
         <!--支付方式-->
         <view class="content">
-            <!-- #ifdef H5 -->
-            <payments-by-h5 :orderId="orderId" :recharge="recharge" :type="type" :uid="userInfo.id"></payments-by-h5>
-            <!-- #endif -->
             <!-- #ifdef MP-WEIXIN -->
             <payments-by-wx :orderId="orderId" :recharge="recharge" :type="type" :uid="userInfo.id"></payments-by-wx>
             <!-- #endif -->
@@ -117,27 +114,18 @@
     </view>
 </template>
 <script>
-    // #ifdef H5
-    import paymentsByH5 from '@/pages/payment/components/coreshop-paymentsByH5.vue';
-    // #endif
-
     // #ifdef MP-WEIXIN
     import paymentsByWx from '@/pages/payment/components/coreshop-paymentsByWx.vue';
     // #endif
-
     // #ifdef MP-ALIPAY
     import paymentsByAli from '@/pages/payment/components/coreshop-paymentsByAli.vue';
     // #endif
-
     // #ifdef APP-PLUS || APP-PLUS-NVUE
     import paymentsByApp from '@/pages/payment/components/coreshop-paymentsByApp.vue';
     // #endif
-
     // #ifdef MP-TOUTIAO
     import paymentsByTt from '@/pages/payment/components/coreshop-paymentsByTt.vue';
     // #endif
-
-
     export default {
 
         data() {
@@ -153,9 +141,6 @@
             };
         },
         components: {
-            // #ifdef H5
-            paymentsByH5,
-            // #endif
             // #ifdef MP-WEIXIN
             paymentsByWx,
             // #endif
@@ -175,7 +160,7 @@
             this.recharge = Number(options.recharge);
             this.type = Number(options.type);
             this.formId = Number(options.formId);
-            //this.getOrderInfo ()
+
             if (this.orderId && (this.type == this.$globalConstVars.paymentType.common || this.type == this.$globalConstVars.paymentType.pinTuan || this.type == this.$globalConstVars.paymentType.group || this.type == this.$globalConstVars.paymentType.seckill || 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.getOrderInfo();
@@ -208,10 +193,6 @@
                 this.$u.api.paymentsCheckpay(data).then(res => {
                     if (res.status) {
                         this.orderInfo = res.data;
-                        /* console.log(this.orderInfo)
-                            if(this.orderInfo.pay_status == 2){
-                                this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?orderId=' + this.orderInfo.orderId });
-                            } */
                     }
                 });
             },
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.scss b/CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.scss
deleted file mode 100644
index b1620299..00000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.content { position: relative; height: 80vh;
-    .content-c { position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); text-align: center;
-        .load-img { width: 50px; height: 50px; }
-        .load-text { font-size: 13px; }
-    }
-}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.vue b/CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.vue
deleted file mode 100644
index 36b222ee..00000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" />
-        <u-no-network></u-no-network>
-        <u-navbar title="支付中..." safeAreaInsetTop fixed placeholder @leftClick="goNavigateBack"></u-navbar>
-        <view class="content">
-            <view class="content-c">
-                <image class="load-img" src="/static/images/loading.gif" mode=""></image>
-                <view class="load-text ">信息加载中.....</view>
-            </view>
-        </view>
-        <!-- 登录提示 -->
-        <coreshop-login-modal></coreshop-login-modal>
-    </view>
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                type: '',
-                openid: '',
-                orderId: '',
-                state: ''
-            }
-        },
-        onLoad(options) {
-            this.orderId = options.orderId
-            this.money = Number(options.money)
-            this.type = Number(options.type)
-            this.uid = Number(options.uid)
-            this.state = this.$common.getQueryString('state')
-            this.getCode()
-        },
-        methods: {
-            getCode() {
-                var code = this.$common.getQueryString('code')
-                code && this.getOpenId(code)
-            },
-            getOpenId(code) {
-                let data = {
-                    code: code,
-                    scope: 2,
-                    state: this.state
-                }
-                //模拟接口
-                this.$u.api.getOpenId(data).then(res => {
-                    if (res.status) {
-                        this.openid = res.data.openid
-                        this.toPayHandler('wechatpay')
-                    } else {
-                        this.$u.toast(res.msg)
-                    }
-                })
-            },
-            checkWXJSBridge(data) {
-                let that = this
-                let interval = setInterval(() => {
-                    if (typeof window.WeixinJSBridge != 'undefined') {
-                        clearTimeout(interval)
-                        that.onBridgeReady(data)
-                    }
-                }, 200)
-            },
-            onBridgeReady(data) {
-                var _this = this
-                window.WeixinJSBridge.invoke(
-                    'getBrandWCPayRequest',
-                    {
-                        appId: data.appid, // 公众号名称，由商户传入
-                        timeStamp: data.timeStamp, // 时间戳，自1970年以来的秒数
-                        nonceStr: data.nonceStr, // 随机串
-                        package: data.package,
-                        signType: data.signType, // 微信签名方式：
-                        paySign: data.paySign // 微信签名
-                    },
-                    function (res) {
-                        if (res.err_msg === 'get_brand_wcpay_request:ok') {
-                            this.$refs.uToast.show({ message: '支付成功', type: 'success' })
-                        } else if (res.err_msg === 'get_brand_wcpay_request:cancel') {
-                            _this.$u.toast('取消支付')
-                        } else {
-                            _this.$u.toast('支付失败')
-                        }
-                        setTimeout(() => {
-                            this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?id=' + data.payment_id });
-                        }, 1000)
-                    }
-                )
-            },
-            toPayHandler(code) {
-                let data = {
-                    payment_code: code,
-                    payment_type: this.type
-                }
-                data['ids'] = (this.type == 1 || this.type == 5 || this.type == 6) ? this.orderId : this.uid
-                //data['ids'] = this.type == 1 ? this.orderId : this.uid
-
-                if (this.type == 1 && this.orderId) {
-                    // 微信jsapi支付
-                    if (this.openid) {
-                        data['params'] = {
-                            trade_type: 'JSAPI_OFFICIAL',
-                            openid: this.openid
-                        }
-                    }
-                } else if (this.type == 2 && this.money) {
-                    if (this.openid) {
-                        data['params'] = {
-                            trade_type: 'JSAPI_OFFICIAL',
-                            money: this.money,
-                            openid: this.openid
-                        }
-                    }
-                } else if ((this.type == 5 || this.type == 6) && this.recharge) {
-                    data['params'] = {
-                        trade_type: 'JSAPI_OFFICIAL',
-                        openid: this.openid,
-                    }
-                }
-                this.$u.api.pay(data).then(res => {
-                    if (res.status) {
-                        const data = res.data
-                        this.checkWXJSBridge(data)
-                    } else {
-                        this.$u.toast(res.msg)
-                    }
-                })
-            }
-        }
-    }
-</script>
-
-<style scoped lang="scss">
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue
index f63e527c..b09afc11 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue
@@ -119,7 +119,7 @@
                                             （{{ pointShowName}}兑换价:
                                         </view>
                                         <view class="coreshop-text-red">
-                                            {{pointDiscountedProportion * item.products.pointsDeduction }}{{ pointShowName}}+{{ item.products.price - item.products.pointsDeduction}}元
+                                            {{pointDiscountedProportion * item.products.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.products.price - item.products.pointsDeduction).toFixed(2)}}元
                                         </view>
                                         ）
                                     </view>
@@ -133,7 +133,7 @@
                                 {{ pointShowName}}兑换价合计：
                             </view>
                             <view class="coreshop-text-red">
-                                {{pointDiscountedProportion * item.products.pointsDeduction * item.nums }}{{ pointShowName}}+{{(item.products.price - item.products.pointsDeduction)*item.nums }}元
+                                {{pointDiscountedProportion * item.products.pointsDeduction * item.nums }}{{ pointShowName}}+{{parseFloat((item.products.price - item.products.pointsDeduction)*item.nums).toFixed(2) }}元
                             </view>
                         </view>
                         <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-13 coreshop-margin-top-10" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.products.points > 0">
@@ -354,18 +354,16 @@
         onLoad(options) {
             var _this = this;
             //下单前置检查，自定义交易组件检测场景是否需要推送订单到微信服务。
-            // #ifdef H5|APP-PLUS|APP-PLUS-NVUE
+            // #ifdef APP-PLUS|APP-PLUS-NVUE
             _this.getOrderDistributionModel()
             // #endif
             // #ifdef MP
             wx.checkBeforeAddOrder({
                 success(res) {
-                    console.log('下单前置检查', res);
                     if (res.errMsg == 'checkBeforeAddOrder:ok') {
                         _this.requireOrder = res.data.requireOrder;
                         _this.requiredFundType = res.data.requiredFundType;
                         _this.traceId = res.data.traceId;
-
                         // 获取不同类型营销下单支持的配送方式
                         _this.getOrderDistributionModel()
                     }
@@ -429,7 +427,7 @@
                 this.$db.del('userStore', true);
             }
             // #endif
-            // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
+            // #ifdef APP-PLUS || APP-PLUS-NVUE
             let userShip = this.$store.state.userShip;
             if (userShip) {
                 this.userShip = userShip;
@@ -781,9 +779,6 @@
                 data['taxType'] = this.invoice.type
                 data['taxName'] = this.invoice.name
                 data['taxCode'] = this.invoice.code
-                // #ifdef H5
-                data['source'] = 2;
-                // #endif
                 // #ifdef MP-WEIXIN
                 data['source'] = 3;
                 // #endif
@@ -818,7 +813,6 @@
             },
             //发起订阅
             subscription() {
-                let _this = this;
                 this.$u.api.getSubscriptionTmplIds(null).then(res => {
                     if (res.status) {
                         console.log(res.data);
@@ -857,7 +851,6 @@
             // 获取默认店铺
             getDefaultStore() {
                 if (this.storeSwitch == 1) {
-                    console.log("获取默认店铺");
                     this.$u.api.defaultStore().then(res => {
                         if (res.status) {
                             if (res.data && res.data.id) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/invoice/invoice.vue b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/invoice/invoice.vue
index 331dafd2..878f32d6 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/invoice/invoice.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/invoice/invoice.vue
@@ -113,7 +113,7 @@
             let pre = pages[pages.length - 2]
             console.log(pre);
             if (pre != undefined) {
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
+                // #ifdef APP-PLUS || APP-PLUS-NVUE
                 invoice = pre.invoice
                 // #endif
                 // #ifdef MP-WEIXIN
@@ -193,7 +193,7 @@
                     // #ifdef MP-WEIXIN
                     beforePage.$vm.invoice = data;
                     // #endif
-                    // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
+                    // #ifdef APP-PLUS || APP-PLUS-NVUE
                     // beforePage.invoice = data;
                     this.$store.commit('invoice', data)
                     // #endif
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/storeList/storeList.vue b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/storeList/storeList.vue
index b4daf07e..a37a7242 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/storeList/storeList.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/storeList/storeList.vue
@@ -90,6 +90,10 @@
                         _this.latitude = res.latitude;
                     },
                     complete: function (res) {
+                        if (!_this.longitude || !_this.latitude) {
+                            _this.longitude = '0';
+                            _this.latitude = '0';
+                        }
                         let data = {
                             'key': _this.key,
                             'longitude': _this.longitude,
@@ -126,7 +130,7 @@
                 pre.$vm.store = store
                 // #endif
 
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
+                // #ifdef APP-PLUS || APP-PLUS-NVUE
                 pre.store = store
                 // #endif
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue
index 25ec37d2..1f1cffa4 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue
@@ -7,13 +7,15 @@
                 <u-icon name="arrow-left" size="19" @click="goNavigateBack"></u-icon>
                 <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
                 <u-icon name="home" size="22" @click="goHome"></u-icon>
+                <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
+                <u-icon name="share-fill" size="22" @click="goShare"></u-icon>
             </view>
             <view slot="right">
             </view>
         </u-navbar>
 
         <view class="coreshop-full-screen-banner-swiper-box">
-            <u--image width="100%" height="375px" :src="info.thumbnail && info.thumbnail!='null' ?  info.thumbnail+'?x-oss-process=image/resize,m_lfit,h_320,w_240' : '/static/images/common/empty-banner.png'"></u--image>
+            <u--image width="100%" height="375px" :src="info.thumbnail"></u--image>
         </view>
 
         <view class="coreshop-margin-left-16 coreshop-margin-right-16  coreshop-margin-top-12 coreshop-padding-16 coreshop-border-radius-9 coreshop-bg-white">
@@ -23,8 +25,8 @@
                     <text class="coreshop-font-24">{{ info.money || '0.00' }}</text>
                 </view>
                 <view class="coreshop-flex-sub coreshop-flex coreshop-text-left coreshop-justify-end coreshop-align-center">
-                    <view class="coreshop-text-right coreshop-time-right" v-if="timer.openStatus == 1 && timer.lastTime > 0">
-                        <u-count-down :time="timer.lastTime * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange">
+                    <view class="coreshop-text-right coreshop-time-right" v-if="info.openStatus == 1 && info.timestamp > 0">
+                        <u-count-down :time="info.timestamp * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange" @finish="onFinish">
                             <view class="time">
                                 <view class="coreshop-font-12">仅剩：</view>
                                 <view class="time__custom">
@@ -32,7 +34,7 @@
                                 </view>
                                 <text class="time__doc">天</text>
                                 <view class="time__custom">
-                                    <text class="time__custom__item">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}</text>
+                                    <text class="time__custom__item">{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours}}</text>
                                 </view>
                                 <text class="time__doc">:</text>
                                 <view class="time__custom">
@@ -45,16 +47,16 @@
                             </view>
                         </u-count-down>
                     </view>
-                    <view class="coreshop-text-right coreshop-time-right" v-if="timer.openStatus == 2 && timer.lastTime > 0">
-                        <u-count-down :time="timer.lastTime * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange">
+                    <view class="coreshop-text-right coreshop-time-right" v-if="info.openStatus == 2 && info.timestamp > 0">
+                        <u-count-down :time="info.timestamp * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange" @finish="onFinish">
                             <view class="time">
-                                <view class="coreshop-font-12">仅剩：</view>
+                                <view class="coreshop-font-12">即将开始：</view>
                                 <view class="time__custom">
                                     <text class="time__custom__item">{{ timeData.days }}</text>
                                 </view>
                                 <text class="time__doc">天</text>
                                 <view class="time__custom">
-                                    <text class="time__custom__item">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}</text>
+                                    <text class="time__custom__item">{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours}}</text>
                                 </view>
                                 <text class="time__doc">:</text>
                                 <view class="time__custom">
@@ -67,7 +69,7 @@
                             </view>
                         </u-count-down>
                     </view>
-                    <view class="coreshop-font-12 red-price" v-if="timer.openStatus == 3">已结束</view>
+                    <view class="coreshop-font-12" v-if="info.openStatus == 3">已结束</view>
                 </view>
             </view>
             <view class="coreshop-margin-top-12 coreshop-multiple-line-clamp">
@@ -174,7 +176,6 @@
                 <view class="goods" v-for="(item,index) in shopRecommendData" :key="index" slot="slot{{index}}">
                     <view class="coreshop-padding-top-6 coreshop-padding-bottom-3 coreshop-padding-left-8 coreshop-padding-right-8 coreshop-bg-white coreshop-border-radius-bl-18">
                         <view class="coreshop-title-294 coreshop-multiple-line-clamp">
-                            <!--<image class="coreshop-image-price-tags" src="https://files.cdn.coreshop.cn/static/icon/icon-tag-vip-discount.png"></image>-->
                             <text class="coreshop-font-14">{{item.name}}</text>
                         </view>
                         <view class="coreshop-margin-top-8 coreshop-flex coreshop-justify-between coreshop-align-center">
@@ -192,7 +193,7 @@
                                 {{ pointShowName}}兑换价:
                             </view>
                             <view class="coreshop-text-red">
-                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元
+                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
                             </view>
                         </view>
                         <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -211,7 +212,6 @@
                     <view class="goods">
                         <view class="coreshop-padding-top-6 coreshop-padding-bottom-3 coreshop-padding-left-8 coreshop-padding-right-8 coreshop-bg-white coreshop-border-radius-bl-18">
                             <view class="coreshop-title-294 coreshop-multiple-line-clamp">
-                                <!--<image class="coreshop-image-price-tags" src="https://files.cdn.coreshop.cn/static/icon/icon-tag-vip-discount.png"></image>-->
                                 <text class="coreshop-font-14">{{item.name}}</text>
                             </view>
                             <view class="coreshop-margin-top-8 coreshop-flex coreshop-justify-between coreshop-align-center">
@@ -229,7 +229,7 @@
                                     {{ pointShowName}}兑换价:
                                 </view>
                                 <view class="coreshop-text-red">
-                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元
+                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price,item.pointsDeduction).toFixed(2)}} 元
                                 </view>
                             </view>
                             <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
@@ -247,6 +247,18 @@
             </custom-waterfalls-flow>
         </view>
 
+        <!-- 分享弹窗 -->
+        <view class="coreshop-padding-0">
+            <u-popup mode="bottom" :show="shareBox" ref="share">
+                <!-- #ifdef MP-WEIXIN -->
+                <coreshop-share-wx :shareType='$globalConstVars.shareType.serviceGoods' :objectId="info.id" :shareImg="info.thumbnail" :shareTitle="info.title" :shareContent="info.description" :shareHref="shareHref" @close="closeShare()"></coreshop-share-wx>
+                <!-- #endif -->
+                <!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
+                <coreshop-share-app :shareType='$globalConstVars.shareType.serviceGoods' :objectId="info.id" :shareImg="info.thumbnail" :shareTitle="info.title" :shareContent="info.description" :shareHref="shareHref" @close="closeShare()"></coreshop-share-app>
+                <!-- #endif -->
+            </u-popup>
+            <div id="qrCode" ref="qrCodeDiv"></div>
+        </view>
 
         <!--占位底部距离-->
         <view class="coreshop-tabbar-height" />
@@ -255,7 +267,7 @@
             <view class="tabbar">
                 <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-start coreshop-basis-4">
                     <!-- 客服按钮 -->
-                    <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
+                    <!-- #ifdef APP-PLUS-NVUE || APP-PLUS -->
                     <view class="action" @click="showChat()">
                         <button class="noButtonStyle">
                             <u-icon name="server-fill" :size="20" label="找客服" :labelSize="12" labelPos="bottom"></u-icon>
@@ -271,7 +283,7 @@
                     <!-- #endif -->
                 </view>
                 <view class="btn-group coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-basis-4">
-                    <u-button type="success" size="normal" @click="toAddOrder">立刻购买</u-button>
+                    <u-button type="success" size="normal" @click="toAddOrder" :disabled="disabled">立刻购买</u-button>
                 </view>
             </view>
         </view>
@@ -282,17 +294,23 @@
 </template>
 
 <script>
-
+    import { mapState } from 'vuex';
     export default {
-
         data() {
             return {
                 id: 0,
                 info: {},
                 orderType: this.$globalConstVars.paymentType.serviceOrder,	// 订单类型
                 shopRecommendData: [], // 其他数据
-                timer: {},
                 timeData: {},
+                shareUrl: this.$globalConstVars.shareUrl,
+                shareBox: false,
+                serviceDescription: {
+                    commonQuestion: [],
+                    delivery: [],
+                    service: [],
+                },
+                disabled: false,
             }
         },
         onLoad(e) {
@@ -301,6 +319,37 @@
             this.getDetail();
             //获取推荐商品数据
             this.getGoodsRecommendList();
+            //获取服务说明
+            this.getServiceDescription();
+        },
+        computed: {
+            ...mapState({
+                hasLogin: state => state.hasLogin,
+                userInfo: state => state.userInfo,
+            }),
+            hasLogin: {
+                get() {
+                    return this.$store.state.hasLogin;
+                },
+                set(val) {
+                    this.$store.commit('hasLogin', val);
+                }
+            },
+            userInfo: {
+                get() {
+                    return this.$store.state.userInfo;
+                },
+                set(val) {
+                    this.$store.commit('userInfo', val);
+                }
+            },
+            pointSwitch() { return this.$store.state.config.pointSwitch },
+            pointShowExchangePrice() { return this.$store.state.config.pointShowExchangePrice },
+            pointDiscountedProportion() { return this.$store.state.config.pointDiscountedProportion },
+            pointExchangeModel() { return this.$store.state.config.pointExchangeModel },
+            pointShowName() { return this.$store.state.config.pointShowName },
+            pointGetModel() { return this.$store.state.config.pointGetModel },
+            pointShowPoint() { return this.$store.state.config.pointShowPoint },
         },
         methods: {
             wapperClick(item) {
@@ -312,14 +361,27 @@
             onChange(e) {
                 this.timeData = e
             },
+            onFinish(e) {
+                if (this.info.openStatus == 2) {
+                    this.info.openStatus == 1
+                    this.disabled = false;
+                } else if (this.info.openStatus == 1) {
+                    this.info.openStatus == 3
+                    this.disabled = true;
+                }
+            },
             getDetail() {
                 let data = {
                     id: this.id
                 };
                 this.$u.api.getServiceDetail(data).then(res => {
                     if (res.status) {
-                        this.info = res.data.serviceInfo;
-                        this.timer = res.data.timer;
+                        this.info = res.data;
+                        if (res.data.openStatus == 3) {
+                            this.disabled = true;
+                        } else if (res.data.openStatus == 2) {
+                            this.disabled = true;
+                        }
                     } else {
                         this.$u.toast(res.msg);
                     }
@@ -339,6 +401,26 @@
                     }
                 });
             },
+            //获取服务项
+            getServiceDescription() {
+                let _this = this;
+                this.$u.api.getServiceDescription().then(res => {
+                    if (res.status == true) {
+                        _this.serviceDescription.commonQuestion = res.data.commonQuestion;
+                        _this.serviceDescription.delivery = res.data.delivery;
+                        _this.serviceDescription.service = res.data.service;
+
+                    } else {
+                        _this.$refs.uToast.show({
+                            message: res.msg, type: 'error', complete: function () {
+                                uni.navigateBack({
+                                    delta: 1
+                                });
+                            }
+                        })
+                    }
+                })
+            },
             toAddOrder() {
                 //创建一个服务订单并跳转到支付
                 let data = {
@@ -351,8 +433,57 @@
                         this.$u.toast(res.msg);
                     }
                 });
+            },
+            // 跳转到h5分享页面
+            goShare() {
+                this.shareBox = true;
+            },
+            closeShare() {
+                this.shareBox = false;
+            },
+            //获取分享URL
+            getShareUrl() {
+                let data = {
+                    client: this.$globalConstVars.shareClient.wxMiNiProgram,
+                    url: this.$globalConstVars.shareUrl,
+                    type: this.$globalConstVars.shareModel.url,
+                    page: this.$globalConstVars.shareType.serviceGoods,
+                    params: {
+                        serviceGoodsId: this.info.id,
+                    }
+                };
+                let userToken = this.$db.get('userToken');
+                if (userToken && userToken != '') {
+                    data.token = userToken
+                }
+                this.$u.api.share(data).then(res => {
+                    this.shareUrl = res.data
+                });
+            },
+        },
+        watch: {
+            info: {
+                handler() {
+                    this.getShareUrl();
+                },
+                deep: true
             }
-        }
+        },
+        //分享
+        onShareAppMessage(res) {
+            return {
+                title: this.info.title,
+                imageUrl: this.info.thumbnail,
+                path: this.shareUrl
+            }
+        },
+        onShareTimeline(res) {
+            return {
+                title: this.info.title,
+                imageUrl: this.info.thumbnail,
+                path: this.shareUrl
+            }
+        },
     }
 </script>
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.scss
deleted file mode 100644
index 8491aa16..00000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.cell { margin-top: 0; min-height: 30px; line-height: 30px; }
-.order .top .left .store { margin: 0 5px; font-size: 14px; font-weight: normal; }
-.order .bottom { margin-top: 0px; }
-
-.order .bottom2 { display: flex; margin-top: 10px; padding: 0 5px; justify-content: space-between; align-items: center; }
-    .order .bottom2 .coreshop-btn { line-height: 26px; width: 80px; border-radius: 13px; border: 1px solid $u-border-color; font-size: 13px; text-align: center; color: $u-type-info-dark; }
-    .order .bottom2 .evaluate { color: $u-type-warning-dark; border-color: $u-type-warning-dark; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue
index 36afb773..e7fa9b27 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue
@@ -11,33 +11,19 @@
             </view>
         </u-navbar>
         <view class="content">
-            <view v-if="list.length">
-                <view class="orderList" v-for="(item, index) in list" :key="index" @click="goServicesDetail(item.id)">
-                    <view class="coreshop-flex coreshop-justify-between coreshop-solid-bottom coreshop-padding-bottom-5">
-                        <view class="coreshop-flex coreshop-align-center">
-                            <u-icon name="clock" :size="16" color="rgb(94,94,94)"></u-icon>
-                            <!--<view class="store">截止购买剩余：</view>-->
-                            <u-count-down :time="item.timestamp" font-size="12" :separator-size="12"></u-count-down>
-
-                            <!--<button class="cu-btn sm line-black">复制</button>
-                            <u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>-->
-                        </view>
-                        <view class="right">
-                            仅剩{{item.amount}}
-                        </view>
-                    </view>
+            <view v-if="list.length>0">
+                <view class="orderList" v-for="(item, index) in list" :key="index">
                     <view class="item coreshop-solid-bottom coreshop-margin-top-5 coreshop-margin-padding-10 coreshop-padding-bottom-5">
                         <view class="left">
-                            <u--image :showLoading="true" :src="item.thumbnail && item.thumbnail!='null' ?  item.thumbnail : '/static/images/common/empty-banner.png'" width="80px" height="80px"></u--image>
+                            <u--image :showLoading="true" :src="item.thumbnail" width="140px" height="140px"></u--image>
                         </view>
                         <view class="content">
                             <view class="title u-line-2">{{item.title}}</view>
-                            <view class="type u-line-2">{{item.description}}</view>
+                            <view class="type u-line-3">{{item.description}}</view>
                             <view class="coreshop-text-price coreshop-text-red coreshop-margin-bottom-5">{{ item.money }}</view>
                             <view class="delivery-time">最大购买限制：{{item.maxBuyNumber== 0 ? '不限' : item.maxBuyNumber}}</view>
                         </view>
                     </view>
-
                     <view class="coreshop-text-gray coreshop-font-xs coreshop-flex coreshop-flex-nowrap coreshop-padding-10 coreshop-solid-bottom">
                         兑换级别：
                         <view class="coreshop-text-gray coreshop-font-xs coreshop-flex coreshop-flex-nowrap" v-if="item.allowedMemberships && item.allowedMemberships.length>0">
@@ -52,12 +38,61 @@
                             <view class="coreshop-bg-orange-light sm  coreshop-padding-4 coreshop-margin-right-5" v-for="(item, indexChild) in item.consumableStores" :key="indexChild">{{item}}</view>
                         </view>
                     </view>
-                    <view class="coreshop-flex coreshop-flex-nowrap coreshop-justify-between coreshop-padding-10">
-                        <view class="coreshop-font-xs">
-                            购买截止：{{ item.endTime }}
+                    <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-padding-10">
+                        <view class="coreshop-text-right coreshop-time-right" v-if="item.openStatus == 1 && item.timestamp > 0">
+                            <u-count-down :time="item.timestamp * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange($event,index)">
+                                <view class="time coreshop-font-11 coreshop-text-gray">
+                                    <view class="">仅剩时间：</view>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.days }}</text>
+                                    </view>
+                                    <text class="time__doc">天</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.hours>=10?item.timeData.hours:'0'+item.timeData.hours}}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.minutes }}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.seconds }}</text>
+                                    </view>
+                                </view>
+                            </u-count-down>
                         </view>
-                        <view class="coreshop-width-fit-content">
-                            <u-button type="warning" shape="square" size="mini">立刻抢购</u-button>
+                        <view class="coreshop-text-right coreshop-time-right" v-if="item.openStatus == 2 && item.timestamp > 0">
+                            <u-count-down :time="item.timestamp * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange($event,index)">
+                                <view class="time coreshop-font-11 coreshop-text-gray">
+                                    <view class="">距离开始：</view>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.days }}</text>
+                                    </view>
+                                    <text class="time__doc">天</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.hours>=10?item.timeData.hours:'0'+item.timeData.hours}}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.minutes }}</text>
+                                    </view>
+                                    <text class="time__doc">:</text>
+                                    <view class="time__custom">
+                                        <text class="time__custom__item">{{ item.timeData.seconds }}</text>
+                                    </view>
+                                </view>
+                            </u-count-down>
+                        </view>
+                        <view class="coreshop-text-right coreshop-time-right" v-if="item.openStatus == 3">
+                            <view class="time coreshop-font-11 coreshop-text-gray">
+                                <view class="">活动已结束</view>
+                            </view>
+                        </view>
+                        <view v-if="item.openStatus == 3">
+                            <u-button shape="square" size="small" :plain="true">活动已结束</u-button>
+                        </view>
+                        <view v-if="item.openStatus != 3">
+                            <u-button type="warning" shape="square" size="small" @click="goServicesDetail(item.id)">立刻抢购</u-button>
                         </view>
                     </view>
                 </view>
@@ -126,10 +161,15 @@
                     }
                 })
             },
+            onChange(e, key) {
+                this.$set(this.list[key], 'timeData', e)
+            },
         }
     };
 </script>
 
 <style lang="scss">
-    @import "index.scss";
+    .orderList {
+        .title { font-size: 18px; font-weight: bolder; }
+    }
 </style>
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 7fdc103e..17775e2a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
@@ -36,7 +36,7 @@
                                 break;
                             //拼团
                             case _this.$globalConstVars.shareType.pinTuan:
-                                _this.gotoPinTuan(res.data.params.groupId, res.data.params.goodsId, res.data.params.teamId)
+                                _this.gotoPinTuan(res.data.params.groupId, res.data.params.teamId)
                                 break;
                             //店铺邀请
                             case _this.$globalConstVars.shareType.inv:
@@ -48,7 +48,7 @@
                                 break;
                             //参团页面
                             case _this.$globalConstVars.shareType.addPinTuan:
-                                _this.gotoInvitationGroup(res.data.params.groupId, res.data.params.goodsId, res.data.params.teamId)
+                                _this.gotoInvitationGroup(res.data.params.groupId, res.data.params.teamId)
                                 break;
                             //自定义页面
                             case _this.$globalConstVars.shareType.page:
@@ -60,11 +60,11 @@
                                 break;
                             //团购
                             case _this.$globalConstVars.shareType.group:
-                                _this.gotoGroup(res.data.params.goodsId, res.data.params.groupId);
+                                _this.gotoGroup(res.data.params.groupId);
                                 break;
                             //秒杀
                             case _this.$globalConstVars.shareType.seckill:
-                                _this.gotoSeckill(res.data.params.goodsId, res.data.params.groupId);
+                                _this.gotoSeckill(res.data.params.groupId);
                                 break;
                             //代理商
                             case _this.$globalConstVars.shareType.agent:
@@ -74,6 +74,10 @@
                             case _this.$globalConstVars.shareType.solitaire:
                                 _this.gotoSolitaire(res.data.params.id);
                                 break;
+                            //接龙
+                            case _this.$globalConstVars.shareType.serviceGoods:
+                                _this.gotoServiceGoods(res.data.params.serviceGoodsId);
+                                break;
                             default:
                                 _this.gotoIndex();
                                 break;
@@ -130,15 +134,14 @@
                 }
             },
             //跳转到拼团
-            gotoPinTuan(groupId, goodsId, teamId) {
-                if (groupId && goodsId && teamId) {
+            gotoPinTuan(groupId, teamId) {
+                if (groupId && teamId) {
                     uni.$u.route({
                         url: '/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails',
                         type: 'redirectTo',
                         params: {
-                            id: goodsId,
+                            id: groupId,
                             teamId: teamId,
-                            pinTuanId: groupId,
                         }
                     })
                 } else {
@@ -146,15 +149,14 @@
                 }
             },
             //跳转到参团
-            gotoInvitationGroup(groupId, goodsId, teamId) {
-                if (groupId && goodsId && teamId) {
+            gotoInvitationGroup(groupId, teamId) {
+                if (groupId && teamId) {
                     uni.$u.route({
                         url: '/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails',
                         type: 'redirectTo',
                         params: {
-                            id: goodsId,
+                            id: groupId,
                             teamId: teamId,
-                            pinTuanId: groupId,
                         }
                     })
                 } else {
@@ -162,14 +164,13 @@
                 }
             },
             //跳转到团购
-            gotoGroup(id, groupId) {
-                if (id && groupId) {
+            gotoGroup(id) {
+                if (id) {
                     uni.$u.route({
                         url: '/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails',
                         type: 'redirectTo',
                         params: {
                             id: id,
-                            groupId: groupId
                         }
                     })
                 } else {
@@ -177,14 +178,13 @@
                 }
             },
             //跳转到秒杀
-            gotoSeckill(id, groupId) {
-                if (id && groupId) {
+            gotoSeckill(id) {
+                if (id) {
                     uni.$u.route({
                         url: '/pages/activity/seckill/seckillDetails/seckillDetails',
                         type: 'redirectTo',
                         params: {
                             id: id,
-                            groupId: groupId
                         }
                     })
                 } else {
@@ -260,6 +260,20 @@
                 } else {
                     _this.gotoIndex();
                 }
+            },
+            //跳转服务商品
+            gotoServiceGoods(id) {
+                if (id) {
+                    uni.$u.route({
+                        url: '/pages/serviceGoods/details/details',
+                        type: 'redirectTo',
+                        params: {
+                            id: id
+                        }
+                    })
+                } else {
+                    _this.gotoIndex();
+                }
             }
         }
     };
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/shareNewPoster/shareNewPoster.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/shareNewPoster/shareNewPoster.vue
index 87dd0038..3676e6b1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/shareNewPoster/shareNewPoster.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/shareNewPoster/shareNewPoster.vue
@@ -26,13 +26,17 @@
                         <l-painter-text text="￥" css="vertical-align: bottom" />
                         <l-painter-text :text="showModel.price" css="vertical-align: bottom; font-size: 58rpx" />
                         <l-painter-text text="元" css="vertical-align: bottom" />
-                        <l-painter-text :text="'￥'+ showModel.mktprice" css="vertical-align: bottom; padding-left: 10rpx; font-weight: normal; text-decoration: line-through; color: #999999" />
+                        <l-painter-text v-if="showModel.mktprice>0" :text="'￥'+ showModel.mktprice" css="vertical-align: bottom; padding-left: 10rpx; font-weight: normal; text-decoration: line-through; color: #999999" />
                     </l-painter-view>
                     <l-painter-view css="margin-top: 32rpx; font-size: 26rpx; color: #8c5400" v-if="showPinTuanArguments">
                         <l-painter-text :text="'截止：'+showModel.pinTuan.endTime" css="color: #212121; background: #ffb400;" />
                         <l-painter-text :text="showModel.pinTuan.peopleNumber+'人团'" css="margin-left: 16rpx; background: #fff4d9; text-decoration: line-through;" />
                         <!--<l-painter-text text="满减优惠" css="margin-left: 16rpx; background: #fff4d9" />-->
                     </l-painter-view>
+                    <l-painter-view css="margin-top: 32rpx; font-size: 26rpx; color: #8c5400" v-if="showGroupPurchaseSeckillArguments">
+                        <l-painter-text :text="'截止：'+showModel.groupPurchaseSeckill.endTime" css="color: #212121; background: #ffb400;" />
+                        <!--<l-painter-text text="满减优惠" css="margin-left: 16rpx; background: #fff4d9" />-->
+                    </l-painter-view>
                     <l-painter-view css="margin-top: 32rpx; font-size: 26rpx; color: #8c5400">
                         <l-painter-text :text="showModel.brief" css="margin-left: 16rpx; background: #fff4d9" />
                     </l-painter-view>
@@ -49,10 +53,7 @@
 
         <view class="share-bot flex flex-direction coreshop-flex coreshop-flex-wrap coreshop-font-sm coreshop-padding-top-10 coreshop-flex-direction-row coreshop-justify-between">
             <view>
-                <u-button shape="square" type="primary" v-if="weiXinBrowser">
-                    <u-icon name="download" :margin-right="20" label="长按图片保存到手机" color="#fff" labelColor="#fff"></u-icon>
-                </u-button>
-                <u-button shape="square" type="primary" @click="savePoster()" v-else>
+                <u-button shape="square" type="primary" @click="savePoster()">
                     <u-icon name="download" :margin-right="20" label="保存到本地" color="#fff" labelColor="#fff"></u-icon>
                 </u-button>
             </view>
@@ -86,8 +87,13 @@
                         endTime: '',
                         peopleNumber: 0,
                     },
+                    groupPurchaseSeckill: {
+                        endTime: '',
+                    },
+
                 },
-                showPinTuanArguments: false
+                showPinTuanArguments: false,
+                showGroupPurchaseSeckillArguments: false
             };
         },
         onLoad(options) {
@@ -161,12 +167,117 @@
                         })
                     }
                 })
+            } else if (options.shareType == _this.$globalConstVars.shareType.serviceGoods) {
+                let data = {
+                    id: parseInt(options.serviceGoodsId),
+                    data: false,
+                }
+                _this.$u.api.getServiceDetail(data).then(res => {
+                    if (res.status == true) {
+                        console.log(res.data);
+                        _this.showModel.describe = "为您推荐了一个服务商品";
+                        _this.showModel.image = res.data.thumbnail;
+                        _this.showModel.brief = res.data.description;
+                        _this.showModel.name = res.data.title;
+                        _this.showModel.price = res.data.money;
+                        _this.showModel.mktprice = res.data.mktprice;
+
+                        setTimeout(function () {
+                            _this.canvasToTempFilePath();
+                            uni.hideLoading();
+                        }, 1000);
+
+                    } else {
+                        _this.$refs.uToast.show({
+                            message: res.msg, type: 'error', complete: function () {
+                                uni.navigateBack({
+                                    delta: 1
+                                });
+                            }
+                        })
+                    }
+                })
+
+            } else if (options.shareType == _this.$globalConstVars.shareType.seckill) {
+                let data = {
+                    id: parseInt(options.groupId),
+                    type: _this.$globalConstVars.shareType.seckill,
+                    needSku: true
+                }
+                let userToken = this.$db.get('userToken');
+                if (userToken) {
+                    data.token = userToken
+                }
+                _this.$u.api.groupInfo(data).then(res => {
+                    if (res.status == true) {
+                        console.log(res.data);
+                        _this.showModel.describe = "为您推荐了一个秒杀";
+                        _this.showModel.image = res.data.image;
+                        _this.showModel.brief = res.data.brief;
+                        _this.showModel.name = res.data.name;
+                        _this.showModel.price = res.data.price;
+                        _this.showModel.mktprice = res.data.mktprice;
+
+                        _this.showGroupPurchaseSeckillArguments = true;
+                        _this.showModel.groupPurchaseSeckill.endTime = res.data.groupEndTime;
+
+                        setTimeout(function () {
+                            _this.canvasToTempFilePath();
+                            uni.hideLoading();
+                        }, 1000);
+
+                    } else {
+                        _this.$refs.uToast.show({
+                            message: res.msg, type: 'error', complete: function () {
+                                uni.navigateBack({
+                                    delta: 1
+                                });
+                            }
+                        })
+                    }
+                })
+            } else if (options.shareType == _this.$globalConstVars.shareType.group) {
+                let data = {
+                    id: parseInt(options.groupId),
+                    type: _this.$globalConstVars.shareType.seckill,
+                    needSku: true
+                }
+                let userToken = this.$db.get('userToken');
+                if (userToken) {
+                    data.token = userToken
+                }
+                _this.$u.api.groupInfo(data).then(res => {
+                    if (res.status == true) {
+                        console.log(res.data);
+                        _this.showModel.describe = "为您推荐了一个团购";
+                        _this.showModel.image = res.data.image;
+                        _this.showModel.brief = res.data.brief;
+                        _this.showModel.name = res.data.name;
+                        _this.showModel.price = res.data.price;
+                        _this.showModel.mktprice = res.data.mktprice;
+
+                        _this.showGroupPurchaseSeckillArguments = true;
+                        _this.showModel.groupPurchaseSeckill.endTime = res.data.groupEndTime;
+
+                        setTimeout(function () {
+                            _this.canvasToTempFilePath();
+                            uni.hideLoading();
+                        }, 1000);
+
+                    } else {
+                        _this.$refs.uToast.show({
+                            message: res.msg, type: 'error', complete: function () {
+                                uni.navigateBack({
+                                    delta: 1
+                                });
+                            }
+                        })
+                    }
+                })
+
             }
         },
         computed: {
-            weiXinBrowser() {
-                return this.$common.isWeiXinBrowser()
-            }
         },
         methods: {
             canvasToTempFilePath() {
@@ -190,10 +301,6 @@
             // 保存海报到本地
             savePoster() {
                 let _this = this;
-                // #ifdef H5
-                _this.downloadIamge(_this.path, 'image');
-                // #endif
-
                 // #ifdef MP || MP-ALIPAY || APP-PLUS || APP-PLUS-NVUE
                 _this.downloadImageOfMp(_this.path)
                 // #endif
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
index 6217fcb3..d9f5d16a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
@@ -15,10 +15,7 @@
         </view>
         <view class="share-bot flex flex-direction">
             <view class="coreshop-margin-bottom-20">
-                <u-button shape="square" type="primary" v-if="weiXinBrowser">
-                    <u-icon name="download" :margin-right="20" label="长按图片保存到手机" color="#fff" labelColor="#fff"></u-icon>
-                </u-button>
-                <u-button shape="square" type="primary" @click="savePoster()" v-else>
+                <u-button shape="square" type="primary" @click="savePoster()">
                     <u-icon name="download" :margin-right="20" label="保存到本地" color="#fff" labelColor="#fff"></u-icon>
                 </u-button>
             </view>
@@ -41,9 +38,6 @@
             this.poster = decodeURIComponent(options.poster);
         },
         computed: {
-            weiXinBrowser() {
-                return this.$common.isWeiXinBrowser()
-            }
         },
         methods: {
             goBack() {
@@ -54,10 +48,6 @@
             // 保存海报到本地
             savePoster() {
                 let _this = this;
-                // #ifdef H5
-                _this.downloadIamge(_this.poster, 'image');
-                // #endif
-
                 // #ifdef MP || MP-ALIPAY || APP-PLUS || APP-PLUS-NVUE
                 _this.downloadImageOfMp(_this.poster)
                 // #endif
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.scss b/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.scss
index 0460e3ce..6efcc4cb 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.scss
@@ -1,4 +1,4 @@
-.content { width: 100%; /* #ifdef H5 */ height: calc(100vh - 44px); /* #endif */ }
+.content { width: 100%; }
 .map-body { width: 100%; height: 350px; position: relative; }
 .store-list { background-color: #fff; height: calc(100vh - 44px - 350px);
     .coreshop-list-item { height: 80px;
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss
index 34a16481..fd3a0f0e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss
@@ -1,5 +1,5 @@
 /*page { background: #f6f7f9; }*/
-page, .bg-page, .bg-main { background: #f7f7f7; }
+page, .bg-page, .coreshop-bg-main { background: #f7f7f7; }
 
 
 // nvue不能用标签命名样式，不能放在微信组件中，否则微信开发工具会报警告，无法使用标签名当做选择器
@@ -198,8 +198,6 @@ view, text { box-sizing: border-box; }
 //width:max-content 使用子元素中最大的开你的。无论是inline还是block
 .coreshop-width-max-content { width: max-content; }
 
-
-
 /*字体高度*/
 .coreshop-line-height-initial { line-height: initial }
 
@@ -235,6 +233,7 @@ view, text { box-sizing: border-box; }
 .coreshop-btn-all { width: 100%; }
 
 
+
 .coreshop-border-radius-tr-8 { border-radius: 8rpx 8rpx 0rpx 0rpx; }
 .coreshop-border-radius-tr-16 { border-radius: 16rpx 16rpx 0rpx 0rpx; }
 .coreshop-border-radius-tr-18 { border-radius: 18rpx 18rpx 0rpx 0rpx; }
@@ -244,6 +243,10 @@ view, text { box-sizing: border-box; }
 .coreshop-border-radius-bl-24 { border-radius: 0rpx 0rpx 24rpx 24rpx; }
 .coreshop-border-radius-bl-32 { border-radius: 0rpx 0rpx 32rpx 32rpx; }
 .coreshop-border-radius-tlb-18-l-4 { border-radius: 18rpx 18rpx 18rpx 4rpx; }
+
+.coreshop-border-radius-trbl-18 { border-radius: 18rpx 18rpx 18rpx 18rpx; }
+
+
 .coreshop-border-none { border: 0; }
 
 /*图标大小*/
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/style.vue.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/style.app.scss
similarity index 91%
rename from CoreCms.Net.Uni-App/CoreShop/static/style/style.vue.scss
rename to CoreCms.Net.Uni-App/CoreShop/static/style/style.app.scss
index 1191b463..3593093e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/style.vue.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/static/style/style.app.scss
@@ -712,3 +712,30 @@ u-icon { line-height: 0; }
 .index-goods .goods { -webkit-column-break-inside: avoid; border-radius: 18rpx; break-inside: avoid; margin-bottom: 24rpx; width: 326rpx; }
 .coreshop-title-294 { width: 294rpx; }
 .coreshop-image-price-tags { height: 32rpx; margin-bottom: 4rpx; margin-right: 12rpx; vertical-align: middle; width: 98rpx; }
+
+
+
+/*分割线*/
+.coreshop-divider { display: flex; flex-direction: row; flex-direction: row; align-items: center;
+    .complete { margin: 0; border-bottom-width: 1px; border-bottom-style: solid; width: 100%; transform: scaleY(0.5); border-color: #dcdfe6; flex: 1; vertical-align: middle; margin: 10px 0; }
+    .groupPurchase, .seckill, .serviceGood { margin: 0; border-bottom-width: 1px; border-bottom-style: solid; width: 100%; transform: scaleY(0.5); border-color: #dcdfe6; flex: 1; vertical-align: middle; margin: 10px 0; }
+    .left { margin: 0; border-bottom-width: 1px; border-bottom-style: solid; width: 100%; transform: scaleY(0.5); border-color: #dcdfe6; flex: 1; vertical-align: middle; }
+    .dot { font-size: 12px; margin: 0 12px; color: #c0c4cc; }
+    .right { margin: 0; border-bottom-width: 1px; border-bottom-style: solid; width: 100%; transform: scaleY(0.5); border-color: #dcdfe6; flex: 1; vertical-align: middle; }
+}
+
+
+.coreshop-buy-btn { width: 70px; height: 24px; background: linear-gradient(90deg, #fe832a, #ff6600); box-shadow: 0px 3.5px 3px 0px rgba(221, 185, 184, 0.22); border-radius: 15px; font-size: 13px; font-family: PingFang SC; font-weight: 500; color: #fff; padding: 0; text-align: center; line-height: 24px; }
+
+.coreshop-groupPurchase-btn { width: 70px; height: 24px; background: linear-gradient(90deg, #00c78a, #04c668); box-shadow: 0px 3.5px 3px 0px rgba(134, 194, 135, 0.22); border-radius: 15px; font-size: 13px; font-family: PingFang SC; font-weight: 500; color: #fff; padding: 0; text-align: center; line-height: 24px; }
+
+.coreshop-seckill-btn { width: 70px; height: 24px; background: linear-gradient(90deg, #ffbd1d, #ff4a09); box-shadow: 0px 3.5px 3px 0px rgba(255, 104, 4, 0.22); border-radius: 15px; font-size: 13px; font-family: PingFang SC; font-weight: 500; color: #fff; padding: 0; text-align: center; line-height: 24px; }
+
+.coreshop-solitaire-btn { width: 70px; height: 24px; background: linear-gradient(90deg, #04c668, #13804b); box-shadow: 0px 3.5px 3px 0px rgba(255, 104, 4, 0.22); border-radius: 15px; font-size: 12px; font-family: PingFang SC; font-weight: 500; color: #fff; padding: 0; text-align: center; line-height: 24px; }
+
+.coreshop-buy-btn-disabled { width: 70px; height: 24px; background: linear-gradient(180deg,#f8f8f8,#f5f5f5); box-shadow: 0px 3.5px 3px 0px rgba(255, 224, 226, 0.3); border-radius: 15px; font-size: 13px; font-family: PingFang SC; font-weight: 500; color: #8799a3; padding: 0; text-align: center; line-height: 24px; border-color: #ebedf0; border-width: 1px; border-style: solid; }
+
+
+.good-tag-hot { display: flex; margin-top: 5px; position: absolute; top: 15rpx; left: 15rpx; background-color: $u-type-error; color: #FFFFFF; display: flex; align-items: center; padding: 4rpx 14rpx; border-radius: 50rpx; font-size: 20rpx; line-height: 1; }
+.good-tag-recommend { display: flex; margin-top: 5px; position: absolute; top: 15rpx; right: 15rpx; background-color: $u-type-primary; color: #FFFFFF; margin-left: 10px; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
+.good-tag-recommend2 { display: flex; margin-top: 5px; position: absolute; bottom: 15rpx; left: 15rpx; background-color: $u-type-primary; color: #FFFFFF; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/style.mp.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/style.mp.scss
index e0b25b2a..76a362d9 100644
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/style.mp.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/static/style/style.mp.scss
@@ -716,8 +716,26 @@ u-icon { line-height: 0; }
 
 
 /*分割线*/
-.coreshop-divider { display: flex; flex-direction: row; flex-direction: row; align-items: center; margin: 5px 0 15px 0;
+.coreshop-divider { display: flex; flex-direction: row; flex-direction: row; align-items: center;
+    .complete { margin: 0; border-bottom-width: 1px; border-bottom-style: solid; width: 100%; transform: scaleY(0.5); border-color: #dcdfe6; flex: 1; vertical-align: middle; margin: 10px 0; }
+    .groupPurchase, .seckill, .serviceGood { margin: 0; border-bottom-width: 1px; border-bottom-style: solid; width: 100%; transform: scaleY(0.5); border-color: #dcdfe6; flex: 1; vertical-align: middle; margin: 10px 0; }
     .left { margin: 0; border-bottom-width: 1px; border-bottom-style: solid; width: 100%; transform: scaleY(0.5); border-color: #dcdfe6; flex: 1; vertical-align: middle; }
     .dot { font-size: 12px; margin: 0 12px; color: #c0c4cc; }
     .right { margin: 0; border-bottom-width: 1px; border-bottom-style: solid; width: 100%; transform: scaleY(0.5); border-color: #dcdfe6; flex: 1; vertical-align: middle; }
-}
\ No newline at end of file
+}
+
+
+.coreshop-buy-btn { width: 70px; height: 24px; background: linear-gradient(90deg, #fe832a, #ff6600); box-shadow: 0px 3.5px 3px 0px rgba(221, 185, 184, 0.22); border-radius: 15px; font-size: 13px; font-family: PingFang SC; font-weight: 500; color: #fff; padding: 0; text-align: center; line-height: 24px; }
+
+.coreshop-groupPurchase-btn { width: 70px; height: 24px; background: linear-gradient(90deg, #00c78a, #04c668); box-shadow: 0px 3.5px 3px 0px rgba(134, 194, 135, 0.22); border-radius: 15px; font-size: 13px; font-family: PingFang SC; font-weight: 500; color: #fff; padding: 0; text-align: center; line-height: 24px; }
+
+.coreshop-seckill-btn { width: 70px; height: 24px; background: linear-gradient(90deg, #ffbd1d, #ff4a09); box-shadow: 0px 3.5px 3px 0px rgba(255, 104, 4, 0.22); border-radius: 15px; font-size: 13px; font-family: PingFang SC; font-weight: 500; color: #fff; padding: 0; text-align: center; line-height: 24px; }
+
+.coreshop-solitaire-btn { width: 70px; height: 24px; background: linear-gradient(90deg, #04c668, #13804b); box-shadow: 0px 3.5px 3px 0px rgba(255, 104, 4, 0.22); border-radius: 15px; font-size: 12px; font-family: PingFang SC; font-weight: 500; color: #fff; padding: 0; text-align: center; line-height: 24px; }
+
+.coreshop-buy-btn-disabled { width: 70px; height: 24px; background: linear-gradient(180deg,#f8f8f8,#f5f5f5); box-shadow: 0px 3.5px 3px 0px rgba(255, 224, 226, 0.3); border-radius: 15px; font-size: 13px; font-family: PingFang SC; font-weight: 500; color: #8799a3; padding: 0; text-align: center; line-height: 24px; border-color: #ebedf0; border-width: 1px; border-style: solid; }
+
+
+.good-tag-hot { display: flex; margin-top: 5px; position: absolute; top: 15rpx; left: 15rpx; background-color: $u-type-error; color: #FFFFFF; display: flex; align-items: center; padding: 4rpx 14rpx; border-radius: 50rpx; font-size: 20rpx; line-height: 1; }
+.good-tag-recommend { display: flex; margin-top: 5px; position: absolute; top: 15rpx; right: 15rpx; background-color: $u-type-primary; color: #FFFFFF; margin-left: 10px; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
+.good-tag-recommend2 { display: flex; margin-top: 5px; position: absolute; bottom: 15rpx; left: 15rpx; background-color: $u-type-primary; color: #FFFFFF; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/tags.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/tags.scss
index 8624c264..62d93af4 100644
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/tags.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/static/style/tags.scss
@@ -1,6 +1,6 @@
 
 .tag-bangfu { background: #04c668; border-radius: 0rpx 18rpx 0 18rpx; height: 40rpx; line-height: 40rpx; position: absolute; right: 0; text-align: center; top: 0; width: 88rpx; }
-
+/*对口帮扶底图*/
 .tag-duikoubangfu { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAVAAAABcCAYAAAA4Xe0WAAAAAXNSR0IArs4c6QAAINFJREFUeNrtXV2sZEdxvpk+c3cNdh4iAxJSFIQsIREhJQqRiITyxEMUJYp4jBBJxMOcPtd2pAjLCZCHfQkECVBASQBj7y4E22t7DYQfAVKAB9/uvjZWLAQbsIyxF5sfOybBEGO8Bm+qq7u6q/v0ufs3d2ZsaqRSnzk/M3Pvnf32q/qqvrPVWX02RP8crM+l1cHqNAs6rp9T6Xg8B/dNXG/javLrhXPLUJadz1/HX2f88QV7/+p6eC/l9C87N0DE1cJq6bn+JVwT9/ltnbYxiuNxNX1xDhz/BawYyvjt+Nz0eZ/ReT8/DgHv+Sx8rmfhMz0LnxW243MfRj8L18MxWP15dsBtPNfqM7B9Rrn+DFyDQfvgeAjj9/XhPBOPuf4ZOPcZhWv/DBx/prNxn6XnOgY+/zm8LkbnV9PDOsTVPw/R4do/7QP2Pw3PYQ3P4TiG3wc/48/gZ/sZvF4IE6Lzq+2fgs/1FBzHgONPhX06bofowv7/S+FiWP1TH/D5MPC56eOq09oZ3P8TDKt5PBlieBKufxLeF7b7sM/pH2NY/WN4f9juQ9jhf1OYPsYQA7at/p9muP5HGFanmFn9BLzHE/jcDX59YmbgOQ+n/xvD9CHs8Diubngcrn8cn1MY/Thc/xi8zmPKxHD6hxim/yH8bD+c2bDG7R/AdTmc/gG85vdVEcP3QmgMeP3vqRhw/aOw79G5G07B7+9O+E6dhOd3dDxMWOdW3+4Djt82jwGf6cTcDCfg+rjqW+H4LXOjb537tYybfcD7fhzO+zic83G4/t/g2hzwHI5/DM77GHzmj85ZwOseh2tugM/4nkNuuPbwV4c3XLl7/RVby3pEAI2gpxl4VcDGgbQC1HTM5nMI5BQHYlMDZCMiiKbr6T1MPwZqAnHDIoKnSsCZQbIJnrZxDoAn7YM/DD/3F4oBo8rgmMDVg6g/Jx0rzhsSQHoQhdcO4In7cqgQZ+L2mQyiDCj5fstBFcH2mRQElvhcx20Oon6NwGkQVBE0c0TgJBC1ATgRMG2MBKh9As8EnDE6AlHngXJAAOVgSYDZuQimHDAhOsvBM64ElglQdQZTB6DpInACgHYZRJ8sQTRHl7b7DJwmBoGoWVQgysDTxdX0AThhnZkIoAlEFwSkT6RwLBA8+wScM9OXIGoXj6cVgBPDJvAM2w5AEgJXBpwlePYInBi7LAKAAkhWwGkZeDoNAOrX/hEANQP7T3Y+AEg9aMJnvUNx4HQInLcjeDoAT78PQDQAKawAoHMK48G0v0URcMZAIPXg6QA844pA6sHTBvCkgOsDcDp93K+47Venj8E1xwC0PzLf029+yamdyy8dQAPwnS1BjQFUYpT7AGgC3wiYBUOtALgBkuN9DSZq9ei58szUZBBVBJjERCMDVRXb7OI5+fzEMhE8awaaANIxAEUwDRGAMgJng4ESgCYmaiMTJfCMq2ehKjPPxEQLcLSRiUa2SYwTQdT0CJ4Eoh4oOw6iCUwD88T9hoNozxgnrGbwoFqyzwCSP0cQjQAaGGgEVYcs82kETWCgXQ2innkaPFYxzQScYRtB0wMqA9EIoGEdCvBMwIkRtpGBuop9msVPOtweRgAamGf/47QSAzUsADw7zkQdAmYGUQ+exYrbP2ox0QJEI/OcIXhGEK1ZKIGoC8xzRgBKwAnME4HTBBBNLLQAUQRPXGcAmD4QRAE4ZyG+RyBKLJSzTwTPAKiPwns9Ase+2+3pz3kAVRE8iXmGdcjs03kAHQKAwuqBk8BTmcBCPXgG5knrcLNykX06zz4DC/XMUyFYAmhGEFXIOPvIPMMK5yUARRA1+hi8DoAogukHDu0Or1oGAz1bMtEK2BxnfBU4FuBWXV+l8QiOpgHUrffiDLTFPm0F1MQ+WwyUAWTJQnOKn4C1ZqAMRAkcixS+Yp/EUumcKfZJKTyx0MRATWKgBXgm9plYKEvZY6iKgabUvWCiZQqfUvsIopyBEngmEEXA1E/zFH4MomMGWrDPxEL7p9ogSuk8T9lpXYxS+BH7rBmo4Ux0UaTwHYGoi1EzUFuxT8vZJ6x7jIk6lrZ78KRosU9K3ydANDHQCjxnnH2y9H3ERCP79OA5Tt1xO6fvY/bJGGgET2Kfrn+Up/AYyEKH++E7diel75mBAnhG9ulBFN43p/AupvAV+5xHEEXW6YbEPpXJ4IksNKbvyEKJfWIaH8AT3vd4SuET+wzgCdcfhWsxYN9HLtsdXneJANqX4Oc4C61SdEspui5rklTfdDWL1eOo2KdyLVYar+fpOWOhioE4/MNgtdLMMAtwdNNpe1EfRebZj9J8SuGJXRapeWSgOcVvs09klC6ySsNT+J4DJq9/luwz1UD7wD4bKbyKqXraTrXPkoWWUdY+6+38PLPQIqraZ9pugGhHAMoB01TgSYDqcv2TUnhioYFl6gkWqjP7jDXQrmCiDfbJwdPXPx2rf0J0k3XQqv5JzJOn8lN10BizXPcMDBSB0+/rx+wzrpx9zgg4LWOgxEJtK4B9Uvpe1T9nZvF9uDYBaUrfLWOhkX2qGACoj8D3+6vIQiMD5fVPFrcl9kkpfGSfCJ4upO+8/pnSd2Cic84+TZnCK5a+pxqo04x9Dgii8wikcO3RAKR+1TccsjtXXSIDLQEqgCEHwTGjLBloP0rzFd82ERhNg0m6slZKx9M1CNJeRFqMmaipRaSQmnt2OUrPOQPlTNW2QLRM/Xl6rkxO01UBlBxEdcFCFROIkIEimLIUPopIXEgq66A9Y6AMVA1L7RmIdqneGUEysVLN0niewvdjAQnrokNM4fuUvmcBibPP/mkOnGm1UUgyfYyYxrM6aGKfLtZAY/qOwOmGzD5ZHXSKfXYMRANwDlFEWpQikslA2o0ANabxLqbxpgGeNgpImMIPbRDFOmhcx6l7EpDgtbh4lNL3GWOhMyYazWoGGgD1sYKB+nTe9imFn7H0fVYzUDeUIBrA8vuBfQ6BfZpcD811UALSHQBR/Qh8D74YU3lM34mFYupuQxQM1IQ0HlcSkXwqbwKIchY6YqAsjYfrk4jEQTSAZ1gDaDIGitvAQK2+ya/wPXnvy7523YsvMYWv2KedUOIn0/dGas2vN/0oRS/KBY3UXhWvvyiPJVDONdCafXIQrZllPp8zUVYDZal8zUB5ep5ronUNtK5/BgYaFPnIQF1O4cc10AYDtTmFT4p7SuFjDdQQiPZliu50roPa8lgGUV4DpdQ9AmtQ3QsG2tkaRCMjxRpog4HanMIH8OQgWtZAVQJPxkRTCt+qgRbgmUCUK/FdSuEHXvssFXheAzX9WIn3QpKpWKir1HdM4fUEA20ISZap77wGOsFAOXiyNP6xgn1WKXxZBx1i/TOn8QiinH3W9U/GQBN4xjQ+MNHhQfibfyKzT6x/Nhko1UBJhSclXiX2yUC0UuIVT9/9ts0KvErqOwfRsv6pCDxNTOX9CkC6bfUbLwZAcyruGrXJoi6pWerMW5rq9iQ9EocIPFUFsoqdp7hgZRk42tzGpGrRiaX4WUAayrTdteqfOZXPdc5xq5Oq2pgCm2QpOglJthKYWHrP25hQfScGyuqdiaFWyrxqgGetxKdAwKyU+In0PdVCTU7hR+k7PWdCUqv+qbiItE/6Pq5/1kp8lb47lr7buoUpb4/Sd6vbNdCi/tlS4vsMoCx9L8GzZwy0TN8BrMZ10Ao8ZwieDECZAp8EpH3S98A+iYHqkMpT+m76AJ68DmrZmuugAThdFJFi/RPTd8sBNKfwBftkSrxP330oXBePdHvDfZl96ttV1caEqbsjBtpnIcmU6TtX4VFISuAJKTsxUJa+qyp9x+2UwrP0HVP2ARkobgNw5uj/+eX3Ll50iSJS3xCMWnXMcyjxRRrP25gaQtVEC1MCaCYk0fsoDrCFkMSYJaXxdv8aaFkj7Ys6aN3GVPaC6rKFidVHO57G8xooU+ALEckULUxFH2gNol3aNxQiUseVeFcJRtTGhMq8bopIHQNSVODtUDJQE1loBM9aROpIREKWORR9oBxECTwnRaQAlAWQ5jYmiok03lR1UKqBNntBhywguUqJtzozUDPVCzpRC+V1ULevAj9uZ6oU+HEb05DAsykikRIfFfgRA0XgHKLy3haRZi0F3pVKfBKSWC1UIZBq2B6+TH2gEThLBloISUxEciQiIXiOGGiqgbJe0HELE1PgKX1nQhKm7iYLSchCKXw6f/c1r70YBnq2TJ/1tApvK0W+lb7X58T0vWyW70uwdFXP6UiFX+TaKL+e9X9yBlqr8KMaKAdSR0x0PwbaUOFZDyi1MWEd1LQYKKXuXIUvmGbRD7q/Cl8KSKTAe/As66DnUuGJgeY2pq5moHUPKGehZsxAuwYDVUyF7xgLHfeC9lgDTQ3051DhmwzUNhioaavw4zYmBM7QD3pOFT4CKO//PCcDrZnnQA31xDqfKBgo6wdVu5F9IpBmFjpj4IkMtFLiWyp8YqGUxicGWtVBiXnGtVThA4Ai+8T0XWN4AAUgfBjWTyHznFLhDauBsjamEjjPQ4VPwElN9PH5OVR4RSq8B83EQIcb4fhfXSwDHdcuC2Y47gVVNft0jdS9rqOyZnpV10HdVIuTbvaCZvAsm+hHLUqtxnkGstXEUVOFj0BZNNPzPlDeRN9inwonjgILpRSeK/FdW4U/E/dn4ciVU0e8D7RsYSqnkOpJpFYzfUe9oJZNIZESz4F0vxamBK4kImUA5e1MTfbpqjTelgDauXOLSLn2WYGor3+yZvrOFOl81QvaSOM9cKZm+r4NpK0ppNxUPwLSrMQPjH3qdv9no5k+K/EDb6YPU0imSuPLKMHTM1JK3Q0Lm0UkVU8iOa7E70T2GRloANFTVAetGuoT+8zpe2SiEyCa6p91M33qAy3roMUUEvSBJvYZmuuTiIRKfKyDEpDC9+ptF9vGdHYkII2mkcr2oXqCSXEBiTNLEo9Mewyzfh81ev99xjgZCx0B49QYZyud53XSSjxCUHRVmxIHR66+R/aZBaZY/yQW6iJQTrBQzkZjyv4sjnEWk0h9qcQTC2VN9GUv6CKJSHULUwbPICLVk0hBha9qoEUvaLWO6p9DUN9bk0geSEciUlX/JCHJ5dS9JSB1xThn7gNFFT5OI5UK/KiJnlqY4tpnFT6A5QR49oyF9uM+UONrozqB52wkIGUWWjTRm9wLOtvN4Fn2gtJIZ5hCIgY6S32gU72gcRIp1kJRPPIiUqyBEvtsCUnFJNKIhS4QPKFF6rs+AJBMaqR3tQLfx/AtTWULk1fhU+ruhgSeqppEGrNQSN0NTSKxXtAInoqDJ+8FTSy0v3HbDu+8cAB11cTPqF2pMYlkdSOFLwWnZv20OWnUT56jWuzTVWDNm+hDrTQJScq2J5F4K9NYXOprkekX8dpxK1Oahc+N9HweXk1MIlENtBaSOjapVI9y8nalGkBVyVKbU0hdlcanOXhT9YLGtWafHR/lrGqgRS/ohJCUFfhxDbRmo4WQ5GoFfsxCSyCt+kA5gLI0vmv0g3bFPHw1yokgytL4vaGtwNvRSCergy7GNVCnqzamfVjolALPekH5PPxsSoGnGqgbNdEzJX4o2pfSJFJdA7V9St8LFmqH0/D8s6kOyiaRCiClXtB6Hp5amFxkn2wSKSnwXEhKrUxDswaalHjDW5lKIWnb6XdfIID2z9UpvGrWPxvAmpT7RpN86M0sAFI1+kADu+ybddHcB1pOInHw5KOcxEJHU0itSSTqA60YaaiVNufmR+CpTF+m8GwKSVUtTAV48hTejlN4Vc7Ds7pn2Qdag2tzDt6VvaCjFN60p5BSE33RzpTZZwLPBgttzsHbchJpGjz7p0rGyVP3RSkgTTXSB+D8KSnwmYUuSgFpspGeMVBsoh/G4MlV+EKNb0whuSGAaAM8Z66eh4/z747Pwev2JJLRRQ00gGf/WDEHb4pe0Mg4+2wislvOw3sWWtc/Uy8or4G6AJ7EPpXNQIrsk1io6++HLObkvNEHquo5+NzKVM7A+zTejftAFc3Bs2kkEpHSPHxM40eTSEyFTwKST+Hd8LeX0EjfmGNvNMi3+0DP4/pWHygXkOzE8Yk+0ASyqZG+cmIapeuN2qZr1T77yfon7/HsTNlIn0QkPuZZCUk0idRZPWqkL+uhiYWeURN9oHUjvaoa6TkLHfeB1gDKWphiDZSn7/UkEjcUqd2YkpjE3ZhGfaBDXe+cAtQJFlrXQPuqH5TVQRkDzXPwU7PwuJ1VeDelwk/Mwk+5MY1V+PYY53510LoP1LJpJGKdljkxYUz3gfoUftZopM810KGcQKr6QKmNiRrpVRUAXAik8F26h1J43geajERiI70aOzEV00jJkSk5MfVFI33txBSCqfBVHyhvpCcGCiYjb7m4FN6dI612tU2dbos7rtFEb1kdtGCf+1naEQPVVR2U7avZpytroMo16ps8NZ/qFWWTSKM+UDtmn3UfqGKpu6rZ5z5uTGrMQhnb7MdKfBSR0jmmH/WA5hamthKfQNS0a6C5D7SfdmNirkwtBb5Lk0hMiW8AJqnwIwZqSwW+m1LivYFIyUJZH+ji3Eq8a9RAE3hG9mkbbkxuogZ6vk30yYmpZ5NIfTUHD4C5Swo86wE1FYhyBd7kPtAZF5AcB0/OPisFfqoPNK4zN2afuDIGSttwzReCG1NO4ZMCz9gnTSKVLDTWQU1soq/YpyoEJFYDtawPtADPyD6jiJRroKDCX0Qbk/iBih+o+IGKH+gF+4FyQ5ERAzVJjQ9gavW3vXfoWvxASYV3YzMRmkSKTPSDVz1w7SHxAxU/UPEDFT/QlfiBpjpoqoVCDdQsMgu1+jSspxFITX/fZviBUi9oNBMhAemiRjnFD1T8QMUPVPxAL9YPlIlIswiexDypDoogGoHUTyltkB9oZJ49mIno973iK0cOix+o+IGKH6j4ga7UDzSPcuqKgQ6+BnqamCh8fg+kD8H7f3Jz/EBplHPnd8QPVPxAxQ9U/EDX4geahKTIQHn9MwUx0b3hG5vkBwqv+eYlONKLH6j4gYofqPiBXrwfqGIqvEr9oNjKdDow0ACg8HPBOuxugh8ofF/edcHCkfiBih+o+IGKH+jy/UB1xT6H1MZUMFCM4WH4fJ9Zqx8ojG7CXTpfean3RBI/UPEDFT9Q8QNdih9oqoMW00j6u5x9wvkRRPtvKRzvXJsf6J8u67bG4gcqfqDiByp+oEvxA52FxvmwbWMLU8VAQxqvT8Pf7e51+IHCv4F3HDl7ZLYMABU/UPEDFT9Q8QNdmh9oxUBrFT6Ap9EYsP9h+H1/YcV+oB+83OiXbi3jIX6g4gcqfqDiB7psP1BeBy0a6hn79ODpA+qg34bv48lV+YF2ezuv31rWQ/xAxQ9U/EDFD/RA/EBJSGqA5xxZaGCi8PoPQz30vlX4gcJ6zdYyH+IHKn6g4gcqfqAH4gcaVXhWB61amSKQeiaKIKq/dKB+oE6//8rd669YMoCKH6j4gYofqPiBHpQfaEzj7Rg8gyKPwBnCDd+B9/vEQfmBbttrXrO17If4gYofqPiBih/oQfqB8hS+CAJQn8Y7/ZAPSOW/Adfdumw/UHCaf9PWQTzED1T8QMUPVPxAD9oPNLHPoh80MM+0egCFVL7b7XeX6Qe6bXfe9epTR7YPDkDFD1T8QMUPVPxAD9YPtOwBNcRC9WkOnnNkocND8Lf7zJL8QG86bK7+ra2DeogfqPiBih+o+IGuxA8UGWgWj2ZRiS/qoMaDaf8Q7PtmHO+8ND/Q3f6Ptw7yIX6g4gcqfqDiB7oqP9CCifL03QQW6sETWSiseC+lS/AD3XbD248cWcK0kfiBih+o+IGKH+iG+IHmFqYQBfucRxCF9wAQHcA7dPj8RfmB7ukPXXHvW6/cOuiH+IGKH6j4gYof6Er9QElE4j2ghoQkYqCoyPtU/gH4t3PHhfqBXnb31X+wtYqH+IGKH6j4gYof6Or9QPMsPLUxzSOQwnEEUGKhnb+X0gX4gc7t4uqtVT3ED1T8QMUPVPxAV+8HmsFzztqYZsQ+HQNRH6b/8vn4gcLf959e9rXrXrxKABU/UPEDFT9Q8QNdvR9oVOBnTH2n9J2AM6zDQ/D+YDjS33kuP9Dt3at/e2uVD/EDFT9Q8QMVP9B1+YEWIpKNIpIdA2lgocPXUztTww902/Z/vrXqh/iBih+o+IGKH+g6/UB5G1MJnANnot/xAd+5u1pOTPCf6Tt/797FfB0AKn6g4gcqfqDiB7pGP9DIRCdAlAA0MFEwHHH630s/0J1jl92z85tb63iIH6j4gYofqPiBrt8PNNdAvQqfUnc3JPCMLPRBuO6baq+/hVgofIf+aGtdD/EDFT9Q8QMVP9CN8APl8/AYIYUHYA3s04U0fu5TedfvefDc3u3fdvbs2V9bI4CKH6j4gYofqPiBboAfKLUyRfU9C0hDAZ7IQmGFn+2Tv27/5je21vkQP1DxAxU/UPED3Rg/0DoYkCKAIhsdHvQB37sNAVDxAxU/UPEDFT/QDfEDpRrojPeBJvY5BPa52++p0Lq07hRe/EDFD1T8QMUPdIP8QCsGWrJPD6KL/4r3TEIR6dBBW9aJH6j4gYofqPiBPr/8QPMkEmumx/on/Pv5dOEH6oaj62tjEj9Q8QMVP1DxA91AP1Byp0cVPgak7ne1/EA3oZFe/EDFD1T8QMUPdKP8QItJJKNxlHPKD3Tb7bxpTQAqfqDiByp+oOIHuol+oGkO3qvud57LD3SNZiLiByp+oOIHKn6gm+cH6lf4HfzHefmBup33r9rOTvxAxQ9U/EDFD3Rz/UDBUJnfmXM/P9B4V86VGiqLH6j4gYofqPiBbqYfqFk8AIB4ewbP/f1A6XbG3d7i9eIHKn6g4gcqfqC/0n6g8Jqfn7PbGlO0/EDn5Z05P7yqm8qJH6j4gYofqPiBbpwfKPwHuUf3hJ+8K2cCzgCeCUjhnvCgyr9jlbc1Fj9Q8QMVP1DxA90MP1CrvwXvcSvejZPqn+RGH1P43Ada1kEpjYdjxw/dffWfiB+o+IGKH6j4gf5K+YHCa38aAdMNCTwVB88mC4XU3YQVA1goHD962OlXiB+o+IGKH6j4gf5K+IHCf9p3xVn3mxU2zkf26VgaTwo8F5LSrY1LFgp/03e9+tSRbfEDFT9Q8QMVP9AXth+o1V+H17kFgZPEI5/Gu/F94VUEzzmbRiIRKQQwUIss9Dic/2bxAxU/UPEDFT/QF64fKHp86k8g+8xxMxeSPJBS6j53fdFIz+ufOfRxAtJte81rxA9U/EDFD1T8QF+QfqDwPl8CML0Vft7EQFVkoJl9DiP2qQoBidVAE3gOx+H6Y/A53n/l7vVXiB+o+IGKH6j4gb6w/ECt/k8PnhX7vGVes09e/6TAufixCk81UGShDgH02CGn/1r8QMUPVPxAxQ/0heMH6vQD8Lu/Y+7bljwDjTXQecFCqxYmV5qJlM30sf7pAgPlIArXHDtsrv5D8QMVP1DxAxU/0BeEHyh8f76gEDj1LR48A/OkdQgqfAxK5Ws/UFVOIaXVC0hJTPIg6lP5Pf2hy41+qfiBih+o+IGKH+jz2g8Uvjd3I/OM7HMeQVRRD+i5JpGYAj83oYUp9YBWKXysgx6D649um+Hvj5xdwpSS+IGKH6j4gYof6Jr8QL8F+2/z7BPB04X0vaXAYysTZ58TfqDcUIRS+DkJSbEO6oEUrj0K8WfiByp+oOIHKn6gzz8/UDdA6j58Bsc1zXDCp+/zCKRehQ9MNLPQEQOd8gNlIBoV+KDGm5KBznF7uPHwXcMrxQ9U/EDFD1T8QJ9XfqDw7+AuAk9K4UMNVBc10MxAL8gP9KMliLL6Z0rlB89Aj2674R+veuDaQ+IHKn6g4gcqfqDPFz/QbwCAnYD0+4QHUcXUd0rfuQqf+kAvwA8Utx3rA3WZffq7eHoGittW3wSf5S/FD1T8QMUPVPxAnw9+oA/B3+VT8POcQBAlAYkig+eIgV6gH2hioEUvqAmBaXxkoXMfVv+u+IGKH6j4gYof6Eb7gcJ35ssInj5197VPSt9jG1MJnOehwu/jB7qfCo8s1AOoZ6AQ8L173yu+cuSw+IGKH6j4gYof6Gb6ge7hvY1uI/aZ0/fIRCdA9FL8QNFIhNhnaK5PIlJU4hOQblv9RvEDFT9Q8QMVP9AN9APtvw3fhTtT6o4sNDBRVbUw0Sz8UvxAPZBG8FQcPGMKz1koHP/XCxaUxA9U/EDFD1T8QA/aDxS+Z1/Enk8PnoyFIojGFH5OrUzEQpfkBzpS4g1vZQpCEsX87mteK36g4gcqfqDiB7oxfqDwt7oHQROiSOGjCs9FpNjKdPOy/UDrGmihwgcR6aYYbxE/UPEDFT9Q8QPdED/Q/n64xhuFIHhioPqe25iokV6NnZiW6gda94Gm9D2usQ76d+IHKn6g4gcqfqDr9wMF5yV4/lkAr9sT+2QpfFLgGfs8YD/QUomPIlKqgdrhxm2n3y1+oOIHKn6g4ge6dj9Q+P0ZD54cQFMKb4iFBgVe1fXPA/IDTSl8ZKAYDEQh6/oH8QMVP1DxAxU/0PX6gfppIwLOkL7fHhhojwwU0/eoxBd10BX4gab6JwJpFpE8gMJo59vFD1T8QMUPVPxA1+kHCkYh+lNokmyHzD6ZCl/0gbJG+pX4gcaJpJS+JxAdbrzgsU7xAxU/UPEDFT/QZfqBQq32KwoZJ4BnZJ8KVfi+UOFHo5wr9ANNIlIe5Qws1Oz8vviBih+o+IGKH+i6/EDv88wzsM9Q/2SRVHhFKTz1gK7DD7RO4Z3+l5ffu3iR+IGKH6j4gYof6Or9QI1+EL4Tn/Ts0wMosVBM3Rt9oGkWfn1+oEUb0yWMcoofqPiBih+o+IFemh8ovPYXS/aJ9c8mA6Ua6Lr9QEmFh/W9L/vadS8WP1DxAxU/UPEDXbkfKPzN74HndxCAqty+VLQxhf7P/sQm+YHCsRsO2Z2rxA9U/EDFD1T8QFfuBwrfrfsh7oTf90kCT9gmIL1txEALIWndfqD6I5ftDq+7VEd68QMVP1DxAxU/0Av3A92FWXenP6cCWI4Z6JQKvxl+oB84tDu8aln3RBI/UPEDFT9Q8QO9ID9Q+B7twt/yJLLPyEDrOmjVUL8BfqD6hrnd+YuXnNq5fJm3NRY/UPEDFT9Q8QM9bz9Q+NudCh6fAJxOn6QaqGK1z9RI72oFfoV+oHb4MLz+e+Dca+H78IYrd6+/YmtJj/8H+f3JJqu+sl4AAAAASUVORK5CYII=) no-repeat; background-size: 100%; }
 
 .tag-duikoubangfu, .tag-hyzx { bottom: 0; height: 46rpx; left: 0; line-height: 46rpx; position: absolute; width: 168rpx; }
diff --git a/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs b/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs
index 1922bd3f..e7ba2e9a 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs
@@ -21,6 +21,7 @@ using CoreCms.Net.Loging;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.FromBody;
 using CoreCms.Net.Model.ViewModels.UI;
+using CoreCms.Net.Services;
 using CoreCms.Net.Utility.Helper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
@@ -74,7 +75,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
 
             //获取数据
             var list = await _coreCmsArticleTypeServices.QueryListByClauseAsync(p => p.id > 0, p => p.sort,
-                OrderByType.Desc);
+                OrderByType.Desc, true, true);
             //返回数据
             jm.data = list;
             jm.code = 0;
@@ -132,12 +133,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
         [Description("创建提交")]
         public async Task<AdminUiCallBack> DoCreate([FromBody] CoreCmsArticleType entity)
         {
-            var jm = new AdminUiCallBack();
-
-            var bl = await _coreCmsArticleTypeServices.InsertAsync(entity) > 0;
-            jm.code = bl ? 0 : 1;
-            jm.msg = (bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure);
-
+            var jm = await _coreCmsArticleTypeServices.InsertAsync(entity);
             return jm;
         }
         #endregion
@@ -194,15 +190,13 @@ namespace CoreCms.Net.Web.Admin.Controllers
                 return jm;
             }
             //事物处理过程开始
-            oldModel.id = entity.id;
+            //oldModel.id = entity.id;
             oldModel.name = entity.name;
             oldModel.parentId = entity.parentId;
             oldModel.sort = entity.sort;
 
             //事物处理过程结束
-            var bl = await _coreCmsArticleTypeServices.UpdateAsync(oldModel);
-            jm.code = bl ? 0 : 1;
-            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+            jm = await _coreCmsArticleTypeServices.UpdateAsync(oldModel);
 
             return jm;
         }
@@ -240,9 +234,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
                 return jm;
             }
 
-            var bl = await _coreCmsArticleTypeServices.DeleteByIdAsync(entity.id);
-            jm.code = bl ? 0 : 1;
-            jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
+            jm = await _coreCmsArticleTypeServices.DeleteByIdAsync(entity.id);
 
             return jm;
         }
diff --git a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs
index 6f590bd1..66067f9f 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs
@@ -1142,10 +1142,12 @@ namespace CoreCms.Net.Web.Admin.Controllers
             var jm = new AdminUiCallBack();
             var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1);
             var pageSize = Request.Form["limit"].FirstOrDefault().ObjectToInt(30);
+            var id = Request.Form["id"].FirstOrDefault().ObjectToInt(0);
+
             var where = PredicateBuilder.True<CoreCmsPromotion>();
 
             var dt = DateTime.Now;
-            where = where.And(p => p.isEnable == true && p.isDel == false && p.startTime < dt && p.endTime > dt && p.type == (int)GlobalEnumVars.PromotionType.Seckill);
+            where = where.And(p => p.isEnable == true && p.isDel == false && p.startTime < dt && p.endTime > dt && p.type == id);
 
             //促销名称 nvarchar
             var name = Request.Form["name"].FirstOrDefault();
diff --git a/CoreCms.Net.Web.Admin/appsettings.json b/CoreCms.Net.Web.Admin/appsettings.json
index 031def2a..9b35aed5 100644
--- a/CoreCms.Net.Web.Admin/appsettings.json
+++ b/CoreCms.Net.Web.Admin/appsettings.json
@@ -16,7 +16,7 @@
   "AppConfig": {
     "AppUrl": "https://admin.test.pro.coreshop.cn/", //后端管理地址
     "AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址
-    "AppVersion": "CoreShopProfessional v0.6.2"
+    "AppVersion": "CoreShopProfessional v0.6.4"
   },
   //redis为必须启动项，请保持redis为正常可用
   "RedisConfig": {
diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.css b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.css
index 6910b905..d73b816b 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.css
+++ b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.css
@@ -1045,7 +1045,8 @@ template {
 #selectGoods li .icon-delete:hover {
   color: #000;
 }
-#selectGroupPurchaseGoods li {
+#selectGroupPurchaseGoods li,
+#selectSeckillGoods li {
   float: left;
   margin: 10px;
   height: 100px;
@@ -1055,23 +1056,27 @@ template {
   border-radius: 3px;
   cursor: move;
 }
-#selectGroupPurchaseGoods li .left {
+#selectGroupPurchaseGoods li .left,
+#selectSeckillGoods li .left {
   float: left;
   width: 170px;
   height: 90px;
 }
-#selectGroupPurchaseGoods li .left img {
+#selectGroupPurchaseGoods li .left img,
+#selectSeckillGoods li .left img {
   width: 170px;
   height: 90px;
   object-fit: cover;
 }
-#selectGroupPurchaseGoods li .right {
+#selectGroupPurchaseGoods li .right,
+#selectSeckillGoods li .right {
   float: left;
   width: calc(100% - 180px);
   height: 90px;
   margin-left: 10px;
 }
-#selectGroupPurchaseGoods li .icon-delete {
+#selectGroupPurchaseGoods li .icon-delete,
+#selectSeckillGoods li .icon-delete {
   position: absolute;
   top: -6px;
   right: -6px;
@@ -1082,7 +1087,8 @@ template {
   transition: background-color 0.3s ease-out, border-color 0.3s ease-out;
   -webkit-transition: background-color 0.3s ease-out, border-color 0.3s ease-out;
 }
-#selectGroupPurchaseGoods li .icon-delete:hover {
+#selectGroupPurchaseGoods li .icon-delete:hover,
+#selectSeckillGoods li .icon-delete:hover {
   color: #000;
 }
 .divider {
diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.less b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.less
index 66651d8b..14cdf584 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.less
+++ b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.less
@@ -289,7 +289,7 @@ template { display: none; }
         }
     }
 }
-#selectGroupPurchaseGoods {
+#selectGroupPurchaseGoods, #selectSeckillGoods {
     li { float: left; margin: 10px; height: 100px; width: calc(100% - 20px); background: #f7fafc; position: relative; border-radius: 3px; cursor: move;
         .left { float: left; width: 170px; height: 90px;
             img { width: 170px; height: 90px; object-fit: cover; }
diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.min.css b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.min.css
index 9a760260..5f6b764f 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.min.css
+++ b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.min.css
@@ -1 +1 @@
-html{line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;box-sizing:border-box;}body{margin:0;padding:20px;}article,aside,footer,header,nav,section{display:block;}h1{font-size:2em;margin:.67em 0;}figcaption,figure,main{display:block;}figure{margin:1em 40px;}hr{box-sizing:content-box;height:0;overflow:visible;}pre{font-family:monospace,monospace;font-size:1em;}a{background-color:transparent;-webkit-text-decoration-skip:objects;}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted;}b,strong{font-weight:inherit;font-weight:bolder;}code,kbd,samp{font-family:monospace,monospace;font-size:1em;}dfn{font-style:italic;}mark{background-color:#ff0;color:#000;}small{font-size:80%;}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}sub{bottom:-.25em;}sup{top:-.5em;}audio,video{display:inline-block;}audio:not([controls]){display:none;height:0;}img{border-style:none;}svg:not(:root){overflow:hidden;}button,input,optgroup,select,textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0;}button,input{overflow:visible;}button,select{text-transform:none;}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button;}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0;}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText;}fieldset{padding:.35em .75em .625em;}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal;}progress{display:inline-block;vertical-align:baseline;}textarea{overflow:auto;}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0;}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto;}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px;}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit;}details,menu{display:block;}summary{display:list-item;}canvas{display:inline-block;}template{display:none;}[hidden]{display:none;}.clearfix:after{content:".";display:block;clear:both;visibility:hidden;height:0;font-size:0;}::-moz-selection{background:#009688;color:#fff;}::selection{background:#159b76;color:#fff;}::-webkit-scrollbar{width:6px;height:6px;}::-webkit-scrollbar-thumb{border-radius:10px;background-color:#bdbdbd;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);}.twolist-hidden{display:-webkit-box;word-break:break-all;text-overflow:ellipsis;overflow:hidden;-webkit-box-orient:vertical;-webkit-line-clamp:2;}.form-edit-wrapper{display:-webkit-box;display:-ms-flexbox;display:flex;width:100%;min-width:1200px;background:#fff;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;}.edit-body{height:auto;width:calc(100% - 700px - 300px);}.center-container{width:375px;height:806px;border:1px solid #e9e9e9;box-shadow:0 3px 10px #dcdcdc;position:relative;}.center-container .model-title{height:88px;width:100%;position:relative;}.center-container .model-title img{width:100%;height:100%;}.nav-aside{width:300px;height:auto;position:relative;}.nav-aside .components-wrap{border:1px solid #e9e9e9;padding:10px;text-align:left;color:#666;}.nav-aside .components-wrap .components-title{padding:5px;border-bottom:1px solid #f0f0f0;margin-bottom:35px;}.nav-aside .components-wrap .components-title .text{padding:0 10px;border-left:4px solid #ff7159;}.nav-aside .components-wrap .components-list{display:-webkit-box;display:-ms-flexbox;display:flex;}.nav-aside .components-wrap .components-list .component-item{padding:10px;}.nav-aside .components-wrap .components-list .component-item ul{position:relative;overflow:hidden;padding:0;margin:0;}.nav-aside .components-wrap .components-list .component-item-title{font-size:12px;color:#999;margin:10px 0;}.nav-aside .components-wrap .components-list .component-item-li{width:74px;float:left;padding:3px 0;margin:5px;height:50px;text-align:center;display:block;background-color:#f5f5f5;border:1px solid #ddd;font-size:12px;color:#333;cursor:pointer;-webkit-transition:all .5s;transition:all .5s;height:auto;}.nav-aside .components-wrap .components-list .component-item-li .iconfont{font-size:20px !important;margin-bottom:5px;margin-right:0 !important;}.nav-aside .components-wrap .components-list .component-item-li .text{padding:0;margin-top:5px;}.urlBox{width:800px;border:1px solid #e9e9e9;box-shadow:0 3px 10px #dcdcdc;position:relative;padding:10px;}.urlBox p{font-size:13px;word-break:break-all;line-height:30px;}.recycle{position:absolute;top:43px;right:26px;}.recycle ul{position:relative;}.recycle ul li.component-item-li{display:none;}.recycle ul .layout-main{position:absolute;width:100%;height:30px;top:10px;left:0;}.recycle ul .ghost{background:#fff;border:1px dashed #409eff;position:absolute;left:0;line-height:30px;height:30px;overflow:hidden;list-style:none;font-size:0;}.recycle ul .ghost::after{content:'删除组件';display:block;background:#fff;position:absolute;text-align:center;top:0;left:0;right:0;font-size:12px;color:#000;z-index:2000;}.recycle-content{width:55px;padding:3px 0;margin:5px;height:45px;text-align:center;background-color:#fff;border:1px solid #ddd;font-size:12px;color:#333;-webkit-transition:all .5s;transition:all .5s;height:auto;}.recycle-content .iconfont{font-size:16px !important;margin-right:0 !important;margin-bottom:3px;}.recycle-content .text{margin-top:5px;}.layout-list{height:710px;overflow-y:scroll;}.layout-list .layout-main{position:relative;}.layout-list .layout-main.npr{position:static !important;}.layout-list .layout-main .drag{position:relative;}.layout-list .layout-main .lay-item{display:-webkit-box;display:-ms-flexbox;display:flex;}.layout-list .layout-main .lay-notice{line-height:32px;padding:2px 10px;background:#fff;overflow:hidden;}.layout-list .layout-main .lay-notice .notice-right{height:32px;overflow:hidden;}.layout-list .layout-main .lay-notice .notice-right .notice-text{text-overflow:ellipsis;overflow:hidden;white-space:nowrap;}.layout-list .layout-main .lay-notice .iconfont{color:#ff7159;margin-right:2px;}.layout-list .layout-main .lay-guide .line{width:100%;height:0;border-top:1px solid #000;}.layout-list .layout-main .lay-textarea textarea{display:block;width:100%;border:none;}.layout-list .layout-main .lay-navBar.row3 .item{width:33.3333%;}.layout-list .layout-main .lay-navBar.row4 .item{width:25%;}.layout-list .layout-main .lay-navBar.row5 .item{width:20%;}.layout-list .layout-main .lay-navBar .item{float:left;text-align:center;padding:10px 0;}.layout-list .layout-main .lay-navBar .item-image{margin-bottom:4px;text-align:center;}.layout-list .layout-main .lay-navBar .item-image img{height:44px;width:44px;object-fit:cover;}.layout-list .layout-main .lay-navBar .item-text{height:20px;line-height:20px;width:70px;margin:0 auto;text-align:center;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;}.layout-list .layout-main .lay-imgSingle .img-wrap{display:block;margin:0;height:auto;flex:1;position:relative;}.layout-list .layout-main .lay-imgSingle .img-wrap img{display:block;width:100%;}.layout-list .layout-main .lay-imgSingle .img-wrap .img-btn{display:block;position:absolute;bottom:25px;left:40px;width:80px;height:30px;line-height:30px;text-align:center;}.layout-list .layout-main .lay-imgSlide .el-carousel{overflow:hidden !important;width:100%;height:175px !important;}.layout-list .layout-main .el-carousel__container{height:175px !important;}.layout-list .layout-main .el-carousel__item{height:175px !important;}.layout-list .layout-main .lay-search{width:100%;height:50px;padding:7px 13px;}.layout-list .layout-main .lay-search .iconfont{position:absolute;top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%);right:15px;color:#999;font-size:18px !important;}.layout-list .layout-main .lay-search-c{width:100%;height:100%;position:relative;}.layout-list .layout-main .lay-search-input{width:100%;height:100%;border-radius:50px;background-color:#e9e9e9;border:none;padding:0 15px;color:#999;cursor:move;}.layout-list .layout-main .lay-search-input.square{border-radius:0;}.layout-list .layout-main .lay-search-input.radius{border-radius:5px;}.layout-list .layout-main .lay-search-input.round{border-radius:18px;}.layout-list .layout-main .btn-clone{position:absolute;height:18px;line-height:18px;right:50px;bottom:2px;z-index:90;width:36px;text-align:center;font-size:10px;color:#fff;background:#409eff;cursor:pointer;z-index:1300;}.layout-list .layout-main .btn-delete{position:absolute;height:18px;line-height:18px;right:2px;bottom:2px;z-index:90;width:36px;text-align:center;font-size:10px;color:#fff;background:rgba(0,0,0,.4);cursor:pointer;z-index:1300;}.layout-list .ghost{background:#fff;border:1px dashed #409eff;}.layout-list .ghost::after{background:#fff;}.layout-list li.ghost{position:relative;line-height:30px;list-style:none;font-size:0;}.layout-list li.ghost::after{content:'放到这里';display:block;background:#fff;position:absolute;left:50%;margin-left:-32px;top:0;font-size:16px;color:#999;z-index:10;}.layout-list .layout-main.active .drag:before,.layout-main:hover .drag:before{content:'';position:absolute;top:0;left:0;right:0;bottom:0;border:2px dashed #ff7159;cursor:move;z-index:1001;}.lay-navBar{min-height:88px;}.lay-article{background:#f7f7f7;}.lay-article .article-wrap{width:100%;height:100px;padding:15px;background:#fff;}.lay-article .article-wrap:not(last-child){margin-bottom:10px;}.lay-article .article-wrap .article-left{float:left;height:100%;width:200px;}.lay-article .article-wrap .article-img{float:right;width:120px;height:70px;}.lay-article .article-wrap .article-img img{display:block;width:120px;height:100%;object-fit:cover;}.savePageBtn{padding:10px 13px;border-top:1px dotted #ddd;display:flex;justify-content:space-between;}.lay-special{height:30px;align-items:center;}.lay-special .special-left{width:70px;padding:5px 10px;}.lay-special .special-left img{width:100%;}.lay-goods{background:#f6f6f6;}.lay-goods .goods-head{height:40px;display:flex;justify-content:space-between;align-items:center;background:#fff;padding:0 10px;}.lay-goods .goods-tab-head{min-height:40px;display:inline-block;justify-content:flex-start;align-items:center;background:#fff;padding:0 10px;}.lay-goods .goods-tab-head div{padding:3px 10px;background:#e9e9e9;border-radius:10px;margin:5px 5px;float:left;}.lay-goods.list{height:auto;}.lay-goods.list .goods-item{float:left;}.lay-goods.slide{overflow-x:hidden;white-space:nowrap;width:auto;}.lay-goods.slide .goods-item{float:none;display:inline-block;}.lay-goods .goods-item.column2{width:50%;padding:3px;float:left;}.lay-goods .goods-item.column1{width:100%;padding:8px;height:140px;display:flex;background:#fff;margin-bottom:8px;}.lay-goods .goods-item.column1 .goods-price{margin-top:50px;}.lay-goods .goods-item.column1 .goods-image{width:120px;height:120px;padding:0;}.lay-goods .goods-item.column1 .goods-image img{width:120px;height:120px;padding:0;}.lay-goods .goods-item.column1 .goods-detail{flex:1;}.lay-goods .goods-item.column3{width:33%;padding:3px;}.lay-goods .goods-item .goods-image{position:relative;width:100%;height:0;padding-bottom:100%;overflow:hidden;background:#fff;}.lay-goods .goods-item .goods-image:after{content:'';display:block;margin-top:100%;}.lay-goods .goods-item .goods-image img{position:absolute;width:100%;height:100%;top:0;left:0;-o-object-fit:cover;object-fit:cover;}.lay-goods .goods-item .goods-detail{padding:4px;background:#fff;font-size:13px;}.lay-goods .goods-item .goods-detail .goods-name{height:40px;overflow:hidden;margin-bottom:5px;}.lay-goods .goods-item .goods-detail .goods-price{font-size:15px;color:#f00;}.lay-goods.group{background:#fff;padding:10px;}.lay-goods .group-item{width:300px;padding:10px;position:relative;background:#f6f6f6;height:120px;display:inline-block;margin-right:15px;}.lay-goods .group-item .group-image{width:98px;height:98px;position:absolute;left:10px;top:10px;}.lay-goods .group-item .group-image img{width:100%;height:100%;object-fit:cover;}.lay-goods .group-item .group-detail{position:absolute;top:10px;left:120px;bottom:10px;right:0;}.lay-goods .group-item .group-detail .group-price{position:absolute;top:50px;left:0;font-size:18px;color:#ff7159;}.lay-goods .group-item .group-detail .group-time{position:absolute;bottom:0;left:0;font-size:12px;}.lay-goods .group-item .group-detail .group-time span{color:#ff7159;padding:3px;text-align:center;}.lay-goods .group-item .group-detail .group-time span.time{background:#fff;}.lay-goods .group-item .group-detail .buy-icon{position:absolute;bottom:0;right:10px;display:block;width:20px;height:20px;}.lay-goods .group-item .group-detail .buy-icon img{width:100%;}.lay-service{width:50px;height:50px;padding:4px;position:absolute;bottom:30px;right:10px;}.lay-record{width:210px;background:rgba(0,0,0,.25);position:absolute !important;top:30%;z-index:9999;cursor:pointer;}.lay-record.left{left:0;}.lay-record.right{right:0;}.lay-record:before{cursor:pointer !important;}.record-item{height:30px;line-height:30px;padding-left:10px;}.record-item .text{color:#ff7159;}.lay-coupon{padding:4px 12px;}.lay-coupon .coupon-item{width:100%;box-sizing:border-box;background:linear-gradient(to right,#ff6565,#ff8a8a);margin:.1rem 0;border-radius:5px;overflow:hidden;position:relative;}.lay-coupon .coupon-item .coupon-left{width:28%;height:50px;color:#fff7f7;font-size:12px;padding:0 14px;float:left;margin:12px 0;text-align:center;box-sizing:border-box;border-right:1px dotted #fff;display:inline-block;}.lay-coupon .coupon-item .coupon-left p{position:relative;top:50%;transform:translateY(-50%);}.lay-coupon .coupon-item .coupon-right{width:50%;height:100%;float:left;text-align:left;color:#fff;box-sizing:border-box;padding:10px;display:inline-block;font-size:12px;}.lay-coupon .coupon-item .coupon-right .conpon-f{font-size:14px;}.lay-coupon .coupon-item .coupon-btn{padding:0 8px;background-color:#ffe7e7;color:#ff5454;font-size:12px;position:absolute;top:50%;transform:translateY(-50%);right:10px;border-radius:2px;}.lay-imgWindow{min-height:100px;}.lay-imgWindow.row0 .display{height:0;width:100%;margin:0;padding-bottom:50%;position:relative;}.lay-imgWindow.row2 .img-wrap{width:50%;height:150px;}.lay-imgWindow.row3 .img-wrap{width:33%;height:150px;}.lay-imgWindow.row4 .img-wrap{width:25%;height:150px;}.lay-imgWindow .img-wrap{float:left;box-sizing:border-box;}.lay-imgWindow .img-wrap img{width:100%;height:100%;object-fit:cover;}.display img{width:100%;height:100%;}.display .display-left{width:50%;height:100%;position:absolute;top:0;left:0;}.display .display-right{width:50%;height:100%;position:absolute;top:0;left:50%;}.display .display-right .display-right1{width:100%;height:50%;position:absolute;top:0;left:0;}.display .display-right .display-right2{width:100%;height:50%;position:absolute;top:50%;left:0;}.display .display-right .display-right2 .left{width:50%;height:100%;position:absolute;top:0;left:0;}.display .display-right .display-right2 .right{width:50%;height:100%;position:absolute;top:0;left:50%;}.lay-video .video-wrap{width:100%;z-index:1200;}.lay-video .video-wrap video{display:block;width:100%;}.pl25{padding-left:25px;}.custom-tip{margin-top:40px;}.custom-tip p{margin-bottom:5px;}#selectGoods li{float:left;margin:10px;height:70px;width:70px;background:#f7fafc;position:relative;border-radius:3px;cursor:move;}#selectGoods li img{width:100%;height:100%;object-fit:cover;}#selectGoods li .icon-delete{position:absolute;top:-6px;right:-6px;border-radius:50%;text-align:center;cursor:pointer;font-size:18px;transition:background-color .3s ease-out,border-color .3s ease-out;-webkit-transition:background-color .3s ease-out,border-color .3s ease-out;}#selectGoods li .icon-delete:hover{color:#000;}#selectGroupPurchaseGoods li{float:left;margin:10px;height:100px;width:calc(100% - 20px);background:#f7fafc;position:relative;border-radius:3px;cursor:move;}#selectGroupPurchaseGoods li .left{float:left;width:170px;height:90px;}#selectGroupPurchaseGoods li .left img{width:170px;height:90px;object-fit:cover;}#selectGroupPurchaseGoods li .right{float:left;width:calc(100% - 180px);height:90px;margin-left:10px;}#selectGroupPurchaseGoods li .icon-delete{position:absolute;top:-6px;right:-6px;border-radius:50%;text-align:center;cursor:pointer;font-size:18px;transition:background-color .3s ease-out,border-color .3s ease-out;-webkit-transition:background-color .3s ease-out,border-color .3s ease-out;}#selectGroupPurchaseGoods li .icon-delete:hover{color:#000;}.divider{height:0;margin:20px auto;overflow:hidden;clear:both;border-top:1px dashed #ccc;}.el-color-picker{height:24px !important;vertical-align:middle;}.el-color-picker__trigger{height:24px !important;}.reset-color{display:inline-block;padding:0 10px;border:1px solid #bdbdbd;text-align:center;height:20px;line-height:20px;vertical-align:middle;margin-left:5px;}.main-body{padding:10px;border:1px solid #e9e9e9;}.main-body .el-form-item{padding:0;margin-bottom:0 !important;font-size:12px !important;}.main-body .el-form-item__label{font-size:12px !important;line-height:40px !important;}.main-body .el-slider__runway{margin:12px 0 !important;}.custom-item-t{padding:5px;border-bottom:1px solid #f0f0f0;margin-bottom:15px;}.custom-item-t-c{padding:0 10px;border-left:4px solid #ff7159;text-align:left;}.custom-item .layui-form-label{box-sizing:content-box;}.custom-item .content{padding:10px;}.custom-item .drag-block{height:30px;background:#f2f2f2;cursor:move;position:relative;}.custom-item .drag-block .handle-icon{position:absolute;right:0;top:0;width:30px;height:30px;line-height:30px;text-align:center;cursor:pointer;}.custom-item .drag-block .handle-icon .iconfont{font-size:16px !important;color:#999;margin:0 auto;}.custom-item .drag-block .handle-icon .iconfont:hover{color:#ff7159;}.custom-item .content-item{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;margin-bottom:5px;}.custom-item .content-item .item-label{width:90px;}.custom-item .content-item .el-input{-webkit-box-flex:1;-ms-flex:1;flex:1;}.custom-item li{border:1px dashed #e9e9e9;}.custom-item li.ghost{border-color:#ff7159;}.custom-item .addImg{width:100%;height:32px;line-height:32px;text-align:left;border:1px dashed #e9e9e9;margin-top:15px;cursor:pointer;padding-left:5px;}.custom-item .addImg .iconfont{font-size:12px !important;margin-right:5px !important;}.custom-item .addImg:hover{color:#ff7159;}.content-item .el-form-item{flex:1;}.content-item .el-radio-group .el-radio{margin-bottom:10px;}.el-select-dropdown__item.second span{padding-left:15px !important;}.number-input{width:100%;padding:5px;margin-bottom:4px;border:0;border-bottom:1px solid #c2cad8;transition:all ease-in-out .15s;}.number-input:focus{border-color:#ff7159;}.tpl-block{flex:1;padding-left:20px;}.tpl-item{width:75px;height:75px;display:inline-block;border:1px solid #e5e5e5;margin:0 10px 15px 0;padding-top:5px;background-color:#fff;text-align:center;cursor:pointer;}.tpl-item.active{border:1px solid #ff7159;}.tpl-item .tpl-item-image{height:40px;}.tpl-item .tpl-item-image img{height:auto;width:60px;margin:0 auto;vertical-align:middle;}.tpl-item .tpl-item-text{margin-top:10px;font-size:12px;}.selectLinkVal{width:100%;padding:0 10px;color:#555;height:30px;line-height:30px;margin-top:5px;border:1px solid #bdbdbd;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;font-size:12px;}.layout-select{width:100%;padding:5px 6px;color:#555;line-height:1.5;margin-bottom:4px;}.el-select{width:100% !important;}.el-input__inner,.el-textarea__inner{border-radius:0 !important;border:1px solid #bdbdbd !important;height:30px !important;line-height:30px !important;padding:0 10px !important;font-size:12px !important;}.ml20{margin-left:20px;}.layout-tip{color:#838fa1;font-size:12px;}*,*:before,*:after{box-sizing:inherit;}.layui-nav .layui-nav-item{box-sizing:content-box;}.tabBarItem{border:1px solid #e9e9e9;margin-bottom:10px;padding:10px;}
\ No newline at end of file
+html{line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;box-sizing:border-box;}body{margin:0;padding:20px;}article,aside,footer,header,nav,section{display:block;}h1{font-size:2em;margin:.67em 0;}figcaption,figure,main{display:block;}figure{margin:1em 40px;}hr{box-sizing:content-box;height:0;overflow:visible;}pre{font-family:monospace,monospace;font-size:1em;}a{background-color:transparent;-webkit-text-decoration-skip:objects;}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted;}b,strong{font-weight:inherit;font-weight:bolder;}code,kbd,samp{font-family:monospace,monospace;font-size:1em;}dfn{font-style:italic;}mark{background-color:#ff0;color:#000;}small{font-size:80%;}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}sub{bottom:-.25em;}sup{top:-.5em;}audio,video{display:inline-block;}audio:not([controls]){display:none;height:0;}img{border-style:none;}svg:not(:root){overflow:hidden;}button,input,optgroup,select,textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0;}button,input{overflow:visible;}button,select{text-transform:none;}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button;}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0;}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText;}fieldset{padding:.35em .75em .625em;}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal;}progress{display:inline-block;vertical-align:baseline;}textarea{overflow:auto;}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0;}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto;}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px;}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit;}details,menu{display:block;}summary{display:list-item;}canvas{display:inline-block;}template{display:none;}[hidden]{display:none;}.clearfix:after{content:".";display:block;clear:both;visibility:hidden;height:0;font-size:0;}::-moz-selection{background:#009688;color:#fff;}::selection{background:#159b76;color:#fff;}::-webkit-scrollbar{width:6px;height:6px;}::-webkit-scrollbar-thumb{border-radius:10px;background-color:#bdbdbd;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);}.twolist-hidden{display:-webkit-box;word-break:break-all;text-overflow:ellipsis;overflow:hidden;-webkit-box-orient:vertical;-webkit-line-clamp:2;}.form-edit-wrapper{display:-webkit-box;display:-ms-flexbox;display:flex;width:100%;min-width:1200px;background:#fff;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;}.edit-body{height:auto;width:calc(100% - 700px - 300px);}.center-container{width:375px;height:806px;border:1px solid #e9e9e9;box-shadow:0 3px 10px #dcdcdc;position:relative;}.center-container .model-title{height:88px;width:100%;position:relative;}.center-container .model-title img{width:100%;height:100%;}.nav-aside{width:300px;height:auto;position:relative;}.nav-aside .components-wrap{border:1px solid #e9e9e9;padding:10px;text-align:left;color:#666;}.nav-aside .components-wrap .components-title{padding:5px;border-bottom:1px solid #f0f0f0;margin-bottom:35px;}.nav-aside .components-wrap .components-title .text{padding:0 10px;border-left:4px solid #ff7159;}.nav-aside .components-wrap .components-list{display:-webkit-box;display:-ms-flexbox;display:flex;}.nav-aside .components-wrap .components-list .component-item{padding:10px;}.nav-aside .components-wrap .components-list .component-item ul{position:relative;overflow:hidden;padding:0;margin:0;}.nav-aside .components-wrap .components-list .component-item-title{font-size:12px;color:#999;margin:10px 0;}.nav-aside .components-wrap .components-list .component-item-li{width:74px;float:left;padding:3px 0;margin:5px;height:50px;text-align:center;display:block;background-color:#f5f5f5;border:1px solid #ddd;font-size:12px;color:#333;cursor:pointer;-webkit-transition:all .5s;transition:all .5s;height:auto;}.nav-aside .components-wrap .components-list .component-item-li .iconfont{font-size:20px !important;margin-bottom:5px;margin-right:0 !important;}.nav-aside .components-wrap .components-list .component-item-li .text{padding:0;margin-top:5px;}.urlBox{width:800px;border:1px solid #e9e9e9;box-shadow:0 3px 10px #dcdcdc;position:relative;padding:10px;}.urlBox p{font-size:13px;word-break:break-all;line-height:30px;}.recycle{position:absolute;top:43px;right:26px;}.recycle ul{position:relative;}.recycle ul li.component-item-li{display:none;}.recycle ul .layout-main{position:absolute;width:100%;height:30px;top:10px;left:0;}.recycle ul .ghost{background:#fff;border:1px dashed #409eff;position:absolute;left:0;line-height:30px;height:30px;overflow:hidden;list-style:none;font-size:0;}.recycle ul .ghost::after{content:'删除组件';display:block;background:#fff;position:absolute;text-align:center;top:0;left:0;right:0;font-size:12px;color:#000;z-index:2000;}.recycle-content{width:55px;padding:3px 0;margin:5px;height:45px;text-align:center;background-color:#fff;border:1px solid #ddd;font-size:12px;color:#333;-webkit-transition:all .5s;transition:all .5s;height:auto;}.recycle-content .iconfont{font-size:16px !important;margin-right:0 !important;margin-bottom:3px;}.recycle-content .text{margin-top:5px;}.layout-list{height:710px;overflow-y:scroll;}.layout-list .layout-main{position:relative;}.layout-list .layout-main.npr{position:static !important;}.layout-list .layout-main .drag{position:relative;}.layout-list .layout-main .lay-item{display:-webkit-box;display:-ms-flexbox;display:flex;}.layout-list .layout-main .lay-notice{line-height:32px;padding:2px 10px;background:#fff;overflow:hidden;}.layout-list .layout-main .lay-notice .notice-right{height:32px;overflow:hidden;}.layout-list .layout-main .lay-notice .notice-right .notice-text{text-overflow:ellipsis;overflow:hidden;white-space:nowrap;}.layout-list .layout-main .lay-notice .iconfont{color:#ff7159;margin-right:2px;}.layout-list .layout-main .lay-guide .line{width:100%;height:0;border-top:1px solid #000;}.layout-list .layout-main .lay-textarea textarea{display:block;width:100%;border:none;}.layout-list .layout-main .lay-navBar.row3 .item{width:33.3333%;}.layout-list .layout-main .lay-navBar.row4 .item{width:25%;}.layout-list .layout-main .lay-navBar.row5 .item{width:20%;}.layout-list .layout-main .lay-navBar .item{float:left;text-align:center;padding:10px 0;}.layout-list .layout-main .lay-navBar .item-image{margin-bottom:4px;text-align:center;}.layout-list .layout-main .lay-navBar .item-image img{height:44px;width:44px;object-fit:cover;}.layout-list .layout-main .lay-navBar .item-text{height:20px;line-height:20px;width:70px;margin:0 auto;text-align:center;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;}.layout-list .layout-main .lay-imgSingle .img-wrap{display:block;margin:0;height:auto;flex:1;position:relative;}.layout-list .layout-main .lay-imgSingle .img-wrap img{display:block;width:100%;}.layout-list .layout-main .lay-imgSingle .img-wrap .img-btn{display:block;position:absolute;bottom:25px;left:40px;width:80px;height:30px;line-height:30px;text-align:center;}.layout-list .layout-main .lay-imgSlide .el-carousel{overflow:hidden !important;width:100%;height:175px !important;}.layout-list .layout-main .el-carousel__container{height:175px !important;}.layout-list .layout-main .el-carousel__item{height:175px !important;}.layout-list .layout-main .lay-search{width:100%;height:50px;padding:7px 13px;}.layout-list .layout-main .lay-search .iconfont{position:absolute;top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%);right:15px;color:#999;font-size:18px !important;}.layout-list .layout-main .lay-search-c{width:100%;height:100%;position:relative;}.layout-list .layout-main .lay-search-input{width:100%;height:100%;border-radius:50px;background-color:#e9e9e9;border:none;padding:0 15px;color:#999;cursor:move;}.layout-list .layout-main .lay-search-input.square{border-radius:0;}.layout-list .layout-main .lay-search-input.radius{border-radius:5px;}.layout-list .layout-main .lay-search-input.round{border-radius:18px;}.layout-list .layout-main .btn-clone{position:absolute;height:18px;line-height:18px;right:50px;bottom:2px;z-index:90;width:36px;text-align:center;font-size:10px;color:#fff;background:#409eff;cursor:pointer;z-index:1300;}.layout-list .layout-main .btn-delete{position:absolute;height:18px;line-height:18px;right:2px;bottom:2px;z-index:90;width:36px;text-align:center;font-size:10px;color:#fff;background:rgba(0,0,0,.4);cursor:pointer;z-index:1300;}.layout-list .ghost{background:#fff;border:1px dashed #409eff;}.layout-list .ghost::after{background:#fff;}.layout-list li.ghost{position:relative;line-height:30px;list-style:none;font-size:0;}.layout-list li.ghost::after{content:'放到这里';display:block;background:#fff;position:absolute;left:50%;margin-left:-32px;top:0;font-size:16px;color:#999;z-index:10;}.layout-list .layout-main.active .drag:before,.layout-main:hover .drag:before{content:'';position:absolute;top:0;left:0;right:0;bottom:0;border:2px dashed #ff7159;cursor:move;z-index:1001;}.lay-navBar{min-height:88px;}.lay-article{background:#f7f7f7;}.lay-article .article-wrap{width:100%;height:100px;padding:15px;background:#fff;}.lay-article .article-wrap:not(last-child){margin-bottom:10px;}.lay-article .article-wrap .article-left{float:left;height:100%;width:200px;}.lay-article .article-wrap .article-img{float:right;width:120px;height:70px;}.lay-article .article-wrap .article-img img{display:block;width:120px;height:100%;object-fit:cover;}.savePageBtn{padding:10px 13px;border-top:1px dotted #ddd;display:flex;justify-content:space-between;}.lay-special{height:30px;align-items:center;}.lay-special .special-left{width:70px;padding:5px 10px;}.lay-special .special-left img{width:100%;}.lay-goods{background:#f6f6f6;}.lay-goods .goods-head{height:40px;display:flex;justify-content:space-between;align-items:center;background:#fff;padding:0 10px;}.lay-goods .goods-tab-head{min-height:40px;display:inline-block;justify-content:flex-start;align-items:center;background:#fff;padding:0 10px;}.lay-goods .goods-tab-head div{padding:3px 10px;background:#e9e9e9;border-radius:10px;margin:5px 5px;float:left;}.lay-goods.list{height:auto;}.lay-goods.list .goods-item{float:left;}.lay-goods.slide{overflow-x:hidden;white-space:nowrap;width:auto;}.lay-goods.slide .goods-item{float:none;display:inline-block;}.lay-goods .goods-item.column2{width:50%;padding:3px;float:left;}.lay-goods .goods-item.column1{width:100%;padding:8px;height:140px;display:flex;background:#fff;margin-bottom:8px;}.lay-goods .goods-item.column1 .goods-price{margin-top:50px;}.lay-goods .goods-item.column1 .goods-image{width:120px;height:120px;padding:0;}.lay-goods .goods-item.column1 .goods-image img{width:120px;height:120px;padding:0;}.lay-goods .goods-item.column1 .goods-detail{flex:1;}.lay-goods .goods-item.column3{width:33%;padding:3px;}.lay-goods .goods-item .goods-image{position:relative;width:100%;height:0;padding-bottom:100%;overflow:hidden;background:#fff;}.lay-goods .goods-item .goods-image:after{content:'';display:block;margin-top:100%;}.lay-goods .goods-item .goods-image img{position:absolute;width:100%;height:100%;top:0;left:0;-o-object-fit:cover;object-fit:cover;}.lay-goods .goods-item .goods-detail{padding:4px;background:#fff;font-size:13px;}.lay-goods .goods-item .goods-detail .goods-name{height:40px;overflow:hidden;margin-bottom:5px;}.lay-goods .goods-item .goods-detail .goods-price{font-size:15px;color:#f00;}.lay-goods.group{background:#fff;padding:10px;}.lay-goods .group-item{width:300px;padding:10px;position:relative;background:#f6f6f6;height:120px;display:inline-block;margin-right:15px;}.lay-goods .group-item .group-image{width:98px;height:98px;position:absolute;left:10px;top:10px;}.lay-goods .group-item .group-image img{width:100%;height:100%;object-fit:cover;}.lay-goods .group-item .group-detail{position:absolute;top:10px;left:120px;bottom:10px;right:0;}.lay-goods .group-item .group-detail .group-price{position:absolute;top:50px;left:0;font-size:18px;color:#ff7159;}.lay-goods .group-item .group-detail .group-time{position:absolute;bottom:0;left:0;font-size:12px;}.lay-goods .group-item .group-detail .group-time span{color:#ff7159;padding:3px;text-align:center;}.lay-goods .group-item .group-detail .group-time span.time{background:#fff;}.lay-goods .group-item .group-detail .buy-icon{position:absolute;bottom:0;right:10px;display:block;width:20px;height:20px;}.lay-goods .group-item .group-detail .buy-icon img{width:100%;}.lay-service{width:50px;height:50px;padding:4px;position:absolute;bottom:30px;right:10px;}.lay-record{width:210px;background:rgba(0,0,0,.25);position:absolute !important;top:30%;z-index:9999;cursor:pointer;}.lay-record.left{left:0;}.lay-record.right{right:0;}.lay-record:before{cursor:pointer !important;}.record-item{height:30px;line-height:30px;padding-left:10px;}.record-item .text{color:#ff7159;}.lay-coupon{padding:4px 12px;}.lay-coupon .coupon-item{width:100%;box-sizing:border-box;background:linear-gradient(to right,#ff6565,#ff8a8a);margin:.1rem 0;border-radius:5px;overflow:hidden;position:relative;}.lay-coupon .coupon-item .coupon-left{width:28%;height:50px;color:#fff7f7;font-size:12px;padding:0 14px;float:left;margin:12px 0;text-align:center;box-sizing:border-box;border-right:1px dotted #fff;display:inline-block;}.lay-coupon .coupon-item .coupon-left p{position:relative;top:50%;transform:translateY(-50%);}.lay-coupon .coupon-item .coupon-right{width:50%;height:100%;float:left;text-align:left;color:#fff;box-sizing:border-box;padding:10px;display:inline-block;font-size:12px;}.lay-coupon .coupon-item .coupon-right .conpon-f{font-size:14px;}.lay-coupon .coupon-item .coupon-btn{padding:0 8px;background-color:#ffe7e7;color:#ff5454;font-size:12px;position:absolute;top:50%;transform:translateY(-50%);right:10px;border-radius:2px;}.lay-imgWindow{min-height:100px;}.lay-imgWindow.row0 .display{height:0;width:100%;margin:0;padding-bottom:50%;position:relative;}.lay-imgWindow.row2 .img-wrap{width:50%;height:150px;}.lay-imgWindow.row3 .img-wrap{width:33%;height:150px;}.lay-imgWindow.row4 .img-wrap{width:25%;height:150px;}.lay-imgWindow .img-wrap{float:left;box-sizing:border-box;}.lay-imgWindow .img-wrap img{width:100%;height:100%;object-fit:cover;}.display img{width:100%;height:100%;}.display .display-left{width:50%;height:100%;position:absolute;top:0;left:0;}.display .display-right{width:50%;height:100%;position:absolute;top:0;left:50%;}.display .display-right .display-right1{width:100%;height:50%;position:absolute;top:0;left:0;}.display .display-right .display-right2{width:100%;height:50%;position:absolute;top:50%;left:0;}.display .display-right .display-right2 .left{width:50%;height:100%;position:absolute;top:0;left:0;}.display .display-right .display-right2 .right{width:50%;height:100%;position:absolute;top:0;left:50%;}.lay-video .video-wrap{width:100%;z-index:1200;}.lay-video .video-wrap video{display:block;width:100%;}.pl25{padding-left:25px;}.custom-tip{margin-top:40px;}.custom-tip p{margin-bottom:5px;}#selectGoods li{float:left;margin:10px;height:70px;width:70px;background:#f7fafc;position:relative;border-radius:3px;cursor:move;}#selectGoods li img{width:100%;height:100%;object-fit:cover;}#selectGoods li .icon-delete{position:absolute;top:-6px;right:-6px;border-radius:50%;text-align:center;cursor:pointer;font-size:18px;transition:background-color .3s ease-out,border-color .3s ease-out;-webkit-transition:background-color .3s ease-out,border-color .3s ease-out;}#selectGoods li .icon-delete:hover{color:#000;}#selectGroupPurchaseGoods li,#selectSeckillGoods li{float:left;margin:10px;height:100px;width:calc(100% - 20px);background:#f7fafc;position:relative;border-radius:3px;cursor:move;}#selectGroupPurchaseGoods li .left,#selectSeckillGoods li .left{float:left;width:170px;height:90px;}#selectGroupPurchaseGoods li .left img,#selectSeckillGoods li .left img{width:170px;height:90px;object-fit:cover;}#selectGroupPurchaseGoods li .right,#selectSeckillGoods li .right{float:left;width:calc(100% - 180px);height:90px;margin-left:10px;}#selectGroupPurchaseGoods li .icon-delete,#selectSeckillGoods li .icon-delete{position:absolute;top:-6px;right:-6px;border-radius:50%;text-align:center;cursor:pointer;font-size:18px;transition:background-color .3s ease-out,border-color .3s ease-out;-webkit-transition:background-color .3s ease-out,border-color .3s ease-out;}#selectGroupPurchaseGoods li .icon-delete:hover,#selectSeckillGoods li .icon-delete:hover{color:#000;}.divider{height:0;margin:20px auto;overflow:hidden;clear:both;border-top:1px dashed #ccc;}.el-color-picker{height:24px !important;vertical-align:middle;}.el-color-picker__trigger{height:24px !important;}.reset-color{display:inline-block;padding:0 10px;border:1px solid #bdbdbd;text-align:center;height:20px;line-height:20px;vertical-align:middle;margin-left:5px;}.main-body{padding:10px;border:1px solid #e9e9e9;}.main-body .el-form-item{padding:0;margin-bottom:0 !important;font-size:12px !important;}.main-body .el-form-item__label{font-size:12px !important;line-height:40px !important;}.main-body .el-slider__runway{margin:12px 0 !important;}.custom-item-t{padding:5px;border-bottom:1px solid #f0f0f0;margin-bottom:15px;}.custom-item-t-c{padding:0 10px;border-left:4px solid #ff7159;text-align:left;}.custom-item .layui-form-label{box-sizing:content-box;}.custom-item .content{padding:10px;}.custom-item .drag-block{height:30px;background:#f2f2f2;cursor:move;position:relative;}.custom-item .drag-block .handle-icon{position:absolute;right:0;top:0;width:30px;height:30px;line-height:30px;text-align:center;cursor:pointer;}.custom-item .drag-block .handle-icon .iconfont{font-size:16px !important;color:#999;margin:0 auto;}.custom-item .drag-block .handle-icon .iconfont:hover{color:#ff7159;}.custom-item .content-item{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;margin-bottom:5px;}.custom-item .content-item .item-label{width:90px;}.custom-item .content-item .el-input{-webkit-box-flex:1;-ms-flex:1;flex:1;}.custom-item li{border:1px dashed #e9e9e9;}.custom-item li.ghost{border-color:#ff7159;}.custom-item .addImg{width:100%;height:32px;line-height:32px;text-align:left;border:1px dashed #e9e9e9;margin-top:15px;cursor:pointer;padding-left:5px;}.custom-item .addImg .iconfont{font-size:12px !important;margin-right:5px !important;}.custom-item .addImg:hover{color:#ff7159;}.content-item .el-form-item{flex:1;}.content-item .el-radio-group .el-radio{margin-bottom:10px;}.el-select-dropdown__item.second span{padding-left:15px !important;}.number-input{width:100%;padding:5px;margin-bottom:4px;border:0;border-bottom:1px solid #c2cad8;transition:all ease-in-out .15s;}.number-input:focus{border-color:#ff7159;}.tpl-block{flex:1;padding-left:20px;}.tpl-item{width:75px;height:75px;display:inline-block;border:1px solid #e5e5e5;margin:0 10px 15px 0;padding-top:5px;background-color:#fff;text-align:center;cursor:pointer;}.tpl-item.active{border:1px solid #ff7159;}.tpl-item .tpl-item-image{height:40px;}.tpl-item .tpl-item-image img{height:auto;width:60px;margin:0 auto;vertical-align:middle;}.tpl-item .tpl-item-text{margin-top:10px;font-size:12px;}.selectLinkVal{width:100%;padding:0 10px;color:#555;height:30px;line-height:30px;margin-top:5px;border:1px solid #bdbdbd;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;font-size:12px;}.layout-select{width:100%;padding:5px 6px;color:#555;line-height:1.5;margin-bottom:4px;}.el-select{width:100% !important;}.el-input__inner,.el-textarea__inner{border-radius:0 !important;border:1px solid #bdbdbd !important;height:30px !important;line-height:30px !important;padding:0 10px !important;font-size:12px !important;}.ml20{margin-left:20px;}.layout-tip{color:#838fa1;font-size:12px;}*,*:before,*:after{box-sizing:inherit;}.layui-nav .layui-nav-item{box-sizing:content-box;}.tabBarItem{border:1px solid #e9e9e9;margin-bottom:10px;padding:10px;}
\ No newline at end of file
diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js
index 8fac3dbc..c2c84341 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js
+++ b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js
@@ -296,9 +296,30 @@ var allWidget = {
     },
     {
         "type": "groupPurchase",
-        "name": "团购秒杀",
+        "name": "团购",
         "value": {
-            "title": '活动名称',
+            "title": '团购活动名称',
+            "limit": '10',
+            "list": [
+                {
+                    "image": "/static/images/common/empty-banner.png",
+                    "name": '',
+                    "price": ''
+                },
+                {
+                    "image": "/static/images/common/empty-banner.png",
+                    "name": '',
+                    "price": ''
+                },
+            ]
+        },
+        "icon": "icon-tuangou"
+    },
+    {
+        "type": "seckill",
+        "name": "秒杀",
+        "value": {
+            "title": '秒杀活动名称',
             "limit": '10',
             "list": [
                 {
@@ -780,7 +801,10 @@ Vue.component('layout-config', {
                         return '商品选项卡'
                         break;
                     case 'groupPurchase':
-                        return '团购秒杀'
+                        return '团购'
+                        break;
+                    case 'seckill':
+                        return '秒杀'
                         break;
                     case 'pinTuan':
                         return '拼团'
@@ -1202,7 +1226,7 @@ Vue.component('layout-config', {
             var that = this;
             layui.use(['form', 'table'], function () {
                 layui.admin.popup({
-                    title: '团购秒杀列表',
+                    title: '团购列表',
                     area: ['1200px', '90%'],
                     id: 'LAY-app-CoreCmsCommon-getGroupIds',
                     success: function (layero, index) {
@@ -1218,9 +1242,36 @@ Vue.component('layout-config', {
                                     for (let i in ids) {
                                         arr.push(ids[i]);
                                     }
-
                                     console.log(arr);
-
+                                    that.$set(that.selectWg.value, 'list', arr)
+                                    layer.close(index);
+                                });
+                        });
+                    }
+                });
+            });
+        },
+        selectSeckillGoods: function () {
+            var that = this;
+            layui.use(['form', 'table'], function () {
+                layui.admin.popup({
+                    title: '秒杀列表',
+                    area: ['1200px', '90%'],
+                    id: 'LAY-app-CoreCmsCommon-getSeckillIds',
+                    success: function (layero, index) {
+                        layui.view(this.id).render('common/getSeckillIds', null).done(function () {
+                            layui.form.on('submit(LAY-app-CoreCmsCommon-GetSeckillIds-submit)',
+                                function (data) {
+                                    //判断个数是否满足
+                                    if (Object.getOwnPropertyNames(ids).length > that.maxSelectGoods) {
+                                        layer.msg("最多只能选择" + that.maxSelectGoods + "个");
+                                        return false;
+                                    }
+                                    var arr = []
+                                    for (let i in ids) {
+                                        arr.push(ids[i]);
+                                    }
+                                    console.log(arr);
                                     that.$set(that.selectWg.value, 'list', arr)
                                     layer.close(index);
                                 });
diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js
index f9c7ac17..48306ba0 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js
+++ b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js
@@ -12,7 +12,7 @@ layui.define(['laytpl', 'layer', 'element', 'util'], function (exports) {
         , pageTabs: false //是否开启页面选项卡功能。单页版不推荐开启
 
         , name: '核心商城系统'
-        , version: 'CoreShopProfessional v0.6.2'
+        , version: '0.6.4'
         , tableName: 'CoreCms' //本地存储表名
         , MOD_NAME: 'admin' //模块事件名
 
diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/index.js b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/index.js
index c416d13a..75bd94df 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/index.js
+++ b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/index.js
@@ -1,2 +1,2 @@
 /** layuiAdmin.pro-v1.7.0 LPPL License */
-; layui.extend({ setter: "config", admin: "lib/admin", view: "lib/view", breadcrumb: 'controller/breadcrumb' }).define(["setter", "admin", "breadcrumb"],function(e){var a=layui.setter,n=layui.element,i=layui.admin,t=i.tabsPage,l=layui.view,r=function(){var e=layui.router(),o=e.path,y=i.correctRouter(e.path.join("/"));o.length||(o=[""]),""===o[o.length-1]&&(o[o.length-1]=a.entry);var h=function(e){r.haveInit&&d(".layui-layer").each(function(){var e=d(this),a=e.attr("times");e.hasClass("layui-layim")||layer.close(a)}),r.haveInit=!0,d(s).scrollTop(0),delete t.type};return"tab"===t.type&&("/"!==y||"/"===y&&i.tabsBody().html())?(i.tabsBodyChange(t.index),h(t.type)):(l().render(o.join("/")).then(function(l){var r,o=d("#LAY_app_tabsheader>li");o.each(function(e){var a=d(this),n=a.attr("lay-id");n===y&&(r=!0,t.index=e)}),a.pageTabs&&"/"!==y&&(r||(d(s).append('<div class="layadmin-tabsbody-item layui-show"></div>'),t.index=o.length,n.tabAdd(u,{title:"<span>"+(l.title||"新标签页")+"</span>",id:y,attr:e.href}))),this.container=i.tabsBody(t.index),a.pageTabs||this.container.scrollTop(0),n.tabChange(u,y),i.tabsBodyChange(t.index)}).done(function(){layui.use("common",layui.cache.callback.common),c.on("resize",layui.data.resize),n.render("breadcrumb","breadcrumb"),i.tabsBody(t.index).on("scroll",function(){var e=d(this),a=d(".layui-laydate"),n=d(".layui-layer")[0];a[0]&&(a.each(function(){var e=d(this);e.hasClass("layui-laydate-static")||e.remove()}),e.find("input").blur()),n&&layer.closeAll("tips")})}),void h())},o=function(e){var n,t=layui.router(),o=l(a.container),s=i.correctRouter(t.path.join("/"));if(layui.each(a.indPage,function(e,a){if(s===a)return n=!0}),layui.config({base:a.base+"controller/"}),n||"/user/login"===s)o.render(t.path.join("/")).done(function(){i.pageType="alone"});else{if(a.interceptor){var u=layui.data(a.tableName);if(!u[a.request.tokenName])return location.hash="/user/login/redirect="+encodeURIComponent(s)}"console"===i.pageType?r():o.render("layout").done(function(){r(),layui.element.render(),i.screen()<2&&i.sideFlexible(),i.pageType="console"})}},s="#LAY_app_body",u="layadmin-layout-tabs",d=layui.$,c=d(window);layui.link(a.base+"style/admin.css?v="+(i.v+"-1"),function(){o()},"layuiAdmin"),window.onhashchange=function(){o(),layui.event.call(this,a.MOD_NAME,"hash({*})",layui.router())},layui.each(a.extend,function(e,n){var i={},t=a.extend.constructor===Array;i[t?n:e]="{/}"+a.base+"lib/extend/"+n,layui.extend(i)}),e("index",{render:r})});
\ No newline at end of file
+; layui.extend({ setter: "config", admin: "lib/admin", view: "lib/view", breadcrumb: 'controller/breadcrumb' }).define(["setter", "admin", "breadcrumb"],function(e){console.log(`\n %c \u6838\u5fc3\u5546\u57ce\u7cfb\u7edf\u0020\u0043\u006f\u0072\u0065\u0053\u0068\u006f\u0070 V${layui.setter.version} %c \u0068\u0074\u0074\u0070\u0073\u003a\u002f\u002f\u0077\u0077\u0077\u002e\u0063\u006f\u0072\u0065\u0073\u0068\u006f\u0070\u002e\u0063\u006e\u002f \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #f1f1f1; padding:5px 0;');var a=layui.setter,n=layui.element,i=layui.admin,t=i.tabsPage,l=layui.view,r=function(){var e=layui.router(),o=e.path,y=i.correctRouter(e.path.join("/"));o.length||(o=[""]),""===o[o.length-1]&&(o[o.length-1]=a.entry);var h=function(e){r.haveInit&&d(".layui-layer").each(function(){var e=d(this),a=e.attr("times");e.hasClass("layui-layim")||layer.close(a)}),r.haveInit=!0,d(s).scrollTop(0),delete t.type};return"tab"===t.type&&("/"!==y||"/"===y&&i.tabsBody().html())?(i.tabsBodyChange(t.index),h(t.type)):(l().render(o.join("/")).then(function(l){var r,o=d("#LAY_app_tabsheader>li");o.each(function(e){var a=d(this),n=a.attr("lay-id");n===y&&(r=!0,t.index=e)}),a.pageTabs&&"/"!==y&&(r||(d(s).append('<div class="layadmin-tabsbody-item layui-show"></div>'),t.index=o.length,n.tabAdd(u,{title:"<span>"+(l.title||"新标签页")+"</span>",id:y,attr:e.href}))),this.container=i.tabsBody(t.index),a.pageTabs||this.container.scrollTop(0),n.tabChange(u,y),i.tabsBodyChange(t.index)}).done(function(){layui.use("common",layui.cache.callback.common),c.on("resize",layui.data.resize),n.render("breadcrumb","breadcrumb"),i.tabsBody(t.index).on("scroll",function(){var e=d(this),a=d(".layui-laydate"),n=d(".layui-layer")[0];a[0]&&(a.each(function(){var e=d(this);e.hasClass("layui-laydate-static")||e.remove()}),e.find("input").blur()),n&&layer.closeAll("tips")})}),void h())},o=function(e){var n,t=layui.router(),o=l(a.container),s=i.correctRouter(t.path.join("/"));if(layui.each(a.indPage,function(e,a){if(s===a)return n=!0}),layui.config({base:a.base+"controller/"}),n||"/user/login"===s)o.render(t.path.join("/")).done(function(){i.pageType="alone"});else{if(a.interceptor){var u=layui.data(a.tableName);if(!u[a.request.tokenName])return location.hash="/user/login/redirect="+encodeURIComponent(s)}"console"===i.pageType?r():o.render("layout").done(function(){r(),layui.element.render(),i.screen()<2&&i.sideFlexible(),i.pageType="console"})}},s="#LAY_app_body",u="layadmin-layout-tabs",d=layui.$,c=d(window);layui.link(a.base+"style/admin.css?v="+(i.v+"-1"),function(){o()},"layuiAdmin"),window.onhashchange=function(){o(),layui.event.call(this,a.MOD_NAME,"hash({*})",layui.router())},layui.each(a.extend,function(e,n){var i={},t=a.extend.constructor===Array;i[t?n:e]="{/}"+a.base+"lib/extend/"+n,layui.extend(i)}),e("index",{render:r})});
\ No newline at end of file
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/common/getGroupIds.html b/CoreCms.Net.Web.Admin/wwwroot/views/common/getGroupIds.html
index c9478c68..a90815a3 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/common/getGroupIds.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/common/getGroupIds.html
@@ -61,7 +61,7 @@
                     method: 'POST',
                     toolbar: '#LAY-app-getGroupIds-toolbar',
                     defaultToolbar: null,
-                    where: { types: 3 },
+                    where: { id: 3 },
                     height: 'full-260',//无面包屑127,搜索框189,1行62
                     page: true,
                     limit: 30,
@@ -70,8 +70,8 @@
                     cols: [
                         [
                             { type: "checkbox", fixed: "left" },
-                            { field: 'id', title: '', width: 60, sort: false },
-                            { field: 'name', title: '团购(秒杀)名称', sort: false },
+                            { field: 'id', title: '序列', width: 60, sort: false },
+                            { field: 'name', title: '团购名称', sort: false },
                             { field: 'sort', title: '权重', sort: false, width: 105 },
                         ]
                     ],
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/common/getSeckillIds.html b/CoreCms.Net.Web.Admin/wwwroot/views/common/getSeckillIds.html
new file mode 100644
index 00000000..a3dce5dc
--- /dev/null
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/common/getSeckillIds.html
@@ -0,0 +1,132 @@
+<script type="text/html" template lay-done="layui.data.done(d);">
+
+</script>
+<script type="text/html" id="LAY-app-GetSeckillIds-toolbar">
+    <div class="layui-form coreshop-toolbar-search-form">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <div class="layui-input-inline">
+                    <input type="text" name="name" id="name" placeholder="请输入秒杀名称" class="layui-input">
+                </div>
+            </div>
+            <div class="layui-inline">
+                <button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-CoreCmsPromotion-search"><i class="layui-icon layui-icon-search"></i>筛选</button>
+            </div>
+            <div class="layui-inline"><div class="layui-form-mid">您选择了:<span id="tagGroupsNum">0</span>个秒杀</div></div>
+            <button class="layui-btn layui-btn-sm  float-right" lay-submit lay-filter="LAY-app-CoreCmsCommon-GetSeckillIds-submit" style="float: right"><i class="layui-icon layui-icon-add-1"></i>提交选项</button>
+        </div>
+    </div>
+</script>
+<div class="noDefaultToolbar">
+    <table id="LAY-app-CoreCmsPromotion-tableBox" lay-filter="LAY-app-CoreCmsPromotion-tableBox"></table>
+</div>
+
+<script>
+    var ids = {};
+    var table_data = new Array();
+    var indexData;
+    var debug = layui.setter.debug;
+    layui.data.done = function (d) {
+        //开启调试情况下获取接口赋值数据
+        if (debug) { console.log(d); }
+
+        indexData = d.data;
+        layui.use(['index', 'table', 'laydate', 'util', 'coreHelper'],
+            function () {
+                var $ = layui.$
+                    , admin = layui.admin
+                    , table = layui.table
+                    , form = layui.form
+                    , laydate = layui.laydate
+                    , setter = layui.setter
+                    , coreHelper = layui.coreHelper
+                    , util = layui.util
+                    , view = layui.view;
+
+                //重载form
+                form.render();
+                var searchwhere;
+                //监听搜索
+                form.on('submit(LAY-app-CoreCmsPromotion-search)',
+                    function (data) {
+                        var field = data.field;
+                        searchwhere = field;
+                        //执行重载
+                        table.reloadData('LAY-app-CoreCmsPromotion-tableBox', { where: field });
+                    });
+                //数据绑定
+                table.render({
+                    elem: '#LAY-app-CoreCmsPromotion-tableBox',
+                    url: layui.setter.apiUrl + 'Api/Tools/TagPromotions',
+                    method: 'POST',
+                    toolbar: '#LAY-app-GetSeckillIds-toolbar',
+                    defaultToolbar: null,
+                    where: { id: 4 },
+                    height: 'full-260',//无面包屑127,搜索框189,1行62
+                    page: true,
+                    limit: 30,
+                    limits: [10, 15, 20, 25, 30, 50, 100, 200],
+                    text: { none: '暂无相关数据' },
+                    cols: [
+                        [
+                            { type: "checkbox", fixed: "left" },
+                            { field: 'id', title: '序列', width: 60, sort: false },
+                            { field: 'name', title: '秒杀名称', sort: false },
+                            { field: 'sort', title: '权重', sort: false, width: 105 },
+                        ]
+                    ],
+                    done: function (res, curr, count) {
+                        //数据表格加载完成时调用此函数
+                        //如果是异步请求数据方式，res即为你接口返回的信息。
+                        //如果是直接赋值的方式，res即为：{data: [], count: 99} data为当前页数据、count为数据总长度
+
+                        //设置全部数据到全局变量
+                        table_data = res.data;
+
+                        //在缓存中找到id ,然后设置data表格中的选中状态
+                        //循环所有数据，找出对应关系，设置checkbox选中状态
+                        for (var i = 0; i < res.data.length; i++) {
+                            if (ids[res.data[i].id]) {
+                                //这里才是真正的有效勾选
+                                res.data[i]["LAY_CHECKED"] = 'true';
+                                //找到对应数据改变勾选样式，呈现出选中效果
+                                var index = res.data[i]['LAY_TABLE_INDEX'];
+                                $('#LAY-app-CoreCmsPromotion-tableBox + div .layui-table-body tr[data-index=' + index + '] input[type="checkbox"]').prop('checked', true);
+                                $('#LAY-app-CoreCmsPromotion-tableBox + div .layui-table-body tr[data-index=' + index + '] input[type="checkbox"]').next().addClass('layui-form-checked');
+                            }
+                        }
+                        //设置全选checkbox的选中状态，只有改变LAY_CHECKED的值， table.checkStatus才能抓取到选中的状态
+                        var checkStatus = layui.table.checkStatus('LAY-app-CoreCmsPromotion-tableBox');
+                        if (checkStatus.isAll) {
+                            $('#LAY-app-CoreCmsPromotion-tableBox + div .layui-table-header th[data-field="0"] input[type="checkbox"]').prop('checked', true);
+                            $('#LAY-app-CoreCmsPromotion-tableBox + div .layui-table-header th[data-field="0"] input[type="checkbox"]').next().addClass('layui-form-checked');
+                        }
+                    }
+                });
+
+                //监听表格复选框选择
+                layui.table.on('checkbox(LAY-app-CoreCmsPromotion-tableBox)', function (obj) {
+                    if (obj.checked) {
+                        if (obj.type == 'one') {
+                            ids[obj.data.id] = obj.data;
+                        } else {
+                            for (var i = 0; i < table_data.length; i++) {
+                                ids[table_data[i].id] = table_data[i];
+                            }
+                        }
+                        //the_val[obj.data.id] = obj.data;
+                    } else {
+                        if (obj.type == 'one') {
+                            delete ids[obj.data.id];
+                        } else {
+                            for (var i = 0; i < table_data.length; i++) {
+                                delete ids[table_data[i].id];
+                            }
+                        }
+                    }
+                    $('#tagGroupsNum').html(Object.getOwnPropertyNames(ids).length);
+                });
+
+            });
+    };
+</script>
\ No newline at end of file
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/design.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/design.html
index bd760661..97ba1d2d 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/design.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/design.html
@@ -225,7 +225,7 @@
                             </div>
                         </div>
                     </div>
-                    <!-- 团购秒杀 -->
+                    <!-- 团购 -->
                     <div v-if="item.type === 'groupPurchase'" class="drag clearfix lay-goods slide group">
                         <div class="goods-head">
                             <div>{{item.value.title}}</div>
@@ -248,6 +248,29 @@
                             </div>
                         </div>
                     </div>
+                    <!-- 秒杀 -->
+                    <div v-if="item.type === 'seckill'" class="drag clearfix lay-goods slide group">
+                        <div class="goods-head">
+                            <div>{{item.value.title}}</div>
+                        </div>
+                        <div class="group-item" v-for="(goods,key) in item.value.list" :key="key">
+                            <div class="group-image">
+                                <img src="/static/images/common/empty-banner.png" alt="">
+                            </div>
+                            <div class="group-detail">
+                                <p class="group-name twolist-hidden">
+                                    {{goods.name||'此处显示商品名称'}}
+                                </p>
+                                <p class="group-price">{{goods.price||'￥99.00'}}</p>
+                                <p class="group-time">
+                                    <span>剩余：</span><span class="time">21</span>:<span class="time">30</span>:<span class="time">45</span>
+                                </p>
+                                <span class="buy-icon">
+                                    <img src="/static/images/common/ic-car.png" alt="">
+                                </span>
+                            </div>
+                        </div>
+                    </div>
                     <!-- 拼团 -->
                     <div v-if="item.type === 'pinTuan'" class="drag clearfix lay-goods slide group">
                         <div class="goods-head">
@@ -684,7 +707,7 @@
                         </div>
                     </div>
                 </template>
-                <!-- 团购秒杀 -->
+                <!-- 团购 -->
                 <template v-if="selectWg.type=='groupPurchase'">
                     <div>
                         <div class="select_seller_goods_box">
@@ -718,7 +741,46 @@
                         </el-form-item>
                         <div class="pl25">
                             <p class="layout-tip">
-                                团购秒杀数据请到 促销管理 - <a href="javascript:;" lay-href="/promotion/group/">团购秒杀列表</a>中管理
+                                团购数据请到 促销管理 - <a href="javascript:;" lay-href="/promotion/group/">团购秒杀列表</a>中管理
+                            </p>
+                        </div>
+                    </div>
+                </template>
+                <!-- 秒杀 -->
+                <template v-if="selectWg.type=='seckill'">
+                    <div>
+                        <div class="select_seller_goods_box">
+                            <input type="hidden" name="params[goodsId]" value="">
+                            <ul id="selectSeckillGoods" class="sellect_seller_goods_list clearfix">
+                                <draggable element="ul" :list="selectWg.value.list" :options="{group:{ name:'selectGoodsList'}, ghostClass: 'ghost',animation: 150}">
+                                    <li v-for="(goods,key) in selectWg.value.list" :key="key">
+                                        <i class="layui-icon layui-icon-close-fill icon-delete" @click="handleDeleteGoods(key)"></i>
+                                        <!--<img :src="goods.image" alt="">-->
+                                        <div class="left">
+                                            <img src="/static/images/common/empty-banner.png" alt="">
+                                        </div>
+                                        <div class="right">
+                                            <p>{{goods.name}}</p>
+                                        </div>
+                                    </li>
+                                </draggable>
+                            </ul>
+                            <div class="addImg" @click="selectSeckillGoods">
+                                <i class="iconfontCustom icon-icon-test"></i>
+                                <span>选择商品</span>
+                            </div>
+                        </div>
+                        <hr class="divider">
+                        </hr>
+                        <el-form-item label="商品组名称">
+                            <input type="text" v-model="selectWg.value.title" class="selectLinkVal">
+                        </el-form-item>
+                        <el-form-item label="显示数量">
+                            <input type="number" v-model.number="selectWg.value.limit" min="1" class="number-input">
+                        </el-form-item>
+                        <div class="pl25">
+                            <p class="layout-tip">
+                                秒杀数据请到 促销管理 - <a href="javascript:;" lay-href="/promotion/group/">团购秒杀列表</a>中管理
                             </p>
                         </div>
                     </div>
diff --git a/CoreCms.Net.Web.WebApi/Controllers/GroupController.cs b/CoreCms.Net.Web.WebApi/Controllers/GroupController.cs
index 657fa8ae..bdafa4be 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/GroupController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/GroupController.cs
@@ -34,17 +34,15 @@ namespace CoreCms.Net.Web.WebApi.Controllers
 
         private readonly IHttpContextUser _user;
         private readonly ICoreCmsPromotionServices _coreCmsPromotionServices;
-        private ICoreCmsGoodsServices _goodsServices;
 
 
         /// <summary>
         /// 构造函数
         /// </summary>
-        public GroupController(IHttpContextUser user, ICoreCmsPromotionServices coreCmsPromotionServices, ICoreCmsGoodsServices goodsServices)
+        public GroupController(IHttpContextUser user, ICoreCmsPromotionServices coreCmsPromotionServices)
         {
             _user = user;
             _coreCmsPromotionServices = coreCmsPromotionServices;
-            _goodsServices = goodsServices;
         }
 
 
@@ -58,7 +56,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
         [HttpPost]
         public async Task<WebApiCallBack> GetList([FromBody] FMGroupGetListPost entity)
         {
-            var jm = await _coreCmsPromotionServices.GetGroupList(entity.type, _user.ID, entity.status, entity.page, entity.limit);
+            var jm = await _coreCmsPromotionServices.GetGroupList(entity.type, entity.status, entity.page, entity.limit);
 
             return jm;
         }
@@ -72,7 +70,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
         [HttpPost]
         public async Task<WebApiCallBack> GetGoodsDetial([FromBody] FMGetGoodsDetial entity)
         {
-            var jm = await _coreCmsPromotionServices.GetGroupDetail(entity.id, 0, entity.type, entity.groupId, entity.needSku);
+            var jm = await _coreCmsPromotionServices.GetGroupDetail(entity.id, 0, entity.type, entity.needSku);
             return jm;
         }
         #endregion
diff --git a/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs b/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs
index d93d824b..e727e40c 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs
@@ -16,6 +16,7 @@ using CoreCms.Net.Auth.HttpContextUser;
 using CoreCms.Net.Caching.AutoMate.RedisCache;
 using CoreCms.Net.Configuration;
 using CoreCms.Net.IServices;
+using CoreCms.Net.Loging;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.Entities.Expression;
 using CoreCms.Net.Model.FromBody;
@@ -25,6 +26,7 @@ using CoreCms.Net.Utility.Extensions;
 using CoreCms.Net.Utility.Helper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using SqlSugar;
 
 namespace CoreCms.Net.Web.WebApi.Controllers
@@ -48,6 +50,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
         private readonly ICoreCmsGoodsServices _goodsServices;
         private readonly ICoreCmsStoreServices _storeServices;
         private readonly ICoreCmsOrderDistributionModelServices _orderDistributionModelServices;
+        private readonly ICoreCmsBillPaymentsServices _billPaymentsServices;
         private readonly IRedisOperationRepository _redisOperationRepository;
 
 
@@ -61,7 +64,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
         , ICoreCmsSettingServices settingServices
         , ICoreCmsAreaServices areaServices
         , ICoreCmsBillReshipServices reshipServices, ICoreCmsShipServices shipServices
-        , ICoreCmsBillDeliveryServices billDeliveryServices, ICoreCmsLogisticsServices logisticsServices, ICoreCmsGoodsServices goodsServices, ICoreCmsStoreServices storeServices, ICoreCmsOrderDistributionModelServices orderDistributionModelServices, IRedisOperationRepository redisOperationRepository)
+        , ICoreCmsBillDeliveryServices billDeliveryServices, ICoreCmsLogisticsServices logisticsServices, ICoreCmsGoodsServices goodsServices, ICoreCmsStoreServices storeServices, ICoreCmsOrderDistributionModelServices orderDistributionModelServices, IRedisOperationRepository redisOperationRepository, ICoreCmsBillPaymentsServices billPaymentsServices)
         {
             _user = user;
             _orderServices = orderServices;
@@ -76,6 +79,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
             _storeServices = storeServices;
             _orderDistributionModelServices = orderDistributionModelServices;
             _redisOperationRepository = redisOperationRepository;
+            _billPaymentsServices = billPaymentsServices;
         }
 
 
@@ -269,6 +273,52 @@ namespace CoreCms.Net.Web.WebApi.Controllers
         }
         #endregion
 
+        #region 订单是否支付状态查询==================================================
+        /// <summary>
+        /// 订单预览
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Authorize]
+        public async Task<WebApiCallBack> CheckOrderIsPaid([FromBody] FMStringId entity)
+        {
+            var jm = new WebApiCallBack();
+
+            var lockKey = "LOCK_CheckOrderIsPaid:user_" + _user.ID;
+            var lockHolder = Guid.NewGuid().ToString("N"); //锁持有者
+            var redisUserLock = await _redisOperationRepository.LockTakeAsync(lockKey, lockHolder, TimeSpan.FromSeconds(5));
+            if (redisUserLock)
+            {
+                try
+                {
+                    if (string.IsNullOrEmpty(entity.id))
+                    {
+                        jm.msg = "支付单编号不能为空";
+                        return jm;
+                    }
+                    var bl = await _orderServices.ExistsAsync(p => p.orderId == entity.id && (p.payStatus == (int)GlobalEnumVars.OrderPayStatus.Yes || p.payStatus == (int)GlobalEnumVars.OrderPayStatus.PartialYes), true);
+                    jm.status = true;
+                    jm.data = bl;
+                }
+                catch (Exception e)
+                {
+                    jm.msg = "数据处理异常";
+                    jm.otherData = e;
+                    NLogUtil.WriteFileLog(NLog.LogLevel.Error, LogType.ApiRequest, "用户支付支付", JsonConvert.SerializeObject(jm));
+                }
+                finally
+                {
+                    await _redisOperationRepository.LockReleaseAsync(lockKey, lockHolder);
+                }
+            }
+            else
+            {
+                jm.msg = "当前请求太频繁_请稍后再试";
+            }
+            return jm;
+        }
+        #endregion
+
         #region 获取订单不同状态的数量==================================================
         /// <summary>
         /// 获取订单不同状态的数量
@@ -610,5 +660,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
 
         #endregion
 
+
+
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.Web.WebApi/Controllers/PageController.cs b/CoreCms.Net.Web.WebApi/Controllers/PageController.cs
index 5eec51c2..939d5f0c 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/PageController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/PageController.cs
@@ -84,45 +84,24 @@ namespace CoreCms.Net.Web.WebApi.Controllers
         /// </summary>
         [HttpPost]
         [Description("获取用户购买记录")]
-        public async Task<WebApiCallBack> GetRecod([FromBody] FMGetRecodPost entity)
+        public async Task<WebApiCallBack> GetRecord([FromBody] FMGetRecodPost entity)
         {
             var jm = new WebApiCallBack() { status = true, msg = "获取成功", otherData = entity };
 
-            /***
-             * 随机数
-             * 其它随机数据，需要自己补充
-             */
-            //logo作为头像
-            Random rand = new Random();
-
+            //随机数
+            var rand = new Random();
+            //获取配置项
             var allConfigs = await _settingServices.GetConfigDictionaries();
-
+            //logo作为头像
             var avatar = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopLogo);
-            var names = new string[] { "无人像你", "啭裑①羣豞", "朕射妳无罪", "骑着蜗牛狂奔", "残孤星", "上网可以，别开QVOD", "请把QQ留下！", "蹭网可以,一小时两块钱", "I～在。哭泣", "不倾国倾城只倾他一人", "你再发光我就拔你插头", "家，世间最温暖的地方", "挥着鸡翅膀的女孩", "难不难过都是一个人过", "原谅我盛装出席只为错过你", "残孤星", "只适合被遗忘", "爱情，算个屁丶", "执子辶掱", "朕今晚翻你牌子", "①苆兜媞命", "中华一样的高傲", "始于心动止于枯骨", "我们幸福呢", "表白失败，勿扰", "髮型吥能亂", "陽咣丅啲憂喐", "你棺材是翻盖的还是滑盖的", "孤枕", "泪颜葬相思", "喵星人", "超拽霸气的微博名字", "晚安晚安晚晚难安", "却输给了秒", "为什么我吃德芙没有黑丝飘", "请输入我大" };
-            var listUsers = new List<RandUser>();
-
-            foreach (var itemName in names)
-            {
-                var min = rand.Next(100, 1000);
-                var createTime = DateTime.Now.AddMinutes(-min);
-                listUsers.Add(new RandUser()
-                {
-                    avatar = avatar,
-                    createTime = CommonHelper.TimeAgo(createTime),
-                    nickname = itemName,
-                    desc = "下单成功",
-                    dt = createTime
-                });
-            }
 
             if (entity.type == "home")
             {
                 //数据库里面随机取出来几条数据
-                var orders = await _orderServices.QueryListByClauseAsync(p => p.isdel == false, 20, p => p.createTime,
-                    OrderByType.Desc);
+                var orders = await _orderServices.QueryListByClauseAsync(p => p.isdel == false, 20, p => p.createTime, OrderByType.Desc, true, true, 60);
                 if (orders != null && orders.Any())
                 {
-                    Random rd = new Random();
+                    var rd = new Random();
                     var index = rd.Next(orders.Count);
                     var orderItem = orders[index];
                     if (orderItem != null)
@@ -143,7 +122,24 @@ namespace CoreCms.Net.Web.WebApi.Controllers
                 }
                 else
                 {
-                    Random rd = new Random();
+                    var names = new[] { "无人像你", "啭裑①羣豞", "朕射妳无罪", "骑着蜗牛狂奔", "残孤星", "上网可以，别开QVOD", "请把QQ留下！", "蹭网可以,一小时两块钱", "I～在。哭泣", "不倾国倾城只倾他一人", "你再发光我就拔你插头", "家，世间最温暖的地方", "挥着鸡翅膀的女孩", "难不难过都是一个人过", "原谅我盛装出席只为错过你", "残孤星", "只适合被遗忘", "爱情，算个屁丶", "执子辶掱", "朕今晚翻你牌子", "①苆兜媞命", "中华一样的高傲", "始于心动止于枯骨", "我们幸福呢", "表白失败，勿扰", "髮型吥能亂", "陽咣丅啲憂喐", "你棺材是翻盖的还是滑盖的", "孤枕", "泪颜葬相思", "喵星人", "超拽霸气的微博名字", "晚安晚安晚晚难安", "却输给了秒", "为什么我吃德芙没有黑丝飘", "请输入我大" };
+                    var listUsers = new List<RandUser>();
+
+                    foreach (var itemName in names)
+                    {
+                        var min = rand.Next(100, 1000);
+                        var createTime = DateTime.Now.AddMinutes(-min);
+                        listUsers.Add(new RandUser()
+                        {
+                            avatar = avatar,
+                            createTime = CommonHelper.TimeAgo(createTime),
+                            nickname = itemName,
+                            desc = "下单成功",
+                            dt = createTime
+                        });
+                    }
+
+                    var rd = new Random();
                     var listI = rd.Next(listUsers.Count);
                     jm.data = listUsers[listI];
                 }
diff --git a/CoreCms.Net.Web.WebApi/Controllers/PinTuanController.cs b/CoreCms.Net.Web.WebApi/Controllers/PinTuanController.cs
index 5c5ea33f..2ded376d 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/PinTuanController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/PinTuanController.cs
@@ -66,7 +66,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<WebApiCallBack> GetList()
+        public async Task<WebApiCallBack> GetList([FromBody] FMPageByIntId entity)
         {
             WebApiCallBack jm;
 
@@ -75,7 +75,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
             {
                 userId = _user.ID;
             }
-            jm = await _pinTuanRuleServices.GetPinTuanList(userId);
+            jm = await _pinTuanRuleServices.GetPinTuanList(userId, entity.page, entity.limit);
             return jm;
         }
 
diff --git a/CoreCms.Net.Web.WebApi/Controllers/ServiceController.cs b/CoreCms.Net.Web.WebApi/Controllers/ServiceController.cs
index fd0d7da1..ab3cf385 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/ServiceController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/ServiceController.cs
@@ -92,7 +92,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
 
             where = where.And(p => p.status == (int)GlobalEnumVars.ServicesStatus.Shelve);
             where = where.And(p => p.amount > 0);
-            where = where.And(p => p.startTime < dt && p.endTime > dt);
+            //where = where.And(p => p.startTime < dt && p.endTime > dt);
 
             var list = await _servicesServices.QueryPageAsync(where, p => p.createTime, OrderByType.Desc, entity.page, entity.limit);
 
@@ -101,30 +101,45 @@ namespace CoreCms.Net.Web.WebApi.Controllers
                 var storesAll = await _storeServices.QueryAsync();
                 var userGradesAll = await _userGradeServices.QueryAsync();
 
-                foreach (var data in list)
+                foreach (var item in list)
                 {
-                    TimeSpan ts = data.endTime.Subtract(dt);
-                    data.timestamp = (int)ts.TotalSeconds;
 
-                    if (!string.IsNullOrEmpty(data.consumableStore))
+                    if (item.startTime > dt)
                     {
-                        var consumableStoreStr = CommonHelper.GetCaptureInterceptedText(data.consumableStore, ",");
+                        item.openStatus = (int)GlobalEnumVars.ServicesOpenStatus.notBegun;
+                        TimeSpan ts = item.startTime.Subtract(dt);
+                        item.timestamp = (int)ts.TotalSeconds;
+                    }
+                    else if (item.startTime <= dt && item.endTime > dt)
+                    {
+                        item.openStatus = (int)GlobalEnumVars.ServicesOpenStatus.begin;
+                        TimeSpan ts = item.endTime.Subtract(dt);
+                        item.timestamp = (int)ts.TotalSeconds;
+                    }
+                    else
+                    {
+                        item.openStatus = (int)GlobalEnumVars.ServicesOpenStatus.haveExpired;
+                    }
+
+                    if (!string.IsNullOrEmpty(item.consumableStore))
+                    {
+                        var consumableStoreStr = CommonHelper.GetCaptureInterceptedText(item.consumableStore, ",");
                         var consumableStoreIds = CommonHelper.StringToIntArray(consumableStoreStr);
                         if (consumableStoreIds.Any())
                         {
                             var stores = storesAll.Where(p => consumableStoreIds.Contains(p.id)).ToList();
-                            data.consumableStores = stores.Select(p => p.storeName).ToList();
+                            item.consumableStores = stores.Select(p => p.storeName).ToList();
                         }
                     }
 
-                    if (!string.IsNullOrEmpty(data.allowedMembership))
+                    if (!string.IsNullOrEmpty(item.allowedMembership))
                     {
-                        var allowedMembershipStr = CommonHelper.GetCaptureInterceptedText(data.allowedMembership, ",");
+                        var allowedMembershipStr = CommonHelper.GetCaptureInterceptedText(item.allowedMembership, ",");
                         var allowedMembershipIds = CommonHelper.StringToIntArray(allowedMembershipStr);
                         if (allowedMembershipIds.Any())
                         {
                             var userGrades = userGradesAll.Where(p => allowedMembershipIds.Contains(p.id)).ToList();
-                            data.allowedMemberships = userGrades.Select(p => p.title).ToList();
+                            item.allowedMemberships = userGrades.Select(p => p.title).ToList();
                         }
                     }
                 }
@@ -184,35 +199,25 @@ namespace CoreCms.Net.Web.WebApi.Controllers
                 }
             }
 
-            int openStatus;
-            var lastTime = 0;
             if (serviceInfo.startTime > dt)
             {
-                openStatus = (int)GlobalEnumVars.ServicesOpenStatus.notBegun;
+                serviceInfo.openStatus = (int)GlobalEnumVars.ServicesOpenStatus.notBegun;
                 var ts = serviceInfo.startTime.Subtract(dt);
-                lastTime = (int)ts.TotalSeconds;
+                serviceInfo.timestamp = (int)ts.TotalSeconds;
             }
             else if (serviceInfo.startTime <= dt && serviceInfo.endTime > dt)
             {
-                openStatus = (int)GlobalEnumVars.ServicesOpenStatus.begin;
+                serviceInfo.openStatus = (int)GlobalEnumVars.ServicesOpenStatus.begin;
                 var ts = serviceInfo.endTime.Subtract(dt);
-                lastTime = (int)ts.TotalSeconds;
+                serviceInfo.timestamp = (int)ts.TotalSeconds;
             }
             else
             {
-                openStatus = (int)GlobalEnumVars.ServicesOpenStatus.haveExpired;
+                serviceInfo.openStatus = (int)GlobalEnumVars.ServicesOpenStatus.haveExpired;
             }
-            
+
             jm.status = true;
-            jm.data = new
-            {
-                serviceInfo,
-                timer=new
-                {
-                    openStatus,
-                    lastTime,
-                }
-            };
+            jm.data = serviceInfo;
             return jm;
 
         }
diff --git a/CoreCms.Net.Web.WebApi/Controllers/StoreController.cs b/CoreCms.Net.Web.WebApi/Controllers/StoreController.cs
index 9cc6ca43..af29dffe 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/StoreController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/StoreController.cs
@@ -74,7 +74,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
         {
             var jm = new WebApiCallBack();
 
-            var ship = await _storeServices.QueryByClauseAsync(p => p.isDefault == true);
+            var ship = await _storeServices.QueryByClauseAsync(p => p.isDefault == true, true, true);
             jm.status = true;
             jm.data = ship;
 
@@ -119,7 +119,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
                     }
                     else
                     {
-                        item.distanceStr = "未知";
+                        item.distanceStr = "";
                     }
                 }
                 jm.data = data;
@@ -243,7 +243,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
             var store = await _storeServices.GetStoreByUserId(_user.ID);
             if (store != null)
             {
-                jm = await _orderServices.GetOrderPageByMerchant(entity.dateType, entity.date, entity.status,entity.receiptType, entity.storeId, entity.page, entity.limit);
+                jm = await _orderServices.GetOrderPageByMerchant(entity.dateType, entity.date, entity.status, entity.receiptType, entity.storeId, entity.page, entity.limit);
             }
             else
             {
diff --git a/CoreCms.Net.Web.WebApi/appsettings.json b/CoreCms.Net.Web.WebApi/appsettings.json
index 031def2a..9b35aed5 100644
--- a/CoreCms.Net.Web.WebApi/appsettings.json
+++ b/CoreCms.Net.Web.WebApi/appsettings.json
@@ -16,7 +16,7 @@
   "AppConfig": {
     "AppUrl": "https://admin.test.pro.coreshop.cn/", //后端管理地址
     "AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址
-    "AppVersion": "CoreShopProfessional v0.6.2"
+    "AppVersion": "CoreShopProfessional v0.6.4"
   },
   //redis为必须启动项，请保持redis为正常可用
   "RedisConfig": {
diff --git a/CoreShopProfessional.sln b/CoreShopProfessional.sln
index 7a71697a..a5c15912 100644
--- a/CoreShopProfessional.sln
+++ b/CoreShopProfessional.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29020.237
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "9.App", "9.App", "{9C52D39C-A85B-4D5E-B29C-724D6566AB04}"
 EndProject
@@ -59,6 +59,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5.WeChat", "5.WeChat", "{FD
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreCms.Net.WeChat.Service", "CoreCms.Net.WeChat.Service\CoreCms.Net.WeChat.Service.csproj", "{7CB698AD-DECF-43B9-A01A-E5E1E5738BAA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreCms.Net.DTO", "CoreCms.Net.DTO\CoreCms.Net.DTO.csproj", "{834DBA03-2302-4618-A65F-46C45F42BBD1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -153,6 +155,10 @@ Global
 		{7CB698AD-DECF-43B9-A01A-E5E1E5738BAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7CB698AD-DECF-43B9-A01A-E5E1E5738BAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7CB698AD-DECF-43B9-A01A-E5E1E5738BAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{834DBA03-2302-4618-A65F-46C45F42BBD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{834DBA03-2302-4618-A65F-46C45F42BBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{834DBA03-2302-4618-A65F-46C45F42BBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{834DBA03-2302-4618-A65F-46C45F42BBD1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -180,6 +186,7 @@ Global
 		{C9E6388D-A70F-48BF-8935-8E571BD3DF6B} = {9C52D39C-A85B-4D5E-B29C-724D6566AB04}
 		{927E68B4-92D1-4F66-B137-87804055DE93} = {B3F41F4C-3681-48F3-9BE3-809763AC1937}
 		{7CB698AD-DECF-43B9-A01A-E5E1E5738BAA} = {FD17E974-7FED-49C6-B9C9-90C8AE4849B7}
+		{834DBA03-2302-4618-A65F-46C45F42BBD1} = {CA1C3EDD-146A-4968-9E25-8FB393DA1D2E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A325D634-06E7-4F4E-BA15-AB3E14622FF1}