diff --git a/crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php b/crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php index e2ff43131..6eb390921 100644 --- a/crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php +++ b/crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php @@ -43,7 +43,7 @@ class StoreIntegralOrderStatusDao extends BaseDao */ public function getStatusList(array $where, int $page, int $limit) { - return $this->search($where)->page($page, $limit)->select()->toArray(); + return $this->search($where)->page($page, $limit)->order('change_time desc')->select()->toArray(); } } diff --git a/crmeb/app/services/agent/AgentLevelServices.php b/crmeb/app/services/agent/AgentLevelServices.php index afa3569c2..498d79c1f 100644 --- a/crmeb/app/services/agent/AgentLevelServices.php +++ b/crmeb/app/services/agent/AgentLevelServices.php @@ -90,6 +90,9 @@ class AgentLevelServices extends BaseServices $this->checkUserLevelFinish($uid); $list = $this->dao->getList(['is_del' => 0, 'status' => 1]); + foreach ($list as &$item) { + $item['image'] = set_file_url($item['image']); + } $agent_level = $user['agent_level'] ?? 0; //没等级默认最低等级 if (!$agent_level) { diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php index 9e646ea2b..b7d7f0246 100644 --- a/crmeb/app/services/order/StoreOrderRefundServices.php +++ b/crmeb/app/services/order/StoreOrderRefundServices.php @@ -430,17 +430,23 @@ class StoreOrderRefundServices extends BaseServices */ public function integralAndCouponBack($order) { + /** @var StoreOrderStatusServices $statusService */ + $statusService = app()->make(StoreOrderStatusServices::class); $res = true; //回退优惠卷 拆分子订单不退优惠券 if (!$order['pid'] && $order['coupon_id'] && $order['coupon_price']) { /** @var StoreCouponUserServices $coumonUserServices */ $coumonUserServices = app()->make(StoreCouponUserServices::class); $res = $res && $coumonUserServices->recoverCoupon((int)$order['coupon_id']); + $statusService->save([ + 'oid' => $order['id'], + 'change_type' => 'coupon_back', + 'change_message' => '商品退优惠券', + 'change_time' => time() + ]); } //回退积分 $order = $this->regressionIntegral($order); - /** @var StoreOrderStatusServices $statusService */ - $statusService = app()->make(StoreOrderStatusServices::class); $statusService->save([ 'oid' => $order['id'], 'change_type' => 'integral_back', diff --git a/crmeb/app/services/order/StoreOrderTakeServices.php b/crmeb/app/services/order/StoreOrderTakeServices.php index 39eff14de..72694e597 100644 --- a/crmeb/app/services/order/StoreOrderTakeServices.php +++ b/crmeb/app/services/order/StoreOrderTakeServices.php @@ -65,15 +65,7 @@ class StoreOrderTakeServices extends BaseServices throw new ApiException(410266); } $order->status = 2; - /** @var StoreOrderStatusServices $statusService */ - $statusService = app()->make(StoreOrderStatusServices::class); - $res = $order->save() && $statusService->save([ - 'oid' => $order['id'], - 'change_type' => 'user_take_delivery', - 'change_message' => '用户已收货', - 'change_time' => time() - ]); - $res = $res && $this->storeProductOrderUserTakeDelivery($order); + $res = $order->save() && $this->storeProductOrderUserTakeDelivery($order); if (!$res) { throw new ApiException(410205); } diff --git a/crmeb/app/services/product/product/StoreProductServices.php b/crmeb/app/services/product/product/StoreProductServices.php index e37745d78..1ea506ab0 100644 --- a/crmeb/app/services/product/product/StoreProductServices.php +++ b/crmeb/app/services/product/product/StoreProductServices.php @@ -2017,13 +2017,15 @@ class StoreProductServices extends BaseServices break; case 2: foreach ($ids as $product_id) { - $batchData[] = [ - 'id' => $product_id, - 'logistics' => implode(',', $data['logistics']), - 'freight' => $data['freight'], - 'postage' => $data['freight'] == 2 ? $data['postage'] : 0, - 'temp_id' => $data['freight'] == 3 ? $data['temp_id'] : 0 - ]; + if ($this->dao->value(['id' => $product_id], 'virtual_type') == 0) { + $batchData[] = [ + 'id' => $product_id, + 'logistics' => implode(',', $data['logistics']), + 'freight' => $data['freight'], + 'postage' => $data['freight'] == 2 ? $data['postage'] : 0, + 'temp_id' => $data['freight'] == 3 ? $data['temp_id'] : 0 + ]; + } } if (count($batchData)) $this->dao->saveAll($batchData); break; diff --git a/crmeb/app/services/user/UserServices.php b/crmeb/app/services/user/UserServices.php index 34c9e5944..728951607 100644 --- a/crmeb/app/services/user/UserServices.php +++ b/crmeb/app/services/user/UserServices.php @@ -1461,7 +1461,7 @@ class UserServices extends BaseServices $user['vip'] = (bool)$userLevel; if ($user['vip']) { $user['vip_id'] = $userLevel['id'] ?? 0; - $user['vip_icon'] = $userLevel['icon'] ?? ''; + $user['vip_icon'] = set_file_url($userLevel['icon']) ?? ''; $user['vip_name'] = $userLevel['name'] ?? ''; } } diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue index 2c20c35eb..5a99a1315 100644 --- a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue +++ b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue @@ -36,7 +36,7 @@ 配送信息 - - - - diff --git a/template/uni-app/pages/goods/order_confirm/index.vue b/template/uni-app/pages/goods/order_confirm/index.vue index fcf82b161..81e7841f4 100644 --- a/template/uni-app/pages/goods/order_confirm/index.vue +++ b/template/uni-app/pages/goods/order_confirm/index.vue @@ -1363,7 +1363,6 @@ addressId: that.addressId, formId: '', couponId: that.couponId, - payType: that.payType, useIntegral: that.useIntegral, bargainId: that.BargainId, combinationId: that.combinationId, diff --git a/template/uni-app/pages/goods_cate/goods_cate.vue b/template/uni-app/pages/goods_cate/goods_cate.vue index d6628cd12..57a008a49 100644 --- a/template/uni-app/pages/goods_cate/goods_cate.vue +++ b/template/uni-app/pages/goods_cate/goods_cate.vue @@ -66,6 +66,7 @@ this.category = status this.status = res.data.status this.$nextTick(e => { + this.$refs.classOne.is_diy = this.is_diy if (this.status == 2 || this.status == 3) { uni.hideTabBar(); } else if (this.status == 1) { diff --git a/template/uni-app/pages/goods_details/index.vue b/template/uni-app/pages/goods_details/index.vue index 1ca72ba48..59d517abf 100644 --- a/template/uni-app/pages/goods_details/index.vue +++ b/template/uni-app/pages/goods_details/index.vue @@ -123,7 +123,7 @@ - {{$t(`活动`)}}： + {{$t(`活动`)}}： {{$t(`未使用`)}} - {{$t(`已使用/过期`)}} + {{$t(`已使用/过期`)}} + {{$t(`￥`)}}{{item.coupon_price}} - {{$t(`满`)}}{{item.use_min_price}}{{$t(`元可用`)}} + {{$t(`满`)}}{{item.use_min_price}}{{$t(`元可用`)}} + {{$t(`无门槛券`)}} @@ -122,6 +124,7 @@ this.getUseCoupons(); }, useCoupon(item) { + if (this.navOn == 2) return let url = ''; if (item.category_id == 0 && item.product_id == '') { url = '/pages/goods/goods_list/index?title=默认' @@ -204,7 +207,7 @@ .coupon-list .item .text .condition .name { font-size: 24rpx; - font-weight: 500; + font-weight: 500; line-height: 28rpx; /* display: flex; align-items: center; */ @@ -218,6 +221,7 @@ display: inline-block; vertical-align: middle; } + .condition .line-title { /* width: 70rpx; */ height: 36rpx !important; diff --git a/template/uni-app/pages/users/user_spread_user/index.vue b/template/uni-app/pages/users/user_spread_user/index.vue index 4bc2f28f5..ab114f5f0 100644 --- a/template/uni-app/pages/users/user_spread_user/index.vue +++ b/template/uni-app/pages/users/user_spread_user/index.vue @@ -7,8 +7,8 @@ - {{userInfo.nickname}} - + {{userInfo.nickname}} + {{userInfo.agent_level_name?$t(userInfo.agent_level_name):$t(`分销等级`)}} @@ -270,7 +270,8 @@ .nickname { font-size: 32rpx; - margin: 10rpx 0; + margin: 10rpx 0; + max-width: 8rem; } .level { @@ -281,7 +282,7 @@ transform: scale(0.9); display: flex; align-items: center; - + max-width: 10rem; .icon-xiangyou { transform: scale(0.7); font-size: 28rpx;