数据中心

app/Http/Controllers/Api/mini/AuthController.php

@@ -98,6 +98,7 @@ class AuthController extends BaseController
     {
         $user = Auth::guard('mini')->user();
         $user->avatar = $user->avatar ? $user->avatar : 'https://t18.9026.com/mini/default-user.png';
+        $user = $user->getUserInfo();
         return $this->success(['data' => $user]);
     }
 }

app/Http/Controllers/Api/mini/OrderController.php

@@ -224,6 +224,21 @@ class OrderController extends BaseController
         ];
         $is_draft = $request->input('is_draft');
 
+        $project_user = ProjectUser::where([
+            ['user_id', $user->id],
+            ['project_id', $request->input('project_id')]
+        ])->first();
+
+        if($project_user) {
+            $project_role = ProjectRole::find($project_user->project_role_id);
+            if($project_role) {
+                $rights = $project_role->getRights();
+                if(isset($rights) && $rights['rentView']) {
+                    unset($search_items[1]);
+                }
+            }
+        }
+
         if($is_draft) {
             $search_items['is_draft'] = $is_draft;
             if($is_draft == 1) {

app/Models/User.php

@@ -122,11 +122,11 @@ class User extends Authenticatable
         return 0;
     }
 
-    public function getUserInfo($session_key)
+    public function getUserInfo($session_key = null)
     {
         $user = User::find($this['id']);
         $user->topRole = $user->getTopRole();
-        $user->session_key = $session_key;
+        if($session_key) $user->session_key = $session_key;
         return $user;
     }
 }

mini/pages/create-order/index.js

@@ -228,6 +228,9 @@ Page({
     }
     this.setData({
       device_name: device.name,
+      selectName: device.name,
+      selectSpec: device.spec,
+      selectRent: device.rent,
       typeIndex,
       nameIndex,
       specIndex,
@@ -299,6 +302,7 @@ Page({
     var name = this.getCustom('name')
     var spec = this.getCustom('spec')
     var rent = this.getCustom('rent')
+    var price = Math.round(this.data.device_price * 100) / 100
     var device = {
       type_name: type.name,
       type_id: type.id,
@@ -306,7 +310,7 @@ Page({
       spec: spec,
       rent: rent,
       quantity: this.data.device_quantity,
-      price: this.data.device_price,
+      price: price,
       start_date: this.data.start_date,
       end_date: this.data.end_date
     }

mini/pages/create-order/index.wxml

@@ -84,7 +84,7 @@
               <view>租赁单价：￥{{item.price}}</view>
               <view>数量：{{item.quantity}}</view>
             </view>
-            <view class="sg-margin-tb-sm">租赁方式：{{item.rent_type ? item.rent_type.name : ''}}</view>
+            <view class="sg-margin-tb-sm">租赁方式：{{item.rent_type ? item.rent_type.name : item.rent}}</view>
             <view class="sg-margin-tb-sm">租赁时间：<text
                 class="sg-rent-date sg-border">{{item.start_date ? (item.start_date + '至' + item.end_date) : ''}}</text>
             </view>
@@ -177,7 +177,7 @@
       <view class="sg-form-item sg-pad-tb sg-top-border">
         <view class="sg-label">设备单价</view>
         <input value="{{device_price}}" class="sg-input" bindinput="onChange" data-name="device_price"
-          placeholder="请输入设备单价" type="number"></input>
+          placeholder="请输入设备单价" type="digit"></input>
       </view>
     </view>
   </van-dialog>

mini/pages/index/index.js

@@ -41,9 +41,10 @@ Page({
         })
       }
     });
-    // api.getByName(this, 'getUserInfo', 'userInfo', {}, function(res) {
-    //   app.updateUserInfo(res);
-    // });
+    api.getByName(this, 'getUserInfo', 'userInfo', {}, function(res) {
+      console.log(res)
+      app.updateUserInfo(res);
+    });
   },
   onLoad: function () {
     if (app.globalData.userInfo) {

mini/pages/order-detail/index.js

@@ -106,7 +106,7 @@ Page({
     if(show) {
       this.setData({
         order_device: item,
-        device_quantity: item.price / 100
+        device_quantity: item.quantity
       })
     }
     this.setData({

mini/pages/use-record/index.wxml

@@ -41,22 +41,22 @@
             </view>
             <view class="sg-center sg-bold sg-black sg-pad-tb-sm">维修合计金额：￥{{item.money/100}}</view>
             <view>
-              <view class="sg-flex sg-align-center sg-space-between sg-pad-tb-sm">
-                <view class="sg-index-color">上报项目</view>
+              <view class="sg-flex sg-align-center sg-space-between sg-pad-tb-sm sg-bottom-border">
+                <view class="sg-black">上报项目</view>
                 <view>{{item.project ? item.project.name : ''}}</view>
-                <view class="sg-index-color">提交人</view>
+                <view class="sg-black">提交人</view>
                 <view>{{item.user ? item.user.name : ''}}</view>
               </view>
-              <view class="sg-flex sg-align-center sg-space-between sg-pad-tb-sm">
-                <view class="sg-index-color">维修天数</view>
+              <view class="sg-flex sg-align-center sg-space-between sg-pad-tb-sm sg-bottom-border">
+                <view class="sg-black">维修天数</view>
                 <view>{{item.day}}</view>
               </view>
-              <view class="sg-flex sg-align-center sg-space-between sg-pad-tb-sm">
-                <view class="sg-index-color">维修原因</view>
+              <view class="sg-flex sg-align-center sg-space-between sg-pad-tb-sm sg-bottom-border">
+                <view class="sg-black">维修原因</view>
                 <view>{{item.reason}}</view>
               </view>
-              <view class="sg-flex sg-align-center sg-space-between sg-pad-tb-sm">
-                <view class="sg-index-color">备注</view>
+              <view class="sg-flex sg-align-center sg-space-between sg-pad-tb-sm sg-bottom-border">
+                <view class="sg-black">备注</view>
                 <view>{{item.remark}}</view>
               </view>
             </view>