1

.idea/workspace.xml

@@ -4,6 +4,7 @@
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/synth/controller/BillApply.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/controller/BillApply.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/synth/view/bill_apply/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/form.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/synth/view/bill_apply/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -328,7 +329,7 @@
       <workItem from="1684543423796" duration="10653000" />
       <workItem from="1684716593546" duration="15730000" />
       <workItem from="1684743465298" duration="6526000" />
-      <workItem from="1684802887863" duration="2167000" />
+      <workItem from="1684802887863" duration="3062000" />
     </task>
     <servers />
   </component>
@@ -458,10 +459,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1410" y="539" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1684374232836" />
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1684804956286">
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1684805451788">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1684804956286" />
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1684805451788" />
     <state x="420" y="147" width="1942" height="1088" key="DiffContextDialog" timestamp="1684740077011">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

application/synth/controller/BillApply.php

@@ -1,5 +1,7 @@
 <?php
 namespace app\synth\controller;
+use app\common\model\ActivityApply;
+use app\common\model\StoreOrderRefund;
 use library\Controller;
 use think\Db;
 
@@ -71,6 +73,31 @@ class BillApply extends Controller
         $this->_form($this->table, 'form');
     }
 
+    /**
+     * 表单数据处理
+     * @auth true
+     * @menu true
+     * @param array $data
+     */
+    protected function _form_filter(&$data)
+    {
+        if ($this->request->isGet() && $this->request->action() == 'detail'){
+            // 退款金额
+            $refund_money = StoreOrderRefund::getRefundMoney($data['order_id'],1);
+            $data['refund_money'] = $refund_money;
+            $order_info = ActivityApply::where('id',$data['apply_id'])->find()->toArray();
+            $data['order_info'] = $order_info;
+            if($data['address_info']) $data['address_info'] = json_decode($data['address_info'],true);
+            $this->data = $data;
+        }
+
+        if ($this->request->isPost() && $this->request->action() == 'deliver') {
+            $express_company =  Db::name('express_company')->field('id,express_title')->find($data['express_company_id']);
+            $data['express_company_title'] = $express_company['express_title'] ? $express_company['express_title'] : '';
+            $data['express_send_at'] = date("Y-m-d H:i:s");
+            $data['express_state'] = 1;
+        }
+    }
 
 
 }

application/synth/view/bill_apply/form.html

@@ -1,62 +1,59 @@
-<style>
-
-</style>
-<div class="think-box-shadow">
-    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-        <div class="layui-card-body">
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">抬头名称</label>
-                <div class="layui-input-block">
-                    <input name="header"  value='{$vo.header|default=""}'  class="layui-input">
-                </div>
-            </div>
-
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">电话</label>
-                <div class="layui-input-block">
-                    <input name="phone"  value='{$vo.phone|default=""}'  class="layui-input">
+<div style="padding: 20px; background-color: #F2F2F2;">
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">发票信息</div>
+                <div class="layui-card-body">
+                    <div class="layui-col-md6">订单号：{$data['order_no']}</div>
+                    <div class="layui-col-md6">订单状态：
+                        {eq name='vo.status' value='0'}<span class="layui-badge layui-bg-orange margin-left-5">未开票</span>{/eq}
+                        {eq name='vo.status' value='1'}<span class="layui-badge layui-bg-black margin-left-5">已开票</span>{/eq}
+                    </div><hr />
+                    <div class="layui-col-md6">实际支付金额：{$data.order_info.money|default='0'}</div><hr />
+                    <div class="layui-col-md6">实际支付金额：{$data['price_total']|default='0'}</div><hr />
+                    <hr />
+                    <div class="layui-col-md6">支付方式：
+                        {eq name='vo.order_info.pay_type' value='0'}<span class="layui-badge layui-bg-gray margin-left-5">未支付</span>{/eq}
+                        {eq name='vo.order_info.pay_type' value='1'}<span class="layui-badge layui-bg-green margin-left-5">微信【H5】</span>{/eq}
+                        {eq name='vo.order_info.pay_type' value='2'}<span class="layui-badge layui-bg-blue margin-left-5">支付宝【H5】</span>{/eq}
+                        {eq name='vo.order_info.pay_type' value='3'}<span class="layui-badge layui-bg-orange margin-left-5">微信【APP】</span>{/eq}
+                        {eq name='vo.order_info.pay_type' value='4'}<span class="layui-badge layui-bg-cyan margin-left-5">支付宝【APP】</span>{/eq}
+                        {eq name='vo.order_info.pay_type' value='5'}<span class="layui-badge layui-bg-black margin-left-5">微信【公众号】</span>{/eq}
+                        {eq name='vo.order_info.pay_type' value='9'}<span class="layui-badge layui-bg-red margin-left-5">线下转账</span>{/eq}
+                    </div>
+                    <hr />
+                    <div class="layui-col-md6">下单时间：{$data.order_info.create_at|default='--'}</div>
+                    <div class="layui-col-md6">
+                        支付时间：{$vo.order_info.pay_at|default='--'}
+                    </div>
+                    <hr />
                 </div>
             </div>
