Merge branch 'room_detail' of 121.43.114.153:/home/git/repositories/shopnc into room_detail

mobile/templates/default/talk/steps_detail.php

@@ -33,11 +33,21 @@
             width: 40px;
             height: 40px;
         }
-        h3.title {
+        .title {
+            overflow: hidden;
+        }
+        .title h3{
             font-size: 15px;
             margin-left: 20px;
             margin-top: 10px;
         }
+        .title span {
+            font-size: 14px;
+            font-weight: 400;
+            color: #333333;
+            margin-right: 20px;
+            margin-top: 12px;
+        }
         .weui-btn_primary {
             background: #2B2B2B;
         }
@@ -100,7 +110,10 @@
 </div>
 
 
-<h3 class="title">步数捐赠至</h3>
+<div class="title">
+    <h3 style="float: left;">步数捐赠至</h3>
+    <span style="float:right;"></span>
+</div>
 
 <div class="group_list">
     <div class="weui-cells">
@@ -141,6 +154,7 @@
         bridge.call_native_handler('on_native_click', JSON.stringify(jsInit),function(res){
             var datas = JSON.parse(res);
             $('.today_num').text("步数："+datas.now);
+            $('.title span').text("可兑换"+(datas.now/<?php echo $output['donate_rate'];?>)+"元");
             app_steps = datas.now;
         });