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

【修复】天猫超市发货问题
【修复】采购单单号因含特殊字符导致入库或取消失败
【修复】售后批量操作设置显示不正确

app/ome/view/admin/order/confirm/delivery_info.html

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

app/ome/view/admin/order/confirm/member_confirm.html

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

app/ome/view/admin/order/detail_basic.html

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

app/ome/view/admin/order/order_edit.html

@@ -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"}>

app/ome/view/admin/order/order_edit_split.html

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