Index: branches/dev/data/smarty_extends/block.marquee.php
===================================================================
--- branches/dev/data/smarty_extends/block.marquee.php	(revision 11658)
+++ branches/dev/data/smarty_extends/block.marquee.php	(revision 11658)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * marquee¥¿¥°¤Ç°Ï¤à¡£
+ *
+ * DoCoMo¤Î·ÈÂÓÃ¼Ëö¤Î¾ì¹ç¤Ïmarquee¤ò»ÈÍÑ¤·¤Ê¤¤¡£
+ *
+ * @param string $value ÆþÎÏ
+ * @return string ½ÐÎÏ
+ */
+function smarty_block_marquee($params, $content, &$smarty, &$repeat) {
+	// {/marquee}¤Î¾ì¹ç¤Î¤ß½ÐÎÏ¤¹¤ë¡£
+	if ($repeat || !isset($content)) {
+		return null;
+	}
+
+	// ËöÈø¤Î²þ¹Ô¤Ê¤É¤ò¼è¤ê½ü¤¯¡£
+	$content = rtrim($content);
+
+	// marquee¥¿¥°¤ò»ÈÍÑ¤·¤Ê¤¤¾ì¹ç
+	if (defined('MOBILE_SITE') && GC_MobileUserAgent::getCarrier() == 'docomo') {
+		return "<div>\n$content\n</div>\n";
+	}
+
+	return "<marquee>\n$content\n</marquee>\n";
+}
+?>
Index: branches/dev/data/Smarty/templates/mobile/cart/index.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/cart/index.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/cart/index.tpl	(revision 11658)
@@ -29,5 +29,8 @@
 		<br>
 		<!--{* ¿ôÎÌ *}-->
-    ¿ôÎÌ:<!--{$arrProductsClass[cnt].quantity}--><br>
+		¿ôÎÌ:<!--{$arrProductsClass[cnt].quantity}-->
+		<a href="<!--{$smarty.server.PHP_SELF|escape}-->?mode=up&amp;cart_no=<!--{$arrProductsClass[cnt].cart_no}-->">+</a>
+		<a href="<!--{$smarty.server.PHP_SELF|escape}-->?mode=down&amp;cart_no=<!--{$arrProductsClass[cnt].cart_no}-->">-</a>
+		<a href="<!--{$smarty.server.PHP_SELF|escape}-->?mode=delete&amp;cart_no=<!--{$arrProductsClass[cnt].cart_no}-->">ºï½ü</a><br>
 		<!--{* ¹ç·× *}-->
 		¾®·×:<!--{$arrProductsClass[cnt].total_pretax|number_format}-->±ß<br>
Index: branches/dev/data/Smarty/templates/mobile/contact/index.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/contact/index.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/contact/index.tpl	(revision 11658)
@@ -9,7 +9,7 @@
 <!--{$business_hour}--><br>
 ÅÅÏÃÈÖ¹æ¡§<br>
-<!--{$tel01}-->-<!--{$tel02}-->-<!--{$tel02}--><br>
+<!--{$tel01}-->-<!--{$tel02}-->-<!--{$tel03}--><br>
 ¡ÚE-mail¡Û<br>
-<a href="mailto:<!--{$email01}-->"><!--{$email01}--></a><br>
+<a href="mailto:<!--{$email02|escape:'url'}-->"><!--{$email02|escape}--></a><br>
 ¢¨¤ªµÞ¤®¤Î¾ì¹ç¤Ë¤Ï¡¢¤ªÅÅÏÃ¤Ë¤Æ¤ªÌä¤¤¹ç¤»²¼¤µ¤¤¡£<br>
 
Index: branches/dev/data/Smarty/templates/mobile/regist/complete.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/regist/complete.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/regist/complete.tpl	(revision 11658)
@@ -22,5 +22,5 @@
 <!--{/if}-->
 
-<a href="<!--{$smarty.const.URL_SITE_TOP}-->">TOP¥Ú¡¼¥¸¤ËÌá¤ë</a><br>
+<a href="<!--{$smarty.const.URL_SITE_TOP}-->" accesskey="0"><!--{0|numeric_emoji}-->TOP¥Ú¡¼¥¸¤ËÌá¤ë</a><br>
 
 <br>
