Browse Source

checkredis

yuenan
娄梦宁 3 years ago
parent
commit
a8c53c02b8
3 changed files with 26 additions and 3 deletions
  1. +3
    -0
      application/admin/controller/unishop/Product.php
  2. +1
    -1
      public/assets/js/backend/unishop/order.js
  3. +22
    -2
      public/assets/js/backend/unishop/product.js

+ 3
- 0
application/admin/controller/unishop/Product.php View File

@@ -124,7 +124,10 @@ class Product extends Backend
->order($sort, $order)
->limit($offset, $limit)
->select();
foreach ($list as &$val){
$val["url"]="http://47.101.187.29:8083/h5/#/pages/product/product?id=".$val["id"];

}
$list = collection($list)->toArray();
$result = array("total" => $total, "rows" => $list);
return json($result);


+ 1
- 1
public/assets/js/backend/unishop/order.js View File

@@ -98,7 +98,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'order_price', title: __('Order_price'), operate:'BETWEEN'},
// {field: 'discount_price', title: __('Discount_price'), operate:'BETWEEN'},
// {field: 'delivery_price', title: __('Delivery_price'), operate:'BETWEEN'},
{field: 'total_price', title: __('Total_price'), operate:'BETWEEN'},
// {field: 'total_price', title: __('Total_price'), operate:'BETWEEN'},
// {field: 'pay_type', title: __('Pay_type'), searchList: {"1":__('Online'),"2":__('Offline'),"3":__('wxPay'),"4":__('aliPay')}, formatter: Table.api.formatter.normal},
{field: 'ip', title: __('Ip'), visible:false},
{field: 'status', title: __('Status'), searchList: {"-1":__('Refund'),"0":__('Cancel'),"1":__('Normal')}, formatter: Table.api.formatter.status},


+ 22
- 2
public/assets/js/backend/unishop/product.js View File

@@ -521,6 +521,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'upload', 'plupload',
[
{checkbox: true},
{field: 'id', title: __('Id')},
{
field: 'buttons',
width: "120px",
title: __('地址'),
table: table,
buttons: [
{
name: 'addtabs',
text: __('打开链接'),
title: __('打开链接'),
classname: 'btn btn-xs btn-warning',
icon: 'fa fa-folder-o',
url: function(row){
return row.url;
},
extend:' target="_blank"'
}
],
formatter: Table.api.formatter.buttons
},
{field: 'category_id', title: __('Category_id'), visible: false},
{
field: 'category', title: __('Category name'), formatter: function (value, row, index) {
@@ -588,8 +608,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'upload', 'plupload',
// extend: 'data-toggle="tooltip"',
// icon: 'fa fa-commenting',
// click: function (row) {
// alert(11);
// window.location.href='http://47.101.187.29:8083/h5/#/pages/product/product?flash=0&id='+row.id
// // alert(11);
// window.location.href='http://47.101.187.29:8083/h5/#/pages/product/product?flash=0&id={url}'
// }
// },
{


Loading…
Cancel
Save