wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-02-05 00:49:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

# 2022-02-09

Browse Source 
### 1.3.5 开源社区版（会员专业版同步修改）：
无
### 0.1.5 会员专业版：
【升级】nuget升级常用组件到最新版本。
【修复】服务商品列表图片组件从image调整为u--image组件。#I4RUC6
【优化】规范coreshop-goods.vue组件for循环未定义key的问题。
【修复】修复因升级uview版本导致【商品选项卡goodTabBar组件】切换失效的问题。
【新增】微信自定义交易组件增加【商品审核结果回调】，【类目审核结果回调】微信服务器消息推送处理。
【优化】调整自定义交易组件sku价格为decimal(18, 2)类型，方便小数处理。
【优化】微信自定义交易组件增加图片同步至微信侧功能。
【优化】重命名一些方法名称大小写。
【新增】首页设计轮播图增加高度设置功能。#I4SWEA
【修复】优化在苹果6/7/8plus及安卓一些机型出现分享海报弹窗文字被遮挡的问题。#I4SWCA
This commit is contained in:
JianWeie
2022-02-09 02:07:06 +08:00
parent 8e3adda57b
commit 05df55d7ec
43 changed files with 1044 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSlide.vue
View File

@@ -1,6 +1,6 @@
<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" keyName="image" @click="taped"></u-swiper>
<u-swiper :list="swiperItems" :height="swiperHeight" :interval="swiperDuration" keyName="image" @click="taped"></u-swiper>
</view>
</template>
@@ -16,6 +16,8 @@
data() {
return {
swiperItems: [],
swiperHeight: 130,
swiperDuration: 2500,
};
},
computed: {
@@ -37,6 +39,8 @@
}
this.swiperItems.push(moder);
}
this.swiperHeight = this.coreshopdata.parameters.height;
this.swiperDuration = this.coreshopdata.parameters.duration;
},
watch: {},
methods: {

3
CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue
View File

@@ -128,7 +128,8 @@
case 'wechatpay':
this.$u.api.pay(data).then(res => {
if (res.status) {
if (res.otherData.checkSceneResult && res.otherData.checkSceneResult.is_matched == 1) {
if (res.otherData.checkSceneResult) {
console.log("自定义交易组件");
wx.requestOrderPayment({
timeStamp: res.data.timeStamp,
nonceStr: res.data.nonceStr,

2
CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-wx/coreshop-share-wx.vue
View File

@@ -13,7 +13,7 @@
</button>
</view>
</view>
<view class="coreshop-bottomBox">
<view class="coreshop-share-bottomBox">
<button class="coreshop-btn coreshop-btn-w coreshop-btn-square" @click="close()">关闭</button>
</view>
</view>

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

@@ -27,7 +27,9 @@
</view>
</view>
<view class="item coreshop-solid-bottom coreshop-margin-top-5 coreshop-margin-padding-10 coreshop-padding-bottom-5">
<view class="left"><image :src="item.thumbnail && item.thumbnail!='null' ? item.thumbnail : '/static/images/common/empty-banner.png'" mode="aspectFill"></image></view>
<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>
</view>
<view class="content">
<view class="title u-line-2">{{item.title}}</view>
<view class="type u-line-2">{{item.description}}</view>

12
CoreCms.Net.Uni-App/CoreShop/static/style/corePage.scss
View File

@@ -65,12 +65,15 @@
/*分享浮层*/
.coreshop-share-Box { width: 100%; height: 120px; background: #FFFFFF; }
.coreshop-share-pop { height: 120px; width: 100%; display: flex; }
.coreshop-share-Box { width: 100%; background: #FFFFFF; }
.coreshop-share-pop { width: 100%; display: flex; }
.coreshop-share-item { flex: 1; text-align: center; font-size: 13px; color: #333; padding: 10px 0;
image { width: 40px; height: 40px; margin: 10px; }
.coreshop-btn { line-height: 1; display: block; font-size: 13px; background-color: #fff; }
}
.coreshop-share-bottomBox { background-color: #fff; height: 45px; width: 100%; display: flex; box-shadow: 0 0 10px #ccc;
.coreshop-btn { flex: 1; }
}
//顶部通用标题
.coreshop-bar-view-box { position: fixed; top: 0; width: 100%; z-index: 10000; background: #FAFAFA; /* #ifndef MP */ height: calc(var(--status-bar-height) + 50px); /* #endif */ /* #ifdef MP */ height: calc(var(--status-bar-height) + 65px); /* #endif */ padding: var(--status-bar-height) 14px 0 14px; align-items: center;
@@ -156,8 +159,7 @@
.orderWrap { display: flex; flex-direction: column; height: calc(100vh - var(--window-top)); width: 100%; }
.orderList { background-color: #ffffff; margin: 10px; border-radius: 10px; box-sizing: border-box; padding: 10px; font-size: 14px;
.item { display: flex; margin: 10px 0 0;
.left { margin-right: 10px;
}
.left { margin-right: 10px; }
.content {
.title { font-size: 14px; line-height: 25px; }
.type { margin: 5px 0; font-size: 12px; color: $core-tips-color; }
@@ -632,4 +634,4 @@
.contact-btn { margin: 0 auto; }
.contact-btn { margin: 0 auto; }