GithubStar/CoreShop
1
0
Fork 0
mirror of https://github.com/CoreUnion/CoreShop.git synced 2026-10-17 05:12:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

!163 【修复】拼团链接问题，导致拼团objectId获取不到变undefined了。#I4I0LM 【修复】商品自定义服务项不支持换行。（一行放不下两行不支持。） 【修复】授权后，对话框关闭问题。#I4HEUS

Browse Source 
* 【修复】拼团链接问题，导致拼团objectId获取不到变undefined了。#I4I0LM
* 【修复】修复一些细节样式问题。
This commit is contained in:
大灰灰
2021-11-13 17:19:55 +00:00
parent 7198475985
commit 28efa12b8a
10 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CoreCms.Net.Model/Entities/Expression/PredicateBuilder.cs
+1 -1
View File
@@ -57,7 +57,7 @@ namespace CoreCms.Net.Model.Entities.Expression
public static Expression<Func<T, bool>> Or<T>(this Expression<Func<T, bool>> first,
Expression<Func<T, bool>> second)
{
return first.Compose(second, System.Linq.Expressions.Expression.Or);
return first.Compose(second, System.Linq.Expressions.Expression.OrElse);
}
}
}
CoreCms.Net.Uni-App/CoreShop/common/mixins/mixinsHelper.js
+3 -3
View File
@@ -139,13 +139,13 @@ export const goods = {
this.$u.route('/pages/activity/groupBuying/details/details', { id: id, groupId: groupId, });
},
//拼团详情页
goPinTuanDetail(id, teamId) {
goPinTuanDetail(id, pinTuanId, teamId) {
console.log(id);
console.log(teamId);
if (teamId) {
this.$u.route('/pages/activity/pinTuan/details/details', { id: id, teamId: teamId, });
this.$u.route('/pages/activity/pinTuan/details/details', { id: id, pinTuanId: pinTuanId, teamId: teamId, });
} else {
this.$u.route('/pages/activity/pinTuan/details/details', { id: id });
this.$u.route('/pages/activity/pinTuan/details/details', { id: id, pinTuanId: pinTuanId });
}
},
// 查看秒杀列表
CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
+1
View File
@@ -265,6 +265,7 @@
} else {
_this.$u.toast('如未授权，您可尝试使用手机号+短信验证码登录');
}
_this.showLogin = false;
},
//实际的去登陆
toGetPhoneNumber: function (data) {
CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue
+1 -1
View File
@@ -9,7 +9,7 @@
<swiper class="carousel" circular @change="swiperChange" :autoplay="true" duration="2000">
<swiper-item v-for="(goods, index) in goodsList" :key="index" class="carousel-item">
<view class="goods-list-box coreshop-flex coreshop-align-center">
<view class="goods-item" v-for="item in goods" :key="item.id" @tap="goPinTuanDetail(item.goodsId)">
<view class="goods-item" v-for="item in goods" :key="item.id" @tap="goPinTuanDetail(item.goodsId,item.id)">
<view class="min-goods">
<view class="img-box">
<view class="tag">{{item.peopleNumber}}人团</view>
CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue
+1 -1
View File
@@ -34,7 +34,7 @@
<view class="original">￥{{ item.price }}</view>
</view>
</view>
<button class="cu-btn buy-btn" @tap="goPinTuanDetail(item.id)">马上拼</button>
<button class="cu-btn buy-btn" @tap="goPinTuanDetail(item.id,item.pinTuanRule.id)">马上拼</button>
</view>
</view>
</view>
CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue
+1 -1
View File
@@ -287,7 +287,7 @@
<text class="u-line-1 coreshop-text-black">{{item.title}}</text>
</view>
<view class="u-font-sm text-list-view">
<view class="margin-left u-line-1 coreshop-text-gray">{{item.description}}</view>
<view class="margin-left coreshop-text-gray">{{item.description}}</view>
</view>
</view>
</view>
CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
+1 -1
View File
@@ -335,7 +335,7 @@
<text class="u-line-1 coreshop-text-black">{{item.title}}</text>
</view>
<view class="u-font-sm text-list-view">
<view class="margin-left u-line-1 coreshop-text-gray">{{item.description}}</view>
<view class="margin-left coreshop-text-gray">{{item.description}}</view>
</view>
</view>
</view>
CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.vue
+1 -1
View File
@@ -151,7 +151,7 @@
<image class="coreshop-avatar radius" :src="item.imageUrl" mode="aspectFill"></image>
<view class="goods-info-view">
<view class="coreshop-text-black u-line-2" @click="goGoodsDetail(item.goodsId)" v-if="orderInfo.orderType == 1">{{ item.name }}</view>
<view class="coreshop-text-black u-line-2" @click="goPinTuanDetail(item.goodsId)" v-else-if="orderInfo.orderType == 2">{{ item.name }}</view>
<view class="coreshop-text-black u-line-2" @click="goPinTuanDetail(item.goodsId,orderInfo.objectId)" v-else-if="orderInfo.orderType == 2">{{ item.name }}</view>
<view class="coreshop-text-gray u-font-sm u-line-1 introduce" v-if="item.addon">{{ item.addon}}</view>
<view class="u-line-1 tag-view">
<u-tag :text="v.name" type="success" shape="circle" v-for="(v, k) in item.promotionList" :key="k" />
CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue
+1 -1
View File
@@ -181,7 +181,7 @@
<image class="coreshop-avatar radius" :src="item.imageUrl" mode="aspectFill"></image>
<view class="goods-info-view">
<view class="coreshop-text-black u-line-2" @click="goGoodsDetail(item.goodsId)" v-if="orderInfo.orderType == 1">{{ item.name }}</view>
<view class="coreshop-text-black u-line-2" @click="goPinTuanDetail(item.goodsId)" v-else-if="orderInfo.orderType == 2">{{ item.name }}</view>
<view class="coreshop-text-black u-line-2" @click="goPinTuanDetail(item.goodsId,orderInfo.objectId)" v-else-if="orderInfo.orderType == 2">{{ item.name }}</view>
<view class="coreshop-text-gray u-font-sm u-line-1 introduce" v-if="item.addon">{{ item.addon}}</view>
<view class="u-line-1 tag-view">
<u-tag :text="v.name" type="success" size="mini" shape="circle" v-for="(v, k) in item.promotionList" :key="k" />
README.md
+3 -8
View File
@@ -23,7 +23,7 @@
------------------------------------------------------------------------
官方网站：https://www.coreshop.cn/ 【建设中】
官方网站：https://www.coreshop.cn/
QQ群：70494974
@@ -156,7 +156,7 @@ https://api.demo.coreshop.cn/job
| Jwt | 授权认证 | [![nuget](https://img.shields.io/nuget/v/IdentityModel?cacheSeconds=10800)](https://www.nuget.org/packages/IdentityModel/) [![nuget](https://img.shields.io/nuget/dt/IdentityModel)](https://www.nuget.org/packages/IdentityModel/) |
| HangFire | 定时任务 | [![nuget](https://img.shields.io/nuget/v/HangFire?cacheSeconds=10800)](https://www.nuget.org/packages/HangFire/) [![nuget](https://img.shields.io/nuget/dt/HangFire)](https://www.nuget.org/packages/HangFire/) |
| Paylink | 在线支付 | [![nuget](https://img.shields.io/nuget/v/Essensoft.Paylink.WeChatPay?cacheSeconds=10800)](https://www.nuget.org/packages/Essensoft.Paylink.WeChatPay/) [![nuget](https://img.shields.io/nuget/dt/Essensoft.Paylink.WeChatPay)](https://www.nuget.org/packages/Essensoft.Paylink.WeChatPay/) |
| SKIT.FlurlHttpClient.Wechat | 微信SDK | [![nuget](https://img.shields.io/nuget/v/SKIT.FlurlHttpClient.Wechat?cacheSeconds=10800)](https://www.nuget.org/packages/SKIT.FlurlHttpClient.Wechat/) [![nuget](https://img.shields.io/nuget/dt/SKIT.FlurlHttpClient.Wechat)](https://www.nuget.org/packages/SKIT.FlurlHttpClient.Wechat/) |
| SKIT.FlurlHttpClient.Wechat | 微信SDK | [![nuget](https://img.shields.io/nuget/v/SKIT.FlurlHttpClient.Wechat.Api?cacheSeconds=10800)](https://www.nuget.org/packages/SKIT.FlurlHttpClient.Wechat.Api/) [![nuget](https://img.shields.io/nuget/dt/SKIT.FlurlHttpClient.Wechat.Api)](https://www.nuget.org/packages/SKIT.FlurlHttpClient.Wechat.Api/) |
| LayUIAdmin | 后端管理UI框架 | [![npm](https://img.shields.io/npm/v/layui.svg?sanitize=true)](https://www.layui.com/) [![github](https://img.shields.io/github/stars/sentsin/layui.svg?style=social)](https://www.layui.com/) |
@@ -207,15 +207,10 @@ https://api.demo.coreshop.cn/job
- [ ] （可选）易联云网络打印机
### ⛵ 安装及说明文档
- 由于文档内容较多，请加QQ群 【[70494974](https://jq.qq.com/?_wv=1027&k=y83TiQC7)】 后群附内下载多种文档，或git源代码从其目录【文档】中获取。
- 由于文档内容较多，请加QQ群 【[70494974](https://jq.qq.com/?_wv=1027&k=y83TiQC7)】 后群附内下载多种文档，或访问官网[https://www.coreshop.cn](https://www.coreshop.cn)在线浏览。
- 已经支持linux下docker-compose部署，可实现一键部署coreshop应用、mysql、redis，请获取代码中【docker-compose.yaml】文件，
### ⚡ 进度及计划
- 目前虽然完成了通用商城该有的功能开发，但是因为业务逻辑层面的功能繁多，不可否认存在一些较明显的bug。
- 近阶段我们主要工作重心放在修复Bug、完善测试、优化业务逻辑、编写文档及官网的建设。
### 🎏 版权须知
- 允许个人学习研究使用，支持二次开发。
- 允许商业用途，商用免费，但仅限自运营；如果商用必须保留版权信息，望自觉遵守。