merge

src/pages/system/library/borrow/bookreturn.vue

 <template>
   <div class="subPage edit-book" :style="{ padding: '20px' }">
     <div v-if="!active">
-      <el-form>
+      <el-form style="text-align: center;">
         <el-form-item>
-          <el-input v-model="customerInfo" placeholder="会员手机号或条形码" :style="{ width: '200px' }"></el-input>
+          <el-input v-model="customerInfo" placeholder="会员手机号或条形码" :style="{ width: '400px' }"></el-input>
         </el-form-item>
         <el-form-item :style="{ paddingTop: '20px' }">
           <el-button type="primary" @click="nextStep()">下一步</el-button>

src/pages/system/library/borrow/borrow.vue

 <template>
   <div class="subPage edit-book" :style="{ padding: '20px' }">
     <div v-if="!active">
-      <el-form>
+      <el-form style="text-align: center;">
         <el-form-item>
-          <el-input v-model="customerInfo" placeholder="会员手机号或条形码" :style="{ width: '200px' }"></el-input>
+          <el-input v-model="customerInfo" placeholder="会员手机号或条形码" :style="{ width: '400px' }"></el-input>
         </el-form-item>
         <el-form-item :style="{ paddingTop: '20px' }">
           <el-button type="primary" @click="nextStep()">下一步</el-button>
     <div v-else>
 
       <!-- 用户信息区 -->
+<<<<<<< HEAD
       <div :style="{ marginBottom: '20px', paddingBottom: '20px', borderBottom: '1px solid #eee' }">
         <el-row :gutter="20">
           <el-col :span="4">
           </el-col>
         </el-row>
       </div>
+=======
+      <el-form label-width="100px" inline>
+        <el-form-item label="姓名">
+          <span>{{ borrowHistory.CustomerName }}</span>
+        </el-form-item>
+        <el-form-item label="手机号">
+          <span>{{ borrowHistory.CustomerPhone }}</span>
+        </el-form-item>
+        <el-form-item label="在借数量">
+          <span>{{ borrowHistory.CustomerPhone }}</span>
+        </el-form-item>
+        <el-form-item label="逾期数量">
+          <span>{{ borrowHistory.CustomerPhone }}</span>
+        </el-form-item>
+        <el-form-item label="历史是否有逾期">
+          <span>{{ borrowHistory.CustomerPhone === 1 ? '是' : '否' }}</span>
+        </el-form-item>
+      </el-form>
+>>>>>>> 2f5bd0fb8b8c339e52c3b1bb4a54c9b1ec57ac07
 
       <!-- 过滤条件 -->
       <el-form inline>

src/store/library/index.js

         ajax({
           ...api.book.borrow,
           urlData: payload,
+          urlData: { ...payload },
         }).then(() => {
           resolve()
         })