修改页面，调整数据

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

@@ -24,7 +24,7 @@
   </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">
-      <view class="sg-left-item sg-width-50">固定资产编号：{{item.number}}</view>
+      <view class="sg-left-item">固定资产编号：{{item.number}}</view>
     </view>
     <view class="sg-item sg-margin-tb-sm sg-flex">
       <view class="sg-left-item sg-width-50">外形尺寸：{{item.shape}}</view>

mini/components/inner-order-item/index.wxml

@@ -15,7 +15,7 @@
       <view class="sg-table-row sg-flex sg-align-center sg-space-around sg-pad-tb-sm sg-top-border"
         wx:for="{{item.devices}}" wx:for-item="j_item" wx:for-index="j_index" wx:key="j_index">
         <view class="sg-table-column">{{j_item.number}}</view>
-        <view class="sg-table-column">{{j_item.name}}</view>
+        <view class="sg-table-column">{{j_item.inner_name}}</view>
         <view class="sg-table-column">{{j_item.pivot ? j_item.pivot.start_date : ''}}</view>
         <view class="sg-table-column">{{j_item.pivot ? j_item.pivot.end_date : ''}}</view>
       </view>

mini/miniprogram_npm/@vant/weapp/dialog/index.js

@@ -87,7 +87,7 @@ VantComponent({
     },
     close() {
       this.setData({
-        show: false,
+        show: true,
       });
     },
     stopLoading() {

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

@@ -64,7 +64,11 @@ Page({
       showDate: e.currentTarget.dataset.show,
     })
   },
-
+  cancel: function () {
+    this.setData({
+      showAdded: false
+    })
+  },
   switchShowAdded: function (e) {
     this.complete()
     this.setData({
@@ -158,7 +162,7 @@ Page({
         device_name_id: this.data.name,
         spec_id: this.data.spec,
         page: this.data.page,
-        free: true
+        status: 'free'
       },
       success: function (res) {
         if (res.code == 0) {

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

@@ -15,24 +15,28 @@
     </van-search>
   </view>
   <view class="sg-list sg-pad">
-    <inner-device-card wx:for="{{list}}" wx:key="index" index="{{index}}" item="{{item}}" showChecked="{{true}}" bind:checked="switchSelect"></inner-device-card>
+    <inner-device-card wx:for="{{list}}" wx:key="index" index="{{index}}" item="{{item}}" showChecked="{{true}}"
+      bind:checked="switchSelect"></inner-device-card>
   </view>
-  <van-dialog show="{{ showAdded }}" use-slot title="已添加设备" confirm-button-color="#5693FC" show-cancel-button bind:confirm="switchShowAdded"
-    z-index="200" data-show="{{false}}">
+  <van-dialog show="{{ showAdded }}" use-slot title="已添加设备" confirm-button-color="#5693FC" show-cancel-button
+    bind:confirm="switchShowAdded" z-index="200" data-show="{{false}}" bind:cancel="cancel">
     <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-left">
-          <view class="sg-name sg-font-small">{{item.device ? item.device.name + ' - ' : ''}}{{item.name}}</view>
+          <view class="sg-name sg-font-small">{{item.inner_name ? item.inner_name + ' - ' : ''}}{{item.spec_name}}
+          </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-white sg-pad-sm" style="background-color: #efefef;color:#fff;border-radius: 20rpx;"  bindtap="deleteDevice" data-index="{{index}}">删除</view>
+        <view class="sg-right sg-white sg-pad-sm"
+          style="text-align:center;background-color: #737477;color:#fff;border-radius: 20rpx;font-size:24rpx;width:80rpx"
+          bindtap="deleteDevice" data-index="{{index}}">删除</view>
       </view>
     </view>
   </van-dialog>
   <van-calendar show="{{ showDate }}" bind:close="switchShowDate" bind:confirm="confirmDate" data-show="{{false}}"
-    type="range" class="sg-calendar" default-date="{{default_dates}}" />
+    type="range" class="sg-calendar" default-date="{{default_dates}}" color="#5992fd" />
   <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> -->

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

@@ -97,6 +97,7 @@ Page({
   },
 
   navigate: function (e) {
+    console.log(e)
     wx.navigateTo({
       url: e.currentTarget.dataset.url,
     })

mini/pages/feedback/index.js

@@ -2,6 +2,7 @@
 import http from '../../utils/http'
 import util from '../../utils/util'
 import api from '../../utils/api'
+import baseUrl from "../../utils/env"
 
 Page({
 
@@ -62,13 +63,32 @@ Page({
     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 })
+          console.log(imgs)
           that.updateInfo()
         })
       }
+      // files.forEach(item => {
+      //   wx.uploadFile({
+      //     filePath: item.url,
+      //     name: 'file',
+      //     url: baseUrl + 'uploadFile',
+      //     success: (res) => {
+      //       var data = JSON.parse(res.data)
+      //       if (data.code == 0) {
+      //         var imgs = that.data.imgs
+      //         imgs.push(res.data.path)
+      //         that.setData({ imgs })
+      //         console.log(imgs)
+      //         // that.updateInfo()
+      //       } else {
+      //         util.error('上传文件失败')
+      //       }
+      //     }
+      //   })
+      // })
     } else {
       that.updateInfo()
     }

mini/pages/index/index.wxml

@@ -42,10 +42,10 @@
         <view class="sg-right">
           <view class="">
             <view class="sg-name sg-bold">{{ item.name }}</view>
-            <view class="sg-date sg-gray-color sg-font-small" style="margin-top:15rpx;font-size:28rpx">
+            <view class="sg-date sg-gray-color sg-font-small" style="margin-top:15rpx;font-size:25rpx">
               创建时间：{{ item.date }}</view>
           </view>
-          <view class="sg-bottom sg-font-xs sg-margin-top-sm" style="font-size:28rpx">
+          <view class="sg-bottom sg-font-xs sg-margin-top-sm" style="font-size:25rpx">
             <view class="sg-desc">项目经理：{{ item.manager ? item.manager.name : '无' }}</view>
             <view class="sg-desc">电话：{{ item.manager ? item.manager.phone : '无' }}</view>
           </view>

mini/pages/repair/index.js

@@ -20,7 +20,7 @@ Page({
     parts: [],
     part_name: '',
     part_change: '',
-    part_price: '',
+    part_price: "",
     showAdd: false,
     order_id: '',
     // create/edit
@@ -28,7 +28,8 @@ Page({
     // create/edit
     dialog_type: 'create',
     default_dates: [],
-    showDevice: false
+    showDevice: false,
+    money: 0
   },
 
   /**
@@ -72,6 +73,14 @@ Page({
       util.error('维修设备必填');
       return false;
     }
+    if (!this.data.reason) {
+      util.error('维修原因必填');
+      return false;
+    }
+    if (!this.data.day) {
+      util.error('维修天数必填');
+      return false;
+    }
     // var work_point = this.data.work_points[this.data.pointIndex]
     var device = this.data.inner_devices[this.data.deviceIndex]
     var url = 'repair-devices/create'
@@ -136,10 +145,16 @@ Page({
     }
     parts.push(part)
     this.setData({
-      parts
+      parts,
+      showAdd: false,
+      money: this.data.money += (part.price - 0)
+    })
+  },
+  cancel: function () {
+    this.setData({
+      showAdd: false
     })
   },
-
   onChange: function (e) {
     var name = e.currentTarget.dataset.name
     var val = e.detail.value
@@ -170,7 +185,6 @@ Page({
       });
     }
   },
-
   switchShow(e) {
     var name = e.currentTarget.dataset.name
     var val = !this.data[name]
@@ -178,7 +192,6 @@ Page({
       [name]: val
     })
   },
-
   switchShowAdd: function (e) {
     var show = e.currentTarget.dataset.show
     if (show) {
@@ -189,7 +202,7 @@ Page({
       })
     }
     this.setData({
-      showAdd: show,
+      showAdd: true,
       dialog_type: 'create'
     })
   },

mini/pages/repair/index.wxml

@@ -27,7 +27,7 @@
       </view>
       <view class="sg-form-item sg-pad sg-top-border">
         <view class="sg-label">维修总金额</view>
-        <input value="{{money}}" class="sg-input" bindinput="onChange" data-name="money" placeholder="请填写维修总金额"></input>
+        <input value="{{money}}" class="sg-input" disabled="true" bindinput="onChange" data-name="money" placeholder="请填写维修总金额"></input>
       </view>
       <view class="sg-form-item sg-pad sg-top-border">
         <view class="sg-label">维修原因</view>
@@ -50,7 +50,7 @@
       <view class="sg-list sg-height-limit">
         <view class="sg-item sg-pad-tb-sm sg-flex sg-align-center sg-space-between sg-bottom-border sg-font-small" wx:for="{{inner_devices}}" wx:key="index" bindtap="switchChecked" data-name="inner_devices" data-index="{{index}}">
           <view>
-            <view class="sg-bold">{{item.device_name ? item.device_name.name : ''}}-{{item.spec ? item.spec.name : ''}}</view>
+            <view class="sg-bold">{{item.device_name ? item.device_name.name : ''}}-{{item.spec_name ? item.spec_name : ''}}</view>
             <view class="sg-font-xs">固定资产编号：{{item.number}}</view>
           </view>
           <van-icon name="checked" class="sg-icon sg-index-color" wx:if="{{item.checked}}"/>
@@ -88,14 +88,14 @@
               </view>
             </view>
           </view>
-          <view class="sg-right  sg-pad sg-flex sg-align-center" style="background-color: #efefef;color:#fff" bindtap="delete" data-index="{{index}}">删除
+          <view class="sg-right  sg-pad sg-flex sg-align-center" style="background-color: #737477;color:#fff" bindtap="delete" data-index="{{index}}">删除
           </view>
         </view>
       </block>
     </view>
   </view>
   <van-dialog show="{{ showAdd }}" use-slot title="{{dialog_type == 'create' ? '维修配件添加' : '修改设备'}}" show-cancel-button
-    bind:confirm="add" z-index="1" confirm-button-color="#5693FC">
+    bind:confirm="add" z-index="1" confirm-button-color="#5693FC" bind:cancel="cancel">
     <view class="sg-add-device-box sg-pad sg-font-small">
       <view class="sg-form-item sg-pad-tb 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}}" type="number" 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>

mini/project.config.json

@@ -23,7 +23,7 @@
     "compileHotReLoad": false,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
-    "useApiHostProcess": true,
+    "useApiHostProcess": false,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],

mini/utils/util.js

@@ -1,5 +1,5 @@
 import http from '../utils/http'
-import baseUrl from '../utils/env'
+import { baseUrl } from '../utils/env'
 
 const formatDate = (date, fmt = 'yyyy-MM-dd') => {
 
@@ -54,6 +54,7 @@ const uploadFile = (path, cb = null) => {
     url: baseUrl + 'uploadFile',
     success: function (res) {
       var data = JSON.parse(res.data)
+      console.log(data)
       if (data.code == 0) {
         typeof cb === "function" && cb(data)
       } else {
@@ -71,7 +72,7 @@ const callLogin = (data, redirect, cb) => {
     success: function (res) {
       if (res.code == 0) {
         getApp().updateUserInfo(res.data)
-        if(res.data.session_key) {
+        if (res.data.session_key) {
           wx.setStorageSync('session_key', res.data.session_key)
         }
         if (redirect) {
@@ -88,13 +89,13 @@ const callLogin = (data, redirect, cb) => {
 const wechatLogin = (e, redirect = false, cb = null, bind = false) => {
   if (e.detail.errMsg == 'getUserInfo:ok') {
     wx.checkSession({
-      success () {
+      success() {
         callLogin(Object.assign({}, e.detail, {
           bind: bind,
           session_key: wx.getStorageSync('session_key')
         }), redirect, cb)
       },
-      fail () {
+      fail() {
         wx.login({
           success(res) {
             if (res.code) {