From 7c415b6a02d9c976e47a0adfe218a8aff274bea8 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 7 Sep 2021 19:02:19 +0800
Subject: [PATCH] no message

---
 pages/process/order-info/index.wxml   |  2 +-
 pages/setting/paper-select/index.js   | 17 ++++++++++++++++-
 pages/setting/paper-select/index.wxml | 11 +++++++++--
 pages/setting/paper-select/index.wxss |  1 -
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml
index 691fbca..06a28c6 100644
--- a/pages/process/order-info/index.wxml
+++ b/pages/process/order-info/index.wxml
@@ -198,7 +198,7 @@
   <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="paymentOrder">客户结算</van-button>
 </submit-layout>
 
-<view style="border-radius: 50rpx;position:fixed;bottom:{{160 + safeBottom}}rpx;right:50rpx" wx:if="{{form && (form.status == 3 || form.status == 4 || form.status == 42)}}">
+<view style="border-radius: 50rpx;position:fixed;bottom:{{160 + safeBottom}}rpx;right:50rpx" wx:if="{{form && form.status != 6}}">
   <van-button round bind:click="printOrderInfo" custom-style="width: 100rpx;height: 100rpx;padding-top:12rpx">
     <van-icon name="/assets/image/icon-print.png" size="100rpx"/>
   </van-button>
diff --git a/pages/setting/paper-select/index.js b/pages/setting/paper-select/index.js
index cddbc48..d4d3db4 100644
--- a/pages/setting/paper-select/index.js
+++ b/pages/setting/paper-select/index.js
@@ -14,9 +14,24 @@ Component({
   },
   data: {
     activeIndex: 0,
-    cIndex: -1
+    cIndex: -1,
+    singleList: []
   },
   methods: {
+    updateSubItems: function(){
+      var single = 0
+      var typeIndex = 0
+      for (let index = 0; index < this.data.paperList.length; index++) {
+        if(this.data.paperList[index].smallProductCategoryInfoList && this.data.paperList[index].smallProductCategoryInfoList.length){
+          single ++
+          typeIndex = index
+        }
+      }
+      if(single == 1){
+        this.data.singleList = this.data.paperList[typeIndex].smallProductCategoryInfoList
+        this.setData({ singleList: this.data.singleList })
+      }
+    },
     onClickNav: function({detail}){
       this.setData({ activeIndex: Number(detail), cIndex: -1 })
     },
diff --git a/pages/setting/paper-select/index.wxml b/pages/setting/paper-select/index.wxml
index 6df3f19..c1880c7 100644
--- a/pages/setting/paper-select/index.wxml
+++ b/pages/setting/paper-select/index.wxml
@@ -6,8 +6,15 @@
       <van-icon name="cross" size="24" color="#999999" />
     </view>
   </view>
-  <view class="flex" style="height:580rpx;">
-    <scroll-view scroll-y class="van-tree-select__nav" style="height:100%;width: 200rpx;background-color: #F7F8FA;border-right: 1rpx solid #f3f3f3">
+  <scroll-view scroll-y="true" style="height:580rpx;padding: 12rpx 0rpx" wx:if="{{singleList.length}}">
+    <van-grid column-num="3" border="{{fasle}}">
+      <van-grid-item use-slot wx:for="{{ singleList }}" wx:key="index" content-style="padding:12rpx">
+        <van-button plain type="{{index == cIndex ? 'info' : 'default'}}" custom-style="height:88rpx;width:208rpx;padding: 0rpx" data-index="{{index}}" bind:click="onConfirm">{{item.categoryName}}</van-button>
+      </van-grid-item>
+    </van-grid>
+  </scroll-view>
+  <view class="flex" style="height:580rpx;" wx:else>
+    <scroll-view scroll-y style="height:100%;width: 200rpx;background-color: #F7F8FA;border-right: 1rpx solid #f3f3f3">
       <van-sidebar active-key="{{ activeIndex }}" bind:change="onClickNav" custom-class="van-tree-select__nav__inner">
         <van-sidebar-item wx:for="{{ paperList }}" wx:key="index" title="{{ item.name }}" />
       </van-sidebar>
diff --git a/pages/setting/paper-select/index.wxss b/pages/setting/paper-select/index.wxss
index 9615958..e69de29 100644
--- a/pages/setting/paper-select/index.wxss
+++ b/pages/setting/paper-select/index.wxss
@@ -1 +0,0 @@
-.van-tree-select__nav__inner{width:100%!important;height:100%}
\ No newline at end of file