From 66ed9016760d5384f7b9decd3d41ffe8d684aece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com> Date: Tue, 10 Aug 2021 18:10:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=BB=84=E4=BB=B6=E7=BC=A9=E6=94=BE=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=97=B6=E8=BD=BB=E6=8F=90=E7=A4=BA=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E7=BC=A9=E6=94=BE=E6=AF=94=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/lf-previewImage/lf-previewImage.vue | 13 ++++++++++--- canteen/pages/index/index.vue | 1 - .../components/lf-previewImage/lf-previewImage.vue | 13 ++++++++++--- supplier/pages/index/index.vue | 1 - 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/canteen/components/lf-previewImage/lf-previewImage.vue b/canteen/components/lf-previewImage/lf-previewImage.vue index 0143b20..a72abee 100644 --- a/canteen/components/lf-previewImage/lf-previewImage.vue +++ b/canteen/components/lf-previewImage/lf-previewImage.vue @@ -92,7 +92,6 @@ created(){ // TODO PC端屏蔽遮罩滚动穿透 // TODO PC端滚轮放大缩小 - // TODO 放大缩小百分比显示 // TODO 双击时会被关掉 }, methods: { @@ -117,8 +116,12 @@ }, // movable 缩放事件 scale(event){ - let scale = event.detail.scale; - this.$msg(scale); // TODO 轻提示层级不够，没有被显示出来 + let scale = parseInt(event.detail.scale * 100) +'%'; + uni.showToast({ + title: scale, + icon: 'none', + position: 'bottom' + }) }, // 鼠标滚动缩放事件，目前会触发浏览器页面滚动事件，暂时先不要这个功能 mousewheel(event){ @@ -227,4 +230,8 @@ } } } + // 轻提示框样式 + /deep/.uni-sample-toast{ + z-index: 1002; + } diff --git a/canteen/pages/index/index.vue b/canteen/pages/index/index.vue index 1f2d0ee..a2a1bd1 100644 --- a/canteen/pages/index/index.vue +++ b/canteen/pages/index/index.vue @@ -38,7 +38,6 @@ } }, onShow() { - // todo 优化：显示订单角标 this.getHomeData(); }, onReady() { diff --git a/supplier/components/lf-previewImage/lf-previewImage.vue b/supplier/components/lf-previewImage/lf-previewImage.vue index 0143b20..a72abee 100644 --- a/supplier/components/lf-previewImage/lf-previewImage.vue +++ b/supplier/components/lf-previewImage/lf-previewImage.vue @@ -92,7 +92,6 @@ created(){ // TODO PC端屏蔽遮罩滚动穿透 // TODO PC端滚轮放大缩小 - // TODO 放大缩小百分比显示 // TODO 双击时会被关掉 }, methods: { @@ -117,8 +116,12 @@ }, // movable 缩放事件 scale(event){ - let scale = event.detail.scale; - this.$msg(scale); // TODO 轻提示层级不够，没有被显示出来 + let scale = parseInt(event.detail.scale * 100) +'%'; + uni.showToast({ + title: scale, + icon: 'none', + position: 'bottom' + }) }, // 鼠标滚动缩放事件，目前会触发浏览器页面滚动事件，暂时先不要这个功能 mousewheel(event){ @@ -227,4 +230,8 @@ } } } + // 轻提示框样式 + /deep/.uni-sample-toast{ + z-index: 1002; + } diff --git a/supplier/pages/index/index.vue b/supplier/pages/index/index.vue index c14b788..7826038 100644 --- a/supplier/pages/index/index.vue +++ b/supplier/pages/index/index.vue @@ -39,7 +39,6 @@ } }, onShow() { - // todo 优化：显示订单角标 this.getData(); }, onReady(){ From fac83cabed8aa0f3590950283e5fb45bfc173328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com> Date: Wed, 11 Aug 2021 12:01:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E4=B8=A4=E7=AB=AF?= =?UTF-8?q?=E6=94=AF=E6=8C=81/=E5=85=BC=E5=AE=B9=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- canteen/pages/classification/material.vue | 5 +++++ canteen/pages/classification/supplier.vue | 5 +++++ canteen/pages/classification/warehouse.vue | 6 +++++- canteen/pages/delivery/order.vue | 2 +- canteen/pages/purchase/order.vue | 2 +- supplier/components/wyb-table/wyb-table.vue | 12 +++++++++--- supplier/pages/gonghuo/detail.vue | 8 ++++---- supplier/pages/gonghuo/order.vue | 2 +- supplier/pages/offer/index.vue | 15 +++++++++------ supplier/pages/order/detail.vue | 4 ++-- supplier/pages/order/index.vue | 2 +- 11 files changed, 43 insertions(+), 20 deletions(-) diff --git a/canteen/pages/classification/material.vue b/canteen/pages/classification/material.vue index dd74684..4bc908d 100644 --- a/canteen/pages/classification/material.vue +++ b/canteen/pages/classification/material.vue @@ -64,7 +64,12 @@ }) return; } + // #ifdef H5 this.checked_list = prevPage.$data.material_list; + // #endif + // #ifdef MP-WEIXIN + this.checked_list = prevPage.data.material_list; + // #endif this.getData(); }, methods: { diff --git a/canteen/pages/classification/supplier.vue b/canteen/pages/classification/supplier.vue index 80a94de..5c0b937 100644 --- a/canteen/pages/classification/supplier.vue +++ b/canteen/pages/classification/supplier.vue @@ -60,7 +60,12 @@ }) return; } + // #ifdef H5 this.checked_list = prevPage.$data.material_list; + // #endif + // #ifdef MP-WEIXIN + this.checked_list = prevPage.data.material_list; + // #endif if(this.show_count <= 1){ this.getData(); diff --git a/canteen/pages/classification/warehouse.vue b/canteen/pages/classification/warehouse.vue index 6aecdd5..7bd1856 100644 --- a/canteen/pages/classification/warehouse.vue +++ b/canteen/pages/classification/warehouse.vue @@ -58,8 +58,12 @@ }) return; } + // #ifdef H5 this.checked_list = prevPage.$data.warehouse_list; - console.log('onload',this.checked_list ) + // #endif + // #ifdef MP-WEIXIN + this.checked_list = prevPage.data.warehouse_list; + // #endif this.getData(); }, methods: { diff --git a/canteen/pages/delivery/order.vue b/canteen/pages/delivery/order.vue index 401b707..7cc3c25 100644 --- a/canteen/pages/delivery/order.vue +++ b/canteen/pages/delivery/order.vue @@ -27,7 +27,7 @@ 订单状态 - {{ item.state }} + {{ item.state }} diff --git a/canteen/pages/purchase/order.vue b/canteen/pages/purchase/order.vue index a6dd865..2cdd41f 100644 --- a/canteen/pages/purchase/order.vue +++ b/canteen/pages/purchase/order.vue @@ -43,7 +43,7 @@ 订单状态 - {{ item.state }} + {{ item.state }} diff --git a/supplier/components/wyb-table/wyb-table.vue b/supplier/components/wyb-table/wyb-table.vue index b85a24b..e92dc8d 100644 --- a/supplier/components/wyb-table/wyb-table.vue +++ b/supplier/components/wyb-table/wyb-table.vue @@ -135,7 +135,7 @@ v-for="(header, hIndex) in headers" @tap.stop="onContentItemTap(cIndex, hIndex)" :key="contentItemKey(header, hIndex)" - :style="{ + :style="[myAssign({ minWidth: (header.width || defaultColWidth) + 'rpx', maxWidth: (header.width || defaultColWidth) + 'rpx', textAlign: textAlign, @@ -149,8 +149,7 @@ borderRight: hIndex === headers.length - 1 || (!showVertBorder && hIndex !== 0) ? 'none' : '1px solid' + borderColor, zIndex: hIndex === 0 ? 20 : 0, left: enableCheck ? checkColWidth + 'rpx' : 0, - position: hIndex === 0 && firstLineFixed ? 'sticky' : 'static', - ...content.searchStyle }"> + position: hIndex === 0 && firstLineFixed ? 'sticky' : 'static'}, content.searchStyle)]"> { this.$set(item, 'checked', false) + this.$set(item, 'searchStyle', {}) }) this.oContentsSort = this.contentsSort.slice() this.onload = false @@ -792,6 +792,7 @@ }) // 处理匹配到item时滚动至第一个item if(positionIndex != null){ + // #ifdef H5 let tabView = document.querySelector('.wyb-table-scroll-view'); // 获取第一层大对象，table let tabContent = tabView.querySelector('.wyb-table-content'); // 获取第二层，table的content部分 let contentLine = tabContent.querySelector('.wyb-table-content-line-'+ positionIndex); // 获取第三层，获取内容列 @@ -799,6 +800,7 @@ let offsetHeight = contentLine.offsetHeight; // table行高度 let offsetTop = contentLine.offsetTop; // table行距离页面高度 tabView.scrollTop = offsetTop - tabViewTop - offsetHeight; + // #endif }else if(val){ this.$msg('该关键字没有搜索到物资哦') } @@ -823,6 +825,10 @@ } }, methods: { + // 对象拼接 + myAssign(a, b){ + return Object.assign(a, b); + }, // 页面初次加载，判断是否自动滚动至input输入框所在的位置 autoScrollView(){ try{ diff --git a/supplier/pages/gonghuo/detail.vue b/supplier/pages/gonghuo/detail.vue index 0ba625b..7841dd8 100644 --- a/supplier/pages/gonghuo/detail.vue +++ b/supplier/pages/gonghuo/detail.vue @@ -249,10 +249,10 @@ let list = order.items || []; let contents = list.map(item => { let obj = { - m_name: item.material?.m_name || '', - material_id: item.material?.id, - spec: item.spec?.name || '', - spec_id: item.spec?.id, + m_name: item?.material?.m_name || '', + material_id: item?.material?.id, + spec: item?.spec?.name || '', + spec_id: item?.spec?.id, brand: item?.material?.brand || '', quality_level: item?.material?.quality_level || '', m_sn: item?.material?.m_sn || '', diff --git a/supplier/pages/gonghuo/order.vue b/supplier/pages/gonghuo/order.vue index da2900d..9f06a91 100644 --- a/supplier/pages/gonghuo/order.vue +++ b/supplier/pages/gonghuo/order.vue @@ -39,7 +39,7 @@ 订单状态 - {{ item.state }} + {{ item.state }} diff --git a/supplier/pages/offer/index.vue b/supplier/pages/offer/index.vue index f833c3f..8dc523e 100644 --- a/supplier/pages/offer/index.vue +++ b/supplier/pages/offer/index.vue @@ -167,6 +167,9 @@ let info = uni.createSelectorQuery().select(".relation"); 　　　 info.boundingClientRect(function(data) { let num = app.globalData.customBarH; + // #ifdef MP-WEIXIN + num -= 60; + // #endif num += data.height; num += data.top; that.node_top = num; @@ -226,7 +229,7 @@ return { name: item?.material?.m_name || '', material_id: item?.material?.id || 0, - spec: item.name, + spec: item.name || '', spec_id: item.id, brand: item?.material?.brand || '', quality_level: item?.material?.quality_level || '', @@ -256,7 +259,7 @@ let obj = { name: item?.material?.m_name || '', material_id: item?.material?.id || 0, - spec: item.name, + spec: item.name || '', spec_id: item.id, brand: item?.material?.brand || '', quality_level: item?.material?.quality_level || '', @@ -306,7 +309,7 @@ return { name: item?.material?.m_name || '', material_id: item?.material?.id || 0, - spec: item.name, + spec: item.name || '', spec_id: item.id, brand: item?.material?.brand || '', quality_level: item?.material?.quality_level || '', @@ -358,8 +361,8 @@ onButtonClick(event){ if(event.content.key == 'delete'){ let contentIndex = event.contentIndex; - let name = event.lineData.name; - let spec = event.lineData.spec; + let name = event?.lineData?.name || ''; + let spec = event?.lineData?.spec || ''; uni.showModal({ title: '温馨提示', content: `确定删除 ${name}-${spec} 吗？`, @@ -466,7 +469,7 @@