wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-03-22 18:27:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
Develop

See merge request jianweie/coreshoppro!9
This commit is contained in:
大灰灰
2022-10-14 17:09:04 +00:00
parent 2487a9d03b f0cebcec3a
commit acaf9fe0a3
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,7 +258,7 @@
{{ pointShowName}}兑换价: {{ pointShowName}}兑换价:
</view> </view>
<view class="coreshop-text-red"> <view class="coreshop-text-red">
{{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元 {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
</view> </view>
</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 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">
@@ -295,7 +295,7 @@
{{ pointShowName}}兑换价: {{ pointShowName}}兑换价:
</view> </view>
<view class="coreshop-text-red"> <view class="coreshop-text-red">
{{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元 {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
</view> </view>
</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 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">

4
CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue
View File

@@ -378,7 +378,7 @@
{{ pointShowName}}兑换价: {{ pointShowName}}兑换价:
</view> </view>
<view class="coreshop-text-red"> <view class="coreshop-text-red">
{{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元 {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
</view> </view>
</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 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">
@@ -415,7 +415,7 @@
{{ pointShowName}}兑换价: {{ pointShowName}}兑换价:
</view> </view>
<view class="coreshop-text-red"> <view class="coreshop-text-red">
{{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元 {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
</view> </view>
</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 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">

4
CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue
View File

@@ -261,7 +261,7 @@
{{ pointShowName}}兑换价: {{ pointShowName}}兑换价:
</view> </view>
<view class="coreshop-text-red"> <view class="coreshop-text-red">
{{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元 {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
</view> </view>
</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 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">
@@ -298,7 +298,7 @@
{{ pointShowName}}兑换价: {{ pointShowName}}兑换价:
</view> </view>
<view class="coreshop-text-red"> <view class="coreshop-text-red">
{{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元 {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
</view> </view>
</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 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">

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

@@ -271,7 +271,7 @@
{{ pointShowName}}兑换价: {{ pointShowName}}兑换价:
</view> </view>
<view class="coreshop-text-red"> <view class="coreshop-text-red">
{{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元 {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
</view> </view>
</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 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">
@@ -308,7 +308,7 @@
{{ pointShowName}}兑换价: {{ pointShowName}}兑换价:
</view> </view>
<view class="coreshop-text-red"> <view class="coreshop-text-red">
{{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ item.price - item.pointsDeduction}}元 {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price - item.pointsDeduction).toFixed(2)}}元
</view> </view>
</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 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">

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

@@ -287,7 +287,7 @@
showItem: false showItem: false
}, },
myIntegral: { myIntegral: {
name: '我的' + this.$store.state.config.pointShowName, name: '我的' + (this.$store.state.config.pointShowName || '积分'),
icon: 'integral', icon: 'integral',
router: '/pages/member/integral/index', router: '/pages/member/integral/index',
showItem: true showItem: true
@@ -495,6 +495,7 @@
_this.utilityMenus.myServices.showItem = _this.config.showServicePackage == 1; _this.utilityMenus.myServices.showItem = _this.config.showServicePackage == 1;
//优惠券 //优惠券
_this.vas.coupons.showItem = _this.config.showCoupon == 1; _this.vas.coupons.showItem = _this.config.showCoupon == 1;
_this.utilityMenus.myCoupon.showItem = _this.config.showCoupon == 1;
//拼团 //拼团
_this.vas.pinTuan.showItem = _this.config.showPinTuan == 1; _this.vas.pinTuan.showItem = _this.config.showPinTuan == 1;
//秒杀 //秒杀

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

@@ -150,7 +150,7 @@
</view> </view>
<!--优惠券--> <!--优惠券-->
<view class="coreshop-margin-top-10 coreshop-margin-bottom-10 coreshop-common-view-box" v-if="userCoupons.length>0 && orderType== $globalConstVars.paymentType.common"> <view class="coreshop-margin-top-10 coreshop-margin-bottom-10 coreshop-common-view-box" v-if="userCoupons.length>0 && orderType== $globalConstVars.paymentType.common && isShowCoupon">
<view class="coreshop-bg-white coreshop-card goods-view"> <view class="coreshop-bg-white coreshop-card goods-view">
<view class="coreshop-text-black coreshop-gift-list"> <view class="coreshop-text-black coreshop-gift-list">
<view class="u-line-1 title">优惠券</view> <view class="u-line-1 title">优惠券</view>
@@ -895,6 +895,10 @@
isOpenPoint() { isOpenPoint() {
return this.$store.state.config.pointSwitch return this.$store.state.config.pointSwitch
}, },
// 判断是否开启了我的优惠券 1开启 2未开启
isShowCoupon() {
return this.$store.state.config.showCoupon == 2;
},
// 获取使用的优惠券名称 // 获取使用的优惠券名称
usedCouponsCompute() { usedCouponsCompute() {
var userCouponsCount = this.userCoupons.length; var userCouponsCount = this.userCoupons.length;