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-11

Browse Source 
### 1.3.5 开源社区版（会员专业版同步修改）：
无
### 0.1.6 会员专业版：
【新增】后台【平台设置-订单管理】增加【佣金计算通道】功能，分为【仅代理】【仅分销】【先代理后分销】【先分销后代理】四种自选模式。
【新增】增加【CoreCmsAgentOrderDetails】表，实现代理佣金订单详情列表功能，精确到具体商品明细。
【新增】增加【CoreCmsDistributionOrderDetails】表，实现三级佣金订单详情列表功能，精确到具体商品明细。
【修复】修复代理商商铺开启按钮错用三级分销商店铺开关功能，增加代理商商铺开启开关。
【修复】修复代理商佣金明细日期选择范围错乱问题。
【优化】uniapp自带progress进度条更换为uview2.x进度条。
【优化】敏感词过滤组件启用废弃的【WordsMatch】方法，启用【StringSearch】方法替代。
This commit is contained in:
JianWeie
2022-02-11 05:28:04 +08:00
parent 05df55d7ec
commit 8f64209d27
45 changed files with 16751 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,6 +85,7 @@
:range-color="rangeColor"
:range-bg-color="rangeBgColor"
:active-bg-color="activeBgColor"
:monthNum="13"
btnType="success"
@close="showCalendar=false"
@confirm="selDate"></u-calendar>
@@ -108,7 +109,7 @@
//日期选择
showCalendar: false,
minDate: `${year - 1}-${month}-${date}`,
//maxDate: `${year}-${month}-${date}`,
maxDate: `${year}-${month}-${date}`,
mode: 'range',
result: '请选择日期',
startText: '开始',

8
CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order/order.scss
View File

