diff --git a/app/admin/view/nk/areamanager/index.html b/app/admin/view/nk/areamanager/index.html
index 91398e5..acad52f 100644
--- a/app/admin/view/nk/areamanager/index.html
+++ b/app/admin/view/nk/areamanager/index.html
@@ -61,17 +61,17 @@
limit: 20,
cols: [
[
- {
- fixed: 'left',
- field: 'id',
- title: '编号',
- align: 'center',
- width:80,
- },{
+ {
+ fixed: 'left',
+ field: 'id',
+ title: '编号',
+ align: 'center',
+ width:80,
+ },{
field: 'area',
title: '区域',
align: 'center',
- templet: function (d)
+ templet: function (d)
{
var html = '【' + d['area']['area_name'] + '】'
return html;
@@ -96,7 +96,7 @@
field: 'status',
title: '状态',
align: 'center',
- templet: function (d)
+ templet: function (d)
{
var html = '禁用';
if (d.status == '0') {
@@ -109,30 +109,17 @@
title: '添加时间',
align: 'center',
width:150,
- },{
- field: 'status',
- templet: function (d)
- {
- var html = '禁用';
- if (d.status == '0') {
- html = '正常';
- }
- return html;
- },
- title: '状态',
- align: 'center',
- width:100,
},{
fixed: 'right',
field: 'right',
title: '操作',
toolbar: '#barDemo',
align: 'center'
- }
+ }
]
]
});
-
+
//监听表头工具栏事件
table.on('toolbar(article)', function(obj){
if (obj.event === 'add') {
diff --git a/app/api/model/ProductOrderLog.php b/app/api/model/ProductOrderLog.php
index 8ac1db3..6dfa415 100644
--- a/app/api/model/ProductOrderLog.php
+++ b/app/api/model/ProductOrderLog.php
@@ -14,5 +14,5 @@
class ProductOrderLog extends Model
{
// 设置当前模型的数据库连接
- protected $connection = 'sznk_shop';
+ protected $connection = 'shop_lihaink_com';
}
\ No newline at end of file
diff --git a/app/api/model/StoreProduct.php b/app/api/model/StoreProduct.php
index 9fdcf17..fe5570d 100644
--- a/app/api/model/StoreProduct.php
+++ b/app/api/model/StoreProduct.php
@@ -14,5 +14,5 @@
class StoreProduct extends Model
{
// 设置当前模型的数据库连接
- protected $connection = 'sznk_shop';
+ protected $connection = 'shop_lihaink_com';
}
\ No newline at end of file