1

app/admin/controller/BestKnowledge.php

@@ -216,6 +216,11 @@ class BestKnowledge extends Controller
             $vo['imgs'] = implode(',',explode('|',$vo['imgs']));
             $vo['audit'] =2;
             unset($vo['user']);
+            if(isset($vo['audit_at'])){
+                if($vo['audit_at'] == '' || $vo['audit_at'] == null){
+                    unset($vo['audit_at']);
+                }
+            }
             if(isset($vo['filename']))
             {
                 unset($vo['filename']);

app/admin/controller/ShipYard.php

@@ -105,9 +105,10 @@ class ShipYard extends Controller
 //            $vo['audit'] =2;
 //            print_r($vo);
             $vo['create_at']=Carbon::now()->toDateTimeString();
+            $vo['update_at'] = date('Y-m-d H:i:s');
             unset($vo['pos']);
             isset($vo['id']) ? DataShipyard::mk()->where('id',$vo['id'])->update($vo) : '';
             $this->success('数据更新成功',$vo);
         }
     }
-}
+}

app/admin/controller/ShopCoor.php

@@ -79,7 +79,7 @@ class ShopCoor extends Controller
                     'name'=>['require',],
                     'spec'=>['require',],
                     'number'=>['require','integer'],
-                    'enclosure'=>['require',],
+//                    'enclosure'=>['require',],
 //                    'price'=>['require','float'],
                 ]);
                 if(!$make){
@@ -99,4 +99,4 @@ class ShopCoor extends Controller
             $this->success('保存成功');
         }
     }
-}
+}

app/admin/controller/ShopProduction.php

@@ -82,7 +82,7 @@ class ShopProduction extends Controller
                     'number'=>['require','integer'],
 //                    'standard'=>['require',],
 //                    'price'=>['require','float'],
-                    'enclosure'=>['require',],
+//                    'enclosure'=>['require',],
                 ]);
                 if(!$make){
                     $this->error('请填写正确的商品信息');
@@ -103,4 +103,4 @@ class ShopProduction extends Controller
             $this->success('保存成功');
         }
     }
-}
+}

app/admin/controller/TeachingKnowledge.php

