diff --git a/components/panel-content/panel-content.vue b/components/panel-content/panel-content.vue index 838f896a..3090a508 100644 --- a/components/panel-content/panel-content.vue +++ b/components/panel-content/panel-content.vue @@ -3,7 +3,7 @@ - + {{ item.name }} @@ -16,8 +16,8 @@ - - + + {{$t('common.view_more')}} @@ -30,8 +30,8 @@ {{propTitle}} - - + + {{ item.name }} @@ -43,7 +43,7 @@ - + {{$t('common.view_more')}} @@ -91,6 +91,16 @@ type: Number, default: 0, }, + // 指定字段 + propAppointField: { + type: String, + default: '', + }, + // 排除字段 + propExcludeField: { + type: String, + default: '', + }, // 无数据提示状态 propNoDataStatus: { type: [Number, String], @@ -129,9 +139,16 @@ methods: { // 数据字段处理 data_field_handle(data) { - var temp_data = data; - for(var i in temp_data) { - temp_data[i]['is_hide'] = (temp_data[i]['is_hide'] || 0) == 0 ? ((i >= this.propIsItemShowMax && this.propIsItemShowMax > 0) ? 1 : 0) : 0; + var appoint = (this.propAppointField || null) == null ? [] : this.propAppointField.split(','); + var exclude = (this.propExcludeField || null) == null ? [] : this.propExcludeField.split(','); + var temp_data = []; + var index = 0; + for(var i in data) { + if((exclude.length == 0 && appoint.length > 0 && appoint.indexOf(data[i]['field']) != -1) || (appoint.length == 0 && (exclude.length == 0 || exclude.indexOf(data[i]['field']) == -1))) { + data[i]['is_hide'] = (data[i]['is_hide'] || 0) == 0 ? ((index >= this.propIsItemShowMax && this.propIsItemShowMax > 0) ? 1 : 0) : 0; + temp_data.push(data[i]); + index++; + } } this.setData({ data_field: temp_data diff --git a/locale/en.json b/locale/en.json index 7dbc7cc9..fb8e5a1a 100644 --- a/locale/en.json +++ b/locale/en.json @@ -165,6 +165,7 @@ "plugins-invoice-invoice-detail": "Invoice details", "plugins-invoice-invoice-saveinfo": "Invoice editing", "plugins-invoice-order": "Order invoicing", + "plugins-invoice-recharge": "Recharge invoice", "plugins-signin-user": "Sign in", "plugins-signin-detail": "Sign in", "plugins-signin-user-qrcode-detail": "Sign in code details", @@ -865,7 +866,6 @@ "330m76": "Source terminal", "p3scy0": "The avatar address is incorrect", "o411h6": "Merge invoicing", - "i52cw1": "Total order amount", "15k32o": "Please select data first", "3fr155": "The element parameter ID is incorrect", "1i873j": "pay", @@ -1126,6 +1126,7 @@ "invoice": { "invoice": { "p3dmd2": "Order invoicing", + "bh8yt3": "Recharge invoice", "l3832z": "Business type", "hoenw8": "Application type", "j04kjc": "Invoice type", @@ -1140,7 +1141,6 @@ "4tu3v3": "You can click on the invoice name and copy it, then go to the browser to open the address and download the invoice.", "rrfex6": "state", "p73963": "Invoice content", - "e5n838": "Tax identification number", "41qbu6": "Name of the bank where the enterprise opens the account", "3a9459": "Enterprise account opening", "2g7t23": "Enterprise contact phone number", @@ -1149,7 +1149,6 @@ "f2222p": "Recipient's phone number", "q8l3zj": "Recipient address", "rpdwd3": "Reason for rejection", - "dt77rq": "User notes", "2000a0": "Express name" } }, diff --git a/locale/zh.json b/locale/zh.json index 1016f3fc..ecfd8ab9 100644 --- a/locale/zh.json +++ b/locale/zh.json @@ -167,6 +167,7 @@ "plugins-invoice-invoice-detail": "发票详情", "plugins-invoice-invoice-saveinfo": "开票编辑", "plugins-invoice-order": "订单开票", + "plugins-invoice-recharge": "充值开票", "plugins-signin-user": "签到", "plugins-signin-detail": "签到", "plugins-signin-user-qrcode-detail": "签到码详情", @@ -855,7 +856,6 @@ "330m76": "来源终端", "p3scy0": "头像地址有误", "o411h6": "合并开票", - "i52cw1": "订单总额", "15k32o": "请先选择数据", "3fr155": "元素参数id有误", "1i873j": "支付", @@ -1114,6 +1114,7 @@ "invoice": { "invoice": { "p3dmd2": "订单开票", + "bh8yt3": "充值开票", "l3832z": "业务类型", "hoenw8": "申请类型", "j04kjc": "发票类型", @@ -1128,7 +1129,6 @@ "4tu3v3": "可点击发票名称复制后、到浏览器打开地址下载发票。", "rrfex6": "状态", "p73963": "发票内容", - "e5n838": "纳税识别号", "41qbu6": "企业开户行名称", "3a9459": "企业开户帐号", "2g7t23": "企业联系电话", @@ -1137,7 +1137,6 @@ "f2222p": "收件人电话", "q8l3zj": "收件人地址", "rpdwd3": "拒绝原因", - "dt77rq": "用户备注", "2000a0": "快递名称" } }, diff --git a/pages.json b/pages.json index c964ef37..db871214 100644 --- a/pages.json +++ b/pages.json @@ -973,6 +973,13 @@ "enablePullDownRefresh": true, "navigationBarTitleText": "" } + }, + { + "path": "recharge/recharge", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "" + } } ] }, diff --git a/pages/plugins/givegift/code/code.vue b/pages/plugins/givegift/code/code.vue index 482adda5..c362cac3 100644 --- a/pages/plugins/givegift/code/code.vue +++ b/pages/plugins/givegift/code/code.vue @@ -18,7 +18,7 @@ {{ item.status_name }} - + @@ -56,7 +56,7 @@ data_bottom_line_status: false, data_is_loading: 0, params: null, - content_field_list: [], + field_list: [], }; }, components: { @@ -133,7 +133,7 @@ var data = res.data.data; this.setData({ nav_status_list: data.nav_status_list || [], - content_field_list: data.content_field_list || [], + field_list: data.field_list || [], data_list_loding_status: 0, data_bottom_line_status: false, data_page: 1, diff --git a/pages/plugins/givegift/gift/gift.vue b/pages/plugins/givegift/gift/gift.vue index 8bbb7827..725dfc89 100644 --- a/pages/plugins/givegift/gift/gift.vue +++ b/pages/plugins/givegift/gift/gift.vue @@ -19,7 +19,7 @@ {{item.goods.title}} - + @@ -129,7 +129,7 @@ form_submit_disabled_status: false, nav_status_list: [], nav_status_index: 0, - content_field_list: [], + field_list: [], // 支付弹窗参数 pay_url: '', qrcode_url: '', @@ -225,7 +225,7 @@ payment_list: data.payment_list || [], default_payment_id: data.default_payment_id || 0, nav_status_list: data.nav_status_list || [], - content_field_list: data.content_field_list || [], + field_list: data.field_list || [], data_list_loding_status: 0, data_bottom_line_status: false, data_page: 1, diff --git a/pages/plugins/invoice/invoice-detail/invoice-detail.vue b/pages/plugins/invoice/invoice-detail/invoice-detail.vue index 4777adf4..00057166 100644 --- a/pages/plugins/invoice/invoice-detail/invoice-detail.vue +++ b/pages/plugins/invoice/invoice-detail/invoice-detail.vue @@ -1,39 +1,23 @@