商城改造

addons/unishop/controller/Product.php

@@ -158,7 +158,7 @@ class Product extends Base
             ->where(['switch' => productModel::SWITCH_ON])
             ->page($page, $pagesize)
             ->order($by, $desc)
-            ->field('id,title,image,sales_price,sales,real_sales')
+            ->field('id,title,info,image,sales_price,sales,real_sales')
             ->select();
 
         if ($result) {

application/admin/lang/zh-cn/unishop/product.php

@@ -4,6 +4,7 @@ return [
     'Category_id'    => '分类ID',
     'Category name'    => '分类名称',
     'Title'          => '产品标题',
+    'Info'          => '产品副标题',
     'Image'          => '主图',
     'Images'         => '组图',
     'Desc'           => '详情',

application/admin/view/unishop/product/add.html

@@ -18,6 +18,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Info')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-info" data-rule="required" class="form-control" name="row[info]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">

application/admin/view/unishop/product/edit.html

@@ -18,6 +18,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Info')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-info" data-rule="required" class="form-control" name="row[info]" type="text" value="{$row.info}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">

application/admin/view/unishop/product/recyclebin.html

@@ -8,9 +8,9 @@
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh')}
                         <a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('unishop/product/restore')?'':'hide'}" href="javascript:;" data-url="unishop/product/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
-                        <a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('unishop/product/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/product/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>
+                        <!--<a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('unishop/product/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/product/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>-->
                         <a class="btn btn-success btn-restoreall {:$auth->check('unishop/product/restore')?'':'hide'}" href="javascript:;" data-url="unishop/product/restore" title="{:__('Restore all')}"><i class="fa fa-rotate-left"></i> {:__('Restore all')}</a>
-                        <a class="btn btn-danger btn-destroyall {:$auth->check('unishop/product/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/product/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>
+                        <!--<a class="btn btn-danger btn-destroyall {:$auth->check('unishop/product/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/product/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>-->
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover"
                            data-operate-restore="{:$auth->check('unishop/product/restore')}"

application/api/controller/Wenzhen.php

@@ -226,7 +226,7 @@ class Wenzhen extends Api
         }
 
         //视频订单接诊后N分钟自动结束
-        if($val['status'] == 20 && $val['ordertype'] == 2){
+        if($val['status'] == 30 && $val['ordertype'] == 2){
             $remain_time = $val['accept_time'] + (config('site.accept_videoorder_autofinish_minute')*60) - time();
             if($remain_time > 0){
                 $status_data_val['minute'] = Sec2Time($remain_time);

public/assets/js/backend/unishop/product.js

@@ -727,14 +727,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'upload', 'vue'], fun
                                     url: 'unishop/product/restore',
                                     refresh: true
                                 },
-                                {
+                                /*{
                                     name: 'Destroy',
                                     text: __('Destroy'),
                                     classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
                                     icon: 'fa fa-times',
                                     url: 'unishop/product/destroy',
                                     refresh: true
-                                }
+                                }*/
                             ],
                             formatter: Table.api.formatter.operate
                         }