@@ -88,8 +88,18 @@ class TeachingKnowledge extends Controller
                 $this->fetch('form');
             }
         }elseif ($this->request->isPost()){
-
-
+            unset($vo['user']);
+            if(isset($vo['audit_at'])){
+                if($vo['audit_at'] == '' || $vo['audit_at'] == null){
+                    unset($vo['audit_at']);
+                }
+            }
+            if(isset($vo['filename']))
+            {
+                unset($vo['filename']);
+            }
+            isset($vo['id']) ? DataTeachingKnowledge::mk()->where('id',$vo['id'])->update($vo) : DataBestKnowledge::mk()->insert($vo);
+            $this->success('数据更新成功');
         }
     }
     /**

app/admin/controller/Xw.php

@@ -201,6 +201,14 @@ class Xw extends Controller
         ]);
     }
 
+    public function _form_filter($vo){
+
+        if ($this->request->isGet()) {
+
+        }elseif ($this->request->isPost()){
+            $vo['user_id'] = null;
+        }
+    }
 
     /**
      * 表单结果处理

app/admin/view/recruitment/form.html

@@ -160,18 +160,22 @@
     var salary_end = vo['salary_end'];
     var salary_start = vo['salary_start'];
     console.log()
-    if(typeof(salary_end) !== "number"){
-        if(salary_end.charAt(salary_end.length - 1) === 'K'){
-            console.log((salary_end.slice(0,salary_end.length - 1)) * 1000);
-            $('[name="salary_end"]').attr('value', (salary_end.slice(0,salary_end.length - 1)) * 1000);
-        };
+    if(salary_end){
+        if(typeof(salary_end) !== "number"){
+            if(salary_end.charAt(salary_end.length - 1) === 'K'){
+                console.log((salary_end.slice(0,salary_end.length - 1)) * 1000);
+                $('[name="salary_end"]').attr('value', (salary_end.slice(0,salary_end.length - 1)) * 1000);
+            };
+        }
     }
 
-    if(typeof(salary_start) !== "number"){
-    if(salary_start.charAt(salary_start.length - 1) === 'K'){
-        console.log((salary_start.slice(0,salary_start.length - 1)) * 1000);
-        $('[name="salary_start"]').attr('value', (salary_start.slice(0,salary_start.length - 1)) * 1000);
-    };
+    if(salary_start){
+        if(typeof(salary_start) !== "number"){
+            if(salary_start.charAt(salary_start.length - 1) === 'K'){
+                console.log((salary_start.slice(0,salary_start.length - 1)) * 1000);
+                $('[name="salary_start"]').attr('value', (salary_start.slice(0,salary_start.length - 1)) * 1000);
+            };
+        }
     }
 
 </script>

app/admin/view/shop_coor/add.html

@@ -60,7 +60,7 @@
                     <el-button @click="addFiles(null,item.enclosure)">增加</el-button>
                     <div>
                         <span v-for="(val,idx) in item.enclosure" :key="idx">
-                            <el-tag type="text" @close="item.enclosure.splice(idx,1)" closable>文件{{idx+1}}</el-tag>
+                            <el-tag type="text" @close="item.enclosure.splice(idx,1)" closable>{{val.filename}}</el-tag>
                         </span>
                     </div>
                 </el-form-item>
@@ -131,6 +131,7 @@
                         this.$message.error('请上传正确的格式')
                         return
                     }
+                    form.push({fileurl:obj.data.url,filename:obj.data.url.split('/')[obj.data.url.split('/').length-1]})
                     this.form.file.push({
                         type:type,
                         src:obj.data.url
@@ -145,7 +146,8 @@
                         this.$message.error('请上传正确的格式')
                         return
                     }
-                    form.push(obj.data.url)
+                    form.push({fileurl:obj.data.url,filename:obj.data.url.split('/')[obj.data.url.split('/').length-1]})
+                    // form.push(obj.data.url)
                 });
                 $('#fileUpload').trigger('click')
             },

app/admin/view/shop_production/add.html

@@ -60,7 +60,7 @@
                     <el-button @click="addFiles(null,item.enclosure)">增加</el-button>
                     <div>
                         <span v-for="(val,idx) in item.enclosure" :key="idx">
-                            <el-tag type="text" @close="item.enclosure.splice(idx,1)" closable>文件{{idx+1}}</el-tag>
+                            <el-tag type="text" @close="item.enclosure.splice(idx,1)" closable>{{val.filename}}</el-tag>
                         </span>
                     </div>
                 </el-form-item>

app/data/controller/api/Auth.php

@@ -84,8 +84,8 @@ abstract class Auth extends Controller
             if($this->uuid) {
                 $user = UserAdminService::get($this->uuid, $this->type);
                 if (!$user['status']) $this->error('账户已被冻结！',null,401);
-                if($user['shipyard'])$user['shipyard']['login_url']='https://ship-expert.zhousi.hdlkeji.com/shipyard.php';
-                if($user['merchants'])$user['merchants']['login_url']='https://ship-expert.zhousi.hdlkeji.com/ship.php';
+                if($user['shipyard'])$user['shipyard']['login_url']='https://ship.shipcc.cn/shipyard.php';
+                if($user['merchants'])$user['merchants']['login_url']='https://ship.shipcc.cn/ship.php';
                 return $user;
             }
             return [];

app/data/controller/api/Order.php

@@ -115,10 +115,18 @@ class Order extends Auth
             'pay_no'=>$pay_no,
             'money'=>$order_money,
             'status'=>1,
-            'create_at'=>date('Y-m-d H:i:s')
+            'create_at'=>date('Y-m-d H:i:s'),
+            'cart_ids' => $cart_ids
         ];
-        ShopOrderPay::mk()->insert($pay_data);
+
         ShopGoodsCart::mk()->whereIn('id',$cart_ids)->delete();
+        if($order_money <= 0){
+            $pay_a = ShopOrderPay::mk()->where(array('cart_ids'=>$cart_ids))->find();
+            $pay_no = $pay_a['pay_no'];
+        }else{
+            ShopOrderPay::mk()->insert($pay_data);
+        }
+
 
         $this->success('快去支付吧',$pay_no);
 
@@ -166,7 +174,6 @@ class Order extends Auth
             }
             ShopOrder::mk()->where('payment_trade',$order_no)->save(['payment_type'=>$payment_type]);
             $notify_url = sysuri("@data/api.notify/{$notify_name}/scene/order/param/{$code}", [], false, true);
-
             $parm = ['uuid'=>$this->uuid];
             $pay =PaymentService::instance($code)->create($user['openid1'],$order_no,$all_price,'商品下单支付','商品下单支付','','',$notify_url,$parm);
             $retrun_data['order_no'] = $order_no;

app/data/controller/api/auth/Purchase.php

@@ -119,6 +119,7 @@ class Purchase extends Auth
             default:
                 $this->error('类型必须');
         }
+
         if($request['sort']==1){
             $query
                 ->field("*,st_distance(point(`longitude`,`latitude`),point({$request['longitude']},{$request['latitude']})) as distance")
@@ -132,7 +133,6 @@ class Purchase extends Auth
 
         $list=$query
             ->paginate($request['limit']?:15)->toArray();
-
         if($request['tab'] == 1){
             foreach ($list['data'] as $k=>$v){
                 $count = count($v['items']);
@@ -148,6 +148,7 @@ class Purchase extends Auth
             }
             $list['data'] = array_values($list['data']);
         }
+
         $this->success('',$list);
     }
 
@@ -746,4 +747,4 @@ class Purchase extends Auth
        // echo DataUserLeaveMessage::getLastSql();die;
         $this->success('成功',$messagelist);
     }
-}
+}

app/data/controller/api/business/Goods.php

@@ -69,12 +69,15 @@ class Goods extends Controller
                     break;
                 case '售卖中':
                     $where['status']=1;
+                    $where['examine']=1;
                     break;
                 case '已下架':
                     $where['status']=0;
+                    $where['examine']=1;
                     break;
                 case '已售罄':
                     $where['status']=2;
+                    $where['examine']=1;
             }
             $v=ShopGoods::mk()->where('admin_id',$admin_id->id)->where('deleted',0)->where($where)->count();
         }
@@ -85,7 +88,12 @@ class Goods extends Controller
             $ids[]= ['cateids','find in set' ,$cateids];
         }
         $query = ShopGoods::mQuery()->like('name')->equal('code,status')->in('examine');
-        $result = $query->where('admin_id',$admin_id->id)->where($ids)->where('deleted',0)->order('id desc')->page(true, false, false, 10);
+        if(input('status') != ''){
+            $result = $query->where('admin_id',$admin_id->id)->where($ids)->where('deleted',0)->order('id desc')->where('examine',1)->page(true, false, false, 10);
+        }else{
+            $result = $query->where('admin_id',$admin_id->id)->where($ids)->where('deleted',0)->order('id desc')->page(true, false, false, 10);
+        }
+
         foreach ($result['list'] as &$v){
             if($v['stock_total'] == 0){
                 ShopGoods::mk()->where('id',$v['id'])->save(['status'=>2]);

app/data/controller/api/business/Purchase.php

@@ -214,6 +214,13 @@ class Purchase extends Controller
         ];
         input('standard_tech')?$purchase_data['standard_tech']=input('standard_tech'):'';
         input('standard_check')?$purchase_data['standard_check']=input('standard_check'):'';
+        $input = input();
+        if(!isset($input['standard_tech'])){
+            $purchase_data['standard_tech'] = '';
+        }
+        if(!isset($input['standard_check'])){
+            $purchase_data['standard_tech'] = '';
+        }
         Db::startTrans();
         try {
             if($request['id']) {
@@ -448,8 +455,10 @@ class Purchase extends Controller
      * @Returned("参考用户端采购订单列表")
      */
     public function list(Request $request){
+
         $status=$request['status'];
         $tab=$request['tab']?:1;
+
         $query=ShopPurchase::getQuery($tab);
         $list=$query
             ->where('admin_id',$this->uuid()->id)

app/data/model/helpers/PurchaseItemEnclosure.php

@@ -11,11 +11,13 @@ trait PurchaseItemEnclosure{
     public function getEnclosureAttr($file){
         $files=json_decode($file,true)?:[];
         foreach ($files as &$file){
-            $file['icon']=sprintf('%s/static/images/ext/pdf.png',request()->domain());
+            if(isset($file['icon'])){
+                $file['icon']=sprintf('%s/static/images/ext/pdf.png',request()->domain());
+            }
         }
         return $files;
     }
     public function setEnclosureAttr($file){
         return json_encode($file?:[],256);
     }
-}
+}