商品删除增加图片选择、支付宝驱动优化去除多余语言

app/admin/controller/Admin.php

@@ -158,7 +158,7 @@ class Admin extends Common
 		$this->IsLogin();
 
 		// 参数
-		$params = $this->data_post;
+		$params = $this->data_request;
 
 		// 不是操作自己的情况下
 		if(!isset($params['id']) || $params['id'] != $this->admin['id'])
@@ -182,7 +182,7 @@ class Admin extends Common
      */
 	public function Delete()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(AdminService::AdminDelete($params));
 	}
@@ -245,7 +245,7 @@ class Admin extends Common
      */
 	public function Login()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		return ApiService::ApiDataReturn(AdminService::Login($params));
 	}
 
@@ -278,7 +278,7 @@ class Admin extends Common
      */
     public function LoginVerifySend()
     {
-        return ApiService::ApiDataReturn(AdminService::LoginVerifySend($this->data_post));
+        return ApiService::ApiDataReturn(AdminService::LoginVerifySend($this->data_request));
     }
 
 	/**

app/admin/controller/Articlecategory.php

@@ -68,7 +68,7 @@ class ArticleCategory extends Base
 	 */
 	public function Delete()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(ArticleCategoryService::ArticleCategoryDelete($params));
 	}

app/admin/controller/Brandcategory.php

@@ -68,7 +68,7 @@ class BrandCategory extends Base
 	 */
 	public function Delete()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(BrandCategoryService::BrandCategoryDelete($params));
 	}

app/admin/controller/Common.php

@@ -113,8 +113,7 @@ class Common extends BaseController
 		$this->admin = AdminService::LoginInfo();
 
 		// 权限菜单
-		$is_refresh = !empty($this->data_request['lang']);
-        $menu = AdminPowerService::PowerMenuInit($this->admin, $is_refresh);
+        $menu = AdminPowerService::PowerMenuInit($this->admin);
 		$this->left_menu = $menu['admin_left_menu'];
 
 		// 视图初始化

app/admin/controller/Design.php

@@ -136,7 +136,7 @@ class Design extends Base
      */
     public function Save()
     {
-        return ApiService::ApiDataReturn(DesignService::DesignSave($this->data_post));
+        return ApiService::ApiDataReturn(DesignService::DesignSave($this->data_request));
     }
 
     /**
@@ -149,7 +149,7 @@ class Design extends Base
      */
     public function StatusUpdate()
     {
-        return ApiService::ApiDataReturn(DesignService::DesignStatusUpdate($this->data_post));
+        return ApiService::ApiDataReturn(DesignService::DesignStatusUpdate($this->data_request));
     }
     
     /**
@@ -162,7 +162,7 @@ class Design extends Base
      */
     public function Delete()
     {
-        return ApiService::ApiDataReturn(DesignService::DesignDelete($this->data_post));
+        return ApiService::ApiDataReturn(DesignService::DesignDelete($this->data_request));
     }
 
     /**
@@ -175,7 +175,7 @@ class Design extends Base
      */
     public function Sync()
     {
-        return ApiService::ApiDataReturn(DesignService::DesignSync($this->data_post));
+        return ApiService::ApiDataReturn(DesignService::DesignSync($this->data_request));
     }
 
     /**

app/admin/controller/Express.php

@@ -74,7 +74,7 @@ class Express extends Base
 	 */
 	public function Delete()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(ExpressService::ExpressDelete($params));
 	}

app/admin/controller/Formtable.php

@@ -48,7 +48,7 @@ class FormTable extends Common
      */
     public function FieldsSelectSave()
     {
-        $params = $this->data_post;
+        $params = $this->data_request;
         $params['user_id'] = $this->admin['id'];
         $params['user_type'] = 0;
         return ApiService::ApiDataReturn(FormTableService::FieldsSelectSave($params));
@@ -64,7 +64,7 @@ class FormTable extends Common
      */
     public function FieldsSelectReset()
     {
-        $params = $this->data_post;
+        $params = $this->data_request;
         $params['user_id'] = $this->admin['id'];
         $params['user_type'] = 0;
         return ApiService::ApiDataReturn(FormTableService::FieldsSelectReset($params));

app/admin/controller/Goods.php

@@ -163,7 +163,7 @@ class Goods extends Base
 	 */
 	public function Save()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(GoodsService::GoodsSave($params));
 	}
@@ -178,7 +178,7 @@ class Goods extends Base
 	 */
 	public function Delete()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(GoodsService::GoodsDelete($params));
 	}
@@ -193,7 +193,7 @@ class Goods extends Base
 	 */
 	public function StatusUpdate()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(GoodsService::GoodsStatusUpdate($params));
 	}
@@ -208,7 +208,7 @@ class Goods extends Base
      */
 	public function BaseTemplate()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(GoodsService::GoodsBaseTemplate($params));
 	}

