wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 17:23:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

uniapp【优化】: 分享海报以及头部问题

Browse Source
This commit is contained in:
15093570141
2024-10-24 12:14:04 +08:00
parent 1ef91351ef 031bc4e19e
commit 00d57b32b5
36 changed files with 217 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CoreCms.Net.Auth/CoreCms.Net.Auth.csproj
View File

@@ -5,8 +5,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="NETCore.Encrypt" Version="2.1.1" />
</ItemGroup>

6
CoreCms.Net.Caching/CoreCms.Net.Caching.csproj
View File

@@ -5,10 +5,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CSRedisCore" Version="3.8.802" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="CSRedisCore" Version="3.8.803" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.36.0" />
<PackageReference Include="StackExchange.Redis" Version="2.7.10" />
<PackageReference Include="StackExchange.Redis" Version="2.8.16" />
</ItemGroup>
<ItemGroup>

2
CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj
View File

@@ -48,7 +48,7 @@
<ItemGroup>
<PackageReference Include="DotLiquid" Version="2.2.692" />
<PackageReference Include="sqlSugarCore" Version="5.1.4.129" />
<PackageReference Include="sqlSugarCore" Version="5.1.4.169" />
</ItemGroup>
<ItemGroup>

2
CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj
View File

@@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
</ItemGroup>
<ItemGroup>

7
CoreCms.Net.Configuration/SystemSettingConstVars.cs
View File

