From 72f51bceb768825c9a4151fbe689338b8648df1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Thu, 11 Mar 2021 16:25:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/ShopGoods.php   |  4 ++--
 app/data/view/shop_goods/form.html  |  4 ++--
 app/data/view/shop_goods/index.html | 20 +++++++++++---------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/data/controller/ShopGoods.php b/app/data/controller/ShopGoods.php
index 06c905ae1..16e6bb171 100644
--- a/app/data/controller/ShopGoods.php
+++ b/app/data/controller/ShopGoods.php
@@ -132,7 +132,7 @@ class ShopGoods extends Controller
     protected function _copy_form_filter(array &$data)
     {
         if ($this->request->isPost()) {
-            $data['code'] = CodeExtend::uniqidNumber(14, 'G');
+            $data['code'] = CodeExtend::uniqidNumber(20, 'G');
         }
     }
 
@@ -146,7 +146,7 @@ class ShopGoods extends Controller
     protected function _form_filter(array &$data)
     {
         if (empty($data['code'])) {
-            $data['code'] = CodeExtend::uniqidNumber(14, 'G');
+            $data['code'] = CodeExtend::uniqidNumber(20, 'G');
         }
         if ($this->request->isGet()) {
             $data['marks'] = str2arr($data['marks'] ?? '');
diff --git a/app/data/view/shop_goods/form.html b/app/data/view/shop_goods/form.html
index 2a9464469..44b2f906b 100644
--- a/app/data/view/shop_goods/form.html
+++ b/app/data/view/shop_goods/form.html
@@ -221,7 +221,7 @@
                     <th width="10%" class="text-center nowrap">市场价格 <a ng-click="batchSet('market',2)" data-tips-text="批量设置" class="layui-icon">&#xe63c;</a></th>
                     <th width="10%" class="text-center nowrap">销售价格 <a ng-click="batchSet('selling',2)" data-tips-text="批量设置" class="layui-icon">&#xe63c;</a></th>
                     <th width="10%" class="text-center nowrap">奖励余额 <a ng-click="batchSet('balance',2)" data-tips-text="批量设置" class="layui-icon">&#xe63c;</a></th>
-                    <th width="10%" class="text-center nowrap">奖励积分 <a ng-click="batchSet('integral',0)" data-tips-text="批量设置" class="layui-icon">&#xe63c;</a></th>
+                    <th width="10%" class="text-center nowrap layui-hide">奖励积分 <a ng-click="batchSet('integral',0)" data-tips-text="批量设置" class="layui-icon">&#xe63c;</a></th>
                     <th width="10%" class="text-center nowrap">虚拟销量 <a ng-click="batchSet('virtual',0)" data-tips-text="批量设置" class="layui-icon">&#xe63c;</a></th>
                     <th width="10%" class="text-center nowrap">快递计件 <a ng-click="batchSet('express',0)" data-tips-text="批量设置" class="layui-icon">&#xe63c;</a></th>
                     <th width="08%" class="text-center nowrap">销售状态</th>
@@ -250,7 +250,7 @@
                             <input ng-blur="rows[0].balance=setValue(rows[0].key,'balance',$event.target.value,'(parseFloat(_)||0).toFixed(2)')" class="layui-input border-0 padding-left-0 text-center" ng-model="rows[0].balance">
                         </label>
                     </td>
-                    <td class="padding-0">
+                    <td class="padding-0 layui-hide">
                         <label class="padding-0 margin-0">
                             <input ng-blur="rows[0].integral=setValue(rows[0].key,'integral',$event.target.value,'(parseInt(_)||0)')" class="layui-input border-0 padding-left-0 text-center" ng-model="rows[0].integral">
                         </label>
diff --git a/app/data/view/shop_goods/index.html b/app/data/view/shop_goods/index.html
index b3995855a..3e0dca9b9 100644
--- a/app/data/view/shop_goods/index.html
+++ b/app/data/view/shop_goods/index.html
@@ -63,32 +63,34 @@
                     <div class="headimg" data-tips-image data-lazy-src="{$vo.cover}"></div>
                     {/notempty}
                     <div class="inline-block text-top sub-span-blue">
-                        商品编号：<span>{$vo.code|default='--'}</span><br>
-                        商品名称：<span>{$vo.name|default='--'}</span><br>
+                        <div>商品名称：<span>{$vo.name|default='--'}</span></div>
+                        <div>商品编号：<span>{$vo.code|default='--'}</span></div>
                     </div>
                 </td>
-                <td class="text-left sub-span-blue">
+                <td>
                     <div>
                         {notempty name='vo.marks'}{foreach $vo.marks as $mark}
-                        <b class="notselect nowrap layui-badge layui-bg-cyan">{$mark}</b>
+                        <span class="notselect nowrap layui-badge layui-bg-cyan">{$mark}</span>
                         {/foreach}{/notempty}
                     </div>
                     <div class="nowrap">
                         {notempty name='vo.cateinfo'}
-                        {:join('<span class="layui-icon layui-icon-right font-s10"></span>', $vo.cateinfo.names)}<br>
+                        {:join('<span class="layui-icon layui-icon-right font-s10 color-blue"></span>', $vo.cateinfo.names)}
                         {/notempty}
                     </div>
                 </td>
                 <td class='nowrap'>
+                    <div>创建时间：{$vo.create_at|format_datetime}</div>
                     <div>
                         {eq name='vo.status' value='0'}<span class="layui-badge">已下架</span>{else}<span class="layui-badge layui-bg-green">销售中</span>{/eq}
-                        {eq name='vo.vip_entry' value='0'}<span class="layui-badge">非入会礼包</span>{else}<span class="layui-badge layui-bg-green">是入会礼包</span>{/eq}
-                        {eq name='vo.truck_type' value='0'}<span class="layui-badge">无需快递配送</span>{else}<span class="layui-badge layui-bg-green">需要快递配送</span>{/eq}
+                        {eq name='vo.vip_entry' value='0'}<span class="layui-badge layui-bg-blue">非入会礼包</span>{else}<span class="layui-badge layui-bg-green">是入会礼包</span>{/eq}
+                        {eq name='vo.truck_type' value='0'}<span class="layui-badge layui-bg-blue">无需快递配送</span>{else}<span class="layui-badge layui-bg-green">需要快递配送</span>{/eq}
                     </div>
-                    <div>创建时间：{$vo.create_at|format_datetime}</div>
                 </td>
                 <td class='nowrap sub-span-blue'>
-                    <div class="margin-bottom-5">剩余库存 <span>{$vo.stock_total-$vo.stock_sales}</span> 件 ( 已销售 <span>{$vo.stock_sales}</span> 件 )</div>
+                    <div class="margin-bottom-5">
+                        剩余库存 <span>{$vo.stock_total-$vo.stock_sales}</span> 件 ( 已销售 <span>{$vo.stock_sales}</span> 件 )
+                    </div>
 
                     <!--{if auth('copy')}-->
                     <a class="layui-btn layui-btn-xs layui-btn-normal" data-open='{:url("copy")}?code={$vo.code}'>复 制</a>