Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/User.php

@@ -107,7 +107,7 @@ class User extends BaseController
         if($stn!=false){
           $plat =isset($stn['platform'])?explode(",",$stn['platform']):"";
           if($plat!=""){
-              $platform = Db::name('platform')->where(['id'=>$stn['platform'],'is_del'=>0])->column("id,platform_name,platform_code");
+              $platform = Db::name('platform')->where(['id'=>$plat,'is_del'=>0])->column("id,platform_name,platform_code");
              $info=$platform;
           }
 

app/admin/model/ChangeLog.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+class ChangeLog extends Model
+{
+    static function logAdd($type,$code,$before_info,$after_info,$token,$post){
+        $user = GetUserInfo($token);
+        unset($post['token']);
+        $createrid= isset($user['data']['id']) ? $user['data']['id'] :0;
+        $creater = isset($user['data']['nickname']) ? $user['data']['nickname'] :'';
+        $db = array_diff($before_info,$after_info);
+        $data=[
+            "createrid"=>$createrid,
+            "creater"=>$creater,
+            "before_info"=>isset($before_info[ 'before_info']) ? trim($before_info['before_info']) :"",
+            "after_info"=>$db,
+            "code"=>isset($code['code']) ? trim($code['code']."") :"",
+            "type"=>$type,
+            "action_data"=>json_encode($post),
+            "addtime"=>date("Y-m-d H:i:s"),
+            "updatetime"=>date("Y-m-d H:i:s")
+        ];
+        self::insert($data);
+    }
+}

app/common.php

@@ -752,8 +752,4 @@ function GoodPrice($data,$cost_rate=0){
     $rate = ($data['open_fee']/$data['num']+ $data['cost_fee']+$data['packing_fee']+$data["mark_fee"]+$data["cert_fee"]+$data['nake_fee'])/(1-$cost_rate
         );
     return $rate;
-}
-
-
-
-
+}