From 60576b4a6ec9550e49a7a7a2228c0e401d8a1b74 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 21 Apr 2021 14:11:49 +0800
Subject: [PATCH] no message

---
 pages/home/index/index.js               |  2 ++
 pages/home/index/index.wxml             |  2 +-
 pages/storage/order-create/index.js     |  3 +++
 pages/storage/order-list/index.wxml     | 12 ++++++++----
 pages/storage/order-settlement/index.js |  3 +++
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index 9dbc697..182fad0 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -17,6 +17,7 @@ Component({
   data: {
     height: app.globalData.safeFragmentHeight,
     firstShow: false,
+    isAdmin: false,
     userInfo: null,
     avatarUrl: '/assets/image/ygImg.png',
     creditInfo: { availableCreditLine: 0, creditLine: 0, usedCreditLine: 0.00 }
@@ -58,6 +59,7 @@ Component({
         avatarUrl: util.isEmpty(app.userInfo.avatarUrl) ? '/assets/image/ygImg.png' : app.userInfo.avatarUrl,
         userInfo: app.userInfo,
         userName: nickname,
+        isAdmin: app.userInfo.type.indexOf('ADMIN') >= 0,
         height: app.globalData.safeFragmentHeight - 100
       })
     },
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index c3418a7..fb61f49 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -49,7 +49,7 @@
   <!-- 企业信息 -->
 	<view style="height:24rpx"></view>
 	<van-cell-group>
-		<van-cell is-link clickable url="/pages/home/employee/index" wx:if="{{userInfo.enterpriseId && userInfo.position != 'ORDINARY'}}">
+		<van-cell is-link clickable url="/pages/home/employee/index" wx:if="{{isAdmin}}">
 			<view class="flex" slot="title" style="align-items: center">
 				<van-icon name="manager-o" size="18"/>
 				<text class="text-sg" style="margin-left:12rpx">员工管理</text>
diff --git a/pages/storage/order-create/index.js b/pages/storage/order-create/index.js
index 39dc46d..f95e867 100644
--- a/pages/storage/order-create/index.js
+++ b/pages/storage/order-create/index.js
@@ -104,6 +104,9 @@ Scene({
       this.setData({ visible: true })
     }
   },
+  onHide: function() {
+    this.setData({ visible: false })
+  },
   onConfirm: function({detail}){
     this.data.nowItem = this.data.paperList[detail.index]
     this.data.form.productId = this.data.nowItem.id
diff --git a/pages/storage/order-list/index.wxml b/pages/storage/order-list/index.wxml
index efcc31c..19ffee5 100644
--- a/pages/storage/order-list/index.wxml
+++ b/pages/storage/order-list/index.wxml
@@ -16,16 +16,20 @@
     <view class="text-empty">{{loading? '正在加载' : '暂无数据'}}</view>
   </view>
   <view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList}}" wx:key="pageIndex">
-    <view class="bg-white" wx:for="{{pageItem}}" wx:key="index">
+    <view wx:for="{{pageItem}}" wx:key="index">
       <view style="background-color:#f3f3f3;" wx:if="{{item.tipsTime}}">
         <text class="text-sg" style="line-height:64rpx;padding-left:32rpx">{{item.tipsTime}}</text>
       </view>
-      <view style="border-bottom:1rpx solid #f3f3f3" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
+      <view class="bg-white" style="border-bottom:1rpx solid #f3f3f3" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
         <view class="flex flex-justify" style="padding:24rpx 32rpx;border-bottom:2rpx solid #f3f3f3">
           <view class="flex">
-            <text class="text-bold">出货纸厂：{{item.consigneeName}}</text>
+            <text class="text-blue text-sg text-bold">出货纸厂：{{item.consigneeName}}</text>
           </view>
-          <text class="text-bold">{{statusOrder(item.status)}}</text>
+          <!-- <text class="text-bold">{{statusOrder(item.status)}}</text> -->
+          <view class="text-df" style="color:#FA541C" wx:if="{{item.status == 0}}">待审核</view>
+          <view class="text-df" style="color:#FBBD08" wx:elif="{{item.status == 1}}">待收款</view>
+          <view class="text-df" style="color:#028A00" wx:elif="{{item.status == 2}}">已完成</view>
+          <view class="text-df" style="color:#CCCCCC" wx:elif="{{item.status == 3}}">已关闭</view>
         </view>
         <view class="flex flex-justify" style="padding:0rpx 32rpx;margin-top:16rpx">
           <text>品类：{{item.productName}}</text>
diff --git a/pages/storage/order-settlement/index.js b/pages/storage/order-settlement/index.js
index 1c2a8c1..6cda1e5 100644
--- a/pages/storage/order-settlement/index.js
+++ b/pages/storage/order-settlement/index.js
@@ -96,6 +96,9 @@ Scene({
       this.setData({ visible: true })
     }
   },
+  onHide: function() {
+    this.setData({ visible: false })
+  },
   onConfirm: function({detail}){
     this.data.nowItem = this.data.paperList[detail.index]
     this.data.form.categoryId = this.data.nowItem.id