diff --git a/components/panel-content/panel-content.vue b/components/panel-content/panel-content.vue index 3e2d2085..cb6f29e9 100644 --- a/components/panel-content/panel-content.vue +++ b/components/panel-content/panel-content.vue @@ -86,7 +86,7 @@ }, // 数据项最大展示数量(0则显示全部) propIsItemShowMax: { - type: Number, + type: [Number,String], default: 0, }, // 指定字段 diff --git a/locale/en.json b/locale/en.json index 2f2d4c50..06d54003 100644 --- a/locale/en.json +++ b/locale/en.json @@ -99,6 +99,7 @@ "web-view": "", "login": "Login", "paytips": "Secure payment", + "paylog-list": "Payment Order list", "paylog-detail": "Payment Order Details", "goods-search": "Product search", "goods-search-start": "Product search", diff --git a/locale/zh.json b/locale/zh.json index 73c323c3..71f5abe6 100644 --- a/locale/zh.json +++ b/locale/zh.json @@ -99,6 +99,7 @@ "web-view": "", "login": "登录", "paytips": "安全支付", + "paylog-list": "支付订单列表", "paylog-detail": "支付订单详情", "goods-search": "商品搜索", "goods-search-start": "商品搜索", diff --git a/pages.json b/pages.json index 70dac49e..5410c425 100644 --- a/pages.json +++ b/pages.json @@ -455,6 +455,18 @@ } ] }, + { + "root": "pages/paylog-list", + "pages": [ + { + "path": "paylog-list", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "" + } + } + ] + }, { "root": "pages/paylog-detail", "pages": [ diff --git a/pages/paylog-detail/paylog-detail.vue b/pages/paylog-detail/paylog-detail.vue index 158be72e..c1e93765 100644 --- a/pages/paylog-detail/paylog-detail.vue +++ b/pages/paylog-detail/paylog-detail.vue @@ -1,11 +1,11 @@