diff --git a/application/admin/controller/api/Update.php b/application/admin/controller/api/Update.php index 7de7557b7..0f33d3b94 100644 --- a/application/admin/controller/api/Update.php +++ b/application/admin/controller/api/Update.php @@ -47,7 +47,8 @@ class Update extends Controller $file = env('root_path') . decode($encode); if (!file_exists($file)) $this->error('获取文件内容失败！'); $this->success('获取文件内容成功！', [ - 'format' => 'base64', 'content' => base64_encode(file_get_contents($file)), + 'format' => 'base64', + 'content' => base64_encode(file_get_contents($file)), ]); } diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php index 85e61ff0b..7950b95cc 100644 --- a/application/index/controller/Index.php +++ b/application/index/controller/Index.php @@ -9,7 +9,7 @@ // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) // +---------------------------------------------------------------------- -// | github开源项目：https://github.com/zoujingli/ThinkAdmin +// | github开源项目：https://github.com/zoujingli/framework // +---------------------------------------------------------------------- namespace app\index\controller; diff --git a/application/store/command/AutoRun.php b/application/store/command/AutoRun.php index 16c97c437..c71ccf89b 100644 --- a/application/store/command/AutoRun.php +++ b/application/store/command/AutoRun.php @@ -14,9 +14,6 @@ namespace app\store\command; -use think\console\Command; -use think\console\Input; -use think\console\Output; use think\Db; /** @@ -24,7 +21,7 @@ use think\Db; * Class AutoRun * @package app\store\command */ -class AutoRun extends Command +class AutoRun extends \think\console\Command { protected function configure() @@ -34,20 +31,20 @@ class AutoRun extends Command /** * 业务指令执行 - * @param Input $input - * @param Output $output + * @param \think\console\Input $input + * @param \think\console\Output $output * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\ModelNotFoundException * @throws \think\exception\DbException * @throws \think\exception\PDOException */ - protected function execute(Input $input, Output $output) + protected function execute(\think\console\Input $input, \think\console\Output $output) { // 自动取消30分钟未支付的订单 $this->autoCancelOrder(); // 清理一天前未支付的订单 - $this->autoCleanOrder(); + $this->autoRemoveOrder(); // 订单自动退款处理 // $this->autoRefundOrder(); // 提现自动打款处理 @@ -61,8 +58,9 @@ class AutoRun extends Command */ private function autoCancelOrder() { - $where = [['create_at', '<', date('Y-m-d H:i:s', strtotime('-30 minutes'))]]; - $count = Db::name('StoreOrder')->where(['pay_state' => '0'])->whereIn('status', ['1', '2'])->where($where)->update([ + $datetime = $this->getDatetime('store_order_wait_time'); + $where = [['status', 'in', ['1', '2']], ['pay_state', 'eq', '0'], ['create_at', '<', $datetime]]; + $count = Db::name('StoreOrder')->where($where)->update([ 'status' => '0', 'cancel_state' => '1', 'cancel_at' => date('Y-m-d H:i:s'), @@ -83,14 +81,15 @@ class AutoRun extends Command * @throws \think\exception\DbException * @throws \think\exception\PDOException */ - private function autoCleanOrder() + private function autoRemoveOrder() { - $where = [['create_at', '<', date('Y-m-d H:i:s', strtotime('-1 day'))]]; - $list = Db::name('StoreOrder')->where(['pay_state' => '0'])->where($where)->limit(20)->select(); - if (count($order_nos = array_unique(array_column($list, 'order_no'))) > 0) { - $this->output->info("自动删除前一天已经取消的订单：\n\t" . join(',' . PHP_EOL . "\t", $order_nos)); - Db::name('StoreOrder')->whereIn('order_no', $order_nos)->delete(); - Db::name('StoreOrderList')->whereIn('order_no', $order_nos)->delete(); + $datetime = $this->getDatetime('store_order_clear_time'); + $where = [['status', 'eq', '0'], ['pay_state', 'eq', '0'], ['create_at', '<', $datetime]]; + $list = Db::name('StoreOrder')->where($where)->limit(20)->select(); + if (count($orderNos = array_unique(array_column($list, 'order_no'))) > 0) { + $this->output->info("自动删除前一天已经取消的订单：" . PHP_EOL . join(',' . PHP_EOL, $orderNos)); + Db::name('StoreOrder')->whereIn('order_no', $orderNos)->delete(); + Db::name('StoreOrderList')->whereIn('order_no', $orderNos)->delete(); } else { $this->output->comment('没有需要自动删除前一天已经取消的订单！'); } @@ -172,4 +171,17 @@ class AutoRun extends Command } } + /** + * 获取配置时间 + * @param string $code + * @return string + * @throws \think\Exception + * @throws \think\exception\PDOException + */ + private function getDatetime($code) + { + $minutes = intval(sysconf($code) * 60); + return date('Y-m-d H:i:s', strtotime("-{$minutes} minutes")); + } + } \ No newline at end of file diff --git a/application/store/controller/Config.php b/application/store/controller/Config.php index 9bc44a18e..d94bba910 100644 --- a/application/store/controller/Config.php +++ b/application/store/controller/Config.php @@ -14,7 +14,7 @@ namespace app\store\controller; -use app\store\service\Extend; +use app\store\service\ExtendService; use library\Controller; /** @@ -35,7 +35,7 @@ class Config extends Controller $this->applyCsrfToken(); $this->title = '商城参数配置'; if ($this->request->isGet()) { - $this->query = Extend::querySmsBalance(); + $this->query = ExtendService::querySmsBalance(); $this->fetch(); } else { foreach ($this->request->post() as $k => $v) sysconf($k, $v); @@ -43,4 +43,22 @@ class Config extends Controller } } + /** + * 商城短信配置 + * @throws \think\Exception + * @throws \think\exception\PDOException + */ + public function sms() + { + $this->applyCsrfToken(); + $this->title = '商城短信配置'; + if ($this->request->isGet()) { + $this->query = ExtendService::querySmsBalance(); + $this->fetch(); + } else { + foreach ($this->request->post() as $k => $v) sysconf($k, $v); + $this->success('商城短信配置保存成功！'); + } + } + } \ No newline at end of file diff --git a/application/store/controller/ExpressCompany.php b/application/store/controller/ExpressCompany.php index f0f8649c5..0a4eec427 100644 --- a/application/store/controller/ExpressCompany.php +++ b/application/store/controller/ExpressCompany.php @@ -95,7 +95,7 @@ class ExpressCompany extends Controller /** * 删除快递公司 */ - public function del() + public function remove() { $this->_delete($this->table); } diff --git a/application/store/controller/ExpressProvince.php b/application/store/controller/ExpressProvince.php index c3ef0b6b7..890adaf6b 100644 --- a/application/store/controller/ExpressProvince.php +++ b/application/store/controller/ExpressProvince.php @@ -83,7 +83,7 @@ class ExpressProvince extends Controller /** * 删除配送省份 */ - public function del() + public function remove() { $this->applyCsrfToken(); $this->_delete($this->table); diff --git a/application/store/controller/ExpressTemplate.php b/application/store/controller/ExpressTemplate.php index 2dc0a0038..5b406c1b6 100644 --- a/application/store/controller/ExpressTemplate.php +++ b/application/store/controller/ExpressTemplate.php @@ -21,11 +21,6 @@ class ExpressTemplate extends Controller /** * 邮费模板管理 - * @throws \think\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\ModelNotFoundException - * @throws \think\exception\DbException - * @throws \think\exception\PDOException */ public function index() { diff --git a/application/store/controller/Goods.php b/application/store/controller/Goods.php index d243dfb65..879ed894c 100644 --- a/application/store/controller/Goods.php +++ b/application/store/controller/Goods.php @@ -91,7 +91,7 @@ class Goods extends Controller ]); if (!empty($data)) { Db::name('StoreGoodsStock')->insertAll($data); - \app\store\service\Goods::syncStock($post['id']); + \app\store\service\GoodsService::syncStock($post['id']); $this->success('商品信息入库成功！'); } } @@ -104,7 +104,7 @@ class Goods extends Controller */ public function add() { - $this->title = '添加商品'; + $this->title = '添加商品信息'; $this->isAddMode = '1'; return $this->_form($this->table, 'form'); } @@ -115,7 +115,7 @@ class Goods extends Controller */ public function edit() { - $this->title = '编辑商品'; + $this->title = '编辑商品信息'; $this->isAddMode = '0'; return $this->_form($this->table, 'form'); } @@ -182,7 +182,7 @@ class Goods extends Controller /** * 删除商品信息 */ - public function del() + public function remove() { $this->_delete($this->table); } diff --git a/application/store/controller/GoodsCate.php b/application/store/controller/GoodsCate.php index b3149858d..2322f7035 100644 --- a/application/store/controller/GoodsCate.php +++ b/application/store/controller/GoodsCate.php @@ -83,7 +83,7 @@ class GoodsCate extends Controller /** * 删除商品分类 */ - public function del() + public function remove() { $this->_delete($this->table); } diff --git a/application/store/controller/Member.php b/application/store/controller/Member.php index f92f2f9e8..36daffe13 100644 --- a/application/store/controller/Member.php +++ b/application/store/controller/Member.php @@ -40,7 +40,8 @@ class Member extends Controller public function index() { $this->title = '会员信息管理'; - $this->_query($this->table)->like('nickname,phone')->equal('vip_level')->dateBetween('create_at')->order('id desc')->page(); + $query = $this->_query($this->table)->like('nickname,phone')->equal('vip_level'); + $query->dateBetween('create_at')->order('id desc')->page(); } /** diff --git a/application/store/controller/Message.php b/application/store/controller/Message.php index 16cbaf25b..8e0017579 100644 --- a/application/store/controller/Message.php +++ b/application/store/controller/Message.php @@ -40,7 +40,16 @@ class Message extends Controller public function index() { $this->title = '短信发送管理'; - $this->_query($this->table)->like('phone,content,result')->dateBetween('create_at')->order('id desc')->page(); + $query = $this->_query($this->table)->like('phone,content,result'); + $query->dateBetween('create_at')->order('id desc')->page(); + } + + /** + * 删除短信记录 + */ + public function remove() + { + $this->_delete($this->table); } } \ No newline at end of file diff --git a/application/store/controller/Order.php b/application/store/controller/Order.php index bb9bf70e3..5cb96902e 100644 --- a/application/store/controller/Order.php +++ b/application/store/controller/Order.php @@ -83,7 +83,7 @@ class Order extends Controller $this->_form($this->table); } - /*** + /** * 快递追踪查询 */ public function expressQuery() diff --git a/application/store/controller/api/Notify.php b/application/store/controller/api/Notify.php index de8a9ca28..5422b474b 100644 --- a/application/store/controller/api/Notify.php +++ b/application/store/controller/api/Notify.php @@ -14,7 +14,7 @@ namespace app\store\controller\api; -use app\store\service\Order; +use app\store\service\OrderService; use think\Db; /** @@ -64,7 +64,7 @@ class Notify 'pay_price' => $pay_price, 'pay_state' => '1', 'pay_at' => date('Y-m-d H:i:s'), ]); // 调用会员升级机制 - Order::update($order['order_no']); + OrderService::update($order['order_no']); return $result !== false; } diff --git a/application/store/controller/api/member/Center.php b/application/store/controller/api/member/Center.php index 5a08e6b39..1f968ff46 100644 --- a/application/store/controller/api/member/Center.php +++ b/application/store/controller/api/member/Center.php @@ -15,7 +15,7 @@ namespace app\store\controller\api\member; use app\store\controller\api\Member; -use app\store\service\Extend; +use app\store\service\ExtendService; use think\Db; /** @@ -79,7 +79,7 @@ class Center extends Member $this->error('获取短信模板失败，联系管理员配置！'); } $cache = cache($cachekey); - if (Extend::sendSms($this->mid, $phone, str_replace('{code}', $code, $content))) { + if (ExtendService::sendSms($this->mid, $phone, str_replace('{code}', $code, $content))) { $dtime = ($cache['time'] + 120 < time()) ? 0 : (120 - time() + $cache['time']); $this->success('短信验证码发送成功！', ['time' => $dtime]); } diff --git a/application/store/controller/api/member/Order.php b/application/store/controller/api/member/Order.php index b0aba206e..6771f8530 100644 --- a/application/store/controller/api/member/Order.php +++ b/application/store/controller/api/member/Order.php @@ -15,7 +15,7 @@ namespace app\store\controller\api\member; use app\store\controller\api\Member; -use app\store\service\Goods; +use app\store\service\GoodsService; use library\tools\Data; use think\Db; @@ -95,7 +95,7 @@ class Order extends Member Db::name('StoreOrder')->insert($order); Db::name('StoreOrderList')->insertAll($orderList); // 同步商品库存及销量 - foreach (array_unique(array_column($orderList, 'goods_id')) as $goodsId) Goods::syncStock($goodsId); + foreach (array_unique(array_column($orderList, 'goods_id')) as $goodsId) GoodsService::syncStock($goodsId); $this->success('订单创建成功，请补全收货信息后支付！', ['order' => $order]); } catch (\think\exception\HttpResponseException $exception) { throw $exception; @@ -252,7 +252,7 @@ class Order extends Member 'cancel_at' => date('Y-m-d H:i:s'), 'cancel_desc' => '用户主动取消订单！', ]); - if ($result !== false && \app\store\service\Order::syncStock($order['order_no'])) { + if ($result !== false && \app\store\service\OrderService::syncStock($order['order_no'])) { $this->success('订单取消成功！'); } $this->error('订单取消失败，请稍候再试！'); diff --git a/application/store/service/Express.php b/application/store/service/Express.php deleted file mode 100644 index 67461467a..000000000 --- a/application/store/service/Express.php +++ /dev/null @@ -1,71 +0,0 @@ -where($map)->find(); - if (!empty($rule)) return self::buildData($rule, '普通模板', $number, $amount); - $rule = Db::name('StoreExpressTemplate')->where(['is_default' => '1'])->find(); - return self::buildData($rule, '默认模板', $number, $amount); - } - - /** - * 生成邮费数据 - * @param array $rule 模板规则 - * @param string $type 模板类型 - * @param integer $number 计费件数 - * @param double $amount 订单金额 - * @return array - */ - protected static function buildData($rule, $type, $number, $amount) - { - // 异常规则 - if (empty($rule)) return [ - 'express_price' => 0.00, 'express_type' => '未知模板', 'express_desc' => '未匹配到邮费模板', - ]; - // 满减免邮 - if ($rule['order_reduction_state'] && $amount >= $rule['order_reduction_price']) { - return [ - 'express_price' => 0.00, 'express_type' => $type, - 'express_desc' => "订单总金额满{$rule['order_reduction_price']}元减免全部邮费", - ]; - } - // 首重计费 - if ($number <= $rule['first_number']) return [ - 'express_price' => $rule['first_price'], 'express_type' => $type, - 'express_desc' => "首件计费，{$rule['first_number']}件及{$rule['first_number']}以内计费{$rule['first_price']}元", - ]; - // 续重计费 - list($price1, $price2) = [$rule['first_price'], 0]; - if ($rule['next_number'] > 0 && $rule['next_price'] > 0) { - $price2 = $rule['next_price'] * ceil(($number - $rule['first_number']) / $rule['next_number']); - } - return [ - 'express_price' => $price1 + $price2, 'express_type' => $type, - 'express_desc' => "续件计费，超出{$rule['first_number']}件，首件费用{$rule['first_price']}元 + 续件费用{$price2}元", - ]; - } -} \ No newline at end of file diff --git a/application/store/service/Extend.php b/application/store/service/Extend.php deleted file mode 100644 index 3c518cfca..000000000 --- a/application/store/service/Extend.php +++ /dev/null @@ -1,82 +0,0 @@ - $tkey, - 'mobile' => $phone, - 'content' => $content, - 'username' => sysconf('sms_zt_username'), - 'productid' => $productid, - 'password' => md5(md5(sysconf('sms_zt_password')) . $tkey), - ]; - $result = Http::post('http://www.ztsms.cn/sendNSms.do', $data); - list($code, $msg) = explode(',', $result . ','); - $insert = ['mid' => $mid, 'phone' => $phone, 'content' => $content, 'result' => $result]; - Db::name('StoreMemberSmsHistory')->insert($insert); - return intval($code) === 1; - } - - /** - * 查询短信余额 - * @return array - * @throws \think\Exception - * @throws \think\exception\PDOException - */ - public static function querySmsBalance() - { - $tkey = date("YmdHis"); - $data = [ - 'tkey' => $tkey, - 'username' => sysconf('sms_zt_username'), - 'password' => md5(md5(sysconf('sms_zt_password')) . $tkey), - ]; - $result = Http::post('http://www.ztsms.cn/balanceN.do', $data); - if ($result > -1) { - return ['code' => 1, 'num' => $result, 'msg' => '获取短信剩余条数成功！']; - } elseif ($result > -2) { - return ['code' => 0, 'num' => '0', 'msg' => '用户名或者密码不正确！']; - } elseif ($result > -3) { - return ['code' => 0, 'num' => '0', 'msg' => 'tkey不正确！']; - } elseif ($result > -4) { - return ['code' => 0, 'num' => '0', 'msg' => '用户不存在或用户停用！']; - } - } - -} \ No newline at end of file diff --git a/application/store/service/Goods.php b/application/store/service/Goods.php deleted file mode 100644 index 06d13b8ac..000000000 --- a/application/store/service/Goods.php +++ /dev/null @@ -1,70 +0,0 @@ -field($fields)->where(['goods_id' => $goodsId])->group('goods_id,goods_spec')->select(); - // 商品销量统计 - $where = [['b.goods_id', 'eq', $goodsId], ['a.status', 'in', ['1', '2', '3', '4', '5']]]; - $fields = 'b.goods_id,b.goods_spec,ifnull(sum(b.number_goods),0) number_sales'; - $salesList = Db::table('store_order a')->field($fields)->leftJoin('store_order_list b', 'a.order_no=b.order_no')->where($where)->group('b.goods_id,b.goods_spec')->select(); - // 组装更新数据 - $dataList = []; - foreach (array_merge($stockList, $salesList) as $vo) { - $key = "{$vo['goods_id']}@@{$vo['goods_spec']}"; - $dataList[$key] = isset($dataList[$key]) ? array_merge($dataList[$key], $vo) : $vo; - if (empty($dataList[$key]['number_sales'])) $dataList[$key]['number_sales'] = '0'; - if (empty($dataList[$key]['number_stock'])) $dataList[$key]['number_stock'] = '0'; - } - unset($salesList, $stockList); - // 更新商品规格销量及库存 - foreach ($dataList as $vo) Db::name('StoreGoodsList')->where([ - 'goods_id' => $goodsId, - 'goods_spec' => $vo['goods_spec'], - ])->update([ - 'number_stock' => $vo['number_stock'], - 'number_sales' => $vo['number_sales'], - ]); - // 更新商品主体销量及库存 - Db::name('StoreGoods')->where(['id' => $goodsId])->update([ - 'number_stock' => intval(array_sum(array_column($dataList, 'number_stock'))), - 'number_sales' => intval(array_sum(array_column($dataList, 'number_sales'))), - ]); - return true; - } - -} \ No newline at end of file diff --git a/application/store/service/Order.php b/application/store/service/Order.php deleted file mode 100644 index 831986c97..000000000 --- a/application/store/service/Order.php +++ /dev/null @@ -1,66 +0,0 @@ - $order_no]; - $goodsIds = Db::name('StoreOrderList')->where($map)->column('goods_id'); - foreach (array_unique($goodsIds) as $goodsId) if (!Goods::syncStock($goodsId)) return false; - return true; - } - - /** - * 订单利润计算 - * @param string $order_no - * @return boolean - */ - public static function profit($order_no = '') - { - // @todo 计算订单返佣 - } -} \ No newline at end of file diff --git a/application/store/view/config/index.html b/application/store/view/config/index.html index 64b0a8a0c..4fe5b334a 100644 --- a/application/store/view/config/index.html +++ b/application/store/view/config/index.html @@ -1,71 +1,40 @@ {extend name="admin@main"} {block name="content"} -
+ -
+
+
-
+ - 平台短信配置 + - {if empty($query.code)} -
{$query.msg|default=''}
- {elseif $query.code eq 1} -
平台剩余 {$query.num|default=0} 条可用短信，{$query.msg|default=''}
- {/if} + -
- -

