From eeaec35f1375a895fea8e6b52c00417b0b83602e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=98=81=E8=BE=89?= Date: Mon, 24 Jan 2022 11:03:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++++ pages.json | 12 +++++++++++- pages/start-page/index.vue | 22 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pages/start-page/index.vue diff --git a/manifest.json b/manifest.json index 2caaf6c..6b74ca8 100644 --- a/manifest.json +++ b/manifest.json @@ -114,6 +114,10 @@ "spotlight@3x" : "unpackage/res/icons/120x120.png" } } + }, + "splashscreen" : { + "androidStyle" : "default", + "iosStyle" : "common" } }, "uniStatistics" : { diff --git a/pages.json b/pages.json index ca4bb9a..3e98ce4 100644 --- a/pages.json +++ b/pages.json @@ -309,7 +309,17 @@ "enablePullDownRefresh": false } } - ], + ,{ + "path" : "pages/start-page/index", + "style" : + { + "navigationBarTitleText": "启动页", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", diff --git a/pages/start-page/index.vue b/pages/start-page/index.vue new file mode 100644 index 0000000..8183fd0 --- /dev/null +++ b/pages/start-page/index.vue @@ -0,0 +1,22 @@ + + + + + From 44ea3ad2ba5238b94be5d9ff71c90370ee00a8df Mon Sep 17 00:00:00 2001 From: buffeyu Date: Mon, 24 Jan 2022 11:41:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/client-detail/base-paper-deals.vue | 5 +++-- pages/client-detail/equipment-information.vue | 5 +++-- pages/trade/orderList.vue | 3 ++- pages/trade/quotationList.vue | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pages/client-detail/base-paper-deals.vue b/pages/client-detail/base-paper-deals.vue index e57afec..8c8356e 100644 --- a/pages/client-detail/base-paper-deals.vue +++ b/pages/client-detail/base-paper-deals.vue @@ -58,9 +58,10 @@ export default { option: { size: 10, auto: true, - emptyText: '暂无数据~', + emptyText: '暂无原纸交易~', background: '#F7F8FA', - disabled: false + disabled: false, + emptyImage: '/static/imgs/order/order-empty.png' }, params: { asc: '', diff --git a/pages/client-detail/equipment-information.vue b/pages/client-detail/equipment-information.vue index ddd4afb..ee95823 100644 --- a/pages/client-detail/equipment-information.vue +++ b/pages/client-detail/equipment-information.vue @@ -122,9 +122,10 @@ export default { option: { size: 10, auto: true, - emptyText: '暂无数据~', + emptyText: '暂无设备信息~', background: '#F7F8FA', - disabled: false + disabled: false, + emptyImage: '/static/imgs/order/order-empty.png' }, seemoreFlag: 0, params: { diff --git a/pages/trade/orderList.vue b/pages/trade/orderList.vue index 0fbe729..4da2f9f 100644 --- a/pages/trade/orderList.vue +++ b/pages/trade/orderList.vue @@ -68,7 +68,8 @@ export default { auto: true, emptyText: '暂无订单信息~', background: '#F7F8FA', - fontSize: '40rpx' + fontSize: '40rpx', + emptyImage: '/static/imgs/client-detail/no-data-icon.png' }, params: { asc: '', diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue index f22b753..456c2fb 100644 --- a/pages/trade/quotationList.vue +++ b/pages/trade/quotationList.vue @@ -71,7 +71,8 @@ export default { auto: true, emptyText: '暂无报价信息~', background: '#F7F8FA', - fontSize: '40rpx' + fontSize: '40rpx', + emptyImage: '/static/imgs/client-detail/no-data-icon.png' }, params: { asc: '', From 30d40961e1d19f59e1d0030cea2ca0475acfd963 Mon Sep 17 00:00:00 2001 From: buffeyu Date: Mon, 24 Jan 2022 14:41:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E6=98=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/trade/orderList.vue | 6 +++--- pages/trade/quotationList.vue | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pages/trade/orderList.vue b/pages/trade/orderList.vue index 4da2f9f..f941b59 100644 --- a/pages/trade/orderList.vue +++ b/pages/trade/orderList.vue @@ -74,9 +74,9 @@ export default { params: { asc: '', desc: '', - // customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效 - // mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id - customerEnterpriseId: '651107734133018624', + customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效 + mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id + // customerEnterpriseId: '651107734133018624', // mallSupplierId: '670334117090562048', // 供应商id status: '0' // 状态 0 全部 待发货/30106,待收货/30107,待借款/30207,已完成/30104 // enterpriseIds: [] //企业ID集合网关获取 diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue index 456c2fb..2cafc09 100644 --- a/pages/trade/quotationList.vue +++ b/pages/trade/quotationList.vue @@ -77,8 +77,8 @@ export default { params: { asc: '', desc: '', - // mallSupplierIds: [this.$store.state.supplierInfo.supplierId], // 网关获取供应商ID集合 - mallSupplierIds: ['553703427180466176'] // 网关获取供应商ID集合 + mallSupplierIds: [this.$store.state.supplierInfo.supplierId], // 网关获取供应商ID集合 + // mallSupplierIds: ['553703427180466176'] // 网关获取供应商ID集合 }, pagination: { pageNum: 0, // 初始会执行一次下拉加载