Skip to content

Commit

Permalink
修复bug
Browse files Browse the repository at this point in the history
  • Loading branch information
heyunpeng committed Jul 26, 2015
1 parent c6f7490 commit 58c0269
Show file tree
Hide file tree
Showing 11 changed files with 6,132 additions and 23 deletions.
Binary file modified app/.DS_Store
View file
Binary file not shown.
Binary file modified app/assets/.DS_Store
View file
Binary file not shown.
Binary file modified app/assets/images/index.swf
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions app/controllers/tracelogs_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ def single
tracelog.gametype = 3
tracelog.coin = params[:tracelogs]["flag#{i}_3"]
tracelog.save
@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
"coin"=>tracelog.coin,"award"=>(tracelog.coin.to_i*tracelog.mulbability)}
end
if params[:tracelogs]["flag#{i}_4"].to_i > 0
tracelog = Tracelog.new
Expand Down
2 changes: 1 addition & 1 deletion app/views/combinationgame/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ function xprint() {
总投注额:<span style="color:red;margin-right:10px" id="coinnums">0</span>
<%= f.hidden_field :totalcoin, id:"cointotal", value:0 %>
<button type="button", style="height:20px;width:60px;margin-right:10px", onclick="resetcoin()">重填</button>
<%= f.submit "下注", style:"height:20px;width:60px"%>
<%= f.submit "下注", style:"height:20px;width:60px", :onclick=>'return confirm("确认下注");'%>
</div></td>
</tfoot>
<%end%>
Expand Down
4 changes: 3 additions & 1 deletion app/views/doublegame/_doublegame.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
<% for info in @result %>
<tr>
<td rowspan="2">注单号</td>
<td>项目:<%=info["pos"]%></td>
<td>项目:<%if info["pos"]==1%>壹<%elsif info["pos"]==2%>贰<%elsif info["pos"]==3%>叁<%elsif info["pos"]%>肆
<%elsif info["pos"]==4%>肆<%elsif info["pos"]==5%>伍<%elsif info["pos"]==6%>陆<%elsif info["pos"]==7%>柒
<%elsif info["pos"]==8%>捌<%else%>镹<%end%></td>
</tr>
<tr>
<td>牌面:<%if info["gametype"]==1%>大<%elsif info["gametype"]==2%>和<%elsif info["gametype"]==3%>小<%end%></td>
Expand Down
20 changes: 10 additions & 10 deletions app/views/doublegame/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function xprint() {
</tr>
<tr class="even">
<td>
<p>1</p>
<p>壹</p>
</td>
<% @gridconfigs.each do |config| %>
<td class="nums">
Expand All @@ -172,7 +172,7 @@ function xprint() {
</tr>
<tr class="even">
<td>
<p>2</p>
<p>贰</p>
</td>
<% @gridconfigs.each do |config| %>
<td class="nums">
Expand All @@ -188,7 +188,7 @@ function xprint() {
</tr>
<tr class="even">
<td>
<p>3</p>
<p>叁</p>
</td>
<% @gridconfigs.each do |config| %>
<td class="nums">
Expand All @@ -204,7 +204,7 @@ function xprint() {
</tr>
<tr class="even">
<td>
<p>4</p>
<p>肆</p>
</td>
<% @gridconfigs.each do |config| %>
<td class="nums">
Expand All @@ -220,7 +220,7 @@ function xprint() {
</tr>
<tr class="even">
<td>
<p>5</p>
<p>伍</p>
</td>
<% @gridconfigs.each do |config| %>
<td class="nums">
Expand All @@ -236,7 +236,7 @@ function xprint() {
</tr>
<tr class="even">
<td>
<p>6</p>
<p>陆</p>
</td>
<% @gridconfigs.each do |config| %>
<td class="nums">
Expand All @@ -252,7 +252,7 @@ function xprint() {
</tr>
<tr class="even">
<td>
<p>7</p>
<p>柒</p>
</td>
<% @gridconfigs.each do |config| %>
<td class="nums">
Expand All @@ -268,7 +268,7 @@ function xprint() {
</tr>
<tr class="even">
<td>
<p>8</p>
<p>捌</p>
</td>
<% @gridconfigs.each do |config| %>
<td class="nums">
Expand All @@ -284,7 +284,7 @@ function xprint() {
</tr>
<tr class="even">
<td>
<p>9</p>
<p>镹</p>
</td>
<% @gridconfigs.each do |config| %>
<td class="nums">
Expand All @@ -305,7 +305,7 @@ function xprint() {
总投注额:<span style="color:red;margin-right:10px" id="coinnums">0</span>
<%= f.hidden_field :totalcoin, id:"cointotal", value:0 %>
<button type="button", style="height:20px;width:60px;margin-right:10px", onclick="resetcoin()">重填</button>
<%= f.submit "下注", style:"height:20px;width:60px"%>
<%= f.submit "下注", style:"height:20px;width:60px", :onclick=>'return confirm("确认下注");'%>
</div></td>
</tfoot>
<%end%>
Expand Down
4 changes: 3 additions & 1 deletion app/views/singlegame/_singlegame.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
<% for info in @result %>
<tr>
<td rowspan="2">注单号</td>
<td>项目:<%=info["pos"]%></td>
<td>项目:<%if info["pos"]==1%>壹<%elsif info["pos"]==2%>贰<%elsif info["pos"]==3%>叁<%elsif info["pos"]%>肆
<%elsif info["pos"]==4%>肆<%elsif info["pos"]==5%>伍<%elsif info["pos"]==6%>陆<%elsif info["pos"]==7%>柒
<%elsif info["pos"]==8%>捌<%else%>镹<%end%></td>
</tr>
<tr>
<td>牌面:<%if info["gametype"]==1%>A<%elsif info["gametype"] < 10%><%=info["gametype"]%>
Expand Down
20 changes: 10 additions & 10 deletions app/views/singlegame/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function xprint() {
<td colspan="14">牌面</td>
</tr>
<tr class="even">
<td rowspan="2" style="width:30px;"><p>1</p></td>
<td rowspan="2" style="width:30px;"><p>壹</p></td>
<font color="blue"><td class="nums">A<%= f.text_field :flag1_1, class:"reccheck", size:6 %></td>
<td class="nums">2<%= f.text_field :flag1_2, class:"reccheck", size:6 %></td>
<td class="nums">3<%= f.text_field :flag1_3, class:"reccheck", size:6 %></td>
Expand All @@ -166,7 +166,7 @@ function xprint() {
<td></td>
</tr>
<tr class="odd">
<td rowspan="2" style="width:30px;"><p>2</p></td>
<td rowspan="2" style="width:30px;"><p>贰</p></td>
<font color="blue"><td class="nums">A<%= f.text_field :flag2_1, class:"reccheck", size:6 %>
<td class="nums">2<%= f.text_field :flag2_2, class:"reccheck", size:6 %>
<td class="nums">3<%= f.text_field :flag2_3, class:"reccheck", size:6 %>
Expand All @@ -187,7 +187,7 @@ function xprint() {
</td>
</tr>
<tr class="even">
<td rowspan="2" style="width:30px;"><p>3</p></td>
<td rowspan="2" style="width:30px;"><p>叁</p></td>
<font color="blue"><td class="nums">A<%= f.text_field :flag3_1, class:"reccheck", size:6 %>
<td class="nums">2<%= f.text_field :flag3_2, class:"reccheck", size:6 %>
<td class="nums">3<%= f.text_field :flag3_3, class:"reccheck", size:6 %>
Expand All @@ -208,7 +208,7 @@ function xprint() {
</td>
</tr>
<tr class="odd">
<td rowspan="2" style="width:30px;"><p>4</p></td>
<td rowspan="2" style="width:30px;"><p>肆</p></td>
<font color="blue"><td class="nums">A<%= f.text_field :flag4_1, class:"reccheck", size:6 %>
<td class="nums">2<%= f.text_field :flag4_2, class:"reccheck", size:6 %>
<td class="nums">3<%= f.text_field :flag4_3, class:"reccheck", size:6 %>
Expand All @@ -229,7 +229,7 @@ function xprint() {
</td>
</tr>
<tr class="even">
<td rowspan="2" style="width:30px;"><p>5</p></td>
<td rowspan="2" style="width:30px;"><p>伍</p></td>
<font color="blue"><td class="nums">A<%= f.text_field :flag5_1, class:"reccheck", size:6 %>
<td class="nums">2<%= f.text_field :flag5_2, class:"reccheck", size:6 %>
<td class="nums">3<%= f.text_field :flag5_3, class:"reccheck", size:6 %>
Expand All @@ -250,7 +250,7 @@ function xprint() {
</td>
</tr>
<tr class="odd">
<td rowspan="2" style="width:30px;"><p>6</p></td>
<td rowspan="2" style="width:30px;"><p>陆</p></td>
<font color="blue"><td class="nums">A<%= f.text_field :flag6_1, class:"reccheck", size:6 %>
<td class="nums">2<%= f.text_field :flag6_2, class:"reccheck", size:6 %>
<td class="nums">3<%= f.text_field :flag6_3, class:"reccheck", size:6 %>
Expand All @@ -271,7 +271,7 @@ function xprint() {
</td>
</tr>
<tr class="even">
<td rowspan="2" style="width:30px;"><p>7</p></td>
<td rowspan="2" style="width:30px;"><p>柒</p></td>
<font color="blue"><td class="nums">A<%= f.text_field :flag7_1, class:"reccheck", size:6 %>
<td class="nums">2<%= f.text_field :flag7_2, class:"reccheck", size:6 %>
<td class="nums">3<%= f.text_field :flag7_3, class:"reccheck", size:6 %>
Expand All @@ -292,7 +292,7 @@ function xprint() {
</td>
</tr>
<tr class="odd">
<td rowspan="2" style="width:30px;"><p>8</p></td>
<td rowspan="2" style="width:30px;"><p>捌</p></td>
<font color="blue"><td class="nums">A<%= f.text_field :flag8_1, class:"reccheck", size:6 %>
<td class="nums">2<%= f.text_field :flag8_2, class:"reccheck", size:6 %>
<td class="nums">3<%= f.text_field :flag8_3, class:"reccheck", size:6 %>
Expand All @@ -313,7 +313,7 @@ function xprint() {
</td>
</tr>
<tr class="even">
<td rowspan="2" style="width:30px;"><p>9</p></td>
<td rowspan="2" style="width:30px;"><p>镹</p></td>
<font color="blue"><td class="nums">A<%= f.text_field :flag9_1, class:"reccheck", size:6 %>
<td class="nums">2<%= f.text_field :flag9_2, class:"reccheck", size:6 %>
<td class="nums">3<%= f.text_field :flag9_3, class:"reccheck", size:6 %>
Expand All @@ -339,7 +339,7 @@ function xprint() {
总投注额:<span style="color:red;margin-right:10px" id="coinnums">0</span>
<%= f.hidden_field :totalcoin, id:"cointotal", value:0 %>
<button type="button", style="height:20px;width:60px;margin-right:10px", onclick="resetcoin()">重填</button>
<%= f.submit "下注", style:"height:20px;width:60px"%>
<%= f.submit "下注", style:"height:20px;width:60px", :onclick=>'return confirm("确认下注");'%>
</div></td>
</tr>
</tfoot>
Expand Down
Binary file modified db/development.sqlite3
View file
Binary file not shown.
Loading

0 comments on commit 58c0269

Please sign in to comment.