Skip to content

ShopXO
ShopXO

alading2018 / ShopXO
与 Fork 源项目一致

Fork自 纵之格 / ShopXO

通知 1
Star 0
Fork 0
ShopXO
ShopXO

体验新版 GitCode，发现更多精彩内容 >>

提交 c630773b 编写于 作者: D devil
浏览文件
操作

细节优化

上级 7229f836
隐藏空白更改
内联 并排
Showing with 215 addition and 88 deletion
application/admin/controller/Goods.php
浏览文件 @ c630773b
......@@ -168,6 +168,11 @@ class Goods extends Common
$goods_spec_extends = GoodsService::GoodsSpecificationsExtends($params);
$this->assign('goods_specifications_extends', $goods_spec_extends['data']);
// 站点类型
$this->assign('common_site_type_list', lang('common_site_type_list'));
// 当前系统设置的站点类型
$this->assign('common_site_type', MyC('common_site_type', 0, true));
// 商品编辑页面钩子
$hook_name = 'plugins_view_admin_goods_save';
$this->assign($hook_name.'_data', Hook::listen($hook_name,
......
application/admin/form/Admin.php
浏览文件 @ c630773b
......@@ -70,10 +70,11 @@ class Admin
[
'label' => '状态',
'view_type' => 'field',
'view_key' => 'status_text',
'view_key' => 'status',
'view_data_key' => 'name',
'view_data' => lang('common_admin_status_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'status',
'where_type' => 'in',
'data' => lang('common_admin_status_list'),
'data_key' => 'value',
......@@ -84,10 +85,11 @@ class Admin
[
'label' => '性别',
'view_type' => 'field',
'view_key' => 'gender_text',
'view_key' => 'gender',
'view_data_key' => 'name',
'view_data' => lang('common_gender_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'gender',
'where_type' => 'in',
'data' => lang('common_gender_list'),
'data_key' => 'id',
......
application/admin/form/Appcenternav.php
浏览文件 @ c630773b
......@@ -67,10 +67,11 @@ class Appcenternav
[
'label' => '所属平台',
'view_type' => 'field',
'view_key' => 'platform_text',
'view_key' => 'platform',
'view_data_key' => 'name',
'view_data' => lang('common_platform_type'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'platform',
'where_type' => 'in',
'data' => lang('common_platform_type'),
'data_key' => 'value',
......@@ -87,11 +88,12 @@ class Appcenternav
[
'label' => '事件类型',
'view_type' => 'field',
'view_key' => 'event_type_text',
'view_key' => 'event_type',
'view_data_key' => 'name',
'view_data' => lang('common_app_event_type'),
'grid_size' => 'sm',
'search_config' => [
'form_type' => 'select',
'form_name' => 'event_type',
'where_type' => 'in',
'data' => lang('common_app_event_type'),
'data_key' => 'value',
......
application/admin/form/Apphomenav.php
浏览文件 @ c630773b
......@@ -67,10 +67,11 @@ class Apphomenav
[
'label' => '所属平台',
'view_type' => 'field',
'view_key' => 'platform_text',
'view_key' => 'platform',
'view_data_key' => 'name',
'view_data' => lang('common_platform_type'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'platform',
'where_type' => 'in',
'data' => lang('common_platform_type'),
'data_key' => 'value',
......@@ -87,11 +88,12 @@ class Apphomenav
[
'label' => '事件类型',
'view_type' => 'field',
'view_key' => 'event_type_text',
'view_key' => 'event_type',
'view_data_key' => 'name',
'view_data' => lang('common_app_event_type'),
'grid_size' => 'sm',
'search_config' => [
'form_type' => 'select',
'form_name' => 'event_type',
'where_type' => 'in',
'data' => lang('common_app_event_type'),
'data_key' => 'value',
......
application/admin/form/Goods.php
浏览文件 @ c630773b
......@@ -85,6 +85,21 @@ class Goods
'placeholder' => '请输入商品名称/简述/SEO信息'
],
],
[
'label' => '商品类型',
'view_type' => 'field',
'view_key' => 'site_type',
'view_data_key' => 'name',
'view_data' => lang('common_site_type_list'),
'search_config' => [
'form_type' => 'select',
'where_type' => 'in',
'data' => lang('common_site_type_list'),
'data_key' => 'value',
'data_name' => 'name',
'is_multiple' => 1,
],
],
[
'label' => '销售价格(元)',
'view_type' => 'field',
......
application/admin/form/Goodscomments.php
浏览文件 @ c630773b
......@@ -88,11 +88,12 @@ class Goodscomments
[
'label' => '业务类型',
'view_type' => 'field',
'view_key' => 'business_type_text',
'view_key' => 'business_type',
'view_data_key' => 'name',
'view_data' => lang('common_goods_comments_business_type_list'),
'width' => 120,
'search_config' => [
'form_type' => 'select',
'form_name' => 'business_type',
'where_type' => 'in',
'data' => lang('common_goods_comments_business_type_list'),
'data_key' => 'value',
......
application/admin/form/Integrallog.php
浏览文件 @ c630773b
......@@ -62,10 +62,11 @@ class Integrallog
[
'label' => '操作类型',
'view_type' => 'field',
'view_key' => 'type_text',
'view_key' => 'type',
'view_data_key' => 'name',
'view_data' => lang('common_integral_log_type_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'type',
'where_type' => 'in',
'data' => lang('common_integral_log_type_list'),
'data_key' => 'id',
......
application/admin/form/Message.php
浏览文件 @ c630773b
......@@ -75,10 +75,11 @@ class Message
[
'label' => '消息类型',
'view_type' => 'field',
'view_key' => 'type_text',
'view_key' => 'type',
'view_data_key' => 'name',
'view_data' => lang('common_message_type_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'type',
'where_type' => 'in',
'data' => lang('common_message_type_list'),
'data_key' => 'id',
......@@ -89,10 +90,11 @@ class Message
[
'label' => '业务类型',
'view_type' => 'field',
'view_key' => 'business_type_text',
'view_key' => 'business_type',
'view_data_key' => 'name',
'view_data' => lang('common_business_type_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'business_type',
'where_type' => 'in',
'data' => lang('common_business_type_list'),
'data_key' => 'id',
......@@ -122,10 +124,11 @@ class Message
[
'label' => '是否已读',
'view_type' => 'field',
'view_key' => 'is_read_text',
'view_key' => 'is_read',
'view_data_key' => 'name',
'view_data' => lang('common_is_read_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'is_read',
'where_type' => 'in',
'data' => lang('common_is_read_list'),
'data_key' => 'id',
......
application/admin/form/Navigation.php
浏览文件 @ c630773b
......@@ -73,10 +73,11 @@ class Navigation
[
'label' => '导航数据类型',
'view_type' => 'field',
'view_key' => 'data_type_text',
'view_key' => 'data_type',
'view_data_key' => 'name',
'view_data' => lang('common_nav_type_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'data_type',
'where_type' => 'in',
'data' => lang('common_nav_type_list'),
'data_key' => 'value',
......
application/admin/form/Order.php
浏览文件 @ c630773b
......@@ -160,11 +160,12 @@ class Order
[
'label' => '订单模式',
'view_type' => 'field',
'view_key' => 'order_model_name',
'view_key' => 'order_model',
'view_data_key' => 'name',
'view_data' => lang('common_site_type_list'),
'width' => 120,
'search_config' => [
'form_type' => 'select',
'form_name' => 'order_model',
'where_type' => 'in',
'data' => lang('common_site_type_list'),
'data_key' => 'value',
......@@ -175,11 +176,12 @@ class Order
[
'label' => '来源',
'view_type' => 'field',
'view_key' => 'client_type_name',
'view_key' => 'client_type',
'view_data_key' => 'name',
'view_data' => lang('common_platform_type'),
'width' => 120,
'search_config' => [
'form_type' => 'select',
'form_name' => 'client_type',
'where_type' => 'in',
'data' => lang('common_platform_type'),
'data_key' => 'value',
......
application/admin/form/Orderaftersale.php
浏览文件 @ c630773b
......@@ -86,11 +86,12 @@ class Orderaftersale
[
'label' => '状态',
'view_type' => 'field',
'view_key' => 'status_text',
'view_key' => 'status',
'view_data_key' => 'name',
'view_data' => lang('common_order_aftersale_status_list'),
'width' => 120,
'search_config' => [
'form_type' => 'select',
'form_name' => 'status',
'where_type' => 'in',
'data' => lang('common_order_aftersale_status_list'),
'data_key' => 'value',
......@@ -101,11 +102,12 @@ class Orderaftersale
[
'label' => '申请类型',
'view_type' => 'field',
'view_key' => 'type_text',
'view_key' => 'type',
'view_data_key' => 'name',
'view_data' => lang('common_order_aftersale_type_list'),
'width' => 120,
'search_config' => [
'form_type' => 'select',
'form_name' => 'type',
'where_type' => 'in',
'data' => lang('common_order_aftersale_type_list'),
'data_key' => 'value',
......@@ -152,11 +154,12 @@ class Orderaftersale
[
'label' => '退款类型',
'view_type' => 'field',
'view_key' => 'refundment_text',
'view_key' => 'refundment',
'view_data_key' => 'name',
'view_data' => lang('common_order_aftersale_refundment_list'),
'width' => 120,
'search_config' => [
'form_type' => 'select',
'form_name' => 'refundment',
'where_type' => 'in',
'data' => lang('common_order_aftersale_refundment_list'),
'data_key' => 'value',
......
application/admin/form/Paylog.php
浏览文件 @ c630773b
......@@ -77,10 +77,11 @@ class Paylog
[
'label' => '业务类型',
'view_type' => 'field',
'view_key' => 'business_type_text',
'view_key' => 'business_type',
'view_data_key' => 'name',
'view_data' => lang('common_business_type_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'business_type',
'where_type' => 'in',
'data' => lang('common_business_type_list'),
'data_key' => 'id',
......
application/admin/form/Refundlog.php
浏览文件 @ c630773b
......@@ -77,10 +77,11 @@ class Refundlog
[
'label' => '业务类型',
'view_type' => 'field',
'view_key' => 'business_type_text',
'view_key' => 'business_type',
'view_data_key' => 'name',
'view_data' => lang('common_business_type_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'business_type',
'where_type' => 'in',
'data' => lang('common_business_type_list'),
'data_key' => 'id',
......
application/admin/form/Slide.php
浏览文件 @ c630773b
......@@ -67,10 +67,11 @@ class Slide
[
'label' => '所属平台',
'view_type' => 'field',
'view_key' => 'platform_text',
'view_key' => 'platform',
'view_data_key' => 'name',
'view_data' => lang('common_platform_type'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'platform',
'where_type' => 'in',
'data' => lang('common_platform_type'),
'data_key' => 'value',
......@@ -87,10 +88,11 @@ class Slide
[
'label' => '事件类型',
'view_type' => 'field',
'view_key' => 'event_type_text',
'view_key' => 'event_type',
'view_data_key' => 'name',
'view_data' => lang('common_app_event_type'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'event_type',
'where_type' => 'in',
'data' => lang('common_app_event_type'),
'data_key' => 'value',
......
application/admin/form/User.php
浏览文件 @ c630773b
......@@ -109,10 +109,11 @@ class User
[
'label' => '性别',
'view_type' => 'field',
'view_key' => 'gender_text',
'view_key' => 'gender',
'view_data_key' => 'name',
'view_data' => lang('common_gender_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'gender',
'where_type' => 'in',
'data' => lang('common_gender_list'),
'data_key' => 'id',
......@@ -123,10 +124,11 @@ class User
[
'label' => '状态',
'view_type' => 'field',
'view_key' => 'status_text',
'view_key' => 'status',
'view_data_key' => 'name',
'view_data' => lang('common_user_status_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'status',
'where_type' => 'in',
'data' => lang('common_user_status_list'),
'data_key' => 'id',
......
application/admin/view/default/config/index.html
浏览文件 @ c630773b
......@@ -38,6 +38,9 @@
<div class="am-form-group">
<label>{{$data.common_baidu_map_ak.name}}<span class="am-form-group-label-tips">{{$data.common_baidu_map_ak.describe}}</span></label>
<input type="text" name="{{$data.common_baidu_map_ak.only_tag}}" placeholder="{{$data.common_baidu_map_ak.describe}}" data-validation-message="{{$data.common_baidu_map_ak.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_baidu_map_ak.value}}"{{/if}} />
<div class="am-alert am-alert-warning" data-am-alert>
请到百度地图开放平台申请，<a href="https://ask.shopxo.net/article/142" target="_blank">查看配置教程 <i class="am-icon-external-link"></i></a>
</div>
</div>
<div class="am-form-group am-form-group-refreshing">
<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
......
application/admin/view/default/goods/save_info.html
浏览文件 @ c630773b
......@@ -146,6 +146,22 @@
<label>单次最大购买数量<span class="am-form-group-label-tips">单次最大数值 100000000, 小于等于0或空则不限</span></label>
<input type="number" name="buy_max_number" placeholder="单次最大购买数量" min="0" max="100000000" data-validation-message="单次最大购买数量 1~100000000" class="am-radius" {{if !empty($data['buy_max_number'])}} value="{{$data.buy_max_number}}"{{/if}} />
</div>
<div class="am-form-group">
<label>商品类型</label>
<div class="am-alert am-alert-warning am-radius am-margin-top-0" data-am-alert>
<p>1. 当前系统配置的站点类型为[ <strong class="am-text-danger">{{$common_site_type_list[$common_site_type]['name']}}</strong> ]</p>
<p>2. 如果商品类型未配置则跟随系统配置的站点类型</p>
<p>3. 当设置的商品类型不在系统设置的站点类型包含的时候，商品加入购物车功能将失效</p>
</div>
<select name="site_type" class="am-radius chosen-select am-margin-top-xs" data-placeholder="可选择..." data-validation-message="请选择商品类型">
<option value="-1">可选择...</option>
{{if !empty($common_site_type_list)}}
{{foreach $common_site_type_list as $v}}
<option value="{{$v.value}}" {{if isset($data['site_type']) and $v['value'] eq $data['site_type']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
{{/if}}
</select>
</div>
<div class="am-form-group am-form-file">
<label class="block">首页推荐图片<span class="am-form-group-label-tips">留空则取相册第一张图</span></label>
<ul class="plug-file-upload-view goods-recommended-images-view" data-form-name="home_recommended_images" data-max-number="1" data-dialog-type="images">
......
application/admin/view/default/public/module/detail.html
浏览文件 @ c630773b
......@@ -58,6 +58,11 @@
<dd>
{{switch $t.view_type}}
{{case field}}
<!-- 前后固定拼接的值 前面 -->
{{if isset($t['view_join_first'])}}
<span>{{$t.view_join_first}}</span>
{{/if}}
<!-- 如果字段为数组则处理多个字段拼接数据 -->
{{if is_array($t['view_key'])}}
{{foreach $t['view_key'] as $fk=>$fv}}
......@@ -70,11 +75,21 @@
{{/if}}
{{/foreach}}
{{else /}}
<!-- 非数组则直接取值 -->
<!-- 是否存在数据 key -->
{{if isset($data[$t['view_key']])}}
<!-- 是否指定数据转换 -->
{{if !empty($t['view_data']) and is_array($t['view_data']) and isset($t['view_data'][$data[$t['view_key']]])}}
{{$t['view_data'][$data[$t['view_key']]]}}
{{if !empty($t['view_data']) and is_array($t['view_data'])}}
<!-- 不存在数组中则不显示 -->
{{if isset($t['view_data'][$data[$t['view_key']]])}}
<!-- 是否指定二维数组key取值 -->
{{if !empty($t['view_data_key'])}}
{{if isset($t['view_data'][$data[$t['view_key']]][$t['view_data_key']])}}
{{$t['view_data'][$data[$t['view_key']]][$t['view_data_key']]}}
{{/if}}
{{else /}}
{{$t['view_data'][$data[$t['view_key']]]}}
{{/if}}
{{/if}}
<!-- 直接展示数据 -->
{{else /}}
......@@ -82,6 +97,10 @@
{{/if}}
{{/if}}
{{/if}}
<!-- 前后固定拼接的值 后面 -->
{{if isset($t['view_join_last'])}}
<span>{{$t.view_join_last}}</span>
{{/if}}
{{/case}}
{{case module}}
<!-- 从模块加载自定义模块数据 -->
......
application/admin/view/default/public/module/form_table.html
浏览文件 @ c630773b
......@@ -171,11 +171,21 @@
{{/if}}
{{/foreach}}
{{else /}}
<!-- 非数组则直接取值 -->
<!-- 是否存在数据 key -->
{{if isset($data_list[$i][$t['view_key']])}}
<!-- 是否指定数据转换 -->
{{if !empty($t['view_data']) and is_array($t['view_data']) and isset($t['view_data'][$data_list[$i][$t['view_key']]])}}
{{$t['view_data'][$data_list[$i][$t['view_key']]]}}
{{if !empty($t['view_data']) and is_array($t['view_data'])}}
<!-- 不存在数组中则不显示 -->
{{if isset($t['view_data'][$data_list[$i][$t['view_key']]])}}
<!-- 是否指定二维数组key取值 -->
{{if !empty($t['view_data_key'])}}
{{if isset($t['view_data'][$data_list[$i][$t['view_key']]][$t['view_data_key']])}}
{{$t['view_data'][$data_list[$i][$t['view_key']]][$t['view_data_key']]}}
{{/if}}
{{else /}}
{{$t['view_data'][$data_list[$i][$t['view_key']]]}}
{{/if}}
{{/if}}
<!-- 直接展示数据 -->
{{else /}}
......
application/index/form/Message.php
浏览文件 @ c630773b
......@@ -67,10 +67,11 @@ class Message
[
'label' => '消息类型',
'view_type' => 'field',
'view_key' => 'type_text',
'view_key' => 'type',
'view_data_key' => 'name',
'view_data' => lang('common_message_type_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'type',
'where_type' => 'in',
'data' => lang('common_message_type_list'),
'data_key' => 'id',
......@@ -81,10 +82,11 @@ class Message
[
'label' => '业务类型',
'view_type' => 'field',
'view_key' => 'business_type_text',
'view_key' => 'business_type',
'view_data_key' => 'name',
'view_data' => lang('common_business_type_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'business_type',
'where_type' => 'in',
'data' => lang('common_business_type_list'),
'data_key' => 'id',
......@@ -114,10 +116,11 @@ class Message
[
'label' => '状态',
'view_type' => 'field',
'view_key' => 'is_read_text',
'view_key' => 'is_read',
'view_data_key' => 'name',
'view_data' => lang('common_is_read_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'is_read',
'where_type' => 'in',
'data' => lang('common_is_read_list'),
'data_key' => 'id',
......
application/index/form/Orderaftersale.php
浏览文件 @ c630773b
......@@ -89,11 +89,12 @@ class Orderaftersale
[
'label' => '状态',
'view_type' => 'field',
'view_key' => 'status_text',
'view_key' => 'status',
'view_data_key' => 'name',
'view_data' => lang('common_order_aftersale_status_list'),
'width' => 120,
'search_config' => [
'form_type' => 'select',
'form_name' => 'status',
'where_type' => 'in',
'data' => lang('common_order_aftersale_status_list'),
'data_key' => 'value',
......@@ -104,11 +105,12 @@ class Orderaftersale
[
'label' => '申请类型',
'view_type' => 'field',
'view_key' => 'type_text',
'view_key' => 'type',
'view_data_key' => 'name',
'view_data' => lang('common_order_aftersale_type_list'),
'width' => 120,
'search_config' => [
'form_type' => 'select',
'form_name' => 'type',
'where_type' => 'in',
'data' => lang('common_order_aftersale_type_list'),
'data_key' => 'value',
......@@ -155,11 +157,12 @@ class Orderaftersale
[
'label' => '退款类型',
'view_type' => 'field',
'view_key' => 'refundment_text',
'view_key' => 'refundment',
'view_data_key' => 'name',
'view_data' => lang('common_order_aftersale_refundment_list'),
'width' => 120,
'search_config' => [
'form_type' => 'select',
'form_name' => 'refundment',
'where_type' => 'in',
'data' => lang('common_order_aftersale_refundment_list'),
'data_key' => 'value',
......
application/index/form/Userintegral.php
浏览文件 @ c630773b
......@@ -65,10 +65,11 @@ class Userintegral
[
'label' => '操作类型',
'view_type' => 'field',
'view_key' => 'type_text',
'view_key' => 'type',
'view_data_key' => 'name',
'view_data' => lang('common_integral_log_type_list'),
'search_config' => [
'form_type' => 'select',
'form_name' => 'type',
'where_type' => 'in',
'data' => lang('common_integral_log_type_list'),
'data_key' => 'id',
......
application/index/view/default/public/module/detail.html
浏览文件 @ c630773b
......@@ -58,6 +58,11 @@
<dd>
{{switch $t.view_type}}
{{case field}}
<!-- 前后固定拼接的值 前面 -->
{{if isset($t['view_join_first'])}}
<span>{{$t.view_join_first}}</span>
{{/if}}
<!-- 如果字段为数组则处理多个字段拼接数据 -->
{{if is_array($t['view_key'])}}
{{foreach $t['view_key'] as $fk=>$fv}}
......@@ -70,11 +75,21 @@
{{/if}}
{{/foreach}}
{{else /}}
<!-- 非数组则直接取值 -->
<!-- 是否存在数据 key -->
{{if isset($data[$t['view_key']])}}
<!-- 是否指定数据转换 -->
{{if !empty($t['view_data']) and is_array($t['view_data']) and isset($t['view_data'][$data[$t['view_key']]])}}
{{$t['view_data'][$data[$t['view_key']]]}}
{{if !empty($t['view_data']) and is_array($t['view_data'])}}
<!-- 不存在数组中则不显示 -->
{{if isset($t['view_data'][$data[$t['view_key']]])}}
<!-- 是否指定二维数组key取值 -->
{{if !empty($t['view_data_key'])}}
{{if isset($t['view_data'][$data[$t['view_key']]][$t['view_data_key']])}}
{{$t['view_data'][$data[$t['view_key']]][$t['view_data_key']]}}
{{/if}}
{{else /}}
{{$t['view_data'][$data[$t['view_key']]]}}
{{/if}}
{{/if}}
<!-- 直接展示数据 -->
{{else /}}
......@@ -82,6 +97,10 @@
{{/if}}
{{/if}}
{{/if}}
<!-- 前后固定拼接的值 后面 -->
{{if isset($t['view_join_last'])}}
<span>{{$t.view_join_last}}</span>
{{/if}}
{{/case}}
{{case module}}
<!-- 从模块加载自定义模块数据 -->
......
application/index/view/default/public/module/form_table.html
浏览文件 @ c630773b
......@@ -174,8 +174,18 @@
<!-- 非数组则直接取值 -->
{{if isset($data_list[$i][$t['view_key']])}}
<!-- 是否指定数据转换 -->
{{if !empty($t['view_data']) and is_array($t['view_data']) and isset($t['view_data'][$data_list[$i][$t['view_key']]])}}
{{$t['view_data'][$data_list[$i][$t['view_key']]]}}
{{if !empty($t['view_data']) and is_array($t['view_data'])}}
<!-- 不存在数组中则不显示 -->
{{if isset($t['view_data'][$data_list[$i][$t['view_key']]])}}
<!-- 是否指定二维数组key取值 -->
{{if !empty($t['view_data_key'])}}
{{if isset($t['view_data'][$data_list[$i][$t['view_key']]][$t['view_data_key']])}}
{{$t['view_data'][$data_list[$i][$t['view_key']]][$t['view_data_key']]}}
{{/if}}
{{else /}}
{{$t['view_data'][$data_list[$i][$t['view_key']]]}}
{{/if}}
{{/if}}
<!-- 直接展示数据 -->
{{else /}}
......
application/lang/zh-cn.php
浏览文件 @ c630773b
......@@ -353,7 +353,8 @@ return array(
// 管理员状态
'common_admin_status_list' => array(
0 => array('value' => 0, 'name' => '正常', 'checked' => true),
1 => array('value' => 1, 'name' => '无效'),
1 => array('value' => 1, 'name' => '暂停'),
2 => array('value' => 2, 'name' => '已离职'),
),
......
application/service/AdminService.php
浏览文件 @ c630773b
......@@ -366,10 +366,10 @@ class AdminService
}
// 获取管理员
$admin = Db::name('Admin')->field('id,username,login_pwd,login_salt,mobile,login_total,role_id')->where(['username'=>$params['username']])->find();
$admin = Db::name('Admin')->field('id,username,login_pwd,login_salt,mobile,login_total,role_id')->where(['username'=>$params['username'], 'status'=>0])->find();
if(empty($admin))
{
return DataReturn('管理员不存在', -2);
return DataReturn('账户异常', -2);
}
// 密码校验
......
application/service/GoodsService.php
浏览文件 @ c630773b
......@@ -657,6 +657,13 @@ class GoodsService
'key_name' => 'buy_min_number',
'error_msg' => '请填写有效的最低起购数量',
],
[
'checked_type' => 'in',
'key_name' => 'site_type',
'checked_data' => array_merge([-1], array_column(lang('common_site_type_list'), 'value')),
'is_checked' => 2,
'error_msg' => '商品型号格式 最多30个字符',
],
[
'checked_type' => 'length',
'key_name' => 'seo_title',
......@@ -753,7 +760,8 @@ class GoodsService
'seo_desc' => empty($params['seo_desc']) ? '' : $params['seo_desc'],
'is_exist_many_spec' => empty($specifications['data']['title']) ? 0 : 1,
'spec_base' => empty($specifications_base['data']) ? '' : json_encode($specifications_base['data']),
'fictitious_goods_value' => $fictitious_goods_value,
'fictitious_goods_value' => $fictitious_goods_value,
'site_type' => isset($params['site_type']) ? $params['site_type'] : -1,
];
// 商品保存处理钩子
......
changelog.txt
浏览文件 @ c630773b
......@@ -15,6 +15,7 @@ web端
6. 支付插件支持自定义输出成功/失败内容
7. 支付插件管理优化适配平台，编辑不可超出插件定义的适配平台
8. 用户积分实时获取
9. 管理员新增状态
小程序端
......
sourcecode/baidu/app.json
浏览文件 @ c630773b
......@@ -89,6 +89,5 @@
"request": 10000,
"downloadFile": 10000
},
"debug": true,
"sitemapLocation": "sitemap.json"
"debug": true
}
\ No newline at end of file
sourcecode/baidu/sitemap.json 已删除 100644 → 0
浏览文件 @ 7229f836
{
"desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
"rules": [{
"action": "allow",
"page": "*"
}]
}
\ No newline at end of file
sourcecode/qq/app.json
浏览文件 @ c630773b
......@@ -82,6 +82,5 @@
"downloadFile": 10000
},
"plugins": {},
"debug": true,
"sitemapLocation": "sitemap.json"
"debug": true
}
\ No newline at end of file
sourcecode/weixin/app.json
浏览文件 @ c630773b
......@@ -115,6 +115,5 @@
"downloadFile": 10000
},
"plugins": {},
"debug": true,
"sitemapLocation": "sitemap.json"
"debug": true
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或