新增服务协议，修改个人中心，数据中心，首页排版，创建订单排版，调用申请流程修改

mini/app.json

@@ -28,7 +28,8 @@
     "pages/project-user/index",
     "pages/create-project/index",
     "pages/login/index",
-    "pages/logs/logs"
+    "pages/logs/logs",
+    "pages/about/agreement"
   ],
   "tabBar": {
     "custom": true,

mini/pages/about/agreement.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

mini/pages/about/agreement.wxml

@@ -0,0 +1,3 @@
+<view class="container" style="margin:15rpx">
+    <rich-text nodes="{{text}}"></rich-text>
+</view>

mini/pages/about/agreement.wxss

@@ -0,0 +1 @@
+/* pages/about/agreement.wxss */

mini/pages/about/index.js

@@ -1,20 +1,33 @@
 // pages/about/index.js
+import { imgHost } from "../../utils/env";
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    imgHost: ""
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.setData({
+      imgHost: imgHost
+    })
   },
 
+  gotoagree() {
+    wx.navigateTo({
+      url: './agreement?state=' + 1,
+    })
+  },
+  gotoprivacy() {
+    wx.navigateTo({
+      url: './agreement?state=' + 2,
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

mini/pages/about/index.wxml

@@ -1,13 +1,13 @@
 <!--pages/about/index.wxml-->
-<view class="sg-container">
-  <view class="sg-flex sg-flex-column sg-align-center sg-pad">
-    <image src="http://app.rt/images/logo.png" mode="widthFix" class="sg-logo" style="width: 400rpx"></image>
+<view class="sg-container sg-align-center sg-flex sg-flex-column" style="justify-content: space-between;">
+  <view class="sg-flex sg-flex-column sg-align-center sg-pad" style="margin-top:50rpx">
+    <image src="{{imgHost+'logo.png'}}" mode="widthFix" class="sg-logo" style="width: 400rpx"></image>
     <view class="sg-margin-tb sg-bold sg-font-lg" style="color: #174589">城通设备管理系统</view>
     <view class="sg-gray-color">Version 1.0.0.1</view>
   </view>
-  <view class="sg-fix-bottom sg-pad sg-flex sg-flex-column sg-align-center sg-font-small">
-    <view class="sg-pad-tb-sm sg-index-color">《软件许可及服务协议》</view>
-    <view class="sg-pad-tb-sm sg-index-color">《隐私保护指引》</view>
+  <view class=" sg-pad sg-flex sg-flex-column sg-align-center sg-font-small">
+    <view class="sg-pad-tb-sm sg-index-color" bindtap="gotoagree">《软件许可及服务协议》</view>
+    <view class="sg-pad-tb-sm sg-index-color" bindtap="gotoprivacy">《隐私保护指引》</view>
     <view class="sg-gray-color">思维定制 版权所有</view>
     <view class="sg-pad-tb-sm sg-gray-color">Copyright © 2017-2020 Thinking Custom</view>
     <view class="sg-gray-color">All rights reserved</view>

mini/pages/account/index.js

@@ -23,12 +23,19 @@ Page({
     }
   },
 
-  navigate: function(e) {
+  navigate: function (e) {
     app.navigate(e)
   },
 
   logout() {
-    app.logout()
+    wx.showActionSheet({
+      itemList: ['退出登录'],
+      success(res) {
+        if (res.tapIndex == 0) {
+          app.logout()
+        }
+      }
+    })
   },
 
   /**

mini/pages/account/index.wxml

@@ -2,37 +2,51 @@
 <view class="sg-container">
   <view class="sg-index-bg sg-pad">
     <view class="sg-flex sg-align-center">
-      <image class="sg-avatar sg-margin-right" src="{{ userInfo.avatar }}" mode="widthFix"></image>
-      <view class="sg-white">
-        <view class="sg-font-lg">{{ userInfo ? userInfo.name : '请登录' }}</view>
-        <view class="sg-font-small" bindtap="navigate" data-url="{{userInfo ? '/pages/user/index' : '/pages/login/index'}}">{{ userInfo ? '修改用户信息' : '点击按钮进行登录操作' }}</view>
+      <image class="sg-avatar sg-margin-right" style="width:100rpx" src="{{ userInfo.avatar }}" mode="widthFix"></image>
+      <view class="sg-white" style="width:100%">
+        <view class="sg-font-lg sg-flex sg-align-center" style="justify-content: space-between;margin-bottom:15rpx;">
+          <view>{{ userInfo ? userInfo.name : '请登录' }}</view>
+          <view class="sg-align-center sg-flex" wx:if="{{userInfo}}" bindtap="logout">
+            <image src="./out.png" alt="" mode="widthFix" style="width:40rpx"></image>
+          </view>
+        </view>
+        <view class="sg-font-small sg-flex sg-align-center" style="justify-content: space-between;">
+          <view wx:if="userInfo">所属项目个数 | xx个</view>
+          <view bindtap="navigate" data-url="{{userInfo ? '/pages/user/index' : '/pages/login/index'}}">{{ userInfo ? '修改用户信息' : '点击按钮进行登录操作' }}</view>
+        </view>
       </view>
     </view>
-    <view wx:if="{{!userInfo}}" class="sg-pad-sm sg-font-small sg-margin-tb sg-white sg-deep-blue-bg sg-flex sg-align-center sg-space-between" bindtap="navigate" data-url="/pages/login/index">
+    <view wx:if="{{!userInfo}}"
+      class="sg-pad-sm sg-font-small sg-margin-tb sg-white sg-deep-blue-bg sg-flex sg-align-center sg-space-between"
+      bindtap="navigate" data-url="/pages/login/index">
       <text>你还未登录，暂时不能查看项目相关数据</text>
       <van-icon name="arrow" class="sg-icon"></van-icon>
     </view>
   </view>
   <view class="sg-white-bg">
-    <view class="sg-flex sg-align-center sg-space-between sg-pad sg-bottom-border" bindtap="navigate" data-url="/pages/bind/index">
+    <view class="sg-flex sg-align-center sg-space-between sg-pad sg-bottom-border" bindtap="navigate"
+      data-url="/pages/bind/index">
       <view>绑定微信</view>
       <van-icon class="sg-icon" name="arrow"></van-icon>
     </view>
-    <view class="sg-flex sg-align-center sg-space-between sg-pad sg-bottom-border" bindtap="navigate" data-url="/pages/password/index">
+    <view class="sg-flex sg-align-center sg-space-between sg-pad sg-bottom-border" bindtap="navigate"
+      data-url="/pages/password/index">
       <view>修改密码</view>
       <van-icon class="sg-icon" name="arrow"></van-icon>
     </view>
-    <view class="sg-flex sg-align-center sg-space-between sg-pad sg-bottom-border" bindtap="navigate" data-url="/pages/feedback/index">
+    <view class="sg-flex sg-align-center sg-space-between sg-pad sg-bottom-border" bindtap="navigate"
+      data-url="/pages/feedback/index">
       <view>用户反馈</view>
       <van-icon class="sg-icon" name="arrow"></van-icon>
     </view>
-    <view class="sg-flex sg-align-center sg-space-between sg-pad sg-bottom-border" bindtap="navigate" data-url="/pages/about/index">
+    <view class="sg-flex sg-align-center sg-space-between sg-pad sg-bottom-border" bindtap="navigate"
+      data-url="/pages/about/index">
       <view>关于我们</view>
       <van-icon class="sg-icon" name="arrow"></van-icon>
     </view>
-    <view class="sg-flex sg-align-center sg-space-between sg-pad sg-bottom-border" bindtap="logout">
+    <!-- <view class="sg-flex sg-align-center sg-space-between sg-pad sg-bottom-border" bindtap="logout">
       <view>退出登录</view>
       <van-icon class="sg-icon" name="arrow"></van-icon>
-    </view>
+    </view> -->
   </view>
 </view>

mini/pages/add-inner-device/index.js

@@ -30,7 +30,7 @@ Page({
    */
   onLoad: function (options) {
     var that = this
-    api.getByName(this, 'devices/getThreeLevel', 'device_types', {type: 'drop_menu'}, function() {
+    api.getByName(this, 'devices/getThreeLevel', 'device_types', { type: 'drop_menu' }, function () {
       that.updateNameSpec()
     });
     // api.getByName(this, 'inner-devices/get', 'names', {type: 'drop_menu'});
@@ -39,13 +39,13 @@ Page({
   },
 
   getItemById(items, id) {
-    for(var i = 0; i < items.length; ++i) {
-      if(items[i].value == id) return items[i]
+    for (var i = 0; i < items.length; ++i) {
+      if (items[i].value == id) return items[i]
     }
     return null
   },
 
-  updateNameSpec: function() {
+  updateNameSpec: function () {
     var device_types = this.data.device_types
     var typeItem = this.getItemById(device_types, this.data.type)
     var names = typeItem.names;
@@ -57,54 +57,56 @@ Page({
     })
   },
 
-  switchShowDate: function(e) {
+  switchShowDate: function (e) {
     this.setData({
-      showDate: e.currentTarget.dataset.show
+      showDate: e.currentTarget.dataset.show,
     })
   },
 
-  switchShowAdded: function(e) {
+  switchShowAdded: function (e) {
+    this.complete()
     this.setData({
       showAdded: e.currentTarget.dataset.show
     })
   },
 
-  complete: function(e) {
+  complete: function (e) {
     wx.setStorageSync('sg-added-devices', this.data.add_devices)
     wx.navigateBack({
       delta: 0,
     })
   },
 
-  confirmDate: function(e) {
+  confirmDate: function (e) {
     var ids = []
     var add_devices = this.data.add_devices
-    for(var i = 0; i < add_devices.length; ++i) {
+    for (var i = 0; i < add_devices.length; ++i) {
       ids.push(add_devices[i].id)
     }
     var list = this.data.list
     var [start_date, end_date] = e.detail;
     start_date = util.formatDate(start_date)
     end_date = util.formatDate(end_date)
-    for(var i = 0; i < list.length; ++i) {
-      if(ids.indexOf(list[i].id) == -1 && list[i].checked) {
+    for (var i = 0; i < list.length; ++i) {
+      if (ids.indexOf(list[i].id) == -1 && list[i].checked) {
         var device = list[i]
         device.start_date = start_date,
-        device.end_date = end_date
+          device.end_date = end_date
         add_devices.push(device)
       }
     }
+    this.switchShowDate(e)
     this.setData({
-      add_devices: add_devices
+      add_devices: add_devices,
+      showAdded:true
     })
-    this.switchShowDate(e)
   },
 
-  switchSelect: function(e) {
+  switchSelect: function (e) {
     var list = this.data.list
     var index = e.currentTarget.dataset.index
     var can = e.currentTarget.dataset.can
-    if(can) {
+    if (can) {
       list[index].checked = list[index].checked ? false : true
       this.setData({
         list
@@ -114,19 +116,19 @@ Page({
     }
   },
 
-  onChange: function(e) {
+  onChange: function (e) {
     var name = e.currentTarget.dataset.name
     this.setData({
       [name]: e.detail
     })
-    if(['type', 'name'].indexOf(name) != -1) {
-      if(name == 'type') {
+    if (['type', 'name'].indexOf(name) != -1) {
+      if (name == 'type') {
         this.setData({
           name: '',
           spec: ''
         })
       }
-      if(name == 'name') {
+      if (name == 'name') {
         this.setData({
           spec: ''
         })
@@ -136,7 +138,7 @@ Page({
     this.search()
   },
 
-  resetList: function() {
+  resetList: function () {
     this.setData({
       list: [],
       page: 1,
@@ -144,12 +146,12 @@ Page({
     })
   },
 
-  search: function() {
+  search: function () {
     this.resetList()
     this.getList()
   },
 
-  getList: function() {
+  getList: function () {
     var that = this
     http({
       url: 'inner-devices/search',
@@ -177,7 +179,7 @@ Page({
     })
   },
 
-  deleteDevice: function(e) {
+  deleteDevice: function (e) {
     var index = e.currentTarget.dataset.index
     var add_devices = this.data.add_devices
     add_devices.splice(index, 1)
@@ -229,7 +231,7 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-    if(!this.data.touchBottom) {
+    if (!this.data.touchBottom) {
       var page = this.data.page
       page = page + 1;
       this.setData({
@@ -237,7 +239,7 @@ Page({
       })
       this.getList()
     }
-    if(this.data.touchBottom) {
+    if (this.data.touchBottom) {
       util.error('没有更多数据了')
     }
   },

mini/pages/add-inner-device/index.wxml

@@ -18,7 +18,8 @@
     <view class="sg-item sg-white-bg sg-pad sg-margin-bottom" wx:for="{{list}}" wx:key="index" bindtap="switchSelect"
       data-index="{{index}}" data-can="{{item.status && item.status.key == 'free'}}">
       <view class="sg-top sg-flex sg-space-between sg-bottom-border sg-pad-bottom-sm sg-font-small sg-bold">
-        <view class="sg-name">{{item.device ? item.device.name : ''}} - {{item.device_name ? item.device_name.name : ''}}</view>
+        <view class="sg-name">{{item.device ? item.device.name : ''}} -
+          {{item.device_name ? item.device_name.name : ''}}</view>
         <view class="sg-status sg-flex sg-align-center">
           <view class="sg-dot" style="background: {{item.status ? item.status.color : ''}}"></view>
           <view class="sg-status-name">{{item.status ? item.status.name : ''}}</view>
@@ -51,12 +52,15 @@
       </view>
     </view>
   </view>
-  <van-dialog show="{{ showAdded }}" use-slot title="已添加设备" show-cancel-button bind:confirm="switchShowAdded" z-index="200" data-show="{{false}}">
+  <van-dialog show="{{ showAdded }}" use-slot title="已添加设备" show-cancel-button bind:confirm="switchShowAdded"
+    z-index="200" data-show="{{false}}">
     <view class="sg-added-list">
-      <view class="sg-item sg-pad sg-bottom-border sg-flex sg-align-center sg-space-between" wx:for="{{add_devices}}" wx:key="index">
+      <view class="sg-item sg-pad sg-bottom-border sg-flex sg-align-center sg-space-between" wx:for="{{add_devices}}"
+        wx:key="index">
         <view class="sg-left">
           <view class="sg-name sg-font-small">{{item.device ? item.device.name + ' - ' : ''}}{{item.name}}</view>
-        <view class="sg-dates sg-font-xs sg-gray-color">{{item.start_date ? item.start_date + '至' + item.end_date : ''}}</view>
+          <view class="sg-dates sg-font-xs sg-gray-color">
+            {{item.start_date ? item.start_date + '至' + item.end_date : ''}}</view>
         </view>
         <view class="sg-right sg-red-bg sg-white sg-pad-sm" bindtap="deleteDevice" data-index="{{index}}">删除</view>
       </view>
@@ -65,9 +69,9 @@
   <van-calendar show="{{ showDate }}" bind:close="switchShowDate" bind:confirm="confirmDate" data-show="{{false}}"
     type="range" class="sg-calendar" default-date="{{default_dates}}" />
   <view class="sg-submit-box sg-fix-bottom sg-flex sg-align-center sg-center">
-    <view class="sg-action sg-pad sg-white-bg" bindtap="switchShowAdded" data-show="{{true}}">已添加({{add_devices.length}})</view>
-    <view class="sg-action sg-draft sg-pad sg-border-right sg-green-bg sg-white" bindtap="complete">完成</view>
-    <view class="sg-action sg-draft sg-pad sg-border-right sg-index-bg sg-white" bindtap="switchShowDate" data-show="{{true}}"
-      data-type='draft'>添加</view>
+    <!-- <view class="sg-action sg-pad sg-white-bg" bindtap="switchShowAdded" data-show="{{true}}">已添加({{add_devices.length}})</view> -->
+    <!-- <view class="sg-action sg-draft sg-pad sg-border-right sg-green-bg sg-white" bindtap="complete">完成</view> -->
+    <view class="sg-action sg-draft sg-pad sg-border-right sg-index-bg sg-white" style="width:100%"
+      bindtap="switchShowDate" data-show="{{true}}" data-type='draft'>立即添加</view>
   </view>
 </view>

mini/pages/create-order-inner/index.js

@@ -53,11 +53,11 @@ Page({
     var order_id = this.data.order_id
     api.getProject(this)
     api.getByName(this, 'work-points/get', 'work_points');
-    if(order_id) {
+    if (order_id) {
       var that = this
-      
-      api.getByName(this, 'orders/detail', 'order', {id: order_id}, function(res) {
-        api.getByName(that, 'orders/getRole', 'role', {id: order_id}, function (res) {
+
+      api.getByName(this, 'orders/detail', 'order', { id: order_id }, function (res) {
+        api.getByName(that, 'orders/getRole', 'role', { id: order_id }, function (res) {
           that.updateActionType()
           that.initData()
         });
@@ -73,13 +73,13 @@ Page({
     var role = this.data.role
     var order = this.data.order
     if (order.project_role_id == role.id) {
-      if(order.status_key == 'checking' && role.project_role.key == 'assist') actionType = 'check'
-      else if(order.status_key == 'checked' && ['manager', 'admin'].indexOf(role.project_role.key) != -1) actionType = 'check'
-      else if(order.status_key == 'reject' && role.project_role.key == 'machine') actionType = 're-submit'
-      else if(order.status_key == 'pass' && role.project_role.key == 'machine') actionType = 'back'
+      if (order.status_key == 'checking' && role.project_role.key == 'assist') actionType = 'check'
+      else if (order.status_key == 'checked' && ['manager', 'admin'].indexOf(role.project_role.key) != -1) actionType = 'check'
+      else if (order.status_key == 'reject' && role.project_role.key == 'machine') actionType = 're-submit'
+      else if (order.status_key == 'pass' && role.project_role.key == 'machine') actionType = 'back'
     }
     var canEdit = actionType == 'check' && role.project_role.key == 'admin' || (actionType == 're-submit');
-    if(order.is_draft == 1) {
+    if (order.is_draft == 1) {
       canEdit = true
       actionType = 'edit'
     }
@@ -89,19 +89,19 @@ Page({
     })
   },
 
-  navigate: function(e) {
+  navigate: function (e) {
     wx.navigateTo({
       url: e.currentTarget.dataset.url,
     })
   },
 
-  check: function(e) {
+  check: function (e) {
     var type = e.currentTarget.dataset.type
     var that = this
     var msg = '确认通过审核吗？'
-    if(type == 'reject') msg = '确认驳回申请吗？'
-    else if(type == 'pass' || type == 're-submit') msg = '确认提交吗？'
-    else if(type == 'back') msg = '确认归还吗？'
+    if (type == 'reject') msg = '确认驳回申请吗？'
+    else if (type == 'pass' || type == 're-submit') msg = '确认提交吗？'
+    else if (type == 'back') msg = '确认归还吗？'
     Dialog.confirm({
       title: '提示',
       message: msg,
@@ -114,7 +114,7 @@ Page({
     var type = e.currentTarget.dataset.type
     var is_change = e.currentTarget.dataset.change
     var that = this
-    if(this.data.devices.length <= 0) {
+    if (this.data.devices.length <= 0) {
       util.error('请选择调用设备');
       return false;
     }
@@ -130,21 +130,21 @@ Page({
       success: function (res) {
         if (res.code == 0) {
           util.success('操作成功')
-          setTimeout(function() {
+          setTimeout(function () {
             that.init()
           }, 1000)
         }
       }
     })
   },
-  
-  initData: function() {
+
+  initData: function () {
     var order = this.data.order,
-    work_points = this.data.work_points,
-    pointIndex = this.data.pointIndex
+      work_points = this.data.work_points,
+      pointIndex = this.data.pointIndex
 
-    for(var i = 0; i < work_points.length; ++i) {
-      if(work_points[i].id == order.work_point_id) {
+    for (var i = 0; i < work_points.length; ++i) {
+      if (work_points[i].id == order.work_point_id) {
         pointIndex = i;
         break;
       }
@@ -157,15 +157,15 @@ Page({
     })
   },
 
-  submit: function(e) {
+  submit: function (e) {
     var type = e.currentTarget.dataset.type
     var is_draft = type == 'draft' ? 1 : 2
     var submit_type = this.data.type
-    if(this.data.pointIndex < 0) {
+    if (this.data.pointIndex < 0) {
       util.error('需求工点必填');
       return false;
     }
-    if(this.data.devices.length <= 0) {
+    if (this.data.devices.length <= 0) {
       util.error('请选择调用设备');
       return false;
     }
@@ -183,21 +183,21 @@ Page({
         is_draft: is_draft,
         type: type
       },
-      success: function(res) {
-        if(res.code == 0) {
+      success: function (res) {
+        if (res.code == 0) {
           util.success('操作成功')
         }
       }
     })
   },
 
-  switchTab: function(e) {
+  switchTab: function (e) {
     this.setData({
       tabIndex: e.currentTarget.dataset.index
     })
   },
 
-  onChange: function(e) {
+  onChange: function (e) {
     var name = e.currentTarget.dataset.name
     this.setData({
       [name]: e.detail.value
@@ -215,7 +215,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    if(this.data.type == 'create' || this.data.loadedOrder) {
+    if (this.data.type == 'create' || this.data.loadedOrder) {
       var devices = wx.getStorageSync('sg-added-devices')
       devices = devices ? devices : []
       this.setData({
@@ -224,18 +224,26 @@ Page({
     }
   },
 
-  goAdd: function(e) {
+  goAdd: function (e) {
     var devices = this.data.devices
     wx.setStorageSync('sg-added-devices', devices)
     this.navigate(e)
   },
 
-  deleteDevice: function(e) {
-    var index = e.currentTarget.dataset.index
-    var devices = this.data.devices
-    devices.splice(index, 1)
-    this.setData({
-      devices
+  deleteDevice: function (e) {
+    wx.showModal({
+      title: "提示",
+      content: "是否确定删除",
+      success: (res) => {
+        if (res.confirm) {
+          var index = e.currentTarget.dataset.index
+          var devices = this.data.devices
+          devices.splice(index, 1)
+          this.setData({
+            devices
+          })
+        }
+      }
     })
   },
 

mini/pages/create-order-inner/index.wxml

@@ -53,7 +53,7 @@
         <view class="sg-center sg-pad">暂无设备</view>
       </block>
       <block wx:else>
-        <view class="sg-item sg-flex sg-align-center sg-bottom-border" wx:for="{{devices}}" wx:key="index"
+        <!-- <view class="sg-item sg-flex sg-align-center sg-bottom-border" wx:for="{{devices}}" wx:key="index"
           bindtap="selectDevice" data-index="{{index}}">
           <view class="sg-left sg-flex-grow sg-pad sg-flex-column">
             <view class="sg-left-top sg-flex sg-justify-center sg-space-between">
@@ -65,7 +65,41 @@
             <view class="sg-right sg-red-bg sg-white sg-pad-sm sg-font-small" bindtap="deleteDevice"
               data-index="{{index}}">删除</view>
           </view>
-          <!-- <view class="sg-right sg-red-bg sg-pad sg-flex sg-align-center" bindtap="deleteDevice" data-index="{{index}}">删除</view> -->
+          <view class="sg-right sg-red-bg sg-pad sg-flex sg-align-center" bindtap="deleteDevice" data-index="{{index}}">删除</view>
+        </view> -->
+        <view class="sg-list sg-pad">
+          <view class="sg-item sg-white-bg sg-pad sg-margin-bottom" wx:for="{{devices}}" wx:key="index" data-index="{{index}}" data-can="{{item.status && item.status.key == 'free'}}">
+            <view class="sg-top sg-flex sg-space-between sg-bottom-border sg-pad-bottom-sm sg-font-small sg-bold">
+              <view class="sg-name">{{item.device ? item.device.name : ''}} -
+                {{item.device_name ? item.device_name.name : ''}}
+              </view>
+              <van-icon name="clear" bindtap="deleteDevice" size="20px" />
+            </view>
+            <view class="sg-body sg-font-xs sg-bottom-border sg-pad-bottom-sm">
+              <view class="sg-item sg-margin-tb-sm sg-flex" style=" justify-content: space-between;">
+                <view class="sg-left-item">固定资产编号：{{item.number}}</view>
+                <view class="sg-right-item">出厂日期：{{item.produce_date}}</view>
+              </view>
+              <view class="sg-item sg-margin-tb-sm sg-flex" style=" justify-content: space-between;">
+                <view class="sg-left-item">外形尺寸：{{item.shape}}</view>
+                <view class="sg-right-item">采购原值：{{item.buy_origin}}</view>
+              </view>
+              <view class="sg-item sg-margin-tb-sm sg-flex" style=" justify-content: space-between;">
+                <view class="sg-left-item">规格型号：{{item.spec ? item.spec.name : ''}}</view>
+                <view class="sg-right-item">生产厂家：{{item.manufacturer}}</view>
+              </view>
+            </view>
+            <view class="sg-bottom sg-font-xs">
+              <view class="sg-left" style="display:block">
+                <view class="sg-item sg-margin-tb-sm">目前在用工点：{{item.work_point ? item.work_point.name : '无'}}</view>
+                <view class="sg-item sg-margin-tb-sm">
+                  借用时间：{{item.start_date ? item.start_date + '至' + item.end_date : '无'}}
+                </view>
+              </view>
+              <!-- <view class="sg-white sg-pad-sm {{item.status && item.status.key == 'free' ? 'sg-green-bg' : 'sg-gray-bg'}}">
+          借用设备</view> -->
+            </view>
+          </view>
         </view>
       </block>
     </view>

mini/pages/create-order/index.wxml

@@ -45,13 +45,22 @@
       <block wx:else>
         <view class="sg-item sg-flex sg-align-center sg-bottom-border" wx:for="{{devices}}" wx:key="index"
           bindtap="selectDevice" data-index="{{index}}">
-          <view class="sg-left sg-flex-grow sg-pad sg-flex-column">
+          <view class=" sg-flex-grow sg-pad sg-flex-column">
             <view class="sg-left-top sg-flex sg-justify-center sg-space-between">
               <view class="sg-name">{{item.type_name}}-{{item.name}}</view>
-              <view class="sg-left-right sg-quantity-price sg-gray-color">
-                ￥<text>{{item.price}}</text> × <text>{{item.quantity}}</text>
+              <view class="sg-left-right sg-quantity-price sg-red-color" style="color:red">
+                ￥<text>{{item.price*item.quantity}}</text>
               </view>
             </view>
+            <view class="sg-left-bottom sg-gray-color sg-font-xs">
+              租赁方式：{{item.rent}}
+            </view>
+            <view class="sg-left-bottom sg-red-color sg-font-xs" style="color:red">
+              租赁单价：￥{{item.price}}
+            </view>
+            <view class="sg-left-bottom sg-gray-color sg-font-xs">
+              租赁数量：{{item.quantity}}
+            </view>
             <view class="sg-left-bottom sg-gray-color sg-font-xs">{{item.start_date}}至{{item.end_date}}</view>
           </view>
           <view class="sg-right sg-pad sg-flex sg-align-center sg-icon" bindtap="selectDevice">

mini/pages/create-project-role/index.wxml

@@ -26,7 +26,7 @@
       <view class="sg-pick-name">将他添加到：</view>
       <picker bindchange="bindPickerChange" value="{{projectIndex}}" range="{{projects}}" range-key="name" data-name="projectIndex">
         <view class="picker sg-gray-color">
-          {{projectIndex >= 0 ? projects[projectIndex].name : '请选择需要将他添加的项目'}}
+          {{projectIndex >= 0 ? projects[projectIndex].name : '请选择添加项目'}}
         </view>
       </picker>
     </view>
@@ -34,7 +34,7 @@
       <view class="sg-pick-name">他的角色：</view>
       <picker bindchange="bindPickerChange" value="{{roleIndex}}" range="{{roles}}" range-key="name" data-name="roleIndex">
         <view class="picker sg-gray-color">
-          {{roleIndex >= 0 ? roles[roleIndex].name : '请选择他在项目中的角色'}}
+          {{roleIndex >= 0 ? roles[roleIndex].name : '请选择角色'}}
         </view>
       </picker>
     </view>

mini/pages/filter-data/index.wxml

@@ -14,16 +14,16 @@
           <view class="sg-bold sg-text-center sg-center sg-margin-tb">- 请选择设备类型 - </view>
           <view>
             <view wx:for="{{device_ids}}" wx:key="index" class="sg-flex sg-align-center">
-              <van-dropdown-menu class="sg-flex-grow sg-margin-tb-sm sg-margin-right">
+              <van-dropdown-menu class="sg-flex-grow sg-margin-tb-sm sg-margin-right" active-color="#1989fa">
                 <van-dropdown-item value="{{ item }}" options="{{ devices }}" bind:change="onDropChange"
                   data-name="device_ids" data-index="{{index}}" />
               </van-dropdown-menu>
-              <van-button icon="cross" type="danger" bindtap="delete" data-name="device_ids"
+              <van-button icon="cross" type="danger" color="#1989fa" bindtap="delete" data-name="device_ids"
                 data-index="{{index}}"></van-button>
             </view>
           </view>
           <view class="sg-margin-tb">
-            <van-button type="primary" block icon="plus" bindtap="add" data-name="device_ids">新增</van-button>
+            <van-button type="primary" block icon="plus" color="#1989fa" bindtap="add" data-name="device_ids">新增</van-button>
           </view>
         </view>
       </van-tab>
@@ -32,16 +32,16 @@
           <view class="sg-bold sg-text-center sg-center sg-margin-tb">- 请选择设备名称 - </view>
           <view>
             <view wx:for="{{device_name_ids}}" wx:key="index" class="sg-flex sg-align-center">
-              <van-dropdown-menu class="sg-flex-grow sg-margin-tb-sm sg-margin-right">
+              <van-dropdown-menu class="sg-flex-grow sg-margin-tb-sm sg-margin-right" active-color="#1989fa">
                 <van-dropdown-item value="{{ item }}" options="{{ names }}" bind:change="onDropChange"
                   data-name="device_name_ids" data-index="{{index}}" />
               </van-dropdown-menu>
-              <van-button icon="cross" type="danger" bindtap="delete"
+              <van-button icon="cross" color="#1989fa" type="danger" bindtap="delete"
                 data-name="device_name_ids" data-index="{{index}}"></van-button>
             </view>
           </view>
           <view class="sg-margin-tb">
-            <van-button type="primary" block icon="plus" bindtap="add" data-name="device_name_ids">新增</van-button>
+            <van-button type="primary" block icon="plus" color="#1989fa" bindtap="add" data-name="device_name_ids">新增</van-button>
           </view>
         </view>
       </van-tab>
@@ -50,16 +50,16 @@
           <view class="sg-bold sg-text-center sg-center sg-margin-tb">- 请选择规格型号 - </view>
           <view>
             <view wx:for="{{spec_ids}}" wx:key="index" class="sg-flex sg-align-center">
-              <van-dropdown-menu class="sg-flex-grow sg-margin-tb-sm sg-margin-right">
+              <van-dropdown-menu class="sg-flex-grow sg-margin-tb-sm sg-margin-right" active-color="#1989fa">
                 <van-dropdown-item value="{{ item }}" options="{{ specs }}" bind:change="onDropChange"
                   data-name="spec_ids" data-index="{{index}}" />
               </van-dropdown-menu>
-              <van-button icon="cross" type="danger" bindtap="delete"
+              <van-button icon="cross" color="#1989fa" type="danger" bindtap="delete"
                 data-name="spec_ids" data-index="{{index}}"></van-button>
             </view>
           </view>
           <view class="sg-margin-tb">
-            <van-button type="primary" block icon="plus" bindtap="add" data-name="spec_ids">新增</van-button>
+            <van-button type="primary" block icon="plus" color="#1989fa" bindtap="add" data-name="spec_ids">新增</van-button>
           </view>
         </view>
       </van-tab>
@@ -68,7 +68,7 @@
           <view class="sg-bold sg-text-center sg-center sg-margin-tb">- 请选择特殊条件 - </view>
           <view>
             <view wx:for="{{spec_ids}}" wx:key="index" class="sg-flex sg-align-center">
-              <van-dropdown-menu class="sg-flex-grow sg-margin-tb-sm sg-margin-right">
+              <van-dropdown-menu class="sg-flex-grow sg-margin-tb-sm sg-margin-right" active-color="#1989fa">
                 <van-dropdown-item value="{{ item }}" options="{{ rent_types }}" bind:change="onDropChange"
                   data-name="spec_ids" data-index="{{index}}" />
               </van-dropdown-menu>

mini/pages/index/index.wxml

@@ -1,35 +1,39 @@
 <!--index.wxml-->
-<view class="sg-container">
-  <view class="sg-top-box sg-index-bg">
-    <view class="sg-top-item sg-font-xs" bindtap="navigate" data-url="/pages/create-project/index">
-      <van-icon name="edit" class="sg-icon"/>
-      <view class="sg-top-name">新建项目</view>
-    </view>
-    <view class="sg-top-item sg-font-xs" bindtap="navigate" data-url="/pages/create-project-role/index">
-      <van-icon name="user-o" class="sg-icon"/>
-      <view class="sg-top-name">成员添加</view>
-    </view>
-    <view class="sg-top-item sg-font-xs" bindtap="navigate" data-url="/pages/draft/index">
-      <van-icon name="description" class="sg-icon"/>
-      <view class="sg-top-name">草稿箱</view>
-    </view>
-    <view class="sg-top-item sg-font-xs sg-right-border" bindtap="navigate" data-url="/pages/notification/index">
-      <van-icon name="bell" class="sg-icon" wx:if="{{notReadCount > 0}}" info="{{notReadCount}}"/>
-        <van-icon name="bell" class="sg-icon" wx:else/>
-      <view class="sg-top-name">消息提示</view>
+<view class="sg-container" style="overflow: hidden;">
+  <view class="flexdstyle">
+    <view class="sg-top-box sg-index-bg">
+      <view class="sg-top-item sg-font-xs" bindtap="navigate" data-url="/pages/create-project/index">
+        <van-icon name="edit" class="sg-icon" />
+        <view class="sg-top-name">新建项目</view>
+      </view>
+      <view class="sg-top-item sg-font-xs" bindtap="navigate" data-url="/pages/create-project-role/index">
+        <van-icon name="user-o" class="sg-icon" />
+        <view class="sg-top-name">成员添加</view>
+      </view>
+      <view class="sg-top-item sg-font-xs" bindtap="navigate" data-url="/pages/draft/index">
+        <van-icon name="description" class="sg-icon" />
+        <view class="sg-top-name">草稿箱</view>
+      </view>
+      <view class="sg-top-item sg-font-xs sg-right-border" bindtap="navigate" data-url="/pages/notification/index">
+        <van-icon name="bell" class="sg-icon" wx:if="{{notReadCount > 0}}" info="{{notReadCount}}" />
+        <van-icon name="bell" class="sg-icon" wx:else />
+        <view class="sg-top-name">消息提示</view>
+      </view>
+      <view class="sg-top-item sg-font-xs">
+        <image class="sg-avatar" src="{{ userInfo.avatar }}" mode="widthFix"></image>
+      </view>
     </view>
-    <view class="sg-top-item sg-font-xs">
-      <image class="sg-avatar" src="{{ userInfo.avatar }}" mode="widthFix"></image>
+    <view class="sg-search-box sg-shadow">
+      <van-icon name="search" class="sg-index-color sg-search-icon" />
+      <input class="sg-search-input" placeholder="搜索相关项目" bindblur="search" bindinput="updateInput"
+        data-name="keyword"></input>
     </view>
   </view>
-  <view class="sg-search-box sg-shadow">
-    <van-icon name="search" class="sg-index-color sg-search-icon"/>
-    <input class="sg-search-input" placeholder="搜索相关项目" bindblur="search" bindinput="updateInput" data-name="keyword"></input>
-  </view>
-  <view class="sg-box sg-pad">
+  <view class="sg-box sg-pad" style="margin-top:280rpx">
     <view class="sg-header">所有项目</view>
     <view class="sg-list">
-      <view class="sg-item sg-index-card sg-shadow sg-pad sg-margin-top-sm" wx:for="{{list}}" wx:key="index" data-id="{{item.id}}" bindtap="navigate" data-url="/pages/project/index?id={{item.id}}">
+      <view class="sg-item sg-index-card sg-shadow sg-pad sg-margin-top-sm" wx:for="{{list}}" wx:key="index"
+        data-id="{{item.id}}" bindtap="navigate" data-url="/pages/project/index?id={{item.id}}">
         <image class="sg-img" mode="widthFix" src="https://t18.9026.com/mini/test.png"></image>
         <view class="sg-right">
           <view class="sg-top">
@@ -37,11 +41,11 @@
             <view class="sg-date sg-gray-color sg-font-small">{{ item.date }}</view>
           </view>
           <view class="sg-bottom sg-font-small sg-margin-top-sm">
-            <view class="sg-desc">经理：{{ item.manager ? item.manager.name : '无' }}</view>
+            <view class="sg-desc">项目经理：{{ item.manager ? item.manager.name : '无' }}</view>
             <view class="sg-desc">电话：{{ item.manager ? item.manager.phone : '无' }}</view>
           </view>
         </view>
       </view>
     </view>
   </view>
-</view>
+</view>

mini/pages/index/index.wxss

@@ -1,4 +1,8 @@
 /**index.wxss**/
+.flexdstyle{
+  position: fixed;
+  width: 100%;
+}
 .sg-top-box {
   color: white;
   display: flex;

mini/pages/project-user/index.js

@@ -118,6 +118,7 @@ Page({
       },
       success: function (res) {
         if (res.code == 0) {
+          res.data.reverse()
           that.setData({
             list: res.data
           })

mini/project.config.json

@@ -29,14 +29,14 @@
       "outputPath": ""
     },
     "enableEngineNative": false,
+    "bundle": false,
     "useIsolateContext": true,
     "useCompilerModule": true,
     "userConfirmedUseCompilerModuleSwitch": false,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "bundle": false
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.14.0",

mini/utils/env.js

@@ -1,4 +1,3 @@
-const isTest = true;
-const baseUrl = isTest ? 'http://app.rt/api/mini/' : 'http://t18.9026.com/api/mini/';
-
-export default baseUrl
+const isTest = false;
+export const baseUrl = isTest ? 'http://app.rt/api/mini/' : 'http://t18.9026.com/api/mini/';
+export const imgHost = isTest ? 'http://app.rt/images/' : 'http://t18.9026.com/images/'

mini/utils/http.js

@@ -1,4 +1,4 @@
-import baseUrl from '../utils/env'
+import { baseUrl } from '../utils/env'
 
 const http = (data) => {
   var data = Object.assign({}, {