sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

用户地址新增距离显示字段和订单发货售后提醒

feat/task1-c-wallet
gongfuxiang 2022-04-06 13:22:51 +08:00
parent 28febe6ad0
commit bd128fca7a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/view/default/order/module/operate.html
View File

@ -18,12 +18,12 @@
{{/if}}
{{if $module_data['operate_data']['is_delivery'] eq 1}}
{{if $module_data['order_model'] eq 2}}
<button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block submit-take" data-id="{{$module_data.id}}" data-user-id="{{$module_data.user_id}}" data-am-modal="{target: '#order-take-modal', closeViaDimmer: 0, width: 200, height: 160}">
<button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block submit-take" data-id="{{$module_data.id}}" data-user-id="{{$module_data.user_id}}" data-am-modal="{target: '#order-take-modal', closeViaDimmer: 0, width: 200, height: 160}" {{if !empty($module_data) and !empty($module_data['aftersale_first'])}}data-am-modal="{target: '#order-delivery-popup'}" data-am-popover="{content: '订单有售后、请注意核对', trigger: 'hover focus', theme: 'danger sm'}"{{/if}}>
<i class="am-icon-check"></i>
<span>取货</span>
</button>
{{else /}}
<button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block submit-delivery" data-url="{{:MyUrl('admin/order/delivery')}}" data-id="{{$module_data.id}}" data-user-id="{{$module_data.user_id}}" data-express-id="{{$module_data.express_id}}" data-am-modal="{target: '#order-delivery-popup'}">
<button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block submit-delivery" data-url="{{:MyUrl('admin/order/delivery')}}" data-id="{{$module_data.id}}" data-user-id="{{$module_data.user_id}}" data-express-id="{{$module_data.express_id}}" {{if !empty($module_data) and !empty($module_data['aftersale_first'])}}data-am-modal="{target: '#order-delivery-popup'}" data-am-popover="{content: '订单有售后、请注意核对', trigger: 'hover focus', theme: 'danger sm'}"{{/if}}>
<i class="am-icon-send-o"></i>
<span>发货</span>
</button>

2
app/service/BuyService.php
View File

@ -554,7 +554,7 @@ class BuyService
'is_delete_time' => 0,
'is_shelves' => 1,
],
'field' => 'id AS goods_id, title, images, inventory_unit, buy_min_number, buy_max_number, model',
'field' => 'id,id AS goods_id, title, images, inventory_unit, buy_min_number, buy_max_number, model',
]);
$ret = GoodsService::GoodsList($goods_params);
if(empty($ret['data'][0]))

4
app/service/UserAddressService.php
View File

@ -193,6 +193,10 @@ class UserAddressService
{
$is_default = true;
}
// 地理位置距离字段
$v['distance_value'] = null;
$v['distance_unit'] = null;
}
// 是否处理默认地址,没有默认地址将第一个设置为默认地址