Merge branch 'dev2.6' of ssh://192.168.3.207:10022/qmx/qfw into dev2.6

core/src/web/templates/manage/vipOrder.html

@@ -146,6 +146,13 @@ $(function(){
 		        },
 				{
 		            title: "邮箱", field: "user_mail"
+					,callback:function(ct,cd,val,k,m){
+						if(ct["user_mail"]){
+							return ct["user_mail"];
+						}else{
+							return "-";	//升级费用为0
+						}
+					}
 		        },
 				/*
 				{

core/src/web/templates/manage/vipOrderDetail.html

@@ -114,6 +114,11 @@
 						{{end}}
 							<li class="row-list nofloat">产品类型：{{.T.res.product_type}}</li>
 							<li class="row-list nofloat">产品价格：{{.T.res.order_money}}元</li>
+							{{if .T.res.user_mail}}
+							<li class="row-list nofloat">邮箱地址：{{.T.res.user_mail}}</li>
+							{{else}}
+							<li class="row-list nofloat">邮箱地址：-</li>
+							{{end}}
 						</ul>
 						<div class="line"></div>
 						<ul class="row third"  style="margin-top:20px  !important;padding-right: 0px;">