修改页面

mini/components/inner-device-card/index.wxml

@@ -1,20 +1,26 @@
 <!--components/inner-device-card/index.wxml-->
 <view class="sg-item sg-white-bg sg-pad sg-margin-bottom" bindtap="switchChecked" data-index="{{index}}">
   <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_name ? item.device_name.name : ''}} - {{item.spec ? item.spec.name : ''}}
+    <view class="sg-name">{{item.device_name ? item.device_name.name : ''}} - {{item.spec_name ? item.spec_name : ''}}
     </view>
-    <view class="sg-status sg-flex sg-align-center" wx:if="{{showStatus}}">
-      <view class="sg-dot" style="background: {{item.status ? item.status.color : ''}}"></view>
-      <view class="sg-status-name">{{item.status ? item.status.name : ''}}</view>
-    </view>
-    <view class="sg-status sg-flex sg-align-center sg-font-lg" wx:if="{{showChecked}}">
-      <van-icon name="passed" wx:if="{{item.checked}}" class="sg-index-color" />
-      <van-icon name="circle" wx:else />
-    </view>
-    <view class="sg-status sg-flex sg-align-center sg-font-lg" wx:if="{{showDelete}}" catchtap="delete" data-index="{{index}}">
-      <van-icon name="clear" />
+    <view class="sg-flex sg-align-center">
+      <view class="sg-status sg-flex sg-align-center" wx:if="{{showStatus}}">
+        <view class="sg-dot" style="background: {{item.status ? item.status.color : ''}}"></view>
+        <view class="sg-status-name">{{item.status ? item.status.name : ''}}</view>
+      </view>
+      <view class="sg-status sg-flex sg-align-center sg-font-lg" wx:if="{{showChecked}}">
+        <van-icon name="passed" wx:if="{{item.checked}}" class="sg-index-color" />
+        <van-icon name="circle" wx:else />
+      </view>
+      <view class="sg-status sg-flex sg-align-center sg-font-lg" style="margin-left:15rpx" wx:if="{{showDelete}}" catchtap="delete"
+        data-index="{{index}}">
+        <van-icon name="clear" />
+      </view>
+      <view style="margin-left:15rpx" class="sg-align-center sg-flex">
+        <van-icon class="sg-action sg-index-color sg-icon" wx:if="{{action=='record'}}" name="notes-o" catchtap="navigate"
+        data-url="/pages/use-record/index?id={{item.id}}"></van-icon>
+      </view>
     </view>
-    <van-icon class="sg-action sg-index-color sg-icon" wx:if="{{action=='record'}}" name="notes-o" catchtap="navigate" data-url="/pages/use-record/index?id={{item.id}}"></van-icon>
   </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">
@@ -32,9 +38,11 @@
   <view class="sg-bottom sg-font-xs sg-flex sg-align-center sg-space-between">
     <view class="sg-left">
       <view class="sg-item sg-margin-tb-sm">目前在用项目：{{item.project ? item.project.name : '无'}}</view>
-      <view class="sg-item sg-margin-tb-sm">借用时间：{{item.start_date ? item.start_date + '至' + item.end_date : (item.pivot ? item.pivot.start_date + '至' + item.pivot.end_date : '无')}}
+      <view class="sg-item sg-margin-tb-sm">
+        借用时间：{{item.start_date ? item.start_date + '至' + item.end_date : (item.pivot ? item.pivot.start_date + '至' + item.pivot.end_date : '无')}}
       </view>
     </view>
-    <view class="sg-white sg-pad-sm sg-index-bg" wx:if="{{editDate}}" catchtap="editDate" data-index="{{index}}">修改时间</view>
+    <view class="sg-white sg-pad-sm sg-index-bg" wx:if="{{editDate}}" catchtap="editDate" data-index="{{index}}">修改时间
+    </view>
   </view>
 </view>

mini/pages/feedback/index.js

