wupengfei 1 年間 前
コミット
27e76d98a9
2 ファイル変更9 行追加6 行削除
  1. 2 3
      .idea/workspace.xml
  2. 7 3
      application/order/view/store_order/detail.html

+ 2 - 3
.idea/workspace.xml

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

+ 7 - 3
application/order/view/store_order/detail.html

@@ -20,9 +20,13 @@
                     <hr />
                     <div class="layui-col-md6">支付方式:
                         {eq name='vo.pay_type' value='0'}<span class="layui-badge layui-bg-green margin-left-5">未支付</span>{/eq}
-                        {eq name='vo.pay_type' value='1'}<span class="layui-badge layui-bg-green margin-left-5">微信</span>{/eq}
-                        {eq name='vo.pay_type' value='2'}<span class="layui-badge layui-bg-blue margin-left-5">余额</span>{/eq}
-                        {eq name='vo.pay_type' value='3'}<span class="layui-badge layui-bg-orange margin-left-5">支付宝</span>{/eq}
+                        {eq name='vo.pay_type' value='1'}<span class="layui-badge layui-bg-green margin-left-5">微信【H5】</span>{/eq}
+                        {eq name='vo.pay_type' value='2'}<span class="layui-badge layui-bg-green margin-left-5">支付宝【H5】</span>{/eq}
+                        {eq name='vo.pay_type' value='3'}<span class="layui-badge layui-bg-green margin-left-5">微信【APP】</span>{/eq}
+                        {eq name='vo.pay_type' value='4'}<span class="layui-badge layui-bg-green margin-left-5">支付宝【APP】</span>{/eq}
+                        {eq name='vo.pay_type' value='5'}<span class="layui-badge layui-bg-green margin-left-5">微信【公众号】</span>{/eq}
+                        {eq name='vo.pay_type' value='6'}<span class="layui-badge layui-bg-green margin-left-5">微信【PC】</span>{/eq}
+                        {eq name='vo.pay_type' value='7'}<span class="layui-badge layui-bg-green margin-left-5">支付宝【PC】</span>{/eq}
                     </div>
                     <hr />
                     <div class="layui-col-md6">下单时间:{$data.create_at|default='--'}</div>