Index: branches/dev/data/Smarty/templates/mobile/top.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/top.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/top.tpl	(revision 11658)
@@ -24,8 +24,12 @@
 <a href="products/search.php" accesskey="2"><!--{2|numeric_emoji}-->¾¦ÉÊ¸¡º÷</a><br>
 <a href="magazine/index.php" accesskey="3"><!--{3|numeric_emoji}-->¥á¥ë¥Þ¥¬ÅÐÏ¿</a><br>
-<a href="entry/new.php" accesskey="4"><!--{4|numeric_emoji}-->²ñ°÷ÅÐÏ¿¡¦Âà²ñ</a><br>
+<!--{if $isLogin eq true}-->
+<a href="mypage/refusal.php" accesskey="4"><!--{4|numeric_emoji}-->²ñ°÷Âà²ñ</a><br>
+<!--{else}-->
+<a href="entry/new.php" accesskey="4"><!--{4|numeric_emoji}-->²ñ°÷ÅÐÏ¿</a><br>
+<!--{/if}-->
 <a href="guide/index.php" accesskey="5"><!--{5|numeric_emoji}-->¤´ÍøÍÑ¥¬¥¤¥É</a><br>
 <a href="contact/index.php" accesskey="6"><!--{6|numeric_emoji}-->¤ªÌä¤¤¹ç¤»</a><br>
-<a href="mypage/index.php" accesskey="7"><!--{7|numeric_emoji}-->My¥Ú¡¼¥¸</a><br>
+<a href="mypage/index.php" accesskey="7" utn><!--{7|numeric_emoji}-->MY¥Ú¡¼¥¸</a><br>
 <!-- ¢¥¥á¥Ë¥å¡¼ ¤³¤³¤Þ¤Ç -->
 
Index: branches/dev/data/Smarty/templates/mobile/mail_templates/mailmagazine_cancel.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/mail_templates/mailmagazine_cancel.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/mail_templates/mailmagazine_cancel.tpl	(revision 11658)
@@ -1,10 +1,10 @@
-¢¨ËÜÒ°Ù¤Ï¼«Æ°ÇÛ¿®Ò°Ù¤Ç¤¹¡
-<!--{$tpl_shopname}-->¤è¤ê¤ÒÙÏ¶Þ¹ØÆÉ²ò½ü¤ò´õË¾¤µ¤ì¤¿Êý¤Ë¤ªÁ÷¤ê¤·¤Æ¤¤¤Þ¤¹¡
-¤â¤·¤ª¿´Åö¤¿¤ê¤¬Ìµ¤¤¾ì¹ç¤Ï¤¤³¤Î¤Þ¤Þ¤³¤ÎÒ°Ù¤òÇË´þ¤·¤Æ¤¤¤¿¤À¤±¤ì¤ÐÒÙÏ¶Þ¹ØÆÉ²ò½ü¤Ï¤Ê¤µ¤ì¤Þ¤»¤ó¡
-¤Þ¤¿¤½¤Î»Ý¤<!--{$tpl_infoemail}-->¤Þ¤Ç¤´Ï¢Íí¤¤¤¿¤À¤±¤ì¤Ð¹¬¤¤¤Ç¤¹¡
+¢¨ËÜ¥á¡¼¥ë¤Ï¼«Æ°ÇÛ¿®¥á¡¼¥ë¤Ç¤¹¡£
+<!--{$tpl_shopname}-->¤è¤ê¡¢¥á¥ë¥Þ¥¬¹ØÆÉ²ò½ü¤ò´õË¾¤µ¤ì¤¿Êý¤Ë¤ªÁ÷¤ê¤·¤Æ¤¤¤Þ¤¹¡£
+¤â¤·¤ª¿´Åö¤¿¤ê¤¬Ìµ¤¤¾ì¹ç¤Ï¡¢¤³¤Î¤Þ¤Þ¤³¤Î¥á¡¼¥ë¤òÇË´þ¤·¤Æ¤¤¤¿¤À¤±¤ì¤Ð¥á¥ë¥Þ¥¬¹ØÆÉ²ò½ü¤Ï¤Ê¤µ¤ì¤Þ¤»¤ó¡£
+¤Þ¤¿¤½¤Î»Ý¡¢<!--{$tpl_infoemail}-->¤Þ¤Ç¤´Ï¢Íí¤¤¤¿¤À¤±¤ì¤Ð¹¬¤¤¤Ç¤¹¡£
 
