移动查询用户信息的参数，由uuid改成imid

donate-service/src/main/java/com/uas/service/donate/controller/AppController.java

@@ -43,7 +43,7 @@ public class AppController {
      */
     @ResponseBody
     @RequestMapping(value = "/appIndex",method = RequestMethod.GET)
-    public ModelMap returnapp(@RequestParam(value = "useFor",defaultValue ="donate")String useFor){
+    public ModelMap returnapp(@RequestParam(value = "useFor",defaultValue ="donate-app")String useFor){
         ModelMap modelMap=new ModelMap();
         Double totality=projectRecodeService.totality();
         //存入捐款总数
@@ -105,8 +105,9 @@ public class AppController {
      * 传入用户UUID
      */
     @ResponseBody
-    @RequestMapping(value = "/donateDetail/{uuid}",method = RequestMethod.GET)
-    public ModelMap projectRecodeList(@PathVariable("uuid") Long uuid){
+    @RequestMapping(value = "/donateDetail/{imid}",method = RequestMethod.GET)
+    public ModelMap projectRecodeList(@PathVariable("imid") Long imid)throws Exception{
+        Long uuid=AccountUtils.getUserUUByImId(imid);
         ModelMap modelMap=new ModelMap();
         List<ProjectRecode> projectRecodeList=projectRecodeService.findByuuid(uuid);
         modelMap.put("projectRecodeList",projectRecodeList);
@@ -123,8 +124,9 @@ public class AppController {
      * 查询某一用户参与的活动
      */
     @ResponseBody
-    @RequestMapping(value = "/joinActivity/{uuid}",method = RequestMethod.GET)
-    public ModelMap queryOne(@PathVariable("uuid")Long uuid){
+    @RequestMapping(value = "/joinActivity/{imid}",method = RequestMethod.GET)
+    public ModelMap queryOne(@PathVariable("imid")Long imid)throws Exception{
+        Long uuid=AccountUtils.getUserUUByImId(imid);
         ModelMap modelMap=new ModelMap();
         List<ActivityRecode> activityRecodeList=activityRecodeService.queryOne(uuid);
         modelMap.put("activityRecodeList",activityRecodeList);

donate-service/src/main/resources/templates/index.ftl

@@ -402,21 +402,6 @@
             width: 190px;
             height: 30px;
             line-height: 30px;
-        /*捐款完成*/
-        .section2 .list-item a.donationOver{
-            display: inline-block;
-            width: 190px;
-            height: 30px;
-            line-height: 30px;
-            font-size: 14px;
-            text-align: center;
-            background: #acabab !important;
-            color: #fff;
-            cursor: not-allowed;
-        }
-        /*兑奖日期*/
-        .section2 .list-item .project-progress p{
-            margin-top: 10px;
             font-size: 14px;
             text-align: center;
             background: #a0a0a0;
@@ -818,7 +803,7 @@
                                         <li>100元</li>
                                         <li>200元</li>
                                     </ul>
-                                    <div class="write"><input name="othermoney" type="text" placeholder="其他金额" onkeyup= "if( ! /^d*(?:.d{0,2})?$/.test(this.value)) class="form-control" id="custom-amount${project.id!''}" maxlength="10"/><em>元</em></div>
+                                    <div class="write"><input name="othermoney" type="text" placeholder="其他金额"   onkeyup="clearNoNum(this)" class="form-control" id="custom-amount${project.id!''}" maxlength="10"/><em>元</em></div>
                                 </div>
                             </div>
                             <div class="choose clearfix">
@@ -857,6 +842,16 @@
     </div>
 </div>
 <script>
+    /*设置只能输入数字和一位小数点和一位小数点后面的两位数字*/
+    function clearNoNum(obj){
+        obj.value = obj.value.replace(/[^\d.]/g,"");  //清除“数字”和“.”以外的字符
+        obj.value = obj.value.replace(/\.{2,}/g,"."); //只保留第一个. 清除多余的
+        obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
+        obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3');//只能输入两个小数
+        if(obj.value.indexOf(".")< 0 && obj.value !=""){//以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
+            obj.value= parseFloat(obj.value);
+        }
+    }
     /*生成轮播图*/
     $(document).ready(function () {
         var mySwiper = new Swiper ('.swiper-container', {