修复文件换行符bug

application/admin/view/agent/agent_manage/index.php

@@ -8,6 +8,7 @@
 <link href="{__FRAME_PATH}css/plugins/footable/footable.core.css" rel="stylesheet">
 <script src="{__PLUG_PATH}sweetalert2/sweetalert2.all.min.js"></script>
 <script src="{__FRAME_PATH}js/plugins/footable/footable.all.min.js"></script>
+<script src="{__ADMIN_PATH}js/layuiList.js"></script>
 <style>
     .on-tag{background-color: #eea91e;}
     .height-auto{height: 300px;}
@@ -547,7 +548,8 @@
             }
         }
         var str = chk_value.join(',');
-        var url = "http://"+window.location.host+"/admin/store.store_coupon/grant/id/"+str;
+//        var url = "http://"+window.location.host+"/admin/store.store_coupon/grant/id/"+str;
+        var url = layList.U({c:'store.store_coupon',a:'grant',p:{id:str}});
         $eb.createModalFrame(this.innerText,url,{'w':800});
     })
     $('.news').on('click',function (e) {
@@ -570,7 +572,8 @@
             }
         }
         var str = chk_value.join(',');
-        var url = "http://"+window.location.host+"/admin/wechat.wechat_news_category/send_news/id/"+str;
+//        var url = "http://"+window.location.host+"/admin/wechat.wechat_news_category/send_news/id/"+str;
+        var url = layList.U({c:'wechat.wechat_news_category',a:'send_news',p:{id:str}});
         $eb.createModalFrame(this.innerText,url,{'w':800});
     })
     $('.synchro').on('click',function(){

application/routine/model/store/StoreBargain.php

@@ -156,4 +156,15 @@ class StoreBargain extends ModelBasic
         if(!$id) return false;
         return self::where('id',$id)->inc('look',1)->update();
     }
+
+    /**
+     * TODO  判断是否可以出售
+     * @param $id
+     * @param int $cartNum
+     * @return int|string
+     * @throws \think\Exception
+     */
+    public static function isValidCartBargain($id,$cartNum = 1){
+       return self::validWhere()->where('id',$id)->where('stock','>',$cartNum)->count();
+    }
 }

application/routine/model/store/StoreBargainUser.php

@@ -115,7 +115,7 @@ class StoreBargainUser extends ModelBasic
      */
     public static function getBargainUserDiffPrice($bargainId = 0,$bargainUserId = 0){
         $price = self::where('bargain_id',$bargainId)->where('uid',$bargainUserId)->field('bargain_price,bargain_price_min')->find()->toArray();
-        return (float)bcsub($price['bargain_price'],$price['bargain_price_min'],0);
+        return (float)bcsub($price['bargain_price'],$price['bargain_price_min'],2);
     }
 
     /**

application/routine/model/store/StoreCombination.php

@@ -157,4 +157,15 @@ class StoreCombination extends ModelBasic
         return $model->count();
     }
 
+    /**
+     * TODO  判断是否可以出售
+     * @param $id
+     * @param int $cartNum
+     * @return int|string
+     * @throws \think\Exception
+     */
+    public static function isValidCartCombination($id,$cartNum = 1){
+        return self::where('id',$id)->where('is_del',0)->where('is_show',1)->where('stock','>',$cartNum)->count();
+    }
+
 }