Procházet zdrojové kódy

Merge branch 'dev_wf' of wugg/phpstock into version1.5

wufeng před 2 roky
rodič
revize
1791669ab1
1 změnil soubory, kde provedl 2 přidání a 2 odebrání
  1. 2 2
      app/admin/controller/Activity.php

+ 2 - 2
app/admin/controller/Activity.php

@@ -328,8 +328,6 @@ class Activity extends Base
                         $lemp['cost_price']=0;
                         $lemp['sale_price']=0;
                         $lemp['activity_price']=0;
-                        $lemp['is_activity'] = $value['is_activity'];
-                        $lemp['settle_price'] = $value['settle_price'];
                         $lemp['status']=0;
                         $lemp['remark']="";
                         $lemp['is_del']=0;
@@ -448,6 +446,8 @@ class Activity extends Base
                 $temp=[];
                 $temp["id"]=$value['id'];
                 $temp["activity_price"]=$value['activity_price'];
+                $temp['is_activity'] = $value['is_activity'];
+                $temp['settle_price'] = $value['settle_price'];
                 $temp["updatetime"]=date("Y-m-d H:i:s");
                 $up=Db::name("activity_info")->save($temp);
                 if($up==false){