diff --git a/components/scroll-list/scroll-list.vue b/components/scroll-list/scroll-list.vue
index 261facc..e820af6 100644
--- a/components/scroll-list/scroll-list.vue
+++ b/components/scroll-list/scroll-list.vue
@@ -24,11 +24,12 @@
-
-
-
- {{ emptyText }}
-
+
+
+
+ {{ emptyText }}
+
+
@@ -614,31 +615,7 @@ export default {
}
}
}
- .empty-wrap {
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- display: flex;
- position: absolute;
- align-items: center;
- flex-direction: column;
- .empty-view {
- margin: auto;
- display: flex;
- align-items: center;
- margin-bottom: 400rpx;
- flex-direction: column;
- .empty-image {
- width: 600rpx;
- height: 600rpx;
- }
- .empty-text {
- color: #606266;
- margin-top: 20rpx;
- }
- }
- }
+
.list-content {
}
.pull-up-wrap {
@@ -666,4 +643,29 @@ export default {
}
}
}
+.empty-wrap {
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ position: absolute;
+ align-items: center;
+ flex-direction: column;
+ .empty-view {
+ margin: auto;
+ display: flex;
+ align-items: center;
+ margin-bottom: 400rpx;
+ flex-direction: column;
+ .empty-image {
+ width: 600rpx;
+ height: 600rpx;
+ }
+ .empty-text {
+ color: #606266;
+ margin-top: 20rpx;
+ }
+ }
+}
diff --git a/pages.json b/pages.json
index e1d26a6..cb52117 100644
--- a/pages.json
+++ b/pages.json
@@ -111,6 +111,7 @@
"path": "pages/paper-details/index",
"style": {
"navigationBarTitleText": "纸品详情",
+ "navigationStyle": "custom",
"enablePullDownRefresh": false
}
},
diff --git a/pages/notification-page/index.vue b/pages/notification-page/index.vue
index 043a353..25e5f34 100644
--- a/pages/notification-page/index.vue
+++ b/pages/notification-page/index.vue
@@ -36,7 +36,7 @@ export default {
// 允许回退
this.backInfo.isBack = true
this.backInfo.isBackTo = 'order-list'
- go2('order-detail', { orderId: orderId })
+ go2('order-detail', { orderId: orderId }, true)
} else {
this.handleResultError({ fn: this.certifySign, data: orderId, errType: '订单合同签约' })
}
diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue
index 36b7fff..5221d36 100644
--- a/pages/paper-details/index.vue
+++ b/pages/paper-details/index.vue
@@ -1,5 +1,6 @@
-
+
+
@@ -141,7 +142,7 @@
import uGap from '@/components/u-gap/u-gap.vue'
import qnFooter from '@/components/qn-footer/qn-footer.vue'
import qnInputNumber from '@/components/qn-input-number/qn-input-number.vue'
-import { go2 } from '@/utils/hook.js'
+import { go2, back } from '@/utils/hook.js'
import { getPaperDetail, createGoodsReserve, createShoppingCar } from '@/apis/paperDetailsApi.js'
import { round } from '@/utils/index.js'
export default {
@@ -214,11 +215,17 @@ export default {
computed: {
buyTon() {
let num = 0
- num = round(this.buyPaperDto.gramWeight * this.buyPaperDto.width * this.buyPaperDto.length * this.buyPaperDto.pieceQuantity * 1e-12, 4)
+ num = round(this.buyPaperDto.gramWeight * this.buyPaperDto.width * this.buyPaperDto.length * this.buyPaperDto.pieceQuantity * 1e-12, 4)
return num
}
},
+ watch: {
+ buyTon(newVal) {
+ this.buyPaperDto.buyTon = newVal
+ }
+ },
methods: {
+ back,
// 查询店铺纸品详情
queryData() {
getPaperDetail(this.params).then((res) => {
@@ -346,7 +353,7 @@ export default {