@@ -14,7 +14,7 @@ Page({
     contact: '',
     imgs: []
   },
-  
+
 
   /**
    * 生命周期函数--监听页面加载
@@ -23,10 +23,10 @@ Page({
 
   },
 
-  afterRead: function(e) {
+  afterRead: function (e) {
     const { file } = e.detail;
     var files = this.data.files
-    if(files.length >= 4) {
+    if (files.length >= 4) {
       util.error('最多上传4张图片')
       return false
     }
@@ -37,35 +37,35 @@ Page({
     })
   },
 
-  delete: function(e) {
+  delete: function (e) {
     var files = this.data.files
     var index = e.detail.index
     files.splice(index, 1)
-    this.setData({files})
+    this.setData({ files })
   },
 
   updateInput(e) {
     getApp().updateInput(this, e)
   },
 
-  save: function() {
-    if(!this.data.content) {
+  save: function () {
+    if (!this.data.content) {
       util.error('反馈意见必填')
       return false
     }
-    if(!this.data.contact) {
+    if (!this.data.contact) {
       util.error('联系方式必填')
       return false
     }
     var files = this.data.files
     var that = this
-    if(files.length != this.data.imgs.length) {
-      for(var i = 0; i < files.length; ++i) {
-        util.uploadFile(files[i].url, function(res) {
+    if (files.length != this.data.imgs.length) {
+      for (var i = 0; i < files.length; ++i) {
+        util.uploadFile(files[i].url, function (res) {
           // console.log(res)
           var imgs = that.data.imgs
           imgs.push(res.data.path)
-          that.setData({imgs})
+          that.setData({ imgs })
           that.updateInfo()
         })
       }
@@ -74,10 +74,10 @@ Page({
     }
   },
 
-  updateInfo: function() {
+  updateInfo: function () {
     var files = this.data.files
     var imgs = this.data.imgs
-    if(imgs.length != files.length) return false;
+    if (imgs.length != files.length) return false;
     http({
       url: 'feedback/create',
       data: {

mini/pages/order-inner/index.js

@@ -41,6 +41,16 @@ Page({
     var id = options.id ? options.id : 1
     var type = options.type ? options.type : 'list'
     var tabIndex = options.index ? options.index : 0
+    if(tabIndex == 4){
+      wx.setNavigationBarTitle({
+        title: "异常处理"
+      })
+    }
+    if(type == 'check'){
+      wx.setNavigationBarTitle({
+        title: "调用审核"
+      })
+    }
     this.setData({
       id,
       type,

mini/pages/order-inner/index.wxml

@@ -11,7 +11,7 @@
     </view>
     <view class="sg-tabs sg-flex sg-align-center sg-white-bg sg-pad sg-bottom-border sg-top-border sg-font-small">
       <view wx:for="{{tabs}}" wx:key="index" class="sg-tab {{tabIndex == index ? 'sg-selected' : ''}}"
-        bindtap="switchTab" data-index="{{index}}" hidden="{{ type=='check' && index > 2 }}">{{ item }}</view>
+        bindtap="switchTab" data-index="{{index}}" hidden="{{ type=='check' && index > 2 ||tabIndex==4&&index<4}}">{{ item }}</view>
     </view>
   </view>
   <view class="sg-list-box sg-pad">

mini/pages/order/index.js

@@ -42,18 +42,28 @@ Page({
     var id = options.id ? options.id : 1
     var type = options.type ? options.type : 'list'
     var tabIndex = options.index ? options.index : 0
+    if (tabIndex == 4) {
+      wx.setNavigationBarTitle({
+        title: "异常处理"
+      })
+    }
+    if (type == 'check') {
+      wx.setNavigationBarTitle({
+        title: "租赁订单"
+      })
+    }
     this.setData({
       id,
       type,
       tabIndex
     })
     api.getProject(this)
-    api.getByName(this, 'work-points/get', 'work_points', {type: 'drop_menu',project_id:id});
-    api.getByName(this, 'orders/getRole', 'role', {id: id});
+    api.getByName(this, 'work-points/get', 'work_points', { type: 'drop_menu', project_id: id });
+    api.getByName(this, 'orders/getRole', 'role', { id: id });
     this.getList();
   },
 
-  navigate: function(e) {
+  navigate: function (e) {
     wx.navigateTo({
       url: e.currentTarget.dataset.url,
     })
@@ -131,12 +141,12 @@ Page({
     })
   },
 
-  onDropChange: function(e) {
+  onDropChange: function (e) {
     var name = e.currentTarget.dataset.name
     this.setData({
       [name]: e.detail
     })
-    if(name == 'work_point_id') {
+    if (name == 'work_point_id') {
       this.search()
     }
   },
@@ -181,7 +191,7 @@ Page({
    */
   onReachBottom: function () {
     var index = this.data.tabIndex
-    if(!this.data.isSearch && !this.data.touchBottom[index]) {
+    if (!this.data.isSearch && !this.data.touchBottom[index]) {
       var pages = this.data.pages
       pages[index] = pages[index] + 1;
       this.setData({
@@ -189,7 +199,7 @@ Page({
       })
       this.getList()
     }
-    if(this.data.touchBottom[index]) {
+    if (this.data.touchBottom[index]) {
       util.error('没有更多数据了')
     }
   },

mini/pages/order/index.wxml

@@ -12,8 +12,10 @@
       </van-search>
     </view>
     <view class="sg-tabs sg-flex sg-align-center sg-white-bg sg-pad sg-bottom-border sg-top-border sg-font-small">
-      <view wx:for="{{tabs}}"  wx:key="index" class="sg-tab {{tabIndex == index ? 'sg-selected' : ''}}"
-        bindtap="switchTab"   data-index="{{index}}" hidden="{{ type=='check' && index > 2 }}">{{ item }}</view>
+      <view wx:for="{{tabs}}" wx:key="index" class="sg-tab {{tabIndex == index ? 'sg-selected' : ''}}"
+        bindtap="switchTab" data-index="{{index}}" hidden="{{ type=='check' && index > 2 ||tabIndex==4&&index<4}}">
+        {{ item }}
+      </view>
     </view>
   </view>
   <view class="sg-list-box sg-pad">

mini/pages/repair/index.js

@@ -51,6 +51,7 @@ Page({
   switchChecked(e) {
     var name = e.currentTarget.dataset.name
     var items = this.data[name]
+    console.log(items)
     var index = e.currentTarget.dataset.index
     for (var i = 0; i < items.length; ++i) {
       items[i].checked = false;

mini/pages/repair/index.wxml

@@ -23,7 +23,7 @@
       </view> -->
       <view class="sg-form-item sg-pad sg-top-border" bindtap="switchShow" data-name="showDevice">
         <view class="sg-label">维修设备</view>
-        <view class="sg-input sg-gray-color">{{deviceIndex >= 0 ? inner_devices[deviceIndex].name : '选择需要维修的设备'}}</view>
+        <view class="sg-input sg-gray-color">{{deviceIndex >= 0 ? inner_devices[deviceIndex].device_name.name : '选择需要维修的设备'}}</view>
       </view>
       <view class="sg-form-item sg-pad sg-top-border">
         <view class="sg-label">维修总金额</view>
@@ -109,7 +109,7 @@
       </view>
       <view class="sg-form-item sg-pad-tb sg-top-border">
         <view class="sg-label">更换配件价格</view>
-        <input value="{{part_price}}" class="sg-input" bindinput="onChange" data-name="part_price"
+        <input value="{{part_price}}" type="number" class="sg-input" bindinput="onChange" data-name="part_price"
           placeholder="请输入更换配件价格(元)"></input>
       </view>
     </view>