Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

liujie

昨天 f7ef2230af6dc8a55c2b5bd6505eed8586c87f75

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_detail_two.html

@@ -111,6 +111,7 @@
                    <div class="col-sm-9">
                        <input type="radio" name="redemptionMethod" value="1" checked onclick="updateMethod(1)"> 积分
                        <input type="radio" name="redemptionMethod" value="2" onclick="updateMethod(2)"> 现金+积分
                        <input type="radio" name="redemptionMethod" value="3" onclick="updateMethod(3)"> 现金
                    </div>
                </div>

@@ -234,8 +235,8 @@
            $("#y4").show()
            $("#y3").show()
        }else if(e==3){
            $("#y1").hide()
            $("#y2").show()
            $("#y4").hide()
            $("#y3").show()
        }else if(e==4){
            $("#y1").show()
            $("#y2").show()