【优化】实收退导入界面

【新增】快捷菜单功能入口

【新增】爱库存电子面单获取

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

@@ -226,7 +226,6 @@
     </tbody></table>
 <{/capture}>
 
-
 <script>
 if ($defined($E('.order-sensitive-btn'))) {
     $E('.order-sensitive-btn').addEvent('click',function(e){
@@ -234,7 +233,6 @@ if ($defined($E('.order-sensitive-btn'))) {
             new Security({url:'index.php?app=ome&ctl=admin_order&act=showSensitiveData&p[0]=<{$order.order_id}>',clickElement:$(e.target)}).desHtml($E('.delivery-info'));
         });
     });
-
 }
 
 if($defined($('consignee-edit'))){
@@ -747,9 +745,10 @@ 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;
+    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;
     new Dialog(url,{
         title:'生成退款单',
         width:width,

app/ome/view/admin/order/products/pkg_view.html

@@ -47,25 +47,17 @@
 /* 为每列设置固定宽度 */
 .pkg_head_div th.width_100px,
 .pkg_main_div td.width_100px { width: 100px; }
-
 .pkg_head_div th.width_120px,
 .pkg_main_div td.width_120px { width: 120px; }
-
 .pkg_head_div th.width_160px,
 .pkg_main_div td.width_160px { width: 160px; }
-
 .pkg_head_div th.width_180px,
 .pkg_main_div td.width_180px { width: 180px; }
-
 .pkg_head_div th.width_200px,
 .pkg_main_div td.width_200px { width: 200px; }
-
 .pkg_head_div th.width_230px,
 .pkg_main_div td.width_230px { width: 230px; }
-
-.pkg_main_div table {
-  cursor: pointer;
-}
+.pkg_main_div table { cursor: pointer; }
 </style>
 
 <div class="division">

app/ome/view/admin/shop/bind_guide.html

@@ -457,6 +457,9 @@
                                 </svg>
                             </div>
                         </div>
+                        <p class="complete-order-traffic-entry">
+                            <a href="<{$order_traffic_purchase_url}>" target="_blank" rel="noopener noreferrer" class="order-traffic-purchase-link">订单流量购买</a>
+                        </p>
                         
                         <{/if}>
                         <{if $is_node_binded}>
@@ -994,6 +997,23 @@
     color: #8c8c8c;
 }
 
+.complete-order-traffic-entry {
+    margin: 0 0 8px 0;
+    font-size: 14px;
+    color: #595959;
+}
+
+.order-traffic-purchase-link {
+    color: #1890ff;
+    font-weight: 500;
+    text-decoration: none;
+}
+
+.order-traffic-purchase-link:hover {
+    color: #40a9ff;
+    text-decoration: underline;
+}
+
 /* 未完成步骤列表 */
 .incomplete-steps-list {
     margin: 24px 0;

app/ome/view/admin/system/dly_corp.html

@@ -326,6 +326,7 @@
                         <input id='electron_type_youzan'  type="radio" value="youzan" name="electron_type" onchange="electronTypeChange()" <{if $electronType!='electron'}>checked<{/if}>/><{t}>有赞控件（菜鸟）<{/t}>
                         <input id='electron_type_dewu'  type="radio" value="dewu" name="electron_type" onchange="electronTypeChange()" <{if $electronType!='electron'}>checked<{/if}>/><{t}>得物品牌直发控件<{/t}>
                         <input id='electron_type_meituan4bulkpurchasing'  type="radio" value="meituan4bulkpurchasing" name="electron_type" onchange="electronTypeChange()" <{if $electronType!='electron'}>checked<{/if}>/><{t}>美团电商控件<{/t}>
+                        <input id='electron_type_aikucun'  type="radio" value="aikucun" name="electron_type" onchange="electronTypeChange()" <{if $electronType!='electron'}>checked<{/if}>/><{t}>爱库存控件<{/t}>
                     </td>
                 </tr>
                 <tr id="electronTmplName">
@@ -343,6 +344,7 @@
                     <td id='youzanTmpl'><{input type="select" name='youzan_tmpl_id' rows=$youzanTmpl  valueColumn="template_id" labelColumn="template_name" value=$dt_info.prt_tmpl_id vtype="required" style="width:100px;"}> <em><font color='red'>*</font></em></td>
                     <td id='dewuTmpl'><{input type="select" name='dewu_tmpl_id' rows=$dewuTmpl  valueColumn="template_id" labelColumn="template_name" value=$dt_info.prt_tmpl_id vtype="required" style="width:100px;"}> <em><font color='red'>*</font></em></td>
                     <td id='meituan4bulkpurchasingTmpl'><{input type="select" name='meituan4bulkpurchasing_tmpl_id' rows=$meituan4bulkpurchasingTmpl  valueColumn="template_id" labelColumn="template_name" value=$dt_info.prt_tmpl_id vtype="required" style="width:100px;"}> <em><font color='red'>*</font></em></td>
+                    <td id='akcTmpl'><{input type="select" name='akc_tmpl_id' rows=$akcTmpl  valueColumn="template_id" labelColumn="template_name" value=$dt_info.prt_tmpl_id vtype="required" style="width:100px;"}> <em><font color='red'>*</font></em></td>
                 </tr>
                 <{else}>
                 <{if $prttpl}>
@@ -426,6 +428,7 @@
             $('youzanTmpl').hide();
             $('dewuTmpl').hide();
             $('meituan4bulkpurchasingTmpl').hide();
+            $('akcTmpl').hide();
             if(jsonelectronchannel[channel_id]['channel_type']=='taobao'){
                 if($$('input[name=electron_type]:checked').get('value') == 'electron'){
                     $('electronTmpl').show();
@@ -507,6 +510,10 @@
                     $('electronTmpl').hide();
                     $('meituan4bulkpurchasingTmpl').show();
                 }
+            }else if(jsonelectronchannel[channel_id]['channel_type']=='aikucun'){
+                $('electron_type_aikucun').set('checked','checked');
+                $('electronTmpl').hide();
+                $('akcTmpl').show();
             }else if(jsonelectronchannel[channel_id]['channel_type']=='360buy' || jsonelectronchannel[channel_id]['channel_type']=='jdalpha' || jsonelectronchannel[channel_id]['channel_type']=='jdgxd'){
                 if($$('input[name=electron_type]:checked').get('value') == 'electron'){
                     $('electronTmpl').show();
@@ -552,6 +559,7 @@
             $('dewuTmpl').hide();
             $('meituan4bulkpurchasingTmpl').hide();
             $('youzanTmpl').hide();
+            $('akcTmpl').hide();
         }
     }