diff --git a/application/admin/form/Goodsbrowse.php b/application/admin/form/Goodsbrowse.php index 39001b005..af60526df 100644 --- a/application/admin/form/Goodsbrowse.php +++ b/application/admin/form/Goodsbrowse.php @@ -105,7 +105,7 @@ class Goodsbrowse [ 'label' => '创建时间', 'view_type' => 'field', - 'view_key' => 'add_time_time', + 'view_key' => 'add_time', 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'b.add_time', diff --git a/application/admin/form/Goodsfavor.php b/application/admin/form/Goodsfavor.php index 4bbf37f30..d95b6dd9b 100644 --- a/application/admin/form/Goodsfavor.php +++ b/application/admin/form/Goodsfavor.php @@ -105,7 +105,7 @@ class Goodsfavor [ 'label' => '创建时间', 'view_type' => 'field', - 'view_key' => 'add_time_time', + 'view_key' => 'add_time', 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'f.add_time', diff --git a/application/admin/view/default/apphomenav/module/images.html b/application/admin/view/default/apphomenav/module/images.html index b75b0300d..8845c44b5 100644 --- a/application/admin/view/default/apphomenav/module/images.html +++ b/application/admin/view/default/apphomenav/module/images.html @@ -1,6 +1,6 @@ {{if !empty($module_data) and !empty($module_data['images_url'])}} -
+
diff --git a/application/admin/view/default/quicknav/module/images.html b/application/admin/view/default/quicknav/module/images.html index b75b0300d..8845c44b5 100644 --- a/application/admin/view/default/quicknav/module/images.html +++ b/application/admin/view/default/quicknav/module/images.html @@ -1,6 +1,6 @@ {{if !empty($module_data) and !empty($module_data['images_url'])}} -
+
diff --git a/application/index/form/Usergoodsbrowse.php b/application/index/form/Usergoodsbrowse.php index 18cf70402..639773a59 100644 --- a/application/index/form/Usergoodsbrowse.php +++ b/application/index/form/Usergoodsbrowse.php @@ -108,7 +108,7 @@ class UserGoodsBrowse [ 'label' => '创建时间', 'view_type' => 'field', - 'view_key' => 'add_time_time', + 'view_key' => 'add_time', 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'b.add_time', diff --git a/application/index/form/Usergoodsfavor.php b/application/index/form/Usergoodsfavor.php index eadd738c0..a5e0c6044 100644 --- a/application/index/form/Usergoodsfavor.php +++ b/application/index/form/Usergoodsfavor.php @@ -108,7 +108,7 @@ class UserGoodsFavor [ 'label' => '创建时间', 'view_type' => 'field', - 'view_key' => 'add_time_time', + 'view_key' => 'add_time', 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'f.add_time', diff --git a/application/service/GoodsBrowseService.php b/application/service/GoodsBrowseService.php index 9e702fb9b..1dadea8db 100644 --- a/application/service/GoodsBrowseService.php +++ b/application/service/GoodsBrowseService.php @@ -141,31 +141,19 @@ class GoodsBrowseService $data = Db::name('GoodsBrowse')->alias('b')->join(['__GOODS__'=>'g'], 'g.id=b.goods_id')->field($field)->where($where)->limit($m, $n)->order($order_by)->select(); if(!empty($data)) { + // 商品数据处理 + $ret = GoodsService::GoodsDataHandle($data, ['data_key_field'=>'goods_id']); + $data = $ret['data']; + + // 是否公共读取 + $is_public = (isset($params['is_public']) && $params['is_public'] == 0) ? 0 : 1; foreach($data as &$v) { // 用户信息 - if(isset($v['user_id'])) + if(isset($v['user_id']) && $is_public == 0) { - if(isset($params['is_public']) && $params['is_public'] == 0) - { - $v['user'] = UserService::GetUserViewInfo($v['user_id']); - } + $v['user'] = UserService::GetUserViewInfo($v['user_id']); } - - // 无封面图片 - if(empty($v['images'])) - { - $v['images'] = ResourcesService::AttachmentPathHandle(GoodsService::GoodsImagesCoverHandle($v['goods_id'])); - } - - // 商品信息 - $v['images_old'] = $v['images']; - $v['images'] = ResourcesService::AttachmentPathViewHandle($v['images']); - $v['goods_url'] = MyUrl('index/goods/index', ['id'=>$v['goods_id']]); - - // 时间 - $v['add_time_time'] = date('Y-m-d H:i:s', $v['add_time']); - $v['add_time_date'] = date('Y-m-d', $v['add_time']); } } return DataReturn('处理成功', 0, $data); diff --git a/application/service/GoodsFavorService.php b/application/service/GoodsFavorService.php index 0b85acf75..634048e17 100644 --- a/application/service/GoodsFavorService.php +++ b/application/service/GoodsFavorService.php @@ -204,31 +204,19 @@ class GoodsFavorService $data = Db::name('GoodsFavor')->alias('f')->join(['__GOODS__'=>'g'], 'g.id=f.goods_id')->field($field)->where($where)->limit($m, $n)->order($order_by)->select(); if(!empty($data)) { + // 商品数据处理 + $ret = GoodsService::GoodsDataHandle($data, ['data_key_field'=>'goods_id']); + $data = $ret['data']; + + // 是否公共读取 + $is_public = (isset($params['is_public']) && $params['is_public'] == 0) ? 0 : 1; foreach($data as &$v) { // 用户信息 - if(isset($v['user_id'])) + if(isset($v['user_id']) && $is_public == 0) { - if(isset($params['is_public']) && $params['is_public'] == 0) - { - $v['user'] = UserService::GetUserViewInfo($v['user_id']); - } + $v['user'] = UserService::GetUserViewInfo($v['user_id']); } - - // 无封面图片 - if(empty($v['images'])) - { - $v['images'] = ResourcesService::AttachmentPathHandle(GoodsService::GoodsImagesCoverHandle($v['goods_id'])); - } - - // 商品信息 - $v['images_old'] = $v['images']; - $v['images'] = ResourcesService::AttachmentPathViewHandle($v['images']); - $v['goods_url'] = MyUrl('index/goods/index', ['id'=>$v['goods_id']]); - - // 时间 - $v['add_time_time'] = date('Y-m-d H:i:s', $v['add_time']); - $v['add_time_date'] = date('Y-m-d', $v['add_time']); } } return DataReturn('处理成功', 0, $data); diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php index 5e7a7a104..cd5afbfcc 100755 --- a/application/service/GoodsService.php +++ b/application/service/GoodsService.php @@ -357,10 +357,14 @@ class GoodsService $is_content_app = (isset($params['is_content_app']) && $params['is_content_app'] == true) ? true : false; $is_category = (isset($params['is_category']) && $params['is_category'] == true) ? true : false; $is_params = (isset($params['is_params']) && $params['is_params'] == true) ? true : false; + $data_key_field = empty($params['data_key_field']) ? 'id' : $params['data_key_field']; // 开始处理数据 foreach($data as &$v) { + // 数据主键id + $data_id = isset($v[$data_key_field]) ? $v[$data_key_field] : 0; + // 商品处理前钩子 $hook_name = 'plugins_service_goods_handle_begin'; $ret = HookReturnHandle(Hook::listen($hook_name, [ @@ -368,7 +372,7 @@ class GoodsService 'is_backend' => true, 'params' => &$params, 'goods' => &$v, - 'goods_id' => isset($v['id']) ? $v['id'] : 0, + 'goods_id' => $data_id, ])); if(isset($ret['code']) && $ret['code'] != 0) { @@ -386,15 +390,15 @@ class GoodsService ]; // 商品url地址 - if(!empty($v['id'])) + if(!empty($data_id)) { - $v['goods_url'] = MyUrl('index/goods/index', ['id'=>$v['id']]); + $v['goods_url'] = MyUrl('index/goods/index', ['id'=>$data_id]); } // 获取相册 - if($is_photo && !empty($v['id'])) + if($is_photo && !empty($data_id)) { - $v['photo'] = self::GoodsPhotoData($v['id']); + $v['photo'] = self::GoodsPhotoData($data_id); if(!empty($v['photo'])) { foreach($v['photo'] as &$vs) @@ -412,7 +416,7 @@ class GoodsService if(empty($v['images'])) { // 获取商品封面图片 - $v['images'] = ResourcesService::AttachmentPathHandle(self::GoodsImagesCoverHandle($v['id'], isset($v['photo']) ? $v['photo'] : [])); + $v['images'] = ResourcesService::AttachmentPathHandle(self::GoodsImagesCoverHandle($data_id, isset($v['photo']) ? $v['photo'] : [])); } $v['images_old'] = $v['images']; $v['images'] = ResourcesService::AttachmentPathViewHandle($v['images']); @@ -460,9 +464,9 @@ class GoodsService } // 是否需要分类名称 - if($is_category && !empty($v['id'])) + if($is_category && !empty($data_id)) { - $v['category_ids'] = Db::name('GoodsCategoryJoin')->where(['goods_id'=>$v['id']])->column('category_id'); + $v['category_ids'] = Db::name('GoodsCategoryJoin')->where(['goods_id'=>$data_id])->column('category_id'); $category_name = Db::name('GoodsCategory')->where(['id'=>$v['category_ids']])->column('name'); $v['category_text'] = implode('，', $category_name); } @@ -474,21 +478,21 @@ class GoodsService } // 获取规格 - if($is_spec && !empty($v['id'])) + if($is_spec && !empty($data_id)) { - $v['specifications'] = self::GoodsSpecificationsData($v['id']); + $v['specifications'] = self::GoodsSpecificationsData($data_id); } // 获取商品参数 - if($is_params && !empty($v['id'])) + if($is_params && !empty($data_id)) { - $v['parameters'] = self::GoodsParametersData($v['id']); + $v['parameters'] = self::GoodsParametersData($data_id); } // 获取app内容 - if($is_content_app && !empty($v['id'])) + if($is_content_app && !empty($data_id)) { - $v['content_app'] = self::GoodsContentAppData(['goods_id'=>$v['id']]); + $v['content_app'] = self::GoodsContentAppData(['goods_id'=>$data_id]); } // 展示字段 @@ -502,7 +506,7 @@ class GoodsService 'is_backend' => true, 'params' => &$params, 'goods' => &$v, - 'goods_id' => isset($v['id']) ? $v['id'] : 0, + 'goods_id' => isset($data_id) ? $data_id : 0, ])); if(isset($ret['code']) && $ret['code'] != 0) { diff --git a/application/tags.php b/application/tags.php index bf63f60f3..afc5f3878 100755 --- a/application/tags.php +++ b/application/tags.php @@ -134,10 +134,12 @@ return array ( 'plugins_service_goods_handle_end' => array ( 0 => 'app\\plugins\\exchangerate\\Hook', + 1 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook', ), 'plugins_service_goods_spec_base' => array ( 0 => 'app\\plugins\\exchangerate\\Hook', + 1 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook', ), 'plugins_service_order_pay_launch_handle' => array ( diff --git a/public/static/upload/images/quick_nav/2020/09/11/1599806993140373.png b/public/static/upload/images/quick_nav/2020/09/11/1599806993140373.png deleted file mode 100644 index e493b07d4..000000000 Binary files a/public/static/upload/images/quick_nav/2020/09/11/1599806993140373.png and /dev/null differ diff --git a/public/static/upload/images/quick_nav/2020/09/11/1599808022935867.png b/public/static/upload/images/quick_nav/2020/09/11/1599808022935867.png deleted file mode 100644 index 9c67425f6..000000000 Binary files a/public/static/upload/images/quick_nav/2020/09/11/1599808022935867.png and /dev/null differ diff --git a/public/static/upload/images/quick_nav/2020/09/14/1600076479218479.png b/public/static/upload/images/quick_nav/2020/09/14/1600076479218479.png deleted file mode 100644 index 339838890..000000000 Binary files a/public/static/upload/images/quick_nav/2020/09/14/1600076479218479.png and /dev/null differ diff --git a/public/static/upload/images/quick_nav/2020/09/14/1600076479297878.png b/public/static/upload/images/quick_nav/2020/09/14/1600076479297878.png deleted file mode 100644 index b34e5e882..000000000 Binary files a/public/static/upload/images/quick_nav/2020/09/14/1600076479297878.png and /dev/null differ diff --git a/public/static/upload/images/quick_nav/2020/09/17/1600321639662998.png b/public/static/upload/images/quick_nav/2020/09/17/1600321639662998.png new file mode 100644 index 000000000..ccfaf7aa1 Binary files /dev/null and b/public/static/upload/images/quick_nav/2020/09/17/1600321639662998.png differ diff --git a/public/static/upload/images/quick_nav/2020/09/17/1600322667732829.png b/public/static/upload/images/quick_nav/2020/09/17/1600322667732829.png new file mode 100644 index 000000000..f6d04789f Binary files /dev/null and b/public/static/upload/images/quick_nav/2020/09/17/1600322667732829.png differ diff --git a/sourcecode/alipay/pages/buy/buy.acss b/sourcecode/alipay/pages/buy/buy.acss index 72eb381e7..5bfb2acc7 100644 --- a/sourcecode/alipay/pages/buy/buy.acss +++ b/sourcecode/alipay/pages/buy/buy.acss @@ -160,11 +160,13 @@ /** * 留言 */ -.content-textarea-view { +.content-textarea-container { padding: 5rpx; } -.content-textarea-view textarea { - height: 180rpx; +.content-textarea-container textarea, +.content-textarea-container view { + padding: 5rpx 15rpx; + height: 170rpx; } /** diff --git a/sourcecode/alipay/pages/buy/buy.axml b/sourcecode/alipay/pages/buy/buy.axml index 07204ae9b..054a57b61 100644 --- a/sourcecode/alipay/pages/buy/buy.axml +++ b/sourcecode/alipay/pages/buy/buy.axml @@ -85,8 +85,9 @@ - -