@@ -9,6 +9,8 @@
***********************************************************************/
using static SKIT.FlurlHttpClient.Wechat.Api.Models.ChannelsECMerchantAddressAddRequest.Types.AddressDetail.Types;
namespace CoreCms.Net.Configuration
{
/// <summary>
@@ -591,6 +593,11 @@ namespace CoreCms.Net.Configuration
/// </summary>
public const string ShowCustomForm = "showCustomForm";
/// <summary>
/// 用户地址开启坐标功能
/// </summary>
public const string AllowAddressToUseMap = "allowAddressToUseMap";
/// <summary>
/// 显示首页弹窗

1
CoreCms.Net.Configuration/SystemSettingDictionary.cs
View File

@@ -64,6 +64,7 @@ namespace CoreCms.Net.Configuration
di.Add(SystemSettingConstVars.ShowSolitaire, new DictionaryKeyValues() { sKey = "显示接龙按钮", sValue = "2" });
di.Add(SystemSettingConstVars.ShowCalendar, new DictionaryKeyValues() { sKey = "显示签到按钮", sValue = "2" });
di.Add(SystemSettingConstVars.ShowCustomForm, new DictionaryKeyValues() { sKey = "显示自定义表单按钮", sValue = "2" });
di.Add(SystemSettingConstVars.AllowAddressToUseMap, new DictionaryKeyValues() { sKey = "用户地址开启坐标", sValue = "1" });
di.Add(SystemSettingConstVars.ShowIndexPopupWindow, new DictionaryKeyValues() { sKey = "显示首页弹窗", sValue = "2" });
di.Add(SystemSettingConstVars.IndexPopupWindowImageUrl, new DictionaryKeyValues() { sKey = "图片地址", sValue = "" });

16
CoreCms.Net.Core/CoreCms.Net.Core.csproj
View File

@@ -14,19 +14,19 @@
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Hangfire" Version="1.8.6" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.6" />
<PackageReference Include="Hangfire.Core" Version="1.8.6" />
<PackageReference Include="Hangfire" Version="1.8.14" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.14" />
<PackageReference Include="Hangfire.Core" Version="1.8.14" />
<PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
<PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.3" />
<PackageReference Include="InitQ" Version="1.0.0.18" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.OpenApi" Version="1.6.11" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="Microsoft.OpenApi" Version="1.6.22" />
<PackageReference Include="SqlSugar.IOC" Version="2.0.0" />
<PackageReference Include="sqlSugarCore" Version="5.1.4.129" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.12" />
<PackageReference Include="sqlSugarCore" Version="5.1.4.169" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
</ItemGroup>
<ItemGroup>

2
CoreCms.Net.Filter/CoreCms.Net.Filter.csproj
View File

@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />
<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
</ItemGroup>
<ItemGroup>

4
CoreCms.Net.IServices/CoreCms.Net.IServices.csproj
View File

@@ -5,8 +5,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.78" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.3" />
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.296" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.4" />
</ItemGroup>
<ItemGroup>

2
CoreCms.Net.Loging/CoreCms.Net.Loging.csproj
View File

@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.2.7" />
</ItemGroup>

4
CoreCms.Net.Model/CoreCms.Net.Model.csproj
View File

@@ -7,9 +7,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.36.0" />
<PackageReference Include="sqlSugarCore" Version="5.1.4.129" />
<PackageReference Include="sqlSugarCore" Version="5.1.4.169" />
</ItemGroup>
<ItemGroup>

4
CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj
View File

@@ -5,8 +5,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.3" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.3" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.4" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.4" />
<PackageReference Include="InitQ" Version="1.0.0.18" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.36.0" />
</ItemGroup>

2
CoreCms.Net.Repository/CoreCms.Net.Repository.csproj
View File

@@ -6,7 +6,7 @@
<ItemGroup>
<PackageReference Include="DotLiquid" Version="2.2.692" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.3" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.4" />
</ItemGroup>
<ItemGroup>

24
CoreCms.Net.Services/CoreCms.Net.Services.csproj
View File

@@ -5,19 +5,19 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="2.0.24" />
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.78" />
<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.3" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.3" />
<PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="3.0.0" />
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.296" />
<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.4" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.4" />
<PackageReference Include="Flurl.Http" Version="3.2.4" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageReference Include="Qiniu" Version="8.5.0" />
<PackageReference Include="QRCoder" Version="1.4.3" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.35" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageReference Include="Qiniu" Version="8.6.0" />
<PackageReference Include="QRCoder" Version="1.6.0" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
<PackageReference Include="System.Drawing.Common" Version="8.0.10" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.40" />
<PackageReference Include="ToolGood.Words" Version="3.1.0" />
</ItemGroup>

4
CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj
View File

@@ -5,8 +5,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.OpenApi" Version="1.6.11" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Microsoft.OpenApi" Version="1.6.22" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
</ItemGroup>
</Project>

4
CoreCms.Net.Task/CoreCms.Net.Task.csproj
View File

@@ -5,8 +5,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Hangfire" Version="1.8.6" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Hangfire" Version="1.8.14" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
</ItemGroup>
<ItemGroup>

4
CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
View File

@@ -28,7 +28,7 @@
mode : string,
title : string,
handleCustomRouteJump : () => void | null,
placeholder:boolean;
placeholder : boolean;
}>(), {
isBack: true,
bgColor: '#eef2f6',
@@ -36,7 +36,7 @@
mode: 'center',
title: '',
handleCustomRouteJump: null,
placeholder:true,
placeholder: true,
});
const hanlderBack = () => {

1
CoreCms.Net.Uni-App/CoreShop/manifest.json
View File

@@ -79,6 +79,7 @@
}
},
"mp-alipay" : {
"appid" : "2021004107611929",
"usingComponents" : true
},
"mp-baidu" : {

3
CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
View File

@@ -1,5 +1,6 @@
<template>
<coreshop-page :isBack="false" bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom needLoadingPage :loadingPage="loading">
<coreshop-page :isBack="false" bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom
needLoadingPage :loadingPage="loading">
<view class="layout-classify-page">
<!-- #ifndef MP-ALIPAY -->
<uv-navbar bgColor="#EEF3F7" :height="menuButtonHeight+'px'">

3
CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
View File

@@ -1,5 +1,6 @@
<template>
<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom needLoadingPage :loadingPage="loading">
<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom
needLoadingPage :loadingPage="loading">
<view class="goods-detail">
<!-- 商品详情 -->
<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"

4
CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
View File

@@ -1,5 +1,6 @@
<template>
<coreshop-page :isBack="false" bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom needLoadingPage :loadingPage="loading">
<coreshop-page :isBack="false" bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom
needLoadingPage :loadingPage="loading">
<view class="layout-home-page page-bg">
<image class="home-bg" :src="handleStaticResources('/static/images/home-bg.jpg')"></image>
<uv-navbar :title="shopConfigStore.config?.shopName"
@@ -64,7 +65,6 @@
/** 触发自定义onshow事件，让后代组件监听页面是都进入 */
uni.$emit(onHomePageShow);
})
onPullDownRefresh(async () => {
await queryHomePageConfig();
uni.stopPullDownRefresh();

10
CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue
View File

@@ -1,7 +1,7 @@
<template>
<coreshop-page :title="state.isScrollToTop ? '' :userInfoStore.userInfo?.nickName" :placeholder="false" titleColor="#fff"
mode="left" bgColor="#d33123" :isShowStatusBarHeight="false"
:isBack="false" showLoginModalDom>
<coreshop-page :title="state.isScrollToTop ? '' :userInfoStore.userInfo?.nickName" :placeholder="false"
titleColor="#fff" mode="left" bgColor="#d33123" :isShowStatusBarHeight="false" :isBack="false"
showLoginModalDom>
<view class="layout-member-page">
<view class="member-head">
<image class="memeber-bg" src="/static/images/member/bg.png"></image>
@@ -164,8 +164,8 @@
<script setup lang="ts">
import { reactive } from 'vue';
import { onPageScroll, onShow ,onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
import { handleStaticResources, handleRouteNavigateTo, handleShowToast, handleRouteSwitchTab, hanldeShowModal ,getDefaultShareData} from '@/core/utils';
import { onPageScroll, onShow, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
import { handleStaticResources, handleRouteNavigateTo, handleShowToast, handleRouteSwitchTab, hanldeShowModal, getDefaultShareData } from '@/core/utils';
import { queryUserInfo, queryOrderStatusNum, queryUserIsClerk, queryDistributionInfo, queryAgentInfo, queryShopConfigV2 } from '@/core/api';
import type { Response, MemberOrderType, UserInfoType, UserIsClerkType, MemberServiceType, ShopConfigType } from '@/core/models';
import { useShopConfigStore, useUserInfoStore, useLoginStore } from '@/core/store';

4
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
View File

@@ -74,7 +74,7 @@
import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
import { useLoadingFn, useSystemInfo } from '@/core/hooks';
import { useLoadingFn } from '@/core/hooks';
interface QueryParams {
id : number;
}
@@ -85,8 +85,6 @@
/** 购物车store */
const cartStore = useCartStore();
const { statusBarHeight } = useSystemInfo();
const state = reactive<{
goodsDetailData : any,
swiperBanner : Array<string>;

5
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
View File

@@ -84,7 +84,7 @@
import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
import { useLoadingFn, useSystemInfo } from '@/core/hooks';
import { useLoadingFn } from '@/core/hooks';
interface QueryParams {
id : number;
@@ -97,8 +97,6 @@
/** 获取购物车数据 */
const cartStore = useCartStore();
const { statusBarHeight } = useSystemInfo();
const state = reactive<{
id : number;
goodsDetailData : any,
@@ -185,7 +183,6 @@
if (uni.getStorageSync(UserToken)) {
getCartNum();
}
state.shareUrl = await getShareUrl({
client: ShareClientEnum.wxMiNiProgram,
url: shareUrl,

6
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
View File

@@ -63,7 +63,7 @@
<script setup lang="ts">
import { reactive, ref } from 'vue';
import { onLoad, onShareAppMessage, onShareTimeline, onPullDownRefresh } from '@dcloudio/uni-app';
import { queryActivityDetial, queryCartNum, queryShare, queryAddCart } from '@/core/api';
import { queryActivityDetial, queryCartNum, queryAddCart } from '@/core/api';
import { PaymentTypeEnum, ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
import type { Response } from '@/core/models';
import { UserToken, shareUrl } from '@/core/consts'
@@ -74,7 +74,7 @@
import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
import { useLoadingFn, useSystemInfo } from '@/core/hooks';
import { useLoadingFn } from '@/core/hooks';
interface QueryParams {
id : number;
@@ -85,8 +85,6 @@
const cartStore = useCartStore();
const { statusBarHeight } = useSystemInfo();
const state = reactive<{
goodsDetailData : any,
swiperBanner : Array<string>;

4
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/custom/custom.vue
View File

@@ -33,14 +33,14 @@
</template>
<script setup lang="ts">
import { onShow,onPageScroll, onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
import { onShow, onPageScroll, onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
import { reactive } from 'vue';
import { queryPageConfig, queryUserInfo } from '@/core/api';
import type { Response, PageConfigType, PageConfigItemsType, UserInfoType } from '@/core/models';
import CustomPage from '@/pages/components/custom-page/index.vue';
import HomeAdpop from '@/pages/components/custom-page/components/home-adpop/home-adpop.vue';
import { handleStaticResources, getDefaultShareData, getShareUrl } from '@/core/utils';
import { UserToken, shareUrl,onHomePageShow } from '@/core/consts';
import { UserToken, shareUrl, onHomePageShow } from '@/core/consts';
import { useUserInfoStore } from '@/core/store';
import { ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';

6
CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj
View File

@@ -5,9 +5,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MediatR" Version="12.2.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageReference Include="MediatR" Version="12.4.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.36.0" />
</ItemGroup>

8
CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs
View File

@@ -602,11 +602,11 @@ namespace CoreCms.Net.Web.Admin.Controllers
#endregion
#region 后台生成小程序码============================================================
#region 后台生成万能表单小程序码============================================================
// POST: Api/CoreCmsForm/GetCreate
/// <summary>
/// 后台生成小程序码
/// 后台生成万能表单小程序码
/// </summary>
/// <returns></returns>
[HttpPost]
@@ -627,7 +627,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
return jm;
}
var path = "pages/form/details/details?id=" + entity.id;
var path = "pages/subpackage/form/detail/detail?id=" + entity.id;
var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
@@ -709,7 +709,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
return jm;
}
var path = "pages/goods/goodDetails/goodDetails?id=" + entity.id;
var path = "pages/goods/detail?id=" + entity.id;
var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
var client = _weChatApiHttpClientFactory.CreateWxOpenClient();

26
CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj
View File

@@ -46,29 +46,29 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.78" />
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.296" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
<PackageReference Include="CSRedisCore" Version="3.8.802" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.3" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.3" />
<PackageReference Include="CSRedisCore" Version="3.8.803" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.4" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.4" />
<PackageReference Include="IdentityModel" Version="6.2.0" />
<PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.10" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
<PackageReference Include="MySql.Data" Version="8.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.6" />
<PackageReference Include="MySql.Data" Version="9.1.0" />
<PackageReference Include="NETCore.Encrypt" Version="2.1.1" />
<PackageReference Include="NLog" Version="5.2.7" />
<PackageReference Include="NLog.Database" Version="5.2.7" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.7" />
<PackageReference Include="NPOI" Version="2.6.2" />
<PackageReference Include="Snowflake.Core" Version="2.0.0" />
<PackageReference Include="StackExchange.Redis" Version="2.7.10" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.35" />
<PackageReference Include="StackExchange.Redis" Version="2.8.16" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.40" />
<PackageReference Include="ToolGood.Words" Version="3.1.0" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>

2
CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml
View File

@@ -2521,7 +2521,7 @@
订单表
</summary>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsOrderController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsOrderServices,CoreCms.Net.IServices.ICoreCmsUserServices,CoreCms.Net.IServices.ICoreCmsAreaServices,CoreCms.Net.IServices.ICoreCmsBillAftersalesServices,CoreCms.Net.IServices.ICoreCmsStoreServices,CoreCms.Net.IServices.ICoreCmsLogisticsServices,CoreCms.Net.IServices.ICoreCmsBillPaymentsServices,CoreCms.Net.IServices.ICoreCmsPaymentsServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsUserWeChatInfoServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository,CoreCms.Net.IServices.ICoreCmsBillDeliveryServices,CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory,CoreCms.Net.IServices.ICoreCmsOrderItemServices,CoreCms.Net.IServices.IWeChatShippingDeliveryServices)">
<member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsOrderController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsOrderServices,CoreCms.Net.IServices.ICoreCmsUserServices,CoreCms.Net.IServices.ICoreCmsAreaServices,CoreCms.Net.IServices.ICoreCmsBillAftersalesServices,CoreCms.Net.IServices.ICoreCmsStoreServices,CoreCms.Net.IServices.ICoreCmsLogisticsServices,CoreCms.Net.IServices.ICoreCmsBillPaymentsServices,CoreCms.Net.IServices.ICoreCmsPaymentsServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsUserWeChatInfoServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository,CoreCms.Net.IServices.ICoreCmsBillDeliveryServices,CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory,CoreCms.Net.IServices.ICoreCmsOrderItemServices,CoreCms.Net.IServices.IWeChatShippingDeliveryServices,CoreCms.Net.IServices.ICoreCmsDistributionOrderServices,CoreCms.Net.IServices.ICoreCmsAgentOrderServices)">
<summary>
构造函数
</summary>

39
CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/design.html
View File

@@ -141,7 +141,40 @@
<div class="urlBox" id="urlBox" style="display: none;">
<h4>常用前端地址：</h4>
<div class="layui-tab layui-tab-brief" style="margin:0px;">
<ul class="layui-tab-title">
<li class="layui-this">Vue3前端</li>
<li>Vue2前端</li>
</ul>
<div class="layui-tab-content" style="padding:0px;">
<div class="layui-tab-item layui-show" style="padding:10px;">
<p>前端首页：/pages/home/home</p>
<p>购 物 车：/pages/cart/cart</p>
<p>会员中心：/pages/member/member</p>
<p>搜索中心：/pages/search/search</p>
<p>分类首页：/pages/classify/classify</p>
<p>分类列表：/pages/category/category?id=分类序列</p>
<p>商品详情：/pages/goods/detail?id=商品序列</p>
<p>商品详情：/pages/goods/detail?id=商品序列</p>
<p>门店列表：/pages/subpackage/storeMap/storeMap</p>
<p>文章首页：/pages/subpackage/article/list/list</p>
<p>文章栏目：/pages/subpackage/article/category/category?id=文章栏目序列</p>
<p>文章详情：/pages/subpackage/article/detail/detail?id=文章序列</p>
<p>万能表单：/pages/subpackage/form/detail/detail?id=表单序列</p>
<p>服务商品列表：/pages/subpackage/serviceGoods/list/list</p>
<p>服务商品详情：/pages/subpackage/serviceGoods/detail/detail?id=商品序列</p>
<p>优惠券列表：/pages/subpackage/coupon/coupon</p>
<p>拼团列表：/pages/subpackage/activity/pinTuan/list/list</p>
<p>拼团详情：/pages/subpackage/activity/pinTuan/detail/detail?id=拼团序列</p>
<p>秒杀列表：/pages/subpackage/activity/seckill/list/list</p>
<p>秒杀详情：/pages/subpackage/activity/seckill/detail/detail?id=秒杀序列</p>
<p>团购列表：/pages/subpackage/activity/groupBuying/list/list</p>
<p>团购详情：/pages/subpackage/activity/groupBuying/detail/detail?id=团购序列</p>
<p>接龙列表：/pages/subpackage/activity/solitaire/list/list</p>
<p>接龙详情：/pages/subpackage/activity/solitaire/detail/detail?id=接龙序列</p>
<p>日历签到：/pages/subpackage/activity/checkIn/checkIn</p>
</div>
<div class="layui-tab-item" style="padding:10px;">
<p>前端首页：/pages/index/default/default</p>
<p>购 物 车：/pages/index/cart/cart</p>
<p>会员中心：pages/index/member/member</p>
@@ -167,6 +200,10 @@
<p>接龙列表：/pages/activity/solitaire/list/list</p>
<p>接龙详情：/pages/activity/solitaire/solitaireDetails/solitaireDetails?id=接龙序列</p>
<p>日历签到：/pages/activity/checkIn/checkIn/checkIn</p>
</div>
</div>
</div>
</div>

10
CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
View File

@@ -53,7 +53,8 @@
<blockquote class="layui-elem-quote">
1、如果开启【显示门店列表】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序涉及多个商家提供商品的在线交易及配送，请补充选择：电商平台-电商平台类目。】</text>”，可先关闭，审核后再开启。<br />
2、如果开启【显示充值】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序页面内容涉及账户充值服务，需补充商家自营-预付卡销售-发行方类目。】</text>”，可先关闭，审核后再开启。<br />
2、如果开启【是否允许提现】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序页面内容涉嫌收集用户信息，包括但不限于银行卡，手机号码等。】</text>”，可先关闭，审核后再开启。<br />
3、如果开启【是否允许提现】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序页面内容涉嫌收集用户信息，包括但不限于银行卡，手机号码等。】</text>”，可先关闭，审核后再开启。<br />
4、如果关闭【用户地址开启坐标功能】模块，则用户在录入地址位置将不会走腾讯地图去获取坐标，“<text style="color: #ff0000;">将导致【同城配送】订单模式下获取不到正确的公里数</text>”，不要同城配送的可以关闭。<br />
</blockquote>
<div class="layui-form-item">
<label class="layui-form-label">{{d.data.configs['showStoresSwitch']['sKey']}}</label>
@@ -76,6 +77,13 @@
<input type="radio" lay-filter="isAllowWithdrawCash" name="isAllowWithdrawCash" value="2" title="不开启" {{d.data.configs['isAllowWithdrawCash']['sValue']==="2" ? 'checked':''}}>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">{{d.data.configs['allowAddressToUseMap']['sKey']}}</label>
<div class="layui-input-inline layui-inline-7">
<input type="radio" lay-filter="allowAddressToUseMap" name="allowAddressToUseMap" value="1" title="开启" {{d.data.configs['allowAddressToUseMap']['sValue']==="1" ? 'checked':''}}>
<input type="radio" lay-filter="allowAddressToUseMap" name="allowAddressToUseMap" value="2" title="不开启" {{d.data.configs['allowAddressToUseMap']['sValue']==="2" ? 'checked':''}}>
</div>
</div>
<blockquote class="layui-elem-quote">
控制首页是否弹出弹窗广告
</blockquote>

4
CoreCms.Net.Web.WebApi/Controllers/CommonController.cs
View File

@@ -112,6 +112,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
var showSolitaire = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowSolitaire).ObjectToInt(2); //显示接龙按钮
var showCalendar = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowCalendar).ObjectToInt(2); //显示签到按钮
var showLiveBroadCast = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowLiveBroadCast).ObjectToInt(2); //显示小程序直播入口
var allowAddressToUseMap = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.AllowAddressToUseMap).ObjectToInt(2); //用户地址开启坐标功能
var showIndexPopupWindow = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowIndexPopupWindow).ObjectToInt(2); //显示首页弹窗
var indexPopupWindowImageUrl = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.IndexPopupWindowImageUrl); //首页弹窗图片地址
@@ -254,7 +255,8 @@ namespace CoreCms.Net.Web.WebApi.Controllers
indexPopupWindowImageUrl,
indexPopupWindowHrefUrl,
showCustomForm,
showLiveBroadCast
showLiveBroadCast,
allowAddressToUseMap
};
jm.data = model;
return jm;

28
CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj
View File

@@ -50,31 +50,31 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.78" />
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.296" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
<PackageReference Include="CSRedisCore" Version="3.8.802" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.3" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.3" />
<PackageReference Include="Hangfire" Version="1.8.6" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.6" />
<PackageReference Include="Hangfire.Core" Version="1.8.6" />
<PackageReference Include="CSRedisCore" Version="3.8.803" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.4" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.4" />
<PackageReference Include="Hangfire" Version="1.8.14" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.14" />
<PackageReference Include="Hangfire.Core" Version="1.8.14" />
<PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
<PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.3" />
<PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
<PackageReference Include="MySql.Data" Version="8.2.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.6" />
<PackageReference Include="MySql.Data" Version="9.1.0" />
<PackageReference Include="NETCore.Encrypt" Version="2.1.1" />
<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
<PackageReference Include="NLog" Version="5.2.7" />
<PackageReference Include="NLog.Database" Version="5.2.7" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.7" />
<PackageReference Include="Snowflake.Core" Version="2.0.0" />
<PackageReference Include="StackExchange.Redis" Version="2.7.10" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.35" />
<PackageReference Include="StackExchange.Redis" Version="2.8.16" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.40" />
<PackageReference Include="ToolGood.Words" Version="3.1.0" />
</ItemGroup>

22
CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
View File

@@ -193,6 +193,12 @@
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.CartController.DoDeleteByIds(CoreCms.Net.Model.FromBody.FMArrayIntIds)">
<summary>
批量删除购物车信息
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.CartController.SetCartNum(CoreCms.Net.Model.ViewModels.DTO.FMSetCartNum)">
<summary>
设置购物车商品数量
@@ -597,7 +603,7 @@
订单调用接口数据
</summary>
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.#ctor(CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IServices.ICoreCmsOrderServices,CoreCms.Net.IServices.ICoreCmsBillAftersalesServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsAreaServices,CoreCms.Net.IServices.ICoreCmsBillReshipServices,CoreCms.Net.IServices.ICoreCmsShipServices,CoreCms.Net.IServices.ICoreCmsLogisticsServices,CoreCms.Net.IServices.ICoreCmsOrderDistributionModelServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository,CoreCms.Net.IServices.ICoreCmsUserServices,CoreCms.Net.IServices.ICoreCmsClerkServices,CoreCms.Net.IServices.ICoreCmsInvoiceServices)">
<member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.#ctor(CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IServices.ICoreCmsOrderServices,CoreCms.Net.IServices.ICoreCmsBillAftersalesServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsAreaServices,CoreCms.Net.IServices.ICoreCmsBillReshipServices,CoreCms.Net.IServices.ICoreCmsShipServices,CoreCms.Net.IServices.ICoreCmsLogisticsServices,CoreCms.Net.IServices.ICoreCmsOrderDistributionModelServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository,CoreCms.Net.IServices.ICoreCmsUserServices,CoreCms.Net.IServices.ICoreCmsClerkServices,CoreCms.Net.IServices.ICoreCmsInvoiceServices,CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory,CoreCms.Net.IServices.ICoreCmsUserWeChatInfoServices,CoreCms.Net.IServices.ICoreCmsBillPaymentsServices)">
<summary>
构造函数
</summary>
@@ -716,6 +722,20 @@
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.OrderShippingList(CoreCms.Net.Model.FromBody.FMStringId)">
<summary>
查询当前订单是否接入微信发货信息管理
</summary>
<param name="entity"></param>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.GetOrderPayInfo(CoreCms.Net.Model.FromBody.FMStringId)">
<summary>
根据订单编号获取当前订单的支付信息
</summary>
<param name="entity"></param>
<returns></returns>
</member>
<member name="T:CoreCms.Net.Web.WebApi.Controllers.PageController">
<summary>
页面接口