Merge branch 'refs/heads/master' into stable

app/Distributor/Actions/SmmAddAccount.php

@@ -33,6 +33,17 @@ class SmmAddAccount extends RowAction
         $this->mediaName = $mediaName;
     }
 
+    public function confirm()
+    {
+        $click_privacy = "<a href='/privacy_policy.html' target='_blank'>".admin_trans_label('click_privacy')."</a>";
+        return [
+            // 确认弹窗 title
+            admin_trans_label('read_privacy'),
+            // 确认弹窗 content
+            $click_privacy
+        ];
+    }
+
     /**
      * 处理请求
      *

app/Distributor/Controllers/DistProductController.php

@@ -55,7 +55,7 @@ class DistProductController extends AdminDistController
                 return $this->_index+1;
             });
             $grid->column('title');
-            $grid->column('sku');
+           // $grid->column('sku');
 
             $grid->column('dist_product_category.name',admin_trans_label('category_name'));
             $grid->column('images')->display(function ($images) {
@@ -78,8 +78,8 @@ class DistProductController extends AdminDistController
                 }
                 return $status;
             });
+            $grid->column('updated_at')->sortable();
             $grid->column('created_at')->sortable();
-            //$grid->column('updated_at')->sortable();
             // 筛选
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel();

lang/en/global.php

@@ -258,6 +258,8 @@ return [
         'post_message_limit' => 'The length of the post exceeds the limit.',
         'post_message_help' => 'Tweets are limited to 280 characters and will be automatically intercepted if the limit is exceeded.',
         'account_send_limit' => 'The number of account sendings has reached the limit.',
+        'read_privacy' => 'Please read the privacy policy',
+        'click_privacy' => 'Click to view the privacy policy',
     ],
     'options' => [
         //

lang/zh_CN/global.php

@@ -268,6 +268,8 @@ return [
         'post_message_limit'    => '帖子内容长度超过限制',
         'post_message_help' => '推特仅可输入 280 字符，超限系统将自动截取。',
         'account_send_limit'    => '帐号发送次数已达上限',
+        'read_privacy'          => '请阅读隐私政策',
+        'click_privacy'         => '点击查看隐私政策',
     ],
     'options' => [
         //