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

!140 ## 1.0.2 日常修复（2021.10.07）

Browse Source 
* ## 1.0.2（2021.10.07）
* 1、【修复】修复页面设计中文章组，文章分类设计下描述链接错误的问题。#I4CPZN
This commit is contained in:
大灰灰
2021-10-07 14:15:06 +00:00
parent a76802b396
commit 7f7db66cdd
7 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue
+4 -2
View File
@@ -351,11 +351,13 @@
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
<view class="action" >
<u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
<button open-type="contact" bindcontact="showChat" class="noButtonStyle">
<u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom"></u-icon>
</button>
</view>
<!-- #endif -->
<view class="action" @click="collection">
<u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
<u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom"></u-icon>
</view>
<view class="action" @click="redirectCart">
<u-badge class="car-num" :count="cartNums?cartNums:0" type="error" :offset="[-3, -6]"></u-badge>
CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue
+4 -2
View File
@@ -392,11 +392,13 @@
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
<view class="action" >
<u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
<button open-type="contact" bindcontact="showChat" class="noButtonStyle">
<u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom"></u-icon>
</button>
</view>
<!-- #endif -->
<view class="action" @click="collection">
<u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
<u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom"></u-icon>
</view>
<view class="action" @click="redirectCart">
<u-badge class="car-num" :count="cartNums?cartNums:0" type="error" :offset="[-3, -6]"></u-badge>
CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue
+4 -2
View File
@@ -354,11 +354,13 @@
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
<view class="action" >
<u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
<button open-type="contact" bindcontact="showChat" class="noButtonStyle">
<u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom"></u-icon>
</button>
</view>
<!-- #endif -->
<view class="action" @click="collection">
<u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
<u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom"></u-icon>
</view>
<view class="action" @click="redirectCart">
CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
+4 -2
View File
@@ -298,11 +298,13 @@
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
<view class="action" >
<u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
<button open-type="contact" bindcontact="showChat" class="noButtonStyle">
<u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom"></u-icon>
</button>
</view>
<!-- #endif -->
<view class="action" @click="collection">
<u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
<u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom"></u-icon>
</view>
<view class="action" @click="redirectCart">
CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail/detail.vue
+25 -23
View File
@@ -26,11 +26,11 @@
<view class="coreshop-bg-white coreshop-card-box">
<view class="coreshop-card-view coreshop-price-view">
<view class="u-font-lg coreshop-text-bold coreshop-text-black">售后单进度</view>
<u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
<u-line color="#eee" border-style="dashed" margin="20rpx 0" />
<view class="u-text-center coreshop-text-black">
<u-button type="warning" shape="square" size="mini" v-if="statusName" class="u-margin-left-20 u-margin-right-20">{{statusName}}</u-button>
<u-button type="warning" shape="square" size="mini" v-if="reshipName" class="u-margin-left-20 u-margin-right-20">{{reshipName}}</u-button>
<u-button type="warning" shape="square" size="mini" v-if="refundName" class="u-margin-left-20 u-margin-right-20">{{refundName}}</u-button>
<u-button type="warning" shape="square" size="mini" v-if="statusName" class="u-margin-left-20 u-margin-right-20">{{statusName}}</u-button>
<u-button type="warning" shape="square" size="mini" v-if="reshipName" class="u-margin-left-20 u-margin-right-20">{{reshipName}}</u-button>
<u-button type="warning" shape="square" size="mini" v-if="refundName" class="u-margin-left-20 u-margin-right-20">{{refundName}}</u-button>
</view>
</view>
</view>
@@ -39,14 +39,14 @@
<view class="coreshop-bg-white coreshop-card-box" v-if="status == 2 && reshipStatus == 1 && refundStatus!=2">
<view class="coreshop-card-view coreshop-address-view">
<view class="u-font-lg coreshop-text-bold coreshop-text-black">退货邮寄信息</view>
<u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
<u-line color="#eee" border-style="dashed" margin="20rpx 0" />
<view class="wrap">
<u-row gutter="16">
<u-col span="1">
<u-row gutter="16">
<u-col span="1">
<u-icon name="map-fill" size="38"></u-icon>
</u-col>
<u-col span="11">
<view class="coreshop-text-black">
</u-col>
<u-col span="11">
<view class="coreshop-text-black">
<text>收货人：</text>
<text>{{ reshipInfo.reshipName }}</text>
<text class="u-margin-left-10">{{ reshipInfo.reshipMobile }}</text>
@@ -54,9 +54,9 @@
<view class="coreshop-text-gray u-font-sm flex">
<view class="u-line-1">{{ reshipInfo.reshipArea + reshipInfo.reshipAddress }}</view>
</view>
</u-col>
</u-row>
</view>
</u-col>
</u-row>
</view>
</view>
</view>
@@ -65,14 +65,14 @@
<view class="coreshop-bg-white coreshop-card-box" v-if="goodsInfo.length>0">
<view class="coreshop-card-view coreshop-shop-view">
<view class="coreshop-text-black coreshop-text-bold u-font-lg title-view">商品信息</view>
<u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
<u-line color="#eee" border-style="dashed" margin="20rpx 0" />
<view class="goods-list-view" v-for="(item, key) in goodsInfo" :key="key">
<image class="coreshop-avatar radius" :src="item.imageUrl" mode="aspectFill"></image>
<view class="goods-info-view">
<view class="coreshop-text-black u-line-2 name">{{item.name}} </view>
<view class="coreshop-text-gray u-font-sm u-line-1 introduce u-margin-top-15">售后单号：{{item.aftersalesId}}</view>
<view class="u-line-1 u-margin-top-15" v-if="item.addon">
<u-tag :text="item.addon" type="success" shape="circle" />
<u-tag :text="item.addon" type="success" shape="circle" />
</view>
<view class="coreshop-text-red u-font-md u-margin-top-15">退货数量:{{item.nums}}</view>
</view>
@@ -85,7 +85,7 @@
<view class="coreshop-bg-white coreshop-card-box">
<view class="coreshop-card-view coreshop-price-view">
<view class="u-font-lg coreshop-text-bold coreshop-text-black">状态</view>
<u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
<u-line color="#eee" border-style="dashed" margin="20rpx 0" />
<view class="coreshop-text-black title-view">
<view class="title">商品状态</view>
<view class="u-text-right">
@@ -98,15 +98,17 @@
<text>{{refund}}元</text>
</view>
</view>
<u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
<view class="u-text-center coreshop-text-black">联系客服</view>
<u-line color="#eee" border-style="dashed" margin="20rpx 0" />
<view class="coreshop-text-black u-text-center">
<u-button type="primary" size="mini" open-type="contact" bindcontact="showChat">联系客服</u-button>
</view>
</view>
</view>
<!--图片凭证-->
<view class="coreshop-bg-white coreshop-card-box" v-if="images.length > 0">
<view class="coreshop-card-view coreshop-order-view">
<view class="u-font-lg coreshop-text-bold coreshop-text-black">图片凭证</view>
<u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
<u-line color="#eee" border-style="dashed" margin="20rpx 0" />
<view class="coreshop-text-black title-view">
<view class="goods-img-item" v-for="(item, key) in images" :key="key">
<image :src="item.imageUrl" mode="aspectFit" @click="clickImg(item.imageUrl)"></image>
@@ -119,7 +121,7 @@
<view class="coreshop-bg-white coreshop-card-box">
<view class="coreshop-card-view coreshop-order-view">
<view class="u-font-lg coreshop-text-bold coreshop-text-black">问题描述</view>
<u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
<u-line color="#eee" border-style="dashed" margin="20rpx 0" />
<view class="coreshop-text-black title-view">
<text v-if="reason">{{reason}}</text>
<text v-else>暂无描述</text>
@@ -131,7 +133,7 @@
<view class="coreshop-bg-white coreshop-card-box" v-if="status == 2 && reshipStatus == 1">
<view class="coreshop-card-view coreshop-order-view">
<view class="u-font-lg coreshop-text-bold coreshop-text-black">请填写回邮商品物流信息</view>
<u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
<u-line color="#eee" border-style="dashed" margin="20rpx 0" />
<view class='coreshop-cell-group u-margin-top-20 u-margin-bottom-20'>
<view class='coreshop-cell-item'>
@@ -159,7 +161,7 @@
<view class="coreshop-bg-white coreshop-card-box" v-if="status == 2 && reshipStatus > 1">
<view class="coreshop-card-view coreshop-order-view">
<view class="u-font-lg coreshop-text-bold coreshop-text-black">快递公司</view>
<u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
<u-line color="#eee" border-style="dashed" margin="20rpx 0" />
<view class="coreshop-text-black title-view">
<view class="title">快递公司</view>
<view class="u-text-right">
@@ -170,7 +172,7 @@
<view class="title">物流单号</view>
<view class="u-text-right">
<text class="u-margin-right-20">{{logiNo}}</text>
<u-tag text="复制" type="success" mode="dark" @click="doCopyData(logiNo)"/>
<u-tag text="复制" type="success" mode="dark" @click="doCopyData(logiNo)" />
</view>
</view>
</view>
CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue
+4 -2
View File
@@ -80,7 +80,7 @@
</view>
</view>
<view class="coreshop-cell-item-ft" v-if="teamInfo.status==1">
<u-button type="success" size="mini" @click="goInvition()">邀请拼单</u-button>
<u-button type="success" size="mini" @click="goInvition()">邀请拼单</u-button>
</view>
</view>
</view>
@@ -292,7 +292,9 @@
<u-line color="#eee" border-style="dashed" margin="20rpx 0" />
<view class="u-text-center coreshop-text-black">联系客服</view>
<view class="coreshop-text-black u-text-center">
<u-button type="primary" size="mini" open-type="contact" bindcontact="showChat">联系客服</u-button>
</view>
</view>
</view>
CoreCms.Net.Web.WebApi/Controllers/GoodController.cs
+12 -16
View File
@@ -155,7 +155,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
where = where.And(p => p.isMarketable == true);
var className = string.Empty;
if (!string.IsNullOrEmpty(entity.where))
if (!string.IsNullOrWhiteSpace(entity.where))
{
var obj = JsonConvert.DeserializeAnonymousType(entity.where, new
{
@@ -167,7 +167,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
searchName = "",
});
if (!string.IsNullOrEmpty(obj.priceFrom))
if (!string.IsNullOrWhiteSpace(obj.priceFrom))
{
var priceF = obj.priceFrom.ObjectToDouble(0);
if (priceF >= 0)
@@ -176,19 +176,19 @@ namespace CoreCms.Net.Web.WebApi.Controllers
where = where.And(p => p.price >= f);
}
}
if (!string.IsNullOrEmpty(obj.priceTo))
if (!string.IsNullOrWhiteSpace(obj.priceTo))
{
var priceT = obj.priceTo.ObjectToDouble(0);
if (priceT >= 0)
if (priceT > 0)
{
var f = Convert.ToDecimal(priceT);
where = where.And(p => p.price <= f);
}
}
if (!string.IsNullOrEmpty(obj.catId))
if (!string.IsNullOrWhiteSpace(obj.catId))
{
var catId = obj.catId.ObjectToInt(0);
if (catId >= 0)
if (catId > 0)
{
var category = await _goodsCategoryServices.QueryByIdAsync(catId);
if (category != null)
@@ -208,30 +208,26 @@ namespace CoreCms.Net.Web.WebApi.Controllers
}
}
}
if (!string.IsNullOrEmpty(obj.brandId))
if (!string.IsNullOrWhiteSpace(obj.brandId))
{
var brandId = obj.brandId.ObjectToInt(0);
if (brandId >= 0)
if (brandId > 0)
{
where = where.And(p => p.brandId == brandId);
}
}
if (!string.IsNullOrEmpty(obj.labelId))
if (!string.IsNullOrWhiteSpace(obj.labelId))
{
var brandId = obj.brandId.ObjectToInt(0);
if (brandId >= 0)
{
where = where.And(p => p.brandId == brandId);
}
where = where.And(p => p.labelIds.Contains(obj.labelId));
}
if (!string.IsNullOrEmpty(obj.searchName))
if (!string.IsNullOrWhiteSpace(obj.searchName))
{
where = where.And(p => p.name.Contains(obj.searchName));
}
}
var orderBy = " isRecommend desc,isHot desc";
if (!string.IsNullOrEmpty(entity.order))
if (!string.IsNullOrWhiteSpace(entity.order))
{
orderBy += "," + entity.order;
}