app/admin/controller/Goodscategory.php

@@ -80,7 +80,7 @@ class GoodsCategory extends Base
 	 */
 	public function Delete()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(GoodsCategoryService::GoodsCategoryDelete($params));
 	}

app/admin/controller/Layout.php

@@ -33,7 +33,7 @@ class Layout extends Base
      */
     public function LayoutIndexHomeSave()
     {
-        return ApiService::ApiDataReturn(LayoutService::LayoutConfigSave('home', $this->data_post));
+        return ApiService::ApiDataReturn(LayoutService::LayoutConfigSave('home', $this->data_request));
     }
 }
 ?>
\ No newline at end of file

app/admin/controller/Packageinstall.php

@@ -48,7 +48,7 @@ class PackageInstall extends Base
      */
     public function Install()
     {
-        return ApiService::ApiDataReturn(PackageInstallService::Install($this->data_post));
+        return ApiService::ApiDataReturn(PackageInstallService::Install($this->data_request));
     }
 }
 ?>
\ No newline at end of file

app/admin/controller/Packageupgrade.php

@@ -33,7 +33,7 @@ class Packageupgrade extends Base
      */
     public function Upgrade()
     {
-        return ApiService::ApiDataReturn(PluginsUpgradeService::Run($this->data_post));
+        return ApiService::ApiDataReturn(PluginsUpgradeService::Run($this->data_request));
     }
 }
 ?>
\ No newline at end of file

app/admin/controller/Paylog.php

@@ -59,7 +59,7 @@ class PayLog extends Base
      */
     public function Close()
     {
-        $params = $this->data_post;
+        $params = $this->data_request;
         $params['admin'] = $this->admin;
         return ApiService::ApiDataReturn(PayLogService::PayLogClose($params));
     }

app/admin/controller/Pluginsadmin.php

@@ -155,7 +155,7 @@ class Pluginsadmin extends Base
      */
     public function Save()
     {
-        return ApiService::ApiDataReturn(PluginsAdminService::PluginsSave($this->data_post));
+        return ApiService::ApiDataReturn(PluginsAdminService::PluginsSave($this->data_request));
     }
 
     /**
@@ -167,7 +167,7 @@ class Pluginsadmin extends Base
      */
     public function Delete()
     {
-        return ApiService::ApiDataReturn(PluginsAdminService::PluginsDelete($this->data_post));
+        return ApiService::ApiDataReturn(PluginsAdminService::PluginsDelete($this->data_request));
     }
 
     /**
@@ -179,7 +179,7 @@ class Pluginsadmin extends Base
      */
     public function StatusUpdate()
     {
-        return ApiService::ApiDataReturn(PluginsAdminService::PluginsStatusUpdate($this->data_post));
+        return ApiService::ApiDataReturn(PluginsAdminService::PluginsStatusUpdate($this->data_request));
     }
 
     /**
@@ -248,7 +248,7 @@ class Pluginsadmin extends Base
      */
     public function SortSave()
     {
-        return ApiService::ApiDataReturn(PluginsAdminService::SortSave($this->data_post));
+        return ApiService::ApiDataReturn(PluginsAdminService::SortSave($this->data_request));
     }
 
     /**
@@ -261,7 +261,7 @@ class Pluginsadmin extends Base
      */
     public function Upgrade()
     {
-        return ApiService::ApiDataReturn(PluginsUpgradeService::Run($this->data_post));
+        return ApiService::ApiDataReturn(PluginsUpgradeService::Run($this->data_request));
     }
 }
 ?>
\ No newline at end of file

app/admin/controller/Power.php

@@ -56,7 +56,7 @@ class Power extends Base
 	 */
 	public function Save()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(AdminPowerService::PowerSave($params));
 	}
@@ -70,7 +70,7 @@ class Power extends Base
 	 */
 	public function Delete()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(AdminPowerService::PowerDelete($params));
 	}

app/admin/controller/Region.php

@@ -68,7 +68,7 @@ class Region extends Base
 	 */
 	public function Delete()
 	{		
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(RegionService::RegionDelete($params));
 	}
@@ -103,7 +103,7 @@ class Region extends Base
      */
     public function CodeData()
     {
-        return ApiService::ApiDataReturn(RegionService::RegionCodeData($this->data_post));
+        return ApiService::ApiDataReturn(RegionService::RegionCodeData($this->data_request));
     }
 }
 ?>
\ No newline at end of file

app/admin/controller/Role.php

