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

# 2022-02-25

Browse Source 
### 1.3.7 开源社区版：
无
### 0.2.5 会员专业版：
【新增】数据库sku表【CoreCmsProducts】增加"赠送积分"【points】字段。
【新增】商品sku新增赠送积分功能，订单结算后可根据单品的积分与数量进行计算。与订单积分按照金额比例获取并存。
【新增】前端新增是否显示单品赠送积分功能，勾选显示，将在商品详情，购物车等界面显示购买此物品赠送多少积分的效果。
【优化】前端使用显示“积分”两个字的界面，替换为后台设置的名称。
【修复】修复form表单录入编辑界面属性值重复的问题。#I4V1PE
【修复】修复商品添加和编辑界面存在的错别字。#I4V1OR
【修复】修复广告位设置商品，弹出选择框不显示图片的问题。#I4V1EO
This commit is contained in:
JianWeie
2022-02-25 01:48:37 +08:00
parent 232640f83f
commit 442d7ef952
29 changed files with 218 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue
View File

@@ -111,6 +111,14 @@
{{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>
</view>
<view class="coreshop-btn-all">
@@ -121,7 +129,7 @@
<view class="coreshop-emptybox" v-else>
<u-empty :icon="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="150" text="当前列表为空" mode="list"></u-empty>
</view>
</view>
<!-- 列表图片 -->
@@ -320,6 +328,8 @@
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: {
listGrid() {

8
CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
View File

@@ -25,11 +25,15 @@
<view class="coreshop-flex coreshop-flex-wrap coreshop-flex-direction-row">
<view class="coreshop-text-through coreshop-padding-bottom-5">原价￥{{ product.mktprice || '0.00'}}</view>
<view class="coreshop-margin-left-10">{{ goodsInfo.buyCount || '0' }} 人已购买</view>
<view class="coreshop-margin-left-10" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && product.points > 0">购买赠送:{{product.points}}{{ pointShowName}}</view>
</view>
</view>
<view v-else>
<view class="coreshop-text-through coreshop-padding-bottom-5">原价￥{{ product.mktprice || '0.00'}}</view>
<view>{{ goodsInfo.buyCount || '0' }} 人已购买</view>
<view class="coreshop-flex coreshop-flex-wrap coreshop-flex-direction-row">
<view>{{ goodsInfo.buyCount || '0' }} 人已购买</view>
<view class="coreshop-margin-left-10" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && product.points > 0">购买赠送:{{product.points}}{{ pointShowName}}</view>
</view>
</view>
</view>
<view class="coreshop-text-right coreshop-share-right">
@@ -520,6 +524,8 @@
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 },
shopName() {
return this.$store.state.config.shopName;
},

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

@@ -28,7 +28,12 @@
</view>
<view class="coreshop-flex coreshop-flex-direction-row coreshop-justify-between coreshop-margin-top-10">
<text class="cart-shoppingcard-goods-price">￥{{item.products.price}}</text>
<view class="coreshop-flex coreshop-flex-direction-row coreshop-align-center">
<text class="cart-shoppingcard-goods-price">￥{{item.products.price}}</text>
<text class="coreshop-font-10 coreshop-margin-left-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.products.points > 0">
(送 {{item.products.points}}{{ pointShowName}})
</text>
</view>
<view class="cart-shoppingcard-goods-number">
<u-number-box buttonSize="24" integer :name="index" :value="item.nums" ref="index" @change="toNumberChange" :step="1" :min="1" :max="item.products.stock"></u-number-box>
</view>
@@ -85,7 +90,6 @@
<text class="coreshop-font-12">{{ pointShowName}}兑换价：</text>
<text class="coreshop-font-12 coreshop-text-red">{{pointShowText}}</text>
</view>
</view>
<view class="cart-shoppingcard-count coreshop-flex coreshop-flex-direction-row coreshop-justify-between coreshop-align-center coreshop-margin-right-5" v-else>
<text class="cart-text">合计 :</text>
@@ -137,6 +141,8 @@
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: {
//数组转字符串

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

@@ -3,7 +3,7 @@
<u-toast ref="uToast" /><u-no-network></u-no-network>
<u-navbar leftIcon="search" title="会员中心" safeAreaInsetTop fixed placeholder @leftClick="goSearch"></u-navbar>
<view class="headBox coreshop-bg-red">
<view class="headBox coreshop-bg-green">
<!--标题栏-->
<!--小程序端不显示-->
<!--用户信息-->
@@ -46,7 +46,7 @@
<text class="coreshop-font-12">等级：{{ userInfo.gradeName }}</text>
</view>
<view class="coreshop-font-12 coreshop-flex-direction-row">
<text class="text-border-x">积分： {{ userInfo.point }}</text>
<text class="text-border-x">{{pointShowName}}： {{ userInfo.point }}</text>
<text>余额： {{ userInfo.balance }}</text>
</view>
</view>
@@ -76,7 +76,7 @@
<view class="user-info-num-box">
<u-row customStyle="margin-bottom: 10px">
<u-col span="3" @tap="navigateToHandle('/pages/member/history/index')" textAlign="center">
<u-col span="3" @tap="navigateToHandle('/pages/member/history/index')" textAlign="center">
<view class="coreshop-font-18" v-if="!hasLogin">-</view>
<view class="coreshop-font-18" v-else>{{ userInfo.footPrintCount }}</view>
<text class="coreshop-font-11">足迹</text>
@@ -289,7 +289,7 @@
showItem: true
},
myIntegral: {
name: '我的积分',
name: '我的' + this.$store.state.config.pointShowName,
icon: 'integral',
router: '/pages/member/integral/index',
showItem: true
@@ -414,7 +414,8 @@
set(val) {
this.$store.commit('userInfo', val);
}
}
},
pointShowName() { return this.$store.state.config.pointShowName },
},
methods: {
goAgentPanel() {

9
CoreCms.Net.Uni-App/CoreShop/pages/member/integral/index.vue
View File

@@ -13,13 +13,13 @@
<u-sticky customNavHeight="48">
<view class="integral-top coreshop-bg-red coreshop-flex coreshop-flex-direction-column coreshop-justify-center">
<view class="coreshop-font-md text-white coreshop-margin-bottom-10">
可用积分
可用{{pointShowName}}
</view>
<view class="coreshop-font-xl coreshop-text-white coreshop-margin-bottom-10">
{{ pointList.length ? pointList[0].balance : 0}}
</view>
<view class="coreshop-font-xs coreshop-text-gray">
截止{{ nowDate }}可用积分
截止{{ nowDate }}可用{{pointShowName}}
</view>
</view>
</u-sticky>
@@ -43,7 +43,7 @@
</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>
<u-empty :icon="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="150" text="暂无记录" mode="list"></u-empty>
</view>
</view>
</template>
@@ -69,7 +69,8 @@
computed: {
nowDate() {
return this.$u.timeFormat(Math.round(new Date().getTime() / 1000))
}
},
pointShowName() { return this.$store.state.config.pointShowName },
},
methods: {
userPointLog() {

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

@@ -267,7 +267,7 @@
</view>
</view>
<view class="coreshop-text-black title-view" v-if="orderInfo.pointMoney > 0">
<view class="title">积分优惠</view>
<view class="title">{{pointShowName}}优惠</view>
<view class="coreshop-text-right">
<text class="coreshop-margin-right-10">-</text>
<text class="coreshop-text-price">{{ orderInfo.pointMoney }}</text>
@@ -495,6 +495,7 @@
orderCancelTime() {
return this.$store.state.config.orderCancelTime || 60;
},
pointShowName() { return this.$store.state.config.pointShowName },
},
methods: {
// 获取订单详情

12
CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue
View File

@@ -131,6 +131,14 @@
{{pointDiscountedProportion * item.products.pointsDeduction * item.nums }}{{ pointShowName}}+{{(item.products.price - item.products.pointsDeduction)*item.nums }}元
</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">
<view>
购买将赠送：
</view>
<view class="coreshop-text-red">
{{item.products.points * item.nums }}{{ pointShowName}}
</view>
</view>
</view>
</view>
@@ -228,7 +236,7 @@
<text class="coreshop-text-right">- {{ cartData.couponPromotionMoney || '0'}}</text>
</view>
<view class="coreshop-text-black item-view">
<view class="u-line-1 title">积分抵扣</view>
<view class="u-line-1 title">{{ pointShowName}}抵扣</view>
<text class="coreshop-text-right">- {{ cartData.pointExchangeMoney || '0'}}</text>
</view>
<view class="coreshop-text-black item-view">
@@ -869,6 +877,8 @@
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 },
},
watch: {
// 监听数据状态(切换收货地址, 是否使用优惠券, 是否使用积分) 重新请求订单数据