@@ -23,19 +23,19 @@
.underline { display: block; width: 34px; height: 2px; background: #fff; border-radius: 1px; }
.underline-active { background: #e54d42; display: block; width: 34px; height: 2px; border-radius: 1px; }
}
.order-list { background-color: #fff; margin-top: 10px;
.order-list { background-color: #fff; margin: 10px; border-radius: 10px;
.order-head { padding: 10px;
.order-code { font-size: 13px; font-weight: 400; color: #999999; }
.order-state { font-size: 13px; font-weight: 500; color: #05c3a1; }
}
.order-from { background-color: #f9f9f9; padding: 10px;
.order-from {/* background-color: #f9f9f9;*/ padding: 10px;
.from-user { font-size: 12px; font-weight: 400; color: #666666;
.user-avatar { width: 13px; height: 13px; border-radius: 50%; margin-right: 4px; }
.user-name { font-size: 12px; font-weight: 400; color: #999999; }
}
.order-time { font-size: 12px; font-weight: 400; color: #999999; }
}
.goods-card { padding: 15px 10px;
.goods-card { padding: 10px 10px;
.goods-img-box { margin-right: 15px;
.goods-img { width: 80px; height: 80px; background-color: #ccc; }
}
@@ -48,7 +48,7 @@
}
}
}
.total-box { height: 40px; padding: 0 10px;
.total-box { height: 30px; width: 100%;
.num-price { font-size: 12px; font-weight: 400; color: #999999; }
.name { font-size: 12px; font-weight: 400; color: #999999; }
.commission-num { font-size: 15px; font-weight: 400; color: #eb2b3d;

31
CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order/order.vue
View File

@@ -72,20 +72,41 @@
<view class="content_box">
<!-- 订单列表 -->
<view class="order-list" v-for="item in list" :key="item.id" v-if="list.length > 0">
<view class="order-head coreshop-flex coreshop-justify-between">
<view class="order-head coreshop-flex coreshop-justify-between coreshop-solid-bottom">
<text class="order-code">订单编号：{{ item.orderId }}</text>
<text class="order-state">{{ item.userId==item.buyUserId?'代购订单':'推广订单' }}</text>
</view>
<view class="order-from coreshop-flex coreshop-justify-between">
<view class="order-from coreshop-flex coreshop-justify-between coreshop-solid-bottom">
<view class="from-user coreshop-flex coreshop-align-center">
<text>下单人：</text>
<!--<image class="user-avatar" :src="item.buyer.avatar" mode=""></image>-->
<u-avatar :src="item.buyUserAvatar" size="20"></u-avatar>
<text class="user-name">{{ item.buyUserNickName }}</text>
</view>
<view class="order-time">{{ $u.timeFormat(item.createTime, ' yyyy.mm.dd hh:MM ') }}</view>
</view>
<view class="total-box coreshop-flex coreshop-justify-between px20">
<view class="num-price">提成：￥{{ item.amount || '0'}}</view>
<view class="goods-card coreshop-flex coreshop-align-center coreshop-solid-bottom" v-for="goods in item.agentOrderDetails" :key="goods.id">
<view class="goods-img-box"><image class="goods-img" :src="goods.imageUrl" mode=""></image></view>
<view class="goods-info coreshop-flex coreshop-flex-direction coreshop-align-center coreshop-justify-between">
<view class="goods-title more-t">{{ goods.name }}</view>
<view class="goods-sku">数量: {{ goods.productNums }}；{{ goods.addon || '' }}</view>
<view class="total-box coreshop-flex coreshop-align-center coreshop-justify-between">
<view class="goods-price">
{{ goods.productPrice * goods.productNums }}
<text class="goods-state">未结算</text>
</view>
<view class="coreshop-flex coreshop-align-center">
<text class="name">佣金：</text>
<text class="commission-num">{{ goods.amount }}</text>
</view>
</view>
</view>
</view>
<view class="total-box coreshop-flex coreshop-align-center coreshop-justify-between coreshop-padding-left-10 coreshop-padding-right-10">
<view class="num-price">商品总价：￥{{ item.goodsAmount }}， 实付款:￥{{ item.payedAmount }}， 优惠金额:￥{{ item.goodsAmount-item.payedAmount }}</view>
<view class="x-f"></view>
</view>
<view class="total-box coreshop-flex coreshop-justify-between coreshop-padding-left-10 coreshop-padding-right-10">
<view class="num-price coreshop-flex coreshop-align-center">提成：￥{{ item.amount || '0'}}</view>
<view class="coreshop-flex coreshop-align-center">{{item.isSettlement==1?'已结算':item.isSettlement==2?'未结算':'已退款'}}</view>
</view>
</view>

2
CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue
View File

@@ -122,7 +122,7 @@
},
onShow() {
var _this = this;
if (_this.$store.state.config.distributionStore != '1') {
if (_this.$store.state.config.agentStore != '1') {
delete this.utilityMenus.myStore;
delete this.utilityMenus.storeSetting;
}

1
CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails/commissionDetails.vue
View File

@@ -81,6 +81,7 @@
:range-color="rangeColor"
:range-bg-color="rangeBgColor"
:active-bg-color="activeBgColor"
:monthNum="13"
btnType="success"
@close="showCalendar=false"
@confirm="selDate"></u-calendar>

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

@@ -18,7 +18,8 @@
<text class="coreshop-text-white" v-if="!condition.conditionStatus">未达标</text>
<text class="coreshop-text-white coreshop-font-40">{{condition.conditionProgress}}%</text>
</view>
<progress class="coreshop-progress-radius" percent="100" active stroke-width="10" activeColor="#fbbd08" />
<!--<progress class="coreshop-progress-radius" percent="100" active stroke-width="10" activeColor="#fbbd08" />-->
<u-line-progress :percentage="condition.conditionProgress" activeColor="#5FB878"></u-line-progress>
<view class="coreshop-text-center coreshop-margin-bottom-10 coreshop-margin-top-10">
<text class="coreshop-text-white">{{condition.conditionMsg}}</text>
</view>

10
CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order/order.scss
View File

@@ -1,5 +1,5 @@
.direct-box { margin: 10px;
.direct-item { width: 170px; height: 57.5px; background: #ffffff; border-radius: 10px; padding: 10px;margin: 0 5px;
.direct-item { width: 170px; height: 57.5px; background: #ffffff; border-radius: 10px; padding: 10px; margin: 0 5px;
.item-title { font-size: 11px; font-weight: 500; color: #999999; margin-bottom: 3px; }
.item-value { font-size: 19px; font-weight: 600; color: #333333; }
}
@@ -23,19 +23,19 @@
.underline { display: block; width: 34px; height: 2px; background: #fff; border-radius: 1px; }
.underline-active { background: #e54d42; display: block; width: 34px; height: 2px; border-radius: 1px; }
}
.order-list { background-color: #fff; margin-top: 10px;
.order-list { background-color: #fff; margin: 10px; border-radius: 10px;
.order-head { padding: 10px;
.order-code { font-size: 13px; font-weight: 400; color: #999999; }
.order-state { font-size: 13px; font-weight: 500; color: #05c3a1; }
}
.order-from { background-color: #f9f9f9; padding: 10px;
.order-from { /* background-color: #f9f9f9;*/ padding: 10px;
.from-user { font-size: 12px; font-weight: 400; color: #666666;
.user-avatar { width: 13px; height: 13px; border-radius: 50%; margin-right: 4px; }
.user-name { font-size: 12px; font-weight: 400; color: #999999; }
}
.order-time { font-size: 12px; font-weight: 400; color: #999999; }
}
.goods-card { padding: 15px 10px;
.goods-card { padding: 10px 10px;
.goods-img-box { margin-right: 15px;
.goods-img { width: 80px; height: 80px; background-color: #ccc; }
}
@@ -48,7 +48,7 @@
}
}
}
.total-box { height: 40px; padding: 0 10px;
.total-box { height: 30px; width: 100%;
.num-price { font-size: 12px; font-weight: 400; color: #999999; }
.name { font-size: 12px; font-weight: 400; color: #999999; }
.commission-num { font-size: 15px; font-weight: 400; color: #eb2b3d;

31
CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order/order.vue
View File

@@ -72,21 +72,38 @@
<view class="content_box">
<!-- 订单列表 -->
<view class="order-list" v-for="item in list" :key="item.id" v-if="list.length > 0">
<view class="order-head coreshop-flex coreshop-justify-between">
<view class="order-head coreshop-flex coreshop-justify-between coreshop-solid-bottom">
<text class="order-code">订单编号：{{ item.orderId }}</text>
<text class="order-state">{{ item.statusName }}</text>
<text class="order-state">{{item.isSettlement==1?'已结算':item.isSettlement==2?'未结算':'已退款'}}</text>
</view>
<view class="order-from coreshop-flex coreshop-justify-between">
<view class="order-from coreshop-flex coreshop-justify-between coreshop-solid-bottom">
<view class="from-user coreshop-flex coreshop-align-center">
<text>下单人：</text>
<!--<image class="user-avatar" :src="item.buyer.avatar" mode=""></image>-->
<u-avatar :src="item.buyUserAvatar" size="20"></u-avatar>
<text class="user-name">{{ item.buyUserNickName }}</text>
</view>
<view class="order-time">{{ $u.timeFormat(item.createTime, ' yyyy.mm.dd hh:MM ') }}</view>
</view>
<view class="total-box coreshop-flex coreshop-justify-between px20">
<view class="num-price">佣金：￥{{ item.amount || '0'}}</view>
<view class="coreshop-flex coreshop-align-center">{{item.isSettlement==1?'已结算':item.isSettlement==2?'未结算':'已退款'}}</view>
<view class="goods-card coreshop-flex coreshop-align-center coreshop-solid-bottom" v-for="goods in item.distributionOrderDetails" :key="goods.id">
<view class="goods-img-box"><image class="goods-img" :src="goods.imageUrl" mode=""></image></view>
<view class="goods-info coreshop-flex coreshop-flex-direction coreshop-align-center coreshop-justify-between">
<view class="goods-title more-t">{{ goods.name }}</view>
<view class="goods-sku">数量: {{ goods.productNums }}；{{ goods.addon || '' }}</view>
<view class="total-box coreshop-flex coreshop-align-center coreshop-justify-between">
<view class="goods-price">
{{ goods.productPrice }}
<text class="goods-state">未结算</text>
</view>
<view class="coreshop-flex coreshop-align-center">
<text class="name">佣金：</text>
<text class="commission-num">{{ goods.amount }}</text>
</view>
</view>
</view>
</view>
<view class="total-box coreshop-flex coreshop-align-center coreshop-justify-between coreshop-padding-left-10 coreshop-padding-right-10">
<view class="num-price">商品总价：￥{{ item.goodsAmount }}， 实付款:￥{{ item.payedAmount }}， 优惠金额:￥{{ item.goodsAmount-item.payedAmount }}，提成：￥{{ item.amount || '0'}}</view>
<view class="x-f"></view>
</view>
</view>
<!-- 无数据时默认显示 -->

2
CoreCms.Net.Uni-App/CoreShop/pages/member/setting/userInfo/index.vue
View File

@@ -16,7 +16,7 @@
<text class="coreshop-text-orange coreshop-font-40">100%</text>
<text class="coreshop-text-black">，太棒啦！</text>
</view>
<progress percent="100" active stroke-width="10" activeColor="#f37b1d" />
<u-line-progress percentage="100" activeColor="#5FB878"></u-line-progress>
</view>
<view class="coreshop-list menu coreshop-bg-white coreshop-padding-15">
<u--form :model="model" :rules="rules" ref="uForm" errorType="message" labelPosition="left" labelWidth="80">