wupengfei 2 years ago
parent
commit
73ae600caa
2 changed files with 3 additions and 3 deletions
  1. 2 2
      .idea/workspace.xml
  2. 1 1
      application/order/view/store_order/index.html

+ 2 - 2
.idea/workspace.xml

@@ -3,7 +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/common.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common.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" />
@@ -170,7 +170,7 @@
       <workItem from="1666054299858" duration="23137000" />
       <workItem from="1666140525910" duration="23609000" />
       <workItem from="1666227349089" duration="7795000" />
-      <workItem from="1666313182769" duration="15726000" />
+      <workItem from="1666313182769" duration="15860000" />
     </task>
     <servers />
   </component>

+ 1 - 1
application/order/view/store_order/index.html

@@ -49,7 +49,7 @@
                 {/eq}
                 <br>
                 订单金额:<strong class="color-blue">{$vo.price_total}</strong><br>
-                支付方式:<span class="layui-bg-green layui-badge">{$all_pay_type[$vo.pay_type]}</span><br>
+                支付方式:<span class="layui-bg-green layui-badge">{if $vo.pay_state}{$all_pay_type[$vo.pay_type]}{else}待支付{/if}</span><br>
                 下单时间:{$vo.create_at|default='--'}<br>
                 支付时间:{$vo.pay_at|default='--'}<br>
             </td>