-¸½ºß¤Ï¤Þ¤À¹ØÆÉ¤µ¤ì¤¿¾õÂÖ¤Ç¤¹¡
-´°Î»¤¹¤ë¤Ë¤Ï²¼µ­URL¤Ë±¸¾½¤·¤Æ¤¯¤À¤µ¤¤¡
-¢¨ÆþÎÏ¤µ¤ì¤¿¤ªµÒÍÍ¤Î¾ðÊó¤ÏSSL°Å¹æ²½ÄÌ¿®¤Ë¤è¤êÊÝ¸î¤µ¤ì¤Þ¤¹¡
+¸½ºß¤Ï¤Þ¤À¹ØÆÉ¤µ¤ì¤¿¾õÂÖ¤Ç¤¹¡£
+´°Î»¤¹¤ë¤Ë¤Ï²¼µ­URL¤Ë¥¢¥¯¥»¥¹¤·¤Æ¤¯¤À¤µ¤¤¡£
+¢¨ÆþÎÏ¤µ¤ì¤¿¤ªµÒÍÍ¤Î¾ðÊó¤ÏSSL°Å¹æ²½ÄÌ¿®¤Ë¤è¤êÊÝ¸î¤µ¤ì¤Þ¤¹¡£
 
 <!--{$tpl_url}-->
Index: branches/dev/data/Smarty/templates/mobile/mail_templates/mailmagazine_regist.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/mail_templates/mailmagazine_regist.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/mail_templates/mailmagazine_regist.tpl	(revision 11658)
@@ -1,11 +1,11 @@
-¢¨ËÜÒ°Ù¤Ï¼«Æ°ÇÛ¿®Ò°Ù¤Ç¤¹¡
-<!--{$tpl_shopname}-->¤è¤ê¤ÒÙÏ¶Þ¹ØÆÉÅÐÏ¿¤ò´õË¾¤µ¤ì¤¿Êý¤Ë¤ªÁ÷¤ê¤·¤Æ¤¤¤Þ¤¹¡
-¤â¤·¤ª¿´Åö¤¿¤ê¤¬Ìµ¤¤¾ì¹ç¤Ï¤¤³¤Î¤Þ¤Þ¤³¤ÎÒ°Ù¤òÇË´þ¤·¤Æ¤¤¤¿¤À¤±¤ì¤ÐÒÙÏ¶Þ¹ØÆÉÅÐÏ¿¤Ï¤Ê¤µ¤ì¤Þ¤»¤ó¡
-¤Þ¤¿¤½¤Î»Ý¤<!--{$tpl_infoemail}-->¤Þ¤Ç¤´Ï¢Íí¤¤¤¿¤À¤±¤ì¤Ð¹¬¤¤¤Ç¤¹¡
+¢¨ËÜ¥á¡¼¥ë¤Ï¼«Æ°ÇÛ¿®¥á¡¼¥ë¤Ç¤¹¡£
+<!--{$tpl_shopname}-->¤è¤ê¡¢¥á¥ë¥Þ¥¬¹ØÆÉÅÐÏ¿¤ò´õË¾¤µ¤ì¤¿Êý¤Ë¤ªÁ÷¤ê¤·¤Æ¤¤¤Þ¤¹¡£
+¤â¤·¤ª¿´Åö¤¿¤ê¤¬Ìµ¤¤¾ì¹ç¤Ï¡¢¤³¤Î¤Þ¤Þ¤³¤Î¥á¡¼¥ë¤òÇË´þ¤·¤Æ¤¤¤¿¤À¤±¤ì¤Ð¥á¥ë¥Þ¥¬¹ØÆÉÅÐÏ¿¤Ï¤Ê¤µ¤ì¤Þ¤»¤ó¡£
+¤Þ¤¿¤½¤Î»Ý¡¢<!--{$tpl_infoemail}-->¤Þ¤Ç¤´Ï¢Íí¤¤¤¿¤À¤±¤ì¤Ð¹¬¤¤¤Ç¤¹¡£
 
-¤³¤ÎÅÙ¤Ï¤ÒÙÏ¶Þ¹ØÆÉ°ÍÍê¤ò¤¤¤¿¤À¤­¤Þ¤·¤Æ¤Í­¤êÆñ¤¦¤´¤¶¤¤¤Þ¤¹¡
-¸½ºß¤Ï²¾ÅÐÏ¿¤Î¾õÂÖ¤Ç¤¹¡
-´°Î»¤¹¤ë¤Ë¤Ï²¼µ­URL¤Ë±¸¾½¤·¤Æ¤¯¤À¤µ¤¤¡
-¢¨ÆþÎÏ¤µ¤ì¤¿¤ªµÒÍÍ¤Î¾ðÊó¤ÏSSL°Å¹æ²½ÄÌ¿®¤Ë¤è¤êÊÝ¸î¤µ¤ì¤Þ¤¹¡
+¤³¤ÎÅÙ¤Ï¡¢¥á¥ë¥Þ¥¬¹ØÆÉ°ÍÍê¤ò¤¤¤¿¤À¤­¤Þ¤·¤Æ¡¢Í­¤êÆñ¤¦¤´¤¶¤¤¤Þ¤¹¡£
+¸½ºß¤Ï²¾ÅÐÏ¿¤Î¾õÂÖ¤Ç¤¹¡£
+´°Î»¤¹¤ë¤Ë¤Ï²¼µ­URL¤Ë¥¢¥¯¥»¥¹¤·¤Æ¤¯¤À¤µ¤¤¡£
+¢¨ÆþÎÏ¤µ¤ì¤¿¤ªµÒÍÍ¤Î¾ðÊó¤ÏSSL°Å¹æ²½ÄÌ¿®¤Ë¤è¤êÊÝ¸î¤µ¤ì¤Þ¤¹¡£
 
 <!--{$tpl_url}-->
Index: branches/dev/data/Smarty/templates/mobile/entry/index.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/entry/index.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/entry/index.tpl	(revision 11658)
@@ -25,5 +25,5 @@
 	<font color="#FF0000"><!--{$arrErr.reminder}--></font>
 	<select name="reminder">
-		<option value="" selected>ÁªÂò¤·¤Æ¤¯¤À¤µ¤¤</option>
+		<option value="">ÁªÂò¤·¤Æ¤¯¤À¤µ¤¤</option>
 		<!--{html_options options=$arrReminder selected=$reminder}-->
 	</select><br>
Index: branches/dev/data/Smarty/templates/mobile/entry/set2.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/entry/set2.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/entry/set2.tpl	(revision 11658)
@@ -8,14 +8,16 @@
 
 	¡ÚÅÔÆ»ÉÜ¸©¡Û<font color="#FF0000">*</font><br>
-	<font color="#FF0000"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></font>
+	<font color="#FF0000"><!--{$arrErr.pref}--></font>
 	<select name="pref">
-		<option value="" selected>ÅÔÆ»ÉÜ¸©¤òÁªÂò</option>
+		<option value="">ÅÔÆ»ÉÜ¸©¤òÁªÂò</option>
 		<!--{html_options options=$arrPref selected=$pref}-->
 	</select><br>
 
 	¡Ú»Ô¶èÄ®Â¼¡Û<font color="#FF0000">*</font><br>
+	<font color="#FF0000"><!--{$arrErr.addr01}--></font>
 	<input type="text" name="addr01" value="<!--{$addr01|escape}-->" istyle="1"><br>
 
 	¡ÚÈÖÃÏ¡Û<font color="#FF0000">*</font><br>
+	<font color="#FF0000"><!--{$arrErr.addr02}--></font>
 	<input type="text" name="addr02" value="<!--{$addr02|escape}-->" istyle="1"><br>
 
Index: branches/dev/data/Smarty/templates/mobile/entry/email_mobile.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/entry/email_mobile.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/entry/email_mobile.tpl	(revision 11658)
@@ -8,10 +8,11 @@
 <br>
 
+<!--{assign var=key value='email_mobile'}-->
 <!--{if @$tpl_kara_mail_to != ''}-->
+<font color="#ff0000"><!--{$arrErr[$key]|default:''}--></font>
 ¼¡¤Î¥ê¥ó¥¯¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¶õ¥á¡¼¥ë¤òÁ÷¿®¤·¤Æ¤¯¤À¤µ¤¤¡£<br>
 <center><a href="mailto:<!--{$tpl_kara_mail_to|escape:'url'}-->">¥á¡¼¥ëÁ÷¿®</a></center>
 <!--{else}-->
 <form method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
-<!--{assign var=key value='email_mobile'}-->
 ¢§¥á¡¼¥ë¥¢¥É¥ì¥¹<br>
 <font color="#ff0000"><!--{$arrErr[$key]|default:''}--></font>
Index: branches/dev/data/Smarty/templates/mobile/frontparts/bloc/news.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/frontparts/bloc/news.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/frontparts/bloc/news.tpl	(revision 11658)
@@ -2,9 +2,9 @@
 <center>
 ¡½¡½¡½¡½¡½¡½¡½¡½¡½<br>
-<marquee>
+<!--{marquee}-->
 <!--{if $arrNews[0].news_url}--><a href="<!--{$arrNews[0].news_url|escape}-->"><!--{/if}-->
 <!--{$arrNews[0].news_title|escape}-->
 <!--{if $arrNews[0].news_url}--></a><!--{/if}-->
-</marquee>
+<!--{/marquee}-->
 ¡½¡½¡½¡½¡½¡½¡½¡½¡½<br>
 </center>
Index: branches/dev/data/Smarty/templates/mobile/products/list.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/products/list.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/products/list.tpl	(revision 11658)
@@ -4,4 +4,17 @@
 
 <hr>
+
+<!--{if isset($tpl_previous_page) || isset($tpl_next_page)}-->
+<!--{if isset($tpl_previous_page)}-->
+<a href="<!--{$tpl_previous_page|escape}-->">Á°¤Ø</a>
+<!--{/if}-->
+<!--{if isset($tpl_previous_page) && isset($tpl_next_page)}-->
+¡Ã
+<!--{/if}-->
+<!--{if isset($tpl_next_page)}-->
+<a href="<!--{$tpl_next_page|escape}-->">¼¡¤Ø</a>
+<!--{/if}-->
+<br><br>
+<!--{/if}-->
 
 <!--{foreach from=$arrProducts key=i item=arrProduct}-->
@@ -28,5 +41,24 @@
 <br>
 <!-- ¢¥¾¦ÉÊ ¤³¤³¤Þ¤Ç -->
+<!--{foreachelse}-->
+<!--{if $tpl_search_mode}-->
+³ºÅö·ï¿ô0·ï¤Ç¤¹¡£Â¾¤Î¸¡º÷¥­¡¼¥ï¡¼¥É¤è¤êºÆÅÙ¸¡º÷¤ò¤·¤Æ¤¯¤À¤µ¤¤¡£<br>
+<!--{else}-->
+¾¦ÉÊ¤¬¤¢¤ê¤Þ¤»¤ó¡£<br>
+<!--{/if}-->
 <!--{/foreach}-->
+
+<!--{if isset($tpl_previous_page) || isset($tpl_next_page)}-->
+<!--{if isset($tpl_previous_page)}-->
+<a href="<!--{$tpl_previous_page|escape}-->">Á°¤Ø</a>
+<!--{/if}-->
+<!--{if isset($tpl_previous_page) && isset($tpl_next_page)}-->
+¡Ã
+<!--{/if}-->
+<!--{if isset($tpl_next_page)}-->
+<a href="<!--{$tpl_next_page|escape}-->">¼¡¤Ø</a>
+<!--{/if}-->
+<br>
+<!--{/if}-->
 
 <br>
Index: branches/dev/data/Smarty/templates/mobile/mypage/change.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/mypage/change.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/mypage/change.tpl	(revision 11658)
@@ -21,5 +21,5 @@
 	<font color="#FF0000"><!--{$arrErr.reminder}--></font>
 	<select name="reminder">
-		<option value="" selected>ÁªÂò¤·¤Æ¤¯¤À¤µ¤¤</option>
+		<option value="">ÁªÂò¤·¤Æ¤¯¤À¤µ¤¤</option>
 		<!--{html_options options=$arrReminder selected=$arrForm.reminder}-->
 	</select><br>
Index: branches/dev/data/Smarty/templates/mobile/mypage/index.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/mypage/index.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/mypage/index.tpl	(revision 11658)
@@ -5,7 +5,7 @@
 ¤¤¤Ä¤â¤´ÍøÍÑ¤¤¤¿¤À¤­¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£<br>
 <br>
-<a href="history.php" accesskey="1"><!--{1|numeric_emoji}-->¹ØÆþÍúÎò<br>
-<a href="change.php" accesskey="2"><!--{2|numeric_emoji}-->ÅÐÏ¿ÆâÍÆÊÑ¹¹<br>
-<a href="refusal.php" accesskey="3"><!--{3|numeric_emoji}-->Âà²ñ<br>
+<a href="history.php" accesskey="1"><!--{1|numeric_emoji}-->¹ØÆþÍúÎò</a><br>
+<a href="change.php" accesskey="2"><!--{2|numeric_emoji}-->ÅÐÏ¿ÆâÍÆÊÑ¹¹</a><br>
+<a href="refusal.php" accesskey="3"><!--{3|numeric_emoji}-->Âà²ñ</a><br>
 
 <hr>
Index: branches/dev/data/Smarty/templates/mobile/mypage/login.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/mypage/login.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/mypage/login.tpl	(revision 11658)
@@ -6,6 +6,4 @@
 	<input type="hidden" name="mode" value="login" >
 <!--{if !$tpl_valid_phone_id}-->
-	¢£°ÊÁ°¤Ë¤´ÃíÊ¸¤µ¤ì¤¿Êý<br>
-	(¥â¥Ð¥¤¥ëËô¤ÏPC¤Ç¤´ÅÐÏ¿ºÑ¤ß)<br>
 	¢§¥á¡¼¥ë¥¢¥É¥ì¥¹<br>
 	<!--{assign var=key value="login_email"}-->
Index: branches/dev/data/Smarty/templates/mobile/mypage/set2.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/mypage/set2.tpl	(revision 11653)
+++ branches/dev/data/Smarty/templates/mobile/mypage/set2.tpl	(revision 11658)
@@ -8,14 +8,16 @@
 
 	¡ÚÅÔÆ»ÉÜ¸©¡Û<font color="#FF0000">*</font><br>
-	<font color="#FF0000"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></font>
+	<font color="#FF0000"><!--{$arrErr.pref}--></font>
 	<select name="pref">
-		<option value="" selected>ÅÔÆ»ÉÜ¸©¤òÁªÂò</option>
+		<option value="">ÅÔÆ»ÉÜ¸©¤òÁªÂò</option>
 		<!--{html_options options=$arrPref selected=$arrForm.pref}-->
 	</select><br>
 
 	¡Ú»Ô¶èÄ®Â¼¡Û<font color="#FF0000">*</font><br>
+	<font color="#FF0000"><!--{$arrErr.addr01}--></font>
 	<input type="text" name="addr01" value="<!--{$arrForm.addr01|escape}-->" istyle="1"><br>
 
 	¡ÚÈÖÃÏ¡Û<font color="#FF0000">*</font><br>
+	<font color="#FF0000"><!--{$arrErr.addr02}--></font>
 	<input type="text" name="addr02" value="<!--{$arrForm.addr02|escape}-->" istyle="1"><br>
 
@@ -34,4 +36,9 @@
 	¡Ê´õË¾¤µ¤ì¤Ê¤¤¾ì¹ç¤Ï¥Á¥§¥Ã¥¯¤ò¤Ï¤º¤·¤Æ¤¯¤À¤µ¤¤¡Ë<br>
 	<br>
