From d2160910769550b959e469cde8f68c3bb23dbbdf Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 20 May 2021 10:22:01 +0800
Subject: [PATCH] role

---
 pages/process/order-info/index.js   | 8 +++++++-
 pages/process/order-info/index.wxml | 8 +++++---
 pages/process/outside-list/index.js | 7 +++++--
 pages/process/payment-list/index.js | 6 +++++-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js
index a691f63..33180ad 100644
--- a/pages/process/order-info/index.js
+++ b/pages/process/order-info/index.js
@@ -42,7 +42,13 @@ Scene({
       } else if(result.data.status == 5){
         this.data.title = '已完成'
       }
-      this.setData({ safeBottom: app.globalData.safeBottom, form: result.data, title: this.data.title, agent: this.data.agent })
+      this.setData({ 
+        safeBottom: app.globalData.safeBottom, 
+        form: result.data, 
+        title: this.data.title, 
+        admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0,
+        agent: this.data.agent 
+      })
     }).catch(err => {
       wx.hideLoading()
       this.setData({ safeBottom: app.globalData.safeBottom })
diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml
index 54e0ac1..7dbcc86 100644
--- a/pages/process/order-info/index.wxml
+++ b/pages/process/order-info/index.wxml
@@ -161,9 +161,11 @@
   </van-cell>
 </view>
 
-<submit-layout wx:if="{{form && (form.status == 3 || form.status == 4 || form.status == 42) && !agent }}">
-  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="repeatOrder" wx:if="{{form.status == 3}}">重新过皮重</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="checkOrder" wx:if="{{form.status == 3}}">通过审核</van-button>
+<submit-layout wx:if="{{form && form.status == 3 && !agent }}">
+  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="repeatOrder">重新过皮重</van-button>
+  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="checkOrder">通过审核</van-button>
+</submit-layout>
+<submit-layout wx:elif="{{form && (form.status == 4 || form.status == 42) && !agent && admin }}">
   <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="paymentOrder" wx:if="{{form.status == 4}}">进行支付</van-button>
   <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="paymentOrder" wx:if="{{form.status == 42}}">客户结算</van-button>
 </submit-layout>
diff --git a/pages/process/outside-list/index.js b/pages/process/outside-list/index.js
index f7ff87d..08580eb 100644
--- a/pages/process/outside-list/index.js
+++ b/pages/process/outside-list/index.js
@@ -109,7 +109,6 @@ Scene({
             }
             this.data.lastTime = itemTime
           }
-
         }
         let nowList = `orderList[${this.data.orderList.length}]`
         var num = this.data.form.pageNum
@@ -144,7 +143,11 @@ Scene({
     if(item.orderStatus == 0 || item.orderStatus == 1){
       wx.navigateTo({ url: `/pages/process/outside-price/index?id=${item.orderId}` })
     } else if(item.orderStatus == 4 || item.orderStatus == 42){
-      wx.navigateTo({ url: `/pages/process/payment/index?id=${item.orderId}` })
+      if(this.data.admin) {
+        wx.navigateTo({ url: `/pages/process/payment/index?id=${item.orderId}` })
+      } else {
+        wx.navigateTo({ url: `/pages/process/outside-info/index?id=${item.orderId}` })
+      }
     } else {
       wx.navigateTo({ url: `/pages/process/outside-info/index?id=${item.orderId}` })
     }
diff --git a/pages/process/payment-list/index.js b/pages/process/payment-list/index.js
index 2f9fba2..004acc6 100644
--- a/pages/process/payment-list/index.js
+++ b/pages/process/payment-list/index.js
@@ -24,7 +24,7 @@ Scene({
   },
   //  * 生命周期函数--监听页面加载
   onLoad: function (options) {
-    this.setData({ height: app.globalData.fragmentHeight })
+    this.setData({ height: app.globalData.fragmentHeight, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 })
     this.fetchOrderList()
   },
   checkSame: function(){
@@ -86,6 +86,10 @@ Scene({
   },
   lookItem: function (e) {
     var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
+    if(!this.data.admin) {
+      wx.navigateTo({ url: `/pages/process/order-info/index?id=${item.id}` })
+      return
+    }
     const that = this
     wx.navigateTo({ 
       url: `/pages/process/payment/index?channel=1`,