mirror of
https://github.com/crmeb/CRMEB.git
synced 2026-10-30 22:40:48 +00:00
Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev
This commit is contained in:
liaofei
commit
83393b3e1b
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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',
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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'] ?? '';
|
||||
}
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
<a @click="delivery(row)" v-if="row.status === 2">配送信息</a>
|
||||
<Divider type="vertical" v-if="row.status === 1 || row.status === 2" />
|
||||
<template>
|
||||
<Dropdown @on-click="changeMenu(row, $event)">
|
||||
<Dropdown @on-click="changeMenu(row, $event)" :transfer="true">
|
||||
<a href="javascript:void(0)">
|
||||
更多
|
||||
<Icon type="ios-arrow-down"></Icon>
|
||||
|
||||
@ -2137,6 +2137,7 @@ export default {
|
||||
},
|
||||
end() {
|
||||
this.moveIndex = '';
|
||||
this.generate(1)
|
||||
},
|
||||
// 单独设置会员设置
|
||||
checkAllGroupChange(data) {
|
||||
|
||||
@ -78,8 +78,8 @@
|
||||
<div class="search">
|
||||
<div>
|
||||
<span>是否显示：</span>
|
||||
<Select v-model="taskData.status" style="width: 200px">
|
||||
<Option value="">全部</Option>
|
||||
<Select v-model="taskData.status" style="width: 200px" clearable>
|
||||
<!-- <Option :value="''">全部</Option> -->
|
||||
<Option :value="1">显示</Option>
|
||||
<Option :value="0">不显示</Option>
|
||||
</Select>
|
||||
|
||||
@ -140,7 +140,12 @@
|
||||
.sharing-packets .sharing-con .text .shareBut {
|
||||
font-size: 22rpx;
|
||||
color: #fff;
|
||||
// #ifdef H5
|
||||
margin-top: 14rpx;
|
||||
// #endif
|
||||
// #ifndef H5
|
||||
margin-top: 26rpx;
|
||||
// #endif
|
||||
height: 50rpx;
|
||||
line-height: 50rpx;
|
||||
}
|
||||
|
||||
@ -254,6 +254,7 @@
|
||||
.flash-sale .timeLsit .item.on .state {
|
||||
width: 120rpx;
|
||||
height: 30rpx;
|
||||
line-height: 30rpx;
|
||||
border-radius: 15rpx;
|
||||
background: var(--view-theme);
|
||||
color: #fff;
|
||||
|
||||
@ -107,7 +107,7 @@
|
||||
<view class='conter'>{{$t(`￥`)}}{{orderInfo.pay_postage}}</view>
|
||||
</view>
|
||||
<view class="actualPay acea-row row-right">
|
||||
{{$t(`real_payment`)}}：<span class="money">{{$t(`￥`)}}{{ orderInfo.pay_price }}</span>
|
||||
{{$t(`实际支付`)}}：<span class="money">{{$t(`￥`)}}{{ orderInfo.pay_price }}</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="wrapper" v-if="
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1363,7 +1363,6 @@
|
||||
addressId: that.addressId,
|
||||
formId: '',
|
||||
couponId: that.couponId,
|
||||
payType: that.payType,
|
||||
useIntegral: that.useIntegral,
|
||||
bargainId: that.BargainId,
|
||||
combinationId: that.combinationId,
|
||||
|
||||
@ -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) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -4,7 +4,8 @@
|
||||
<view class="item acea-row row-center-wrapper" :class="{ on: navOn === 1 }" @click="onNav(1)">{{$t(`未使用`)}}
|
||||
</view>
|
||||
<view class="item acea-row row-center-wrapper" :class="{ on: navOn === 2 }" @click="onNav(2)">
|
||||
{{$t(`已使用/过期`)}}</view>
|
||||
{{$t(`已使用/过期`)}}
|
||||
</view>
|
||||
</view>
|
||||
<view class='coupon-list' v-if="couponsList.length">
|
||||
<view class='item acea-row row-center-wrapper' v-for='(item,index) in couponsList' :key="index"
|
||||
@ -13,7 +14,8 @@
|
||||
<view class='money' :class='item._type == 0 ? "moneyGray" : ""'>
|
||||
<view>{{$t(`￥`)}}<text class='num'>{{item.coupon_price}}</text></view>
|
||||
<view class="pic-num" v-if="item.use_min_price > 0">
|
||||
{{$t(`满`)}}{{item.use_min_price}}{{$t(`元可用`)}}</view>
|
||||
{{$t(`满`)}}{{item.use_min_price}}{{$t(`元可用`)}}
|
||||
</view>
|
||||
<view class="pic-num" v-else>{{$t(`无门槛券`)}}</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -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;
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
<view>
|
||||
<view class="user-msg">
|
||||
<image class="avatar" :src="userInfo.avatar" mode=""></image>
|
||||
<view class="nickname">{{userInfo.nickname}}</view>
|
||||
<view v-if="userInfo.is_agent_level" class="level" @click="jumbPath">
|
||||
<view class="nickname line1">{{userInfo.nickname}}</view>
|
||||
<view v-if="userInfo.is_agent_level" class="level line1" @click="jumbPath">
|
||||
<text>{{userInfo.agent_level_name?$t(userInfo.agent_level_name):$t(`分销等级`)}}</text>
|
||||
<text v-if="userInfo.is_agent_level" class='iconfont icon-xiangyou'></text>
|
||||
</view>
|
||||
@ -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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user