Browse Source

更新文件

rambo 1 year ago
parent
commit
16f146b323

+ 1 - 0
app/home/lang/zh-cn/membercomplain.lang.php

@@ -1,6 +1,7 @@
 <?php
 $lang['member_order_time']		= '下单时间';
 $lang['member_show_order_send_time']	= '发货时间';
+$lang['member_show_order_pay_time']     = '付款时间';
 $lang['member_show_order_finish_time']	= '完成时间';
 $lang['member_address_location'] = '所在地区';
 

+ 5 - 18
app/home/view/default/base/mall_header.html

@@ -39,7 +39,7 @@
                             <li><a href="{:url('Memberorder/index')}" class="arrow">{$Think.lang.ds_my_order}<i></i></a></li>
                             <li><a href="{:url('Memberconsult/index')}">{$Think.lang.ds_consulting_reply}(<span id="member_consult">0</span>)</a></li>
                             <li><a href="{:url('Memberfavorites/fglist')}" class="arrow">{$Think.lang.ds_favorites}<i></i></a></li>
-                            <li><a href="{:url('Membervoucher/index')}">{$Think.lang.ds_vouchers}(<span id="member_voucher">0</span>)</a></li>
+                            <li><a href="{:url('Membervoucher/storevoucher')}">{$Think.lang.ds_vouchers}(<span id="member_voucher">0</span>)</a></li>
                             <li><a href="{:url('Memberpoints/index')}" class="arrow">{$Think.lang.ds_my_points}<i></i></a></li>
                         </ul>
                     </div>
@@ -159,20 +159,7 @@
                 {/foreach}
             </ul>
         </div>
-
-        <script>
-            $(function(){
-                var  href = location.href;
-                var node = $(".nav_list .site_menu a[href='"+href+"']")
-                if(node.length > 0){
-                    $(".nav_list .site_menu a").removeClass('current')
-                    node.addClass('current')
-                }
-                if(location.pathname === '/' || location.pathname === "{:url('Index/index')}"){
-                    $(".nav_list a").eq(0).addClass('current')
-                }
-            })
-        </script>
+       
     </div>
 </div>
 
@@ -184,7 +171,7 @@
 {notempty name="nav_link_list"}
 <div class="dsh-breadcrumb-layout">
     <div class="dsh-breadcrumb w1200"><i class="iconfont">&#xe6ff;</i>
-        {foreach $nav_link_list as $nav_link}
+        {foreach $nav_link_list as $nav_link} 
         {empty name="nav_link.link"}
         <span>{$nav_link.title}</span>
         {else /}
@@ -207,7 +194,7 @@
 				    var cat_id = $(this).attr("cat_id");
 					var menu = $(this).find("div[cat_menu_id='"+cat_id+"']");
 					menu.show();
-					$(this).addClass("hover");
+					$(this).addClass("hover");					
 					var menu_height = menu.height();
 					if (menu_height < 60) menu.height(80);
 					menu_height = menu.height();
@@ -239,5 +226,5 @@
             $(this).unbind('mouseover');
         });
     });
-
+    
 </script>

+ 1 - 1
app/home/view/default/base/member_header.html

@@ -41,7 +41,7 @@
                             <li><a href="{:url('Memberorder/index')}" class="arrow">{$Think.lang.ds_my_order}<i></i></a></li>
                             <li><a href="{:url('Memberconsult/index')}">{$Think.lang.ds_consulting_reply}(<span id="member_consult">0</span>)</a></li>
                             <li><a href="{:url('Memberfavorites/fglist')}" class="arrow">{$Think.lang.ds_favorites}<i></i></a></li>
-                            <li><a href="{:url('Membervoucher/index')}">{$Think.lang.ds_vouchers}(<span id="member_voucher">0</span>)</a></li>
+                            <li><a href="{:url('Membervoucher/storevoucher')}">{$Think.lang.ds_vouchers}(<span id="member_voucher">0</span>)</a></li>
                             <li><a href="{:url('Memberpoints/index')}" class="arrow">{$Think.lang.ds_my_points}<i></i></a></li>
                         </ul>
                     </div>

+ 1 - 1
app/home/view/default/member/member/index.html

@@ -37,7 +37,7 @@
                     <p class="p-price"><span class="">{$home_member_info.member_points}</span>{$Think.lang.credit_unit}</p>
                 </li>
                 <li>
-                    <a href="{:url('membervoucher/index')}" class="p-icon bg-green3 iconfont">&#xe668;</a>
+                    <a href="{:url('membervoucher/storevoucher')}" class="p-icon bg-green3 iconfont">&#xe668;</a>
                     <p class="p-dec">{$Think.lang.ds_vouchers}</p>
                     <p class="p-price"><span>{$home_member_info.voucher_count}</span>{$Think.lang.ds_zhang}</p>
                 </li>

+ 1 - 1
app/home/view/default/member/member/member_info.html

@@ -5,7 +5,7 @@
           <li id="pre-deposit"><a href="{:url('Predeposit/pd_log_list')}" title="{$Think.lang.check_my_balance}">
             <h5>{$Think.lang.ds_predepositnum}</h5>
             <span class="icon iconfont">&#xe6f5;</span> <span class="value">¥<em>{$member_info.available_predeposit}</em></span></a> </li>
-          <li id="voucher"><a href="{:url('Membervoucher/index')}" title="{$Think.lang.check_my_voucher}">
+          <li id="voucher"><a href="{:url('Membervoucher/storevoucher')}" title="{$Think.lang.check_my_voucher}">
             <h5>{$Think.lang.ds_vouchers}</h5>
             <span class="icon iconfont">&#xe64f;</span> <span class="value"><em>{$home_member_info.voucher_count|default='0'}</em>{$Think.lang.ds_zhang}</span></a> </li>
           <li id="points"><a href="{:url('Memberpoints/index')}" title="{$Think.lang.check_my_points}">

+ 1 - 1
app/home/view/default/member/memberorder/show_order.html

@@ -208,7 +208,7 @@
                     <dd class="date" title="{$Think.lang.member_order_time}">{$order_info.add_time|date="Y-m-d H:i:s"}</dd>
                 </dl>
                 {if $order_info['payment_code'] != 'offline'}
-                <dl class="{if intval($order_info['payment_time'])}current{/if}">
+                <dl class="{if intval($order_info['order_state']) >= 20}current{/if}">
                     <dt>{$Think.lang.complete_payment}</dt>
                     <dd class="bg"> </dd>
                     <dd class="date" title="{$Think.lang.member_show_order_pay_time}">{$order_info.payment_time|date="Y-m-d H:i:s"}</dd>