@@ -105,7 +105,7 @@ class Role extends Base
      */
     public function Save()
     {
-        return ApiService::ApiDataReturn(AdminRoleService::RoleSave($this->data_post));
+        return ApiService::ApiDataReturn(AdminRoleService::RoleSave($this->data_request));
     }
 
     /**
@@ -117,7 +117,7 @@ class Role extends Base
      */
     public function Delete()
     {
-        return ApiService::ApiDataReturn(AdminRoleService::RoleDelete($this->data_post));
+        return ApiService::ApiDataReturn(AdminRoleService::RoleDelete($this->data_request));
     }
 
     /**
@@ -129,7 +129,7 @@ class Role extends Base
      */
     public function StatusUpdate()
     {
-        $params = $this->data_post;
+        $params = $this->data_request;
         $params['admin'] = $this->admin;
         return ApiService::ApiDataReturn(AdminRoleService::RoleStatusUpdate($params));
     }

app/admin/controller/Screeningprice.php

@@ -68,7 +68,7 @@ class ScreeningPrice extends Base
 	 */
 	public function Delete()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(ScreeningPriceService::ScreeningPriceDelete($params));
 	}

app/admin/controller/Site.php

@@ -341,7 +341,7 @@ class Site extends Base
     public function GoodsSearch()
     {
         // 搜索数据
-        $ret = SiteService::GoodsSearchList($this->data_post);
+        $ret = SiteService::GoodsSearchList($this->data_request);
         if($ret['code'] == 0)
         {
             MyViewAssign('data', $ret['data']['data']);

app/admin/controller/User.php

@@ -103,7 +103,7 @@ class User extends Base
 	 */
 	public function Save()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(UserService::UserSave($params));
 	}
@@ -117,7 +117,7 @@ class User extends Base
 	 */
 	public function Delete()
 	{
-		$params = $this->data_post;
+		$params = $this->data_request;
 		$params['admin'] = $this->admin;
 		return ApiService::ApiDataReturn(UserService::UserDelete($params));
 	}

app/admin/form/Paylog.php

@@ -305,7 +305,7 @@ class PayLog
     {
         if(!empty($value))
         {
-            // 获取支持业务支付 id
+            // 获取业务id
             $ids = Db::name('PayLogValue')->where('business_id|business_no', '=', $value)->column('pay_log_id');
 
             // 避免空条件造成无效的错觉

app/admin/lang/cht.php

@@ -560,6 +560,8 @@ return [
             'extends'         => ['name' => '擴展數據', 'type'=>'extends'],
             'seo'             => ['name' => 'SEO資訊', 'type'=>'seo'],
         ],
+        'delete_only_goods_text'                => '僅商品',
+        'delete_goods_and_images_text'          => '商品和圖片',
         // 动态表格
         'form_table'                            => [
             'id'                      => '商品ID',

app/admin/lang/en.php

@@ -561,6 +561,8 @@ return [
             'extends'         => ['name' => 'Extends', 'type'=>'extends'],
             'seo'             => ['name' => 'SEO Info', 'type'=>'seo'],
         ],
+        'delete_only_goods_text'                => 'Goods Only',
+        'delete_goods_and_images_text'          => 'Goods and Images',
         // 动态表格
         'form_table'                            => [
             'id'                      => 'Goods ID',

app/admin/lang/spa.php

@@ -560,6 +560,8 @@ return [
             'extends'         => ['name' => 'Datos ampliados', 'type'=>'extends'],
             'seo'             => ['name' => 'Información seo', 'type'=>'seo'],
         ],
+        'delete_only_goods_text'                => 'Solo productos básicos',
+        'delete_goods_and_images_text'          => 'Productos e imágenes',
         // 动态表格
         'form_table'                            => [
             'id'                      => 'Identificación de la mercancía',

app/admin/lang/zh.php

@@ -560,6 +560,8 @@ return [
             'extends'         => ['name' => '扩展数据', 'type'=>'extends'],
             'seo'             => ['name' => 'SEO信息', 'type'=>'seo'],
         ],
+        'delete_only_goods_text'                => '仅商品',
+        'delete_goods_and_images_text'          => '商品和图片',
         // 动态表格
         'form_table'                            => [
             'id'                      => '商品ID',

app/admin/view/default/articlecategory/index.html

@@ -21,7 +21,7 @@
 					<form class="am-form form-validation am-form-popup-fixed" action="{{:MyUrl('admin/articlecategory/save')}}" method="POST" request-type="ajax-fun" request-value="TreeFormSaveBack">
 						<div class="am-form-group">
 							<label>{{:MyLang('common_service.articlecategory.form_item_name')}}<span class="am-form-group-label-tips-must">*</span></label>
-							<input type="text" placeholder="{{:MyLang('common_service.articlecategory.form_item_name_message')}}" name="name" minlength="2" maxlength="16" data-validation-message="{{:MyLang('common_service.articlecategory.form_item_name_message')}}" class="am-radius" required />
+							<input type="text" placeholder="{{:MyLang('common_service.articlecategory.form_item_name_message')}}" name="name" minlength="1" maxlength="60" data-validation-message="{{:MyLang('common_service.articlecategory.form_item_name_message')}}" class="am-radius" required />
 						</div>
 						{{include file="lib/sort" /}}
 						{{include file="lib/is_enable" /}}

app/admin/view/default/brand/save_info.html

@@ -13,7 +13,7 @@
         		<div class="am-u-sm-6 am-padding-horizontal-0">
 					<div class="am-form-group">
 						<label>{{:MyLang('common_service.brand.form_item_name')}}<span class="am-form-group-label-tips-must">*</span></label>
-						<input type="text" name="name" placeholder="{{:MyLang('common_service.brand.form_item_name_message')}}" minlength="2" maxlength="30" data-validation-message="{{:MyLang('common_service.brand.form_item_name_message')}}" class="am-radius" {{if !empty($data['name'])}} value="{{$data.name}}"{{/if}} required />
+						<input type="text" name="name" placeholder="{{:MyLang('common_service.brand.form_item_name_message')}}" minlength="1" maxlength="80" data-validation-message="{{:MyLang('common_service.brand.form_item_name_message')}}" class="am-radius" {{if !empty($data['name'])}} value="{{$data.name}}"{{/if}} required />
 					</div>
 				</div>
 				<div class="am-u-sm-6 am-padding-horizontal-0">

app/admin/view/default/brandcategory/index.html

@@ -21,7 +21,7 @@
 					<form class="am-form form-validation am-form-popup-fixed" action="{{:MyUrl('admin/brandcategory/save')}}" method="POST" request-type="ajax-fun" request-value="TreeFormSaveBack">
 						<div class="am-form-group">
 							<label>{{:MyLang('common_service.brandcategory.form_item_name')}}<span class="am-form-group-label-tips-must">*</span></label>
-							<input type="text" placeholder="{{:MyLang('common_service.brandcategory.form_item_name_message')}}" name="name" minlength="2" maxlength="16" data-validation-message="{{:MyLang('common_service.brandcategory.form_item_name_message')}}" class="am-radius" required />
+							<input type="text" placeholder="{{:MyLang('common_service.brandcategory.form_item_name_message')}}" name="name" minlength="1" maxlength="60" data-validation-message="{{:MyLang('common_service.brandcategory.form_item_name_message')}}" class="am-radius" required />
 						</div>
 						{{include file="lib/sort" /}}
 						{{include file="lib/is_enable" /}}

app/admin/view/default/express/index.html

@@ -32,7 +32,7 @@
 						</div>
 						<div class="am-form-group">
 							<label>{{:MyLang('common_service.express.form_item_name')}}<span class="am-form-group-label-tips-must">*</span></label>
-							<input type="text" placeholder="{{:MyLang('common_service.express.form_item_name_message')}}" name="name" minlength="2" maxlength="16" data-validation-message="{{:MyLang('common_service.express.form_item_name_message')}}" class="am-radius" required />
+							<input type="text" placeholder="{{:MyLang('common_service.express.form_item_name_message')}}" name="name" minlength="1" maxlength="60" data-validation-message="{{:MyLang('common_service.express.form_item_name_message')}}" class="am-radius" required />
 						</div>
 						<div class="am-form-group">
 							<label>{{:MyLang('common_service.express.form_item_website_url')}}</label>

app/admin/view/default/goods/module/operate.html

@@ -11,7 +11,13 @@
     <i class="am-icon-copy"></i>
     <span>{{:MyLang('copy_title')}}</span>
 </a>
-<button type="button" class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block submit-delete" data-url="{{:MyUrl('admin/goods/delete')}}" data-id="{{$module_data.id}}" data-key="ids">
-    <i class="am-icon-trash-o"></i>
-    <span>{{:MyLang('delete_title')}}</span>
-</button>
+<div class="am-dropdown am-dropdown-up am-btn am-btn-danger am-btn-xs am-radius am-btn-block" data-am-dropdown="{trigger: 'hover'}">
+    <div class="am-dropdown-toggle">
+        <i class="am-icon-trash-o"></i>
+        <span>{{:MyLang('delete_title')}}</span>
\ No newline at end of file
+    </div>
+    <div class="am-dropdown-content am-radius">
+        <a href="javascript:;" class="am-badge am-badge-warning am-radius submit-delete" data-url="{{:MyUrl('admin/goods/delete')}}" data-id="{{$module_data.id}}" data-key="ids">{{:MyLang('goods.delete_only_goods_text')}}</a>
+        <a href="javascript:;" class="am-badge am-badge-danger am-radius am-margin-left-sm submit-delete" data-url="{{:MyUrl('admin/goods/delete', ['is_del_images'=>1])}}" data-id="{{$module_data.id}}" data-key="ids">{{:MyLang('goods.delete_goods_and_images_text')}}</a>
+    </div>
+</div>
\ No newline at end of file