app升级

app/admin/view/shop/shop_delivery/index.html

@@ -56,10 +56,7 @@
                 {field: 'price', title: __('发货价'),operate: false},
                 {field: 'total_price', title: __('总价'),operate: false},
                 {field: 'ship_date', title: __('录入时间'), width:120, operate:"date" },
-                {field: 'settlement_data', title: __('结算时间'),width: 120,operate:'date', formatter(value, row, index) {
-                    if(value ==0)  return "-";
-                    return value;
-                }},
+                {field: 'settlement_data', title: __('结算时间'),width: 120,operate:'date'},
                 {field: 'status', title: __('结算状态'), operate: 'select', width:120,searchList: {1: __('待结算'),2: __('已结算')},formatter:Yunqi.formatter.tag},
                 {field: 'createtime', title: __('创建时间'), width:160,formatter: Yunqi.formatter.datetime,operate:false,sortable: true},
                 {field: 'user.nickname', title: __('录入人'),operate: false},

app/api/controller/Index.php

@@ -13,7 +13,7 @@ use think\facade\Db;
 class Index extends Base
 {
 
-
+      protected $noNeedLogin = ['getAppVersion'];
 
       //首页数据分组统计品种
       public function index(StockLog $stockLog)
@@ -56,6 +56,13 @@ class Index extends Base
             $this->success('ok', $result);
       }
 
+      //app版本升级配置
+      public function getAppVersion(){
+            $this->success('ok', 
+            ['version' => site_config('addonsd.app_version'), 
+            'url' => site_config('addonsd.app_address'), 
+            'content' => site_config('addonsd.app_describe')]);
+      }
 
       /**
      * @return void 全部平台
@@ -68,7 +75,6 @@ class Index extends Base
 
       //获取店铺
       public function getShop(ShopList $shopList){
-            
             $platform_id = $this->request->post('platform_id/d');
             if(empty($platform_id)){
                   $this->error('参数有误');

app/api/controller/Shops.php

@@ -46,7 +46,7 @@ class Shops extends Base
                 ->leftjoin('customer u', 'a.customer_id = u.id') //客户
                 ->field('a.id,a.plat_id,a.shop_id,a.ship_date,a.settlement_data,a.createtime,a.num, b.name shop_name,c.title variety_name,d.title spec_name,u.name customer_name')
                 ->where($where)
-                ->order('a.id desc')
+                ->order('a.ship_date desc')
                 ->paginate($limit);
         $this->success('ok', $result);
     }

app/api/route/route.php

@@ -23,6 +23,8 @@ Route::group('user', function () {
     Route::rule('index','index/index','POST');
     //库存统计
     Route::rule('statistics','index/statistics','POST');
+    //app版本升级配置
+    Route::rule('appversion','index/getAppVersion','POST');
 
     //添加记录
     Route::rule('create','shops/create','POST');

app/api/validate/Shop.php

@@ -23,8 +23,6 @@ class Shop extends Validate
         'ship_date' => '参数有误',
     ];
 
-
- 
     protected $scene = [
         'add'  =>  ['plat_id','shop_id','variety', 'ship_date'],
         'edit' =>  ['ids','num'],