From fc223b26f87f7a221b38084bb62d8047974bbf1c Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sun, 26 Apr 2020 12:42:21 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
index 7dd3ce8..175e7ce 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
@@ -45,6 +45,14 @@
cols: [[
{ field: 'proName', width: 300, title: '产品名称' },
{
+ field: 'proType',align: 'center', width: 100, templet: function (d) {
+ if (d.proType === 0)
+ return "试用"
+ else
+ return "正式"
+ }, title: '类型'
+ },
+ {
field: 'proTime', width: 150, title: '有效时长', templet: function (d) {
switch (d.proTimeUnit) {
case 0:
--
Gitblit v1.8.0