+        </div>
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">收货信息</div>
+                <div class="layui-card-body">
+                    <div class="layui-col-md6">收货人姓名：{$data.address_info.name|default='--'}</div>
+                    <div class="layui-col-md6">收货人手机：{$data.address_info.phone|default='--'}</div><hr />
+                    <div class="layui-col-md6">地址：{$vo.address_info.pro_name|default='--'}{$vo.address_info.city_name}{$vo.address_info.county_name}{$vo.address_info.detail}</div><hr />
+                    <div class="layui-col-md6">发货状态：{eq name='vo.express_state' value='0'}
+                        <span class="layui-badge layui-bg-black">未发货</span>
+                        {else}
+                        <span class="layui-badge layui-bg-blue">{$vo.express_company_title|default='--'}</span>
+                        <span class="layui-badge layui-bg-gray margin-left-5">{$vo.express_send_no|default='--'}</span>
+                        {/eq}
+                        {if $vo.status eq 3 || $vo.status eq -3 || $vo.pay_type eq 'offline'}
+                        <a class=" margin-left-5" data-title="填写订单信息" data-modal="{:url('express')}?id={$vo.id}">填写发货信息</a>
+                        {elseif $vo.status eq 4}
+                        <a class=" margin-left-5" data-title="修改发货信息" data-modal="{:url('express')}?id={$vo.id}">修改发货信息</a>
+                        {/if}
+                    </div>
+                    <div class="layui-col-md6">发货时间：{$vo.express_send_at|format_datetime}</div>
+                    <hr />
 
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">邮箱</label>
-                <div class="layui-input-block">
-                    <input name="email"  value='{$vo.email|default=""}'  class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">银行名称</label>
-                <div class="layui-input-block">
-                    <input name="bank"  value='{$vo.bank|default=""}'  class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">银行卡号</label>
-                <div class="layui-input-block">
-                    <input name="card_no"  value='{$vo.card_no|default=""}'  class="layui-input">
-                </div>
-            </div>
-
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">备注</label>
-                <div class="layui-input-block">
-                    <input name="remark"  value='{$vo.remark|default=""}'  class="layui-input">
                 </div>
             </div>
-
-            {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-            <div class="layui-form-item text-center">
-                <button class="layui-btn" type='submit'>保 存</button>
-                <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定取消编辑吗？" data-close>取消编辑</button>
-            </div>
         </div>
-    </form>
-    <script>
-        window.form.render();
-    </script>
-</div>
+    </div>
+</div>

application/synth/view/bill_apply/index.html

@@ -28,7 +28,7 @@
             <td class='text-left nowrap'>
                 <div class="inline-block">
                     抬头名称：{$vo.header|default='--'}<br>
-                    手机号：{$vo.phone_pre|default=''}-{$vo.phone|default='--'}<br>
+                    手机号：{$vo.phone_pre|default='86'}-{$vo.phone|default='--'}<br>
                     邮箱：{$vo.email|default='--'}
                 </div>
             </td>