wupengfei 1 year ago
parent
commit
2d278d0ccd

+ 3 - 2
.idea/workspace.xml

@@ -3,7 +3,8 @@
   <component name="ChangeListManager">
     <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/order/controller/RefundOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/order/controller/RefundOrder.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/order/controller/StoreOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/order/controller/StoreOrder.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/order/view/store_order/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/order/view/store_order/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -420,7 +421,7 @@
       <workItem from="1694392543142" duration="23428000" />
       <workItem from="1694480523673" duration="21063000" />
       <workItem from="1694565971470" duration="21552000" />
-      <workItem from="1694652561038" duration="13393000" />
+      <workItem from="1694652561038" duration="13932000" />
     </task>
     <servers />
   </component>

+ 2 - 0
application/order/controller/StoreOrder.php

@@ -1,6 +1,7 @@
 <?php
 namespace app\order\controller;
 use app\common\model\GoodsOrder;
+use app\common\model\StoreOrderRefund;
 use app\common\model\UserMessage;
 use library\Controller;
 use library\tools\Data;
@@ -60,6 +61,7 @@ class StoreOrder extends Controller
                ->where(['i.order_id'=>$vo['id']])
                ->leftJoin('StoreGoods g','g.id = i.goods_id')
                ->select();
+           $vo['refund_info'] = StoreOrderRefund::where('order_id',$vo['id'])->where('order_type',2)->where('status','in','0,1,2,3,4')->find();
         }
     }
 

+ 5 - 2
application/order/view/store_order/index.html

@@ -49,10 +49,10 @@
                      <span class="layui-badge layui-bg-blue margin-left-5">待审核</span>
                 {/eq}
                 {eq name='vo.refund_state' value='2'}
-                    <span class="layui-badge layui-bg-blue margin-left-5">审核通过</span>
+                <span class="layui-badge layui-bg-blue margin-left-5">拒绝退款</span>
                 {/eq}
                 {eq name='vo.refund_state' value='3'}
-                    <span class="layui-badge layui-bg-blue margin-left-5">拒绝退款</span>
+                    <span class="layui-badge layui-bg-blue margin-left-5">审核通过</span>
                 {/eq}
                 <br>
                 订单金额:<strong class="color-blue">{$vo.price_total}</strong> 元<br>
@@ -90,6 +90,9 @@
             </td>
             <td class='text-left nowrap'>
                 <a data-title="查看详情" class="layui-btn layui-btn-sm" data-modal='{:url("detail")}?id={$vo.id}'>查看详情</a>
+                {if $vo.refund_info}
+                <a data-title="查看售后" class="layui-btn layui-btn-sm" data-modal='{:url("/order/refund_order/audit")}?id={$vo.refund_info.id}'>查看售后</a>
+                {/if}
                 <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('删除','remove','{$vo.id}');">删 除</span>
             </td>
         </tr>