Merge branch 'devlop' of http://git.qniao.cn/qniao/paper-shopkeeper-H5 into devlop

pages/enquiry-list/index.vue

@@ -24,9 +24,9 @@
                 mode=""
               ></image>
               <view class="info-box">
-                <view class="name">{{ subItem.brandName }}</view>
+                <view class="name">{{ subItem.paperName }}</view>
                 <view class="value">
-                  {{ subItem.categoryName }}/{{ subItem.paperName }}/{{ subItem.gramWeight }}g/{{ subItem.width }}*{{ subItem.length }}/{{ subItem.quantity }}张
+                  {{ subItem.brandName }}/{{ subItem.categoryName }}/{{ subItem.gramWeight }}g/{{ subItem.width }}*{{ subItem.length }}/{{ subItem.quantity }}张
                 </view>
               </view>
             </view>
@@ -39,9 +39,9 @@
                 mode=""
               ></image>
               <view class="info-box">
-                <view class="name">{{ subItem.brandName }}</view>
+                <view class="name">{{ subItem.paperName }}</view>
                 <view class="value">
-                  {{ subItem.categoryName }}/{{ subItem.paperName }}/{{ subItem.gramWeight }}g/{{ subItem.width }}*{{ subItem.length }}/{{ subItem.quantity }}张
+                  {{ subItem.brandName }}/{{ subItem.categoryName }}/{{ subItem.gramWeight }}g/{{ subItem.width }}*{{ subItem.length }}/{{ subItem.quantity }}张
                 </view>
               </view>
             </view>
@@ -255,10 +255,10 @@ export default {
       .list-box {
         display: flex;
         flex-direction: row;
-        height: 148rpx;
+        // height: 148rpx;
         background: #ffffff;
 
-        padding: 24rpx 0rpx;
+        // padding: 24rpx 0rpx;
         .image {
           width: 100rpx;
           height: 100rpx;

pages/notification-page/index.vue

@@ -9,7 +9,11 @@ export default {
   data() {
     return {
       // 给一次重试机会
-      retry: true
+      retry: true,
+      backInfo: {
+        isBack: false,
+        isBackTo: ''
+      }
     }
   },
   methods: {
@@ -29,7 +33,10 @@ export default {
           setTimeout(() => {
             confirmContract({ orderId: orderId }).then((res) => {
               if (res) {
-                go2('order-detail', { orderId: orderId }, true)
+                // 允许回退
+                this.backInfo.isBack = true
+                this.backInfo.isBackTo = 'order-list'
+                go2('order-detail', { orderId: orderId })
               } else {
                 this.handleResultError({ fn: this.certifySign, data: orderId, errType: '订单合同签约' })
               }
@@ -77,6 +84,12 @@ export default {
     } else {
       this.handleParamError()
     }
+  },
+  onShow() {
+    if (this.backInfo.isBack) {
+      this.backInfo.isBack = false
+      go2(this.backInfo.isBackTo, {}, true)
+    }
   }
 }
 </script>