助通短信平台账号，可以联系客服获取账号与密码。

+ + +
+
-
- -

助通短信平台账号，可以联系客服获取账号与密码。

-
- -
- -

短信发送安全码，调用接口发短信时需要传入此参数。

-
- -
- -

会员注册短信模板，验证码变量使用 {code} 代替。

-
- - -
-
-
- -
-
-
- -
- +
-{/block} \ No newline at end of file +{/block} diff --git a/application/store/view/express_company/index.html b/application/store/view/express_company/index.html index 8b0e015be..ca27a92fa 100644 --- a/application/store/view/express_company/index.html +++ b/application/store/view/express_company/index.html @@ -4,68 +4,68 @@ {if auth("store/express_company/add")} {/if} -{if auth("store/express_company/del")} - +{if auth("store/express_company/remove")} + {/if} {/block} {block name="content"} - - - - - - - - - - - - - - - - - - - - - - - - - + + {/foreach} + +
{include file='express_company/index_search'}
- - - - 快递名称快递编码记录状态创建时间
- - - - {$vo.express_title|default=''}{$vo.express_code|default=''} - {eq name='vo.status' value='0'}已禁用{else}使用中{/eq}
- 		{$vo.create_at|format_datetime} +
+ + + {notempty name='list'} + + + + + + + + + + + + {/notempty} + + {foreach $list as $key=>$vo} + + + + + + + + - - - -
{include file='express_company/index_search'}
+ + + + 快递名称快递编码记录状态创建时间
+ + + + {$vo.express_title|default=''}{$vo.express_code|default=''} + {eq name='vo.status' value='0'}已禁用{else}使用中{/eq}
+ 		{$vo.create_at|format_datetime} - {if auth("store/express_company/edit")} - 编 辑 - {/if} + {if auth("store/express_company/edit")} + 编 辑 + {/if} - {if $vo.status eq 1 and auth("store/express_company/forbid")} - 禁 用 - {elseif auth("store/express_company/resume")} - 启 用 - {/if} + {if $vo.status eq 1 and auth("store/express_company/forbid")} + 禁 用 + {elseif auth("store/express_company/resume")} + 启 用 + {/if} - {if auth("store/express_company/del")} - 删 除 - {/if} - -
- -{empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} + {if auth("store/express_company/remove")} + 删 除 + {/if} +
+ {empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} +
{/block} \ No newline at end of file diff --git a/application/store/view/express_province/index.html b/application/store/view/express_province/index.html index e411a62a2..11a2dbfbb 100644 --- a/application/store/view/express_province/index.html +++ b/application/store/view/express_province/index.html @@ -6,67 +6,66 @@ - - - +{if auth("store/express_province/remove")} + +{/if} {/block} {block name="content"} - - - {notempty name='list'} - - - - - - - - - - - - {foreach $list as $key=>$vo} - - - - - - - + + {/foreach} + + {/notempty} +
{include file='express_province/index_search'}
- - - - 省份名称创建时间使用状态
- - - - {$vo.title|default='--'}{$vo.create_at|format_datetime} - {eq name='vo.status' value='0'}已禁用{else}使用中{/eq} - +
+ + + {notempty name='list'} + + + + + + + + + + + + {foreach $list as $key=>$vo} + + + + + + + - - - {/foreach} - - {/notempty} -
{include file='express_province/index_search'}
+ + + + 省份名称创建时间使用状态
+ + + + {$vo.title|default='--'}{$vo.create_at|format_datetime} + {eq name='vo.status' value='0'}已禁用{else}使用中{/eq} + - {if auth("store/express_province/edit")} - 编 辑 - {/if} + {if auth("store/express_province/edit")} + 编 辑 + {/if} - {if $vo.status eq 1 and auth("store/express_province/forbid")} - 禁 用 - {elseif auth("store/express_province/resume")} - 启 用 - {/if} - - {if auth("store/express_province/del")} - 删 除 - {/if} -
- -{empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} + {if $vo.status eq 1 and auth("store/express_province/forbid")} + 禁 用 + {elseif auth("store/express_province/resume")} + 启 用 + {/if} + {if auth("store/express_province/remove")} + 删 除 + {/if} +
+ {empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} + {/block} \ No newline at end of file diff --git a/application/store/view/express_template/index.html b/application/store/view/express_template/index.html index 8dab31626..b01b9c8ae 100644 --- a/application/store/view/express_template/index.html +++ b/application/store/view/express_template/index.html @@ -1,9 +1,9 @@ {extend name="admin@main"} {block name="content"} -
+ -
+
{foreach $list as $index=>$item} diff --git a/application/store/view/goods/form.html b/application/store/view/goods/form.html index cb94436da..966050009 100644 --- a/application/store/view/goods/form.html +++ b/application/store/view/goods/form.html @@ -1,35 +1,40 @@ {extend name='admin@main'} {block name="content"} + +{include file='store@goods/form_style'} + -
+
-
-

*商品分类

- +
+ +
-
-

*商品名称

- -
-

*商品图片

+ 商品LOGO及轮播展示图片 - + @@ -40,42 +45,25 @@ -
- 快递运费及分成比例 -
-
-
-
- - -
-
-
-
-
-
-

- * - 商品规格（最多支持3个规格分组，每个分组最多支持5个规格属性；仅添加商品时可编辑内容） -

+ 商品规格及商品SKU绑定（规格填写后不允许再次修改）
- - + + + @@ -95,12 +84,7 @@ - + +
LOGO商品图片展示图片
快递数量 虚拟销量 商品SKU 市场价格 销售价格 虚拟销量 快递计件 销售状态
- - @@ -113,18 +97,29 @@ + + + +
+

请从仓储平台获取商品SKU与商品条码，请注意尽量不要重复，也不能产生订单后再修改！

-

*商品内容

+ 商品详细内容
@@ -136,110 +131,22 @@
- - - {/block} {block name='script'} + +