ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-30 20:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

【新增】天猫超市商品下载同步

Browse Source 
【修复】天猫超市发货问题
【修复】采购单单号因含特殊字符导致入库或取消失败
【修复】售后批量操作设置显示不正确
This commit is contained in:
chenping
2026-04-21 23:42:49 +08:00
parent b20d422532
commit e3d3593fdd
34 changed files with 297 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/ome/controller/admin/order.php
View File

@@ -4294,7 +4294,13 @@ class ome_ctl_admin_order extends desktop_controller{
$tmp = array();
$tmp = $o['items'];
unset($o['items']);
// 更新pay_status状态值
//@todo：解决手工批量删除赠品，又手工编辑订单进行恢复，导致pay_status='5'退款状态，无法审核订单;
if($o['delete'] == 'false' && $o['price'] == '0'){
$o['pay_status'] = '0';
}
$oOrderObj->save($o);
foreach ($tmp as $oo){

24
app/ome/controller/admin/order/lack.php
View File

@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* 缺货列表
*/
@@ -28,11 +29,10 @@ class ome_ctl_admin_order_lack extends desktop_controller {
}
/**
* 缺货搜索
*
*
* @param void
* @return void
*/
function index() {
$params = array(
@@ -349,7 +349,7 @@ class ome_ctl_admin_order_lack extends desktop_controller {
/**
* 缺货订单列表
*
*
* @return void
* @author
*/
@@ -383,10 +383,6 @@ class ome_ctl_admin_order_lack extends desktop_controller {
$this->finder('ome_mdl_orders',$params);
}
/**
* routerAgain
* @return mixed 返回值
*/
public function routerAgain() {
$batchLogModel = app::get('ome')->model('batch_log');
@@ -429,10 +425,6 @@ class ome_ctl_admin_order_lack extends desktop_controller {
return $params;
}
/**
* routerSpilt
* @return mixed 返回值
*/
public function routerSpilt() {
// $key = 'ome-order-lack-router';
// cachecore::store($key, time(), 360);
@@ -457,10 +449,6 @@ class ome_ctl_admin_order_lack extends desktop_controller {
echo json_encode($retArr);
}
/**
* apply
* @return mixed 返回值
*/
public function apply() {
$order_id = (int) $_GET['order_id'];
$order = app::get('ome')->model('orders')->db_dump($order_id, 'shop_type, order_source');
@@ -480,7 +468,7 @@ class ome_ctl_admin_order_lack extends desktop_controller {
exit;
}
$bmIds = array_column($order_items, 'product_id');
$branch_id = current($appointBranch)['branch_id'];
$branch_id = current($appointBranch);
$branch_product = app::get('ome')->model('branch_product')->getList('product_id, store, store_freeze',
['branch_id'=>$branch_id, 'product_id'=>$bmIds]);
$branch_product = array_column($branch_product, null, 'product_id');
@@ -509,10 +497,6 @@ class ome_ctl_admin_order_lack extends desktop_controller {
$this->singlepage('admin/order/lack/apply.html');
}
/**
* dealApply
* @return mixed 返回值
*/
public function dealApply() {
$order_id = (int) $_POST['order_id'];
$out_stock = $_POST['out_stock'];

4
app/ome/controller/admin/return/batch.php
View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class ome_ctl_admin_return_batch extends desktop_controller {
var $workground = "setting_tools";
@@ -54,6 +53,7 @@ class ome_ctl_admin_return_batch extends desktop_controller {
}
}
$oReturn_batch = $this->app->model('return_batch');
$return_batch = array();
if ($batch_id) {
$return_batch = $oReturn_batch->dump($batch_id);
}
@@ -119,4 +119,4 @@ class ome_ctl_admin_return_batch extends desktop_controller {
}
?>
?>

8
app/ome/controller/admin/return/rchange.php
View File

@@ -16,7 +16,6 @@
*/
class ome_ctl_admin_return_rchange extends desktop_controller
{
public $name = "退换货单";
public $workground = "aftersale_center";
@@ -522,7 +521,6 @@ class ome_ctl_admin_return_rchange extends desktop_controller
$is_auto_approve = app::get('ome')->getConf('return.auto_approve');
if ($is_auto_approve == 'on') {
$reshipLib = kernel::single('ome_reship');
$result = $reshipLib->batch_reship_queue($reship[0]['reship_id']);
}
}
@@ -538,6 +536,7 @@ class ome_ctl_admin_return_rchange extends desktop_controller
/**
* 根据order_bn快速获取订单信息（售后申请、退换货单2处加载订单信息）
*
* @author yangminsheng
**/
public function getOrderinfo()
@@ -640,7 +639,7 @@ class ome_ctl_admin_return_rchange extends desktop_controller
$branchLib = kernel::single('ome_branch');
$store_id = $branchLib->isStoreBranch($order["branch_id"]);
if ($store_id) {
//是门店仓
//是门店仓
$order["branch_list"] = kernel::single('o2o_return')->get_aftersale_o2o_branch($order["branch_id"]);
//售后设置->退货仓库设置 类型选择：发货仓库的
$branchtype = app::get('wms')->getConf('wms.branchset.type');
@@ -659,7 +658,7 @@ class ome_ctl_admin_return_rchange extends desktop_controller
}
}
} else {
//是电商仓
//是电商仓
$order["branch_list"] = app::get('ome')->model('branch')->getlist('branch_id,name', array('disabled' => 'false', 'b_type' => 1));
}
$order['member_uname'] = $member['account']['uname'];
@@ -4167,7 +4166,6 @@ class ome_ctl_admin_return_rchange extends desktop_controller
}
}
/**
* 验证页面配置项
*/

8
app/ome/lib/event/trigger/shop/data/delivery/taobao.php
View File

@@ -55,11 +55,19 @@ class ome_event_trigger_shop_data_delivery_taobao extends ome_event_trigger_shop
// }
$this->__sdf['order_extend'] = $this->_get_order_extend($delivery_id);
$this->__sdf['store_code'] = '';
// BN对应的OID
$oidList = [];
$orderObjects = $this->_get_all_order_objects($delivery_id);
$this->__sdf['order_objects'] = $orderObjects;
foreach ($orderObjects as $object) {
if ($object['store_code']) {
$this->__sdf['store_code'] = $object['store_code'];
}
foreach ($object['order_items'] as $item) {
if(empty($object['oid'])) {
continue;

6
app/ome/lib/order/refund.php
View File

@@ -37,13 +37,17 @@ class ome_order_refund {
if($order['createway'] != 'matrix') {
return [false, ['msg'=>'非平台订单']];
}
$shop = app::get('ome')->model('shop')->db_dump(['shop_id'=>$order['shop_id']], 'node_id, node_type');
$shop = app::get('ome')->model('shop')->db_dump(['shop_id'=>$order['shop_id']], 'node_id, node_type, business_type');
if(empty($shop['node_id'])) {
return [false, ['msg'=>'店铺未绑定']];
}
if(!in_array($shop['node_type'], ['taobao'])) {
return [false, ['msg'=>'非淘宝店铺']];
}
if($shop['business_type'] == 'maochao') {
return [false, ['msg'=>'猫超国际']];
}
list($rs, $notice) = kernel::single('ome_order_refund_status')->fetch($order['order_bn'], $shop['node_id'], $order['shop_id']);
if(!$rs) {
return [true, ['msg'=>$notice['msg']]];

10
app/ome/view/admin/delivery/delivery_detail.html
View File

@@ -23,7 +23,7 @@
<style>
.logi-no-input{width:150px;height:20px;}
</style>
<h4><{if $dly.is_encrypt}><a class="delivery-sensitive-btn data-hide" href="javascript:void(0);"></a><{/if}>发货单信息:</h4>
<h4><{if $dly.is_encrypt && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a class="delivery-sensitive-btn data-hide" href="javascript:void(0);"></a><{/if}>发货单信息:</h4>
<input type="hidden" name="status" value="<{$status}>" />
<input type="hidden" name="delivery_id" value="<{$dly.delivery_id}>" />
<div class="division">
@@ -35,15 +35,15 @@
<td ><{foreach from=$order_bn item=item}><{$item}><br><{/foreach}></td>
<th >配送方式：</th>
<td ><{$dly.delivery}></td>
<th ><{if $dly.is_encrypt && $dly.shop_type == 'pinduoduo'}><a data-type = 'uname' class="delivery-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>会员：</th>
<th ><{if $dly.is_encrypt && $dly.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'uname' class="delivery-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>会员：</th>
<td ><span sensitive-field="uname"><{$dly.member_name|ciphertext:'delivery','uname',$dly.shop_type}></span></td>
</tr>
<tr>
<th ><{if $dly.is_encrypt && $dly.shop_type == 'pinduoduo'}><a data-type = 'uname' class="delivery-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>收货人：</th>
<th ><{if $dly.is_encrypt && $dly.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'uname' class="delivery-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>收货人：</th>
<td ><span sensitive-field="ship_name"><{$dly.consignee.name|ciphertext:'delivery','ship_name',$dly.shop_type}></span></td>
<th ><{if $dly.is_encrypt && $dly.shop_type == 'pinduoduo'}><a data-type = 'tel' class="delivery-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>电话：</th>
<th ><{if $dly.is_encrypt && $dly.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'tel' class="delivery-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>电话：</th>
<td ><span sensitive-field="ship_tel"><{$dly.consignee.telephone|ciphertext:'delivery','ship_tel',$dly.shop_type}></span></td>
<th ><{if $dly.is_encrypt && $dly.shop_type == 'pinduoduo'}><a data-type = 'mobile' class="delivery-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>手机：</th>
<th ><{if $dly.is_encrypt && $dly.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'mobile' class="delivery-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>手机：</th>
<td ><span sensitive-field="ship_mobile"><{$dly.consignee.mobile|ciphertext:'delivery','ship_mobile',$dly.shop_type}></span></td>
<th>Email：</th>
<td><{$dly.consignee.email}></td>

6
app/ome/view/admin/order/confirm/delivery_info.html
View File

@@ -17,15 +17,15 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="delivery-info">
<tbody>
<tr>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'uname' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>收货人：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'uname' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>收货人：</th>
<td><span sensitive-field="ship_name"><{$order.consignee.name|ciphertext:'order','ship_name',$order.shop_type}></span>
<input type="hidden" name="consignee[name]" value="<{$order.consignee.name}>" /></td>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'receiver_address' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>配送地址：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'receiver_address' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>配送地址：</th>
<td><span id='consignee[area]'><{$order.consignee.area|region}></span>
<input type="hidden" name="consignee[area]" value="<{$order.consignee.area}>" />
<span id='consignee[addr]' sensitive-field="ship_addr"><{$order.consignee.addr|ciphertext:'order','ship_addr',$order.shop_type}></span>
<input type='hidden' name='consignee[addr]' value="<{$order.consignee.addr}>"/></td>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'tel' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>电话/手机：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'tel' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>电话/手机：</th>
<td>
<span sensitive-field="ship_tel"><{$order.consignee.telephone|ciphertext:'order','ship_tel',$order.shop_type}></span>
<span><{if $order.consignee.telephone}>/<{/if}></span>

8
app/ome/view/admin/order/confirm/member_confirm.html
View File

@@ -23,8 +23,8 @@
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tbody>
<tr>
<{if $member.is_encrypt}><th><a class="data-hide member-sensitive-btn" href="javascript:void(0);" ></a></th><{/if}>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'uname' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>会员用户名：</th>
<{if $member.is_encrypt && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><th><a class="data-hide member-sensitive-btn" href="javascript:void(0);" ></a></th><{/if}>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'uname' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>会员用户名：</th>
<td>
<span sensitive-field="uname">
@@ -40,9 +40,9 @@
<{/if}>
</span>
</td>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'uname' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>姓名：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'uname' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>姓名：</th>
<td><span sensitive-field="name"><{$member.contact.name|ciphertext:'member','name',$order.shop_type}></span></td>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'tel' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>联系电话：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'tel' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>联系电话：</th>
<td>
<span sensitive-field="tel"><{$member.contact.phone.telephone|ciphertext:'member','tel',$order.shop_type}></span>
<span><{if $member.contact.phone.telephone}>/<{/if}></span>

25
app/ome/view/admin/order/detail_basic.html
View File

@@ -13,7 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<{if $order.process_status neq 'is_retrial'}>
<{if $operate && (($order.ship_status neq '1' && $order.ship_status neq '3' && $order.ship_status neq '4'&& $order.shipping.is_cod eq 'false') || ($order.pay_status neq '1' && $order.ship_status neq '3' && $order.ship_status neq '4'&& $order.shipping.is_cod eq 'true') || ($order.pay_status neq '1' && $order.ship_status neq '3' && $order.ship_status neq '4'&& $use_before_payed eq 'true') || ($order.process_status eq 'splitting' && $order.ship_status eq '3'))}>
<{include file="admin/order/order_button.html"}>
@@ -196,30 +195,30 @@
</div>
</td>
<td style="vertical-align:top;">
<h4><{if $member.is_encrypt}><a class="member-sensitive-btn data-hide" href="javascript:void(0);"></a><{/if}>购买人信息</h4>
<h4><{if $member.is_encrypt}><{if !defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW')}><a class="member-sensitive-btn data-hide" href="javascript:void(0);"></a><{/if}><{/if}>购买人信息</h4>
<div class="division">
<table cellspacing="0" cellpadding="0" border="0" id="memberinfo">
<tbody><tr>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'uname' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>用户名：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'uname' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>用户名：</th>
<td>
<span sensitive-field="uname"><{$member.account.uname|ciphertext:'member','uname',$order.shop_type}></span></td>
</tr>
<tr>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'name' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>姓名：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'name' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>姓名：</th>
<td><span sensitive-field="name"><{$member.contact.name|ciphertext:'member','name',$order.shop_type}></span></td>
</tr>
<tr>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'tel' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>电话：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'tel' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>电话：</th>
<td><span sensitive-field="tel"><{$member.contact.phone.telephone|ciphertext:'member','tel',$order.shop_type}></span></td>
</tr>
<tr>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'mobile' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>手机：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'mobile' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>手机：</th>
<td><span sensitive-field="mobile"><{$member.contact.phone.mobile|ciphertext:'member','mobile',$order.shop_type}></span></td>
</tr>
<tr>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'address' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>地区：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'address' class="member-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>地区：</th>
<td><{$member.contact.area|region}></td>
</tr>
<tr>
@@ -232,7 +231,7 @@
</td>
<td style="vertical-align:top;">
<h4>
<span><{if $order.is_encrypt}><a class="order-sensitive-btn data-hide" href="javascript:void(0);"></a><{/if}><{t}>收货人信息<{/t}></span>
<span><{if $order.is_encrypt}><{if !defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW')}><a class="order-sensitive-btn data-hide" href="javascript:void(0);"></a><{/if}><{/if}><{t}>收货人信息<{/t}></span>
<span style="position:relative;" id="order_receiver_copy_span">
<{if $is_hied_receiver_copy !== true}>
<button type="button" class="btn" id="order_receiver_copy" stu="Y">
@@ -248,23 +247,23 @@
<td><{$order.consignee.r_time}></td>
</tr>
<tr>
<th ><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'uname' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>姓名：</th>
<th ><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'uname' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>姓名：</th>
<td><span sensitive-field="ship_name" data-order="2"><{$order.consignee.name|ciphertext:'order','ship_name',$order.shop_type}></span></td>
</tr>
<tr>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'tel' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>电话：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'tel' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>电话：</th>
<td><span sensitive-field="ship_tel" data-order="3"><{$order.consignee.telephone|ciphertext:'order','ship_tel',$order.shop_type}></span></td>
</tr>
<tr>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'mobile' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>手机：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'mobile' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>手机：</th>
<td><span sensitive-field="ship_mobile" data-order="4"><{$order.consignee.mobile|ciphertext:'order','ship_mobile',$order.shop_type}></span></td>
</tr>
<tr>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'address' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>地区：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'address' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>地区：</th>
<td><{$order.consignee.area|region}></td>
</tr>
<tr>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo'}><a data-type = 'receiver_address' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>地址：</th>
<th><{if $member.is_encrypt && $order.shop_type == 'pinduoduo' && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a data-type = 'receiver_address' class="order-sensitive-btn-detail data-hide" style="background-size: 13px 10px;" href="javascript:void(0);"></a><{/if}>地址：</th>
<td style="white-space: normal; line-height: 18px;"><span sensitive-field="ship_addr" data-order="1"><{$order.consignee.addr|escape:'html'|ciphertext:'order','ship_addr',$order.shop_type}></span></td>
</tr>
<tr>

3
app/ome/view/admin/order/order_edit.html
View File

@@ -13,7 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<{capture name="header"}>
<{css app="ome" src="ome.css"}>
<{script src="coms/autocompleter.js" app='desktop' }>
@@ -56,7 +55,7 @@
</div>
<div class="finder-detail">
<h3><{if $order.is_encrypt}><a class="data-hide order-sensitive-btn" href="javascript:void(0);"></a><{/if}>配送信息</h3>
<h3><{if $order.is_encrypt && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a class="data-hide order-sensitive-btn" href="javascript:void(0);"></a><{/if}>配送信息</h3>
<div class="division" style="background:#fff; " id="order_edit_receiver">
<a href="javascript:void(0);" id="consignee-edit">编辑</a>
<{include file="admin/order/edit/consignee_info.html"}>

7
app/ome/view/admin/order/order_edit_split.html
View File

@@ -62,7 +62,7 @@
<!-- 订单售后情况 END-->
<div class="finder-detail">
<h3><{if $order.is_encrypt}><a class="data-hide order-sensitive-btn" href="javascript:void(0);"></a><{/if}>配送信息</h3>
<h3><{if $order.is_encrypt && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a class="data-hide order-sensitive-btn" href="javascript:void(0);"></a><{/if}>配送信息</h3>
<div class="division" style="background:#fff; " id="order_edit_receiver">
<a href="javascript:void(0);" id="consignee-edit">编辑</a>
<{include file="admin/order/edit/consignee_info.html"}>
@@ -757,6 +757,7 @@ function do_refund()
var height=550;
ome_order_refund_dialog(id, newtotal, total, is_cod, pay_status, width, height);
}
function ome_order_refund_dialog(id, newtotal, total, is_cod, pay_status,width,height)
{
var url = 'index.php?app=ome&ctl=admin_order&act=do_check&finder_id=<{$env.get.finder_id}>&p[0]='+id+'&p[1]='+newtotal+'&p[2]='+total+'&is_cod='+is_cod+'&pay_status='+pay_status;
@@ -776,10 +777,7 @@ function ome_order_refund_dialog(id, newtotal, total, is_cod, pay_status,width,h
var callurl='index.php?app=ome&ctl=admin_order&act=getSalesMaterialgroup',store=[];
if($('add-material-btn')){
$('add-material-btn').addEvent('click',function(e) {
var shop_id = $E('input[name=shop_id]').getValue();
var url='index.php?app=desktop&act=alertpages&goto='+encodeURIComponent('index.php?app=material&ctl=admin_material_sales&act=findSalesMaterial&shop_id='+shop_id);
Ex_Loader('modedialog',function() {
@@ -797,6 +795,5 @@ if($('add-material-btn')){
});
}.bind(this));
});
}
</script>

5
app/ome/view/admin/return_product/rchange/check.html
View File

@@ -13,7 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<style>
.gridlist th{
width:140px;
@@ -36,7 +35,7 @@
<td colspan="2">
<table width="100%" border="0" cellspacing="0" cellpadding="0" style="width:100%" class="gridlist">
<tr>
<th><{if $reship_data.is_encrypt}><a class="reship-sensitive-btn data-hide" href="javascript:void(0);"></a><{/if}>销售单:</th>
<th><{if $reship_data.is_encrypt && (!defined('SENSITIVE_DATA_SHOW') || constant('SENSITIVE_DATA_SHOW'))}><a class="reship-sensitive-btn data-hide" href="javascript:void(0);"></a><{/if}>销售单:</th>
<td><{$reship_data.order_bn}></td>
<th>创建日期:</th><td><{$reship_data.createtime|cdate}></td>
<th>会员名:</th><td><{$reship_data.member_id|ciphertext:'reship','ship_name',$reship_data.shop_type}></td>
@@ -407,4 +406,4 @@ CheckEditFrame();
}
<{/if}>
</script>
</script>

7
app/ome/view/admin/return_product/set/batch.html
View File

@@ -13,7 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<form action="index.php?app=ome&ctl=admin_return_batch&act=set&finder_id=<{$finder_id}>" method="post" id="form1" enctype="multipart/form-data" target="upload">
<div class="tableform">
<div class="division">
@@ -31,8 +30,8 @@
<th><{t}>类型:<{/t}></th>
<td >
<select name='batch_type' vtype="required">
<{foreach from=$batch_type item=batch_type key=key}>
<option value='<{$key}>'><{$batch_type}></option>
<{foreach from=$batch_type item=type_label key=key}>
<option value='<{$key}>' <{if $return_batch.batch_type == $key}>selected="selected"<{/if}>><{$type_label}></option>
<{/foreach}>
</select>
<em class="c-red">*</em>
@@ -98,4 +97,4 @@ $('form1').store('target',{
}
}
});
</script>
</script>