+
+	<input type="hidden" name="fax01" value="<!--{$arrForm.fax01|escape}-->">
+	<input type="hidden" name="fax02" value="<!--{$arrForm.fax02|escape}-->">
+	<input type="hidden" name="fax03" value="<!--{$arrForm.fax03|escape}-->">
+	<input type="hidden" name="job" value="<!--{$arrForm.job|escape}-->">
 
 	<input type="submit" name="confirm" value="¼¡¤Ø">
Index: branches/dev/data/Smarty/templates/mobile/shopping/complete.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/shopping/complete.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/shopping/complete.tpl	(revision 11658)
@@ -9,5 +9,5 @@
 <br>
 
-<a href="<!--{$smarty.const.URL_SITE_TOP}-->">TOP¥Ú¡¼¥¸¤ËÌá¤ë</a><br>
+<a href="<!--{$smarty.const.URL_SITE_TOP}-->" accesskey="0"><!--{0|numeric_emoji}-->TOP¥Ú¡¼¥¸¤ËÌá¤ë</a><br>
 
 <br>
Index: branches/dev/data/Smarty/templates/mobile/shopping/set1.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/shopping/set1.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/shopping/set1.tpl	(revision 11658)
@@ -8,14 +8,16 @@
 
 	¡ÚÅÔÆ»ÉÜ¸©¡Û<font color="#FF0000">*</font><br>
-	<font color="#FF0000"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></font>
+	<font color="#FF0000"><!--{$arrErr.pref}--></font>
 	<select name="pref">
-		<option value="" selected>ÅÔÆ»ÉÜ¸©¤òÁªÂò</option>
+		<option value="">ÅÔÆ»ÉÜ¸©¤òÁªÂò</option>
 		<!--{html_options options=$arrPref selected=$arrForm.pref}-->
 	</select><br>
 
 	¡Ú»Ô¶èÄ®Â¼¡Û<font color="#FF0000">*</font><br>
+	<font color="#FF0000"><!--{$arrErr.addr01}--></font>
 	<input type="text" name="addr01" value="<!--{$arrForm.addr01|escape}-->" istyle="1"><br>
 
 	¡ÚÈÖÃÏ¡Û<font color="#FF0000">*</font><br>
+	<font color="#FF0000"><!--{$arrErr.addr02}--></font>
 	<input type="text" name="addr02" value="<!--{$arrForm.addr02|escape}-->" istyle="1"><br>
 
Index: branches/dev/data/Smarty/templates/mobile/shopping/payment.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/shopping/payment.tpl	(revision 11460)
+++ branches/dev/data/Smarty/templates/mobile/shopping/payment.tpl	(revision 11658)
@@ -19,5 +19,5 @@
 <!--{if $arrDelivDate}-->
 <select name="<!--{$key}-->">
-<option value="" selected="">»ØÄê¤Ê¤·</option>
+<option value="">»ØÄê¤Ê¤·</option>
 <!--{html_options options=$arrDelivDate selected=$arrForm[$key].value}-->
 </select>
@@ -33,5 +33,5 @@
 <!--{/if}-->
 <select name="<!--{$key}-->">
-<option value="" selected="">»ØÄê¤Ê¤·</option>
+<option value="">»ØÄê¤Ê¤·</option>
 <!--{html_options options=$arrDelivTime selected=$arrForm[$key].value}-->
 </select>
Index: branches/dev/data/lib/slib.php
===================================================================
--- branches/dev/data/lib/slib.php	(revision 11611)
+++ branches/dev/data/lib/slib.php	(revision 11658)
@@ -2284,4 +2284,8 @@
 	
 	//-- ÊÔ½¸ÅÐÏ¿¼Â¹Ô
+	if (defined('MOBILE_SITE')) {
+		$arrRegist['email_mobile'] = $arrRegist['email'];
+		unset($arrRegist['email']);
+	}
 	$objQuery->begin();
 	$objQuery->update("dtb_customer", $arrRegist, "customer_id = ? ", array($array['customer_id']));
