...

.gitignore

@@ -1,14 +0,0 @@
-# Windows
-[Dd]esktop.ini
-Thumbs.db
-$RECYCLE.BIN/
-
-# macOS
-.DS_Store
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-
-# Node.js
-node_modules/

app.js

@@ -8,7 +8,7 @@ App({
     this.globalData.options = options
     getUpdateManager()
     wx.getSystemInfo({
-      success: e => {
+      success: e => {  
         let modelmes = e.model;
         if (modelmes.search('iPhone X' || 'iPhone 11') != -1) {
           this.globalData.isIphoneX = true
@@ -198,7 +198,7 @@ App({
       if (vipList.length > 0) {
         let isSame = false
         for (let i in vipList) {
-          if (vipList[i]['vip_id'] == vipId) {
+          if (vipList[i]['vip_id'] == vipId){
             isSame = true
             fn(i, vipList[i])      
             break
@@ -291,12 +291,11 @@ App({
     initStatus: 0,
     loginTime: 0,
     appid: 'wxe9cdca7c3365e448',
-    // host: 'https://t.sharingschool.com/gz',
-    // baseImgUrl: 'https://img.sharingschool.com',
-    // thumbnail: '?x-oss-process=image/resize,m_fill,h_300,w_200',
-    host: 'https://xt.sharingschool.com/gz',
-    baseImgUrl: 'https://xtimg.sharingschool.com',
-    thumbnail: '!t200x300.jpg',
+    host: 'https://t.sharingschool.com/gz',
+    baseImgUrl: 'https://img.sharingschool.com',
+    thumbnail: '?x-oss-process=image/resize,m_fill,h_300,w_200',
+    // host: 'https://xt.sharingschool.com/gz',
+    // baseImgUrl: 'https://xtimg.sharingschool.com',
     tempOptions: { query: {}, path: 'pages/index/index', scene: 1001 },
     options: null,
     continuousFn: null,

app.json

@@ -46,6 +46,7 @@
         "pages/good_books_new/good_books_new",
         "pages/random_books/random_books",
         "pages/part_call_in/part_call_in",
+        "pages/borrow_record/borrow_record",
         "pages/search_books_new/search_books_new",
         "pages/book_Imformation/book_Imformation",
         "pages/search_books/search_books",
@@ -70,7 +71,8 @@
         "pages/me/me",
         "pages/withdraw_library/withdraw_library",
         "pages/withdraw_detail/withdraw_detail",
-        "pages/withdraw/withdraw"
+        "pages/withdraw/withdraw",
+        "pages/book_entry/book_entry"
       ]
     }
   ],

dispatcher/pages/book_entry/book_entry.js

@@ -0,0 +1,179 @@
+// parents/pages/information/information.js
+import { routers, viewImage, sharePage, isFn, getGlobalVal } from '../../../utils/util.js'
+import { CheckBookCard, AddBook, UploadFile,RemoveBookLib,BackBookLib} from '../../../utils/api.js'
+const { navigateTo, redirectTo, navigateBack } = routers()
+const { globalData, hasLibraryService, hasVipService } = getApp()
+const { baseImgUrl, qrcodeInvalidToastText } = globalData
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    baseImgUrl,
+    isLoaded: 1,
+    hiddenModel: false,
+    deleteModel: false,
+    bookInfo: {
+      author: "",
+      themeName:'',
+      isbn13: "",
+      localImage: "",
+      libName:'',
+      borrowName:'',
+      price: "",
+      grade: "",
+      summary: "",
+      title: ""
+    },
+    haveReturn:false,
+    value:[2,1],
+    isDetail:false,
+    user_vipId:"",
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    options.userId = getGlobalVal('userId')
+    options.libId = (options.libId ? options.libId : getGlobalVal(`dispatchLibId_${options.userId}`) ? getGlobalVal(`dispatchLibId_${options.userId}`) : '')
+    this.setData({ options })
+    const bookInfo = wx.getStorageSync("bookInfo")
+    const detailsId = wx.getStorageSync("detailsId")
+    this.setData({
+      bookInfo: bookInfo,
+      detailsId: detailsId
+    });
+    // options.vipId = getGlobalVal('vipId', `vipId_${getGlobalVal('userId')}`) || ''
+    // this.setData({ options })
+    // this.getData(res => {
+    //   this.setData({ isLoaded: 1 })
+    // })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+    const obj = { navigateTo, redirectTo, navigateBack, viewImage }
+    for (const i in obj) {
+      this[i] = obj[i]
+    }
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+ 
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+  /**
+   * 提示框隐藏
+   */
+  allShowModel: function () {
+    this.setData({ hiddenModel: false, deleteModel: false })
+  },
+  /**
+   * 确认归还提示框打开
+   */
+  showModel: function () {
+      const { haveReturn } = this.data
+      if(haveReturn){
+          wx.showToast({
+          title: '本书已经归还',
+        })
+      }
+  else{
+      this.setData({ hiddenModel: true })
+  }
+  },
+  /**
+   * 解绑框打开
+   */
+  sureDelete: function () {
+    this.setData({ deleteModel: true })
+  },
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+    if (isFn(sharePage)) return sharePage()
+  },
+
+  /**
+   * 获取个人资料
+   */
+  getData: function (cb) {
+    const continuousFn = { fn: this.getData, param: { ...arguments } }
+    const { user_vipId } = this.data
+    VipInfo({ data: { vipId: user_vipId }, continuousFn }).then(res => {
+      this.setData({ signList: { ...res.data } })
+      cb && cb(res)
+    }).catch(res => {
+      cb && cb(res)
+    })
+  },
+
+  /**
+   * 提交按钮
+   */         
+  operationCtl: function (e) {
+    const continuousFn = { fn: this.submitCtl, param: { ...arguments } }
+    const { type } = e.currentTarget.dataset
+    const { detailsId } = this.data
+    if (type == 1) {
+      RemoveBookLib({ data: {detailId:detailsId}, continuousFn }).then(res => {
+        wx.showToast({
+          title: '解绑成功',
+        })
+          this.allShowModel()
+        setTimeout(() => {
+          navigateBack()
+        }, 2000)
+
+      })
+    } else if (type == 2) {
+      BackBookLib({ data: {detailId:detailsId}, continuousFn }).then(res => {
+        wx.showToast({
+          title: '归还成功',
+        })
+      this.setData({
+        haveReturn: true,
+      });
+        
+      this.allShowModel()
+      })
+    }
+  },
+
+})

dispatcher/pages/book_entry/book_entry.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "书籍详情"
+}

dispatcher/pages/book_entry/book_entry.wxml

@@ -0,0 +1,79 @@
+<!--parents/pages/information/information.wxml-->
+<import src="../../../templates/loading/loading.wxml" /> 
+<view class='container'>
+  <template is='loading' wx:if='{{!isLoaded}}'></template> 
+  <view class='wrapper' wx:else>
+        <!-- 图书录入-书籍详情 -->
+        <view class='list'>
+          <view class='li' bindtap='uploadImgCtl'>
+            <view class="uploadImg">
+            <image class='{{bookInfo.localImage ? "li-imageTip" : "li-image"}}'  src='{{bookInfo.localImage ? baseImgUrl + bookInfo.localImage : "../../../assets/cameare.png"}}'></image>
+            </view>
+          </view>
+          <view class='li'>
+            <view class='li-label'>书名</view>
+            <input class='li-input' type='text' placeholder='' disabled='true' placeholder-class='input-placeholder' value='{{bookInfo.title}}' bindinput='inputCtl' data-type='title'></input>
+          </view> 
+          <view class='li'>
+            <view class='li-label'>作者</view>
+            <input class='li-input' type='text' placeholder='' disabled='true' placeholder-class='input-placeholder' value='{{bookInfo.author}}' bindinput='inputCtl' data-type='author'></input>
+          </view>
+          <view class='li'>
+            <view class='li-label'>ISBN号码</view>
+            <input class='li-input' type='text' placeholder='' disabled='true' placeholder-class='input-placeholder' value='{{bookInfo.isbn13}}' bindinput='inputCtl' data-type='isbn13'></input>
+          </view>
+            <view class='li'>
+            <view class='li-label'>图书馆</view>
+            <input class='li-input' type='text' placeholder='' disabled='true' placeholder-class='input-placeholder' value='{{bookInfo.libName}}' bindinput='inputCtl' data-type='libName'></input>
+          </view>
+            <view class='li'>
+            <view class='li-label'>正在借阅</view>
+            <input class='li-input' type='text' placeholder='' disabled='true' placeholder-class='input-placeholder' value='{{bookInfo.borrowName}}' bindinput='inputCtl' data-type='borrowName'></input>
+          </view>
+          <view class='li'>
+            <view class='li-label'>主题</view>
+            <input class='li-input' type='text' placeholder='' disabled='true' placeholder-class='input-placeholder' value='{{bookInfo.themeName}}' bindinput='inputCtl' data-type='themeName'></input>
+          </view>
+          <view class='li'>
+            <view class='li-label'>年段</view>
+            <input class='li-input' type='text' placeholder='' disabled='true' placeholder-class='input-placeholder' value='{{bookInfo.grade}}' bindinput='inputCtl' data-type='grade'></input>
+          </view>
+          <view class='li'>
+            <view class='li-label'>价格</view>
+            <input class='li-input' type='text' placeholder=''  disabled='true' placeholder-class='input-placeholder' value='{{bookInfo.price}}' bindinput='inputCtl' data-type='price'></input>
+          </view>
+            <view class='li'>
+            <view class='li-label'>简介</view>
+            <textarea class='li-input-text' type='text' placeholder=''  disabled='true' placeholder-class='input-placeholder' value='{{bookInfo.summary}}' bindinput='inputCtl' data-type='summary'></textarea>
+          </view>
+          <view class='footer-box'>
+                <view class='footer-box-item1' bindtap='sureDelete'>解绑图书</view>
+                <view class='footer-box-item2' bindtap='showModel'>归还图书</view>
+            </view>
+        </view>
+         <!-- 解绑图书弹幕 -->
+        <view class='showModel' bindtap='allShowModel' catchtouchmove="allShowModel" wx:if='{{deleteModel}}'></view>
+        <view class='model-show' wx:if='{{deleteModel}}'>
+            <view class='model-list'>
+                <view class='model-list-title'>此书正与{{bookInfo.libName}}馆绑定，是否确定解绑？</view>
+            </view>
+            <view class='model-list-footer'>
+              <view class='model-list-footer-cancel' bindtap='allShowModel'>取消</view>
+              <view class='model-list-footer-sure' data-type='{{1}}' bindtap='operationCtl'>确定解绑</view>
+            </view>
+        </view>
+             <!-- 归还图书图书弹幕 -->
+        <view class='showModel' bindtap='allShowModel' catchtouchmove="allShowModel" wx:if='{{hiddenModel}}'></view>
+        <view class='model-show' wx:if='{{hiddenModel}}'>
+            <view class='model-list'>
+                <view class='model-list-title' wx:if='{{bookInfo.borrowName}}' >{{bookInfo.borrowName}}正在借阅此书，确定归还此书吗？</view>
+                   <view class='model-list-title' wx:if='{{!bookInfo.borrowName}}' >确定归还此书吗？</view>
+            </view>
+            <view class='model-list-footer'>
+              <view class='model-list-footer-cancel' bindtap='allShowModel'>取消</view>
+              <view class='model-list-footer-sure' data-type='{{2}}' bindtap='operationCtl'>确定归还</view>
+            </view>
+        </view>
+  </view>
+</view>
+

dispatcher/pages/book_entry/book_entry.wxss

@@ -0,0 +1,344 @@
+/* parents/pages/information/information.wxss */
+@import '../../../templates/loading/loading.wxss'; 
+page{
+  background: #fff;
+}
+.list {
+  padding: 0rpx;
+  margin-bottom:120rpx;
+}
+.li {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 30rpx;
+  background: #fff;
+  border-radius: 0;
+  border-bottom: solid 1rpx #e6e6e6;
+  margin: 0;
+}
+.li-label {
+  font-size: 32rpx;
+  color: #666;
+  margin: 0;
+}
+.li-image {
+  width: 60rpx;
+  height: 60rpx;
+  margin-top:80rpx;
+}
+.li-imageTip{
+  width: 100%;
+  height: 100%;
+  /* border-radius:50%; */
+}
+.upload-text{
+  font-size:12px;
+  color:#999999;
+}
+.upload-refrehtext{
+  font-size:12px;
+  color:#ffff;
+}
+.uploadImg{
+  width:200rpx;
+  height:220rpx;
+  background-color:#ebebeb;
+  margin:0 auto;
+  text-align:center;
+  line-height:30rpx;
+  box-shadow:0px 0px 8rpx 0px rgba(204,204,204,1);
+  border-radius:10rpx;
+}
+.upload-Model{
+  width:100%;
+  height:100%;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 1000;
+  line-height:220rpx;
+  position:relative;
+  top:-218rpx;
+
+}
+.li-input,
+.li-picker,
+.li-text {
+  width: 400rpx;
+  font-size: 30rpx;
+  color: #999;
+  text-align: right;
+}
+.li-input-text{
+  width: 400rpx;
+  /* max-height: 1.4rem; */
+  font-size: 30rpx;
+  color: #999;
+  text-align: right;
+}
+.li-label-right{
+  width: 12rpx;
+  height: 22rpx;
+  margin: auto 0;
+  margin-left: 20rpx;
+}
+/* 图书录入 */
+.list-logo{
+  margin: 40% 0 35% 0;
+  text-align: center;
+}
+.list-logo-img{
+  width: 395rpx;
+  height: 181rpx;
+}
+.list-btn{
+  width:518rpx;
+  height:98rpx;
+  background:rgba(255,128,168,1);
+  border-radius:49rpx;
+  margin: 0 auto;
+  line-height: 98rpx;
+  color: #FFFFFF;
+  font-size: 32rpx;
+  text-align: center;
+  font-weight:bold;
+}
+.list-btns{
+  margin: 0
+}
+.list-btns-yellow{
+  width:518rpx;
+  height:98rpx;
+  background:#FFD76C;
+  border-radius:49rpx;
+  margin: 0 auto;
+  line-height: 98rpx;
+  color: #41414C;
+  font-size: 32rpx;
+  text-align: center;
+  font-weight:bold;
+  margin-bottom: 30rpx;
+}
+.list-btns-blue{
+  width:518rpx;
+  height:98rpx;
+  background:#82DCFF;
+  border-radius:49rpx;
+  margin: 0 auto;
+  line-height: 98rpx;
+  color: #41414C;
+  font-size: 32rpx;
+  text-align: center;
+  font-weight:bold;
+}
+.list-book-img{
+  width:210rpx;
+  height:220rpx;
+  background:rgba(103,103,103,1);
+  box-shadow:0px 0px 8rpx 0px rgba(204,204,204,1);
+  border-radius:10rpx;
+}
+.list-logo-text{
+  color: #41414C;
+  font-size: 32rpx;
+  font-weight: bold;
+  margin: 30rpx 28%;
+}
+.list-info{
+  margin: 58rpx 0 74rpx 0;
+  text-align: center;
+}
+
+.scan-btn {
+  margin: 150rpx auto;
+  width: 320rpx;
+  height: 320rpx;
+  background: linear-gradient(152deg,rgba(81,206,255,1) 0%,rgba(0,183,255,1) 100%);
+  box-shadow: 0rpx 8rpx 40rpx 0rpx rgba(0,175,243,0.5);
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  border-radius: 400rpx;
+  z-index: 3;
+  cursor: pointer;
+}
+.scan-btn::before {
+  content: "";
+  position: absolute;
+  top: -23rpx;
+  left: -23rpx;
+  width: 366rpx;
+  height: 366rpx;
+  border-radius: 500rpx;
+  background: rgba(0,183,255,1);
+  opacity: 0.06;
+  z-index: 2;
+}
+.scan-btn::after {
+  content: "";
+  position: absolute;
+  top: -56rpx;
+  left: -56rpx;
+  width: 432rpx;
+  height: 432rpx;
+  background: rgba(0,183,255,1);
+  opacity: 0.04;
+  z-index: 1;
+  border-radius: 500rpx;
+}
+.scan-btn-icon {
+  width: 128rpx;
+  height: 120rpx;
+}
+.scan-btn-text {
+  margin-top: 40rpx;
+  color: #fff;
+  font-size: 32rpx;
+}
+.scan-row {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 80rpx;
+}
+.scan-row-icon {
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 14rpx;
+}
+.scan-row-text {
+  font-size: 30rpx;
+  color: #999;
+}
+.scan-row-btn {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: rgba(255,215,108,1);
+  border-radius: 100rpx;
+  padding: 18rpx 68rpx;
+}
+.scan-row-btn-icon {
+  width: 16rpx;
+  height: 24rpx;
+  margin-left: 14rpx;
+}
+.scan-row-btn-text {
+  font-size: 30rpx;
+  color: rgba(102, 102, 102, 1);
+}
+.picker{
+  box-shadow:0px 2rpx 29rpx 2rpx rgba(0, 0, 0, 0.1);
+  width: 100%;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  z-index:999,
+}
+.li-label-picker{
+  width: 100%;
+  height: 400rpx;
+  text-align: center
+}
+.picker-btn{
+  text-align: right;
+  padding: 30rpx 0;
+  color: #00B7FF;
+  font-weight: 500;
+  border-bottom: 1rpx solid #E6E6EC;
+  padding-right: 35rpx;
+}
+
+.picker-item{
+  line-height: 80rpx;
+}
+.list-book-header{
+  width:210rpx;
+  height:220rpx;
+  border-radius:10rpx;
+  box-shadow:0px 0px 8rpx 0px rgba(204,204,204,1);
+}
+.footer-box-item1{
+  height:88rpx;
+  background:rgba(255,255,255,1);
+  border-radius:44rpx;
+  width:292rpx;
+  font-size:30rpx;
+  font-family:PingFang SC;
+  font-weight:500;
+  color:rgba(65,65,76,1);
+  line-height:88rpx;
+  text-align:center;
+  margin:0 20rpx;
+}
+.footer-box-item2{
+  width:292rpx;
+  height:88rpx;
+  margin:0 20rpx;
+  background:rgba(255,215,108,1);
+  border-radius:44rpx;
+  font-size:30rpx;
+  font-family:PingFang SC;
+  font-weight:500;
+  color:rgba(65,65,76,1);
+  line-height:88rpx;
+  text-align:center;
+}
+.model-list{
+  color: #A1A1B3;
+  font-size: 28rpx;
+  text-align: left;
+  padding: 0 34rpx 34rpx 34rpx;
+}
+.model-list-title{
+  color: #41414C;
+  font-size: 32rpx;
+  padding: 37rpx 0;
+  text-align: center;
+}
+.model-list-del{
+  position: absolute;
+  bottom: -120rpx;
+  left: 45%;
+}
+.model-list-img{
+  width: 60rpx;
+  height: 60rpx;
+}
+.model-list-footer{
+  display:flex;
+  justify-content: space-around;
+  font-size: 32rpx;
+  padding: 40rpx 0;
+}
+.model-list-footer-cancel{
+  width:224rpx;
+  height:68rpx;
+  background:rgba(255,255,255,1);
+  border:2rpx solid rgba(0,183,255,1);
+  border-radius:44rpx;
+  line-height: 68rpx;
+  text-align: center;
+  color: #00B7FF;
+}
+.model-list-footer-sure{
+  width:224rpx;
+  height:68rpx;
+  background:linear-gradient(90deg,rgba(81,206,255,1) 0%,rgba(0,183,255,1) 100%);
+  border:2rpx solid transparent;
+  border-radius:44rpx;
+  line-height: 68rpx;
+  text-align: center;
+  color: #FFFFFF;
+}
+.model-show{
+  z-index: 1001;
+  position: fixed;
+  top: 30%;
+  margin: 0 12.5%;
+  width: 75%;
+  background: #fff;
+  border-radius:30rpx;
+  text-align: center;
+}

dispatcher/pages/dispatch_go/dispatch_go.wxml

@@ -29,7 +29,7 @@
   </view>
   <view class="modal-container" wx:if='{{isShowToast}}'>
     <view class="modal-wrapper">
-      <image class="modal-image" wx:if='{{toastImage}}' src="{{baseImgUrl + toastImage + thumbnail}}"></image>
+      <image class="modal-image" wx:if='{{toastImage}}' src="{{baseImgUrl + toastImage}}"></image>
       <view class="modal-title" wx:if='{{toastTitle}}'>{{toastTitle}}</view>
       <view class="modal-btns">
         <view class="modal-btn modal-btn-blue" bindtap="delCtl">取消</view>

dispatcher/pages/home/home.wxml

@@ -14,7 +14,7 @@
       </view>
     </view>
     <view class='list'>
-      <view class='li' wx:for='{{list}}' wx:key='{{index}}'>
+      <view class='li' wx:for='{{list}}' wx:key='index'>
         <view class='li-title'>{{item.league_name}}</view>
         <view class='li-row'>
           <view>

dispatcher/pages/me/me.js

@@ -1,6 +1,6 @@
 // dispatcher/pages/me/me.js
 import { routers, viewImage, sharePage, isFn, getGlobalVal } from '../../../utils/util.js'
-import { GetDispatcherInfo } from '../../../utils/api.js'
+import { GetDispatcherInfo,ScanForBookDetail} from '../../../utils/api.js'
 const { navigateTo, redirectTo, navigateBack } = routers()
 const { globalData } = getApp()
 const { baseImgUrl } = globalData
@@ -34,6 +34,18 @@ Page({
         zindex: 3
       }
     ],
+    routerFour:[
+      {
+        icon: '../../../assets/personal_info.png',
+        text: '归还解绑图书',
+        time: '',
+        url: 'dispatcher/pages/book_entry/book_entry',
+        paras: {
+          type: 2
+        },
+        zindex: 3
+      }
+    ],
     footerData: {
       actIndex: 2,
       list: [
@@ -121,8 +133,59 @@ Page({
   onShareAppMessage: function () {
     if (isFn(sharePage)) return sharePage()
   },
+    /**
+   * 选择跳转进入页
+   */
+  selectNavCtl: function () {
+      navigateTo({
+        url: 'dispatcher/pages/book_entry/book_entry',
+      })
+  },
+  /**
+* 扫一扫书籍标签二维码
+*/
+  codeScanCtl: function () {
+    wx.scanCode({
+      success: res => {
+        const url = res.result
+        const detailsId = url.split('_')[1].split('.')[0]
+        console.log(res)
+        if (!detailsId) {
+          wx.showToast({
+            title: qrcodeInvalidToastText,
+            icon: 'none'
+          })
+          return
+        }
+        this.setData({ detailsId })
+         wx.setStorageSync('detailsId', detailsId);
+        this.setBookInfoByIsbn()
+      }
+    })
+  }, 
+  /**
+ * 调用微信扫一扫
+ */
 
   /**
+   * 根据isbn13查询书籍信息
+   */
+  setBookInfoByIsbn: function () {
+    const continuousFn = { fn: this.setBookInfoByIsbn, param: { ...arguments } }
+    const { detailsId } = this.data
+    const that=this 
+      ScanForBookDetail({ data: { detailId:detailsId }, continuousFn }).then(res => {
+      const {bookInfo} = res.data
+      wx.setStorageSync('bookInfo', bookInfo);
+      this.selectNavCtl()
+      cb && cb(res)
+    }).catch(res => {
+      
+      // navigateBack()
+      cb && cb(res)
+    }) 
+  },
+  /**
    * 选择路由跳转
    */
   selectRouterCtl: function (e) {

dispatcher/pages/me/me.wxml

@@ -17,7 +17,7 @@
     </view>
     <view class='section'>
       <view class='section-list'>
-        <view class='section-li' wx:for='{{routerTwo}}' wx:key='{{index}}' data-index='{{index}}' bindtap='selectRouterCtl'>
+        <view class='section-li' wx:for='{{routerTwo}}' wx:key='index' data-index='{{index}}' bindtap='selectRouterCtl'>
           <view>
             <image class='section-icon' src='{{item.icon}}'></image>
             <text class='section-text'>{{item.text}}</text>
@@ -26,7 +26,16 @@
         </view>
       </view>
       <view class='section-list'>
-        <view class='section-li' wx:for='{{routerThree}}' wx:key='{{index}}' data-url='{{item.url}}' data-paras='{{({...item.paras})}}' data-zindex='{{item.zindex}}' bindtap='navigateTo'>
+        <view class='section-li' wx:for='{{routerThree}}' wx:key='index' data-url='{{item.url}}' data-paras='{{({...item.paras})}}' data-zindex='{{item.zindex}}' bindtap='navigateTo'>
+          <view>
+            <image class='section-icon' src='{{item.icon}}'></image>
+            <text class='section-text'>{{item.text}}</text>
+          </view>
+          <image class='section-arrow' src='../../../assets/arrow_gray.png'></image>
+        </view>
+      </view>
+        <view class='section-list'>
+        <view class='section-li' wx:for='{{routerFour}}' wx:key='index' bindtap='codeScanCtl' >
           <view>
             <image class='section-icon' src='{{item.icon}}'></image>
             <text class='section-text'>{{item.text}}</text>

dispatcher/pages/sweeped_books/sweeped_books.js

@@ -100,6 +100,7 @@ Page({
     options.userId = getGlobalVal('userId')
     options.libId = (options.libId ? options.libId : getGlobalVal(`dispatchLibId_${options.userId}`) ? getGlobalVal(`dispatchLibId_${options.userId}`) : '')
     this.setData({ options })
+
     this.getData(res => {
       this.setData({ isLoaded: true })
     })

dispatcher/pages/sweeped_books/sweeped_books.wxml

@@ -20,7 +20,7 @@
       <view class='li' wx:for='{{list}}' wx:key='{{index}}' data-index='{{index}}' bindtap='toggleSelectLiCtl'>
         <image class='li-circle' wx:if='{{isManage}}' src='{{item.isCheck == 1 ? "../../../assets/circle_blue.png" : "../../../assets/circle_gray.png"}}'></image>
         <view class="li-box">
-          <image class='li-img' mode='aspectFill' src='{{item.local_image ? baseImgUrl + item.local_image + thumbnail : "../../../assets/default_headicon.png"}}'></image>
+          <image class='li-img' mode='aspectFill' src='{{item.local_image ? baseImgUrl + item.local_image: "../../../assets/default_headicon.png"}}'></image>
         </view>
         <view class="li-col">
           <view class="li-text-black" wx:if='{{item.title}}'>{{item.title || ''}}</view>

pages/about_aijia/about_aijia.js

@@ -1,6 +1,6 @@
 // pages/question/question.js
 import { routers, viewImage, sharePage, isFn, getGlobalVal } from '../../utils/util.js'
-import { GetQuestion } from '../../utils/api.js'
+import { AboutSharingSchool } from '../../utils/api.js'
 const { navigateTo, redirectTo, navigateBack } = routers()
 const { globalData, hasLibraryService, hasVipService } = getApp()
 const { baseImgUrl, qrcodeInvalidToastText } = globalData
@@ -93,7 +93,7 @@ Page({
   getList: function (cb) {
     const continuousFn = { fn: this.getList, param: { ...arguments } }
     const { title, pageSize, pageNo, stat, type } = this.data
-    GetQuestion({ data: { title, pageSize, pageNo, stat, type }, continuousFn }).then(res => {
+    AboutSharingSchool({ data: { title, pageSize, pageNo, stat, type }, continuousFn }).then(res => {
       const { list } = res.data
       this.setData({ list })
       cb && cb(res)

pages/about_aijia/about_aijia.wxml

@@ -2,7 +2,7 @@
 <view class='container'>
   <view class='wrapper'>
     <view class='list'>
-      <view class='li' wx:for='{{list}}' wx:key='{{index}}' data-url='pages/webview/webview' data-title='常见问题' data-paras='{{({...item})}}' bindtap='navigateTo'>
+      <view class='li' wx:for='{{list}}' wx:key='index' data-url='pages/webview/webview' data-title='常见问题' data-paras='{{({...item})}}' bindtap='navigateTo'>
         <view class='li-title'>
           <view class='li-text'>{{item.title}}</view>
           <view class='li-arrow-right'></view>

pages/question/question.wxml

@@ -2,7 +2,7 @@
 <view class='container'>
   <view class='wrapper'>
     <view class='list'>
-      <view class='li' wx:for='{{list}}' wx:key='{{index}}' data-url='pages/webview/webview' data-title='常见问题' data-paras='{{({...item})}}' bindtap='navigateTo'>
+      <view class='li' wx:for='{{list}}' wx:key='index' data-url='pages/webview/webview' data-title='常见问题' data-paras='{{({...item})}}' bindtap='navigateTo'>
         <view class='li-title'>
           <view class='li-text'>{{item.title}}</view>
           <view class='li-arrow-right'></view>

parents/pages/School_library/School_library.js

@@ -36,13 +36,13 @@ Page({
     }
     console.log(options)
     this.setData({ options })
-    if (options.isAdd){
+    // if (options.isAdd){
       this.getLocation(res => {
         this.setData({ isLoaded: 1 })
       })
-    }else{
+    // }else{
 
-    }
+    // }
    
     // this.getLocation(res => {
     //   this.setData({ isLoaded: 1 })
@@ -199,14 +199,10 @@ Page({
   selectLibraryCtl: function (e) {
     const { index } = e.currentTarget.dataset
     const { libraryList,options } = this.data
-    // debugger
     const { id, name } = libraryList[index]
-    const { sex = '', phone = '', parentName = '', parentRole = '', libId = '', vipId = '', grade = '', imgUrl = '', childName = '', zindex} = options
+    const { sex = '', phone = '', parentName = '', parentRole = '', libId = '', vipId = '', grade = '', imgUrl = '', childName = '', zindex,isAdd,league_name=''} = options
     if (id) {
-      if (options.isAdd){
-        redirectTo({ url: 'parents/pages/information/information', paras: { zindex, vipId, libId, name, imgUrl, sex, phone, parentName, parentRole, grade, childName, isSchool:1} })
-      }else{
-      }
+        redirectTo({ url: 'parents/pages/information/information', paras: { zindex, vipId, libId, imgUrl, sex, phone, parentName, parentRole, grade, childName, isSchool:1,isAdd,league_name,school:name} })
     } else {
       wx.showToast({
         title: '该学校地址无效',

parents/pages/apply_book/apply_book.wxml

@@ -11,7 +11,7 @@
         </view>
      </view>
      <view class="step-items" wx:if='{{!isDelete}}'>
-        <view class="step-item" wx:for='{{stepList}}' wx:key='{{index}}'>
+        <view class="step-item" wx:for='{{stepList}}' wx:key='index'>
           <text class="step-number">{{item.number}}</text>
           <text class="step-text">{{item.text}}</text>
           <text class="step-icon">{{item.unit}}</text>
@@ -19,7 +19,7 @@
      </view>
     </view>
     <view class='list'>
-      <view class='li' wx:for='{{infofromstorage}}' wx:key='{{index}}' data-index='{{index}}' wx:if='{{infofromstorage.length > 0}}'>
+      <view class='li' wx:for='{{infofromstorage}}' wx:key='index' data-index='{{index}}' wx:if='{{infofromstorage.length > 0}}'>
         <view class='li-items'>
             <view class='li-center-index'>{{index+1}}</view>
             <view class='li-center-two'>

parents/pages/apply_bookLists/apply_bookLists.wxml

@@ -4,7 +4,7 @@
 <view class='container'>
   <view class='wrapper'>
     <view class="step-topic">申请新书记录</view>
-    <view class='list' wx:if='{{list.length > 0}}' wx:for='{{list}}' wx:key='{{index}}' data-index='{{index}}'>
+    <view class='list' wx:if='{{list.length > 0}}' wx:for='{{list}}' wx:key='index' data-index='{{index}}'>
       <view class='header'>
           <view class='apply-time'>{{item.createTime?item.createTime:''}}</view>
           <view class='apply-text'>{{item.state==1?'已申请，待馆长确认':'馆长已确认'}}</view>

parents/pages/book_classification/book_classification.js

@@ -18,6 +18,7 @@ Page({
     list: [],
     themeIdx:0,
     isClass:true,
+    navIndex:0,
     themeList: [
       // {
       //   "code": "child1",
@@ -45,8 +46,8 @@ Page({
       // }
     ],
     nodataArray: {
-      text: '暂没有成长记录',
-      image: '../../../assets/nodata_2.png'
+      text: '暂无数据',
+      // image: '../../../assets/nodata_2.png'
     }
   },
 

parents/pages/book_classification/book_classification.wxml

@@ -48,7 +48,7 @@
               </view>
           </view>
         </block>
-      <!-- <template is='nodata' data='{{...navList[navIndex]["nodataArray"]}}' wx:else></template> -->
+      <template is='nodata' data='{{...navList[navIndex]["nodataArray"]}}' wx:if='{{list.length==0}}'></template>
     </view>
   </view>
 </view>

parents/pages/book_classification/book_classification.wxss

@@ -1,4 +1,5 @@
 /* parents//pages/book_classification/book_classification.wxss */
+@import '../../../templates/nodata/nodata.wxss';
 @import '../../../templates/loading/loading.wxss';
 page{
   background: #fff;

parents/pages/borrow_car/borrow_car.wxss

@@ -59,7 +59,7 @@ page{
   line-height: 34rpx;
 }
 .list-down-footer-num{
-  color: #00B7FF;
+  color: #FF80A8;
   font-size: 26rpx;
   line-height: 34rpx;
 }

parents/pages/borrow_record/borrow_record.js

@@ -47,9 +47,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    options.vipId = getGlobalVal('vipId', `vipId_${getGlobalVal('userId')}`) || ''
-    // options.vipId = '306330bd-5c8c-41aa-8a00-0f0c296ebb29',
-    options.libId = getGlobalVal('library').id || ''
+    // if(options.vipId)
+    // options.vipId = getGlobalVal('vipId', `vipId_${getGlobalVal('userId')}`) || ''
+    // // options.vipId = '306330bd-5c8c-41aa-8a00-0f0c296ebb29',
+    // options.libId = getGlobalVal('library').id || ''
+    // console.log(options)
     this.setData({ options })
     this.getData(res => {
       this.setData({ isLoaded: 1 })

parents/pages/borrow_record/borrow_record.wxml

@@ -5,7 +5,7 @@
   <template is='loading' wx:if='{{!isLoaded}}'></template>
   <view class='wrapper' wx:else>
     <view class='nav'>
-      <view class='nav-item' wx:for='{{navList}}' wx:key='{{index}}' data-index='{{index}}' bindtap='selectNavCtl'>
+      <view class='nav-item' wx:for='{{navList}}' wx:key='index' data-index='{{index}}' bindtap='selectNavCtl'>
         <view class='nav-item-row {{navIndex == index ? "nav-item-row-active" : ""}}'>
           <view class='nav-item-text {{navIndex == index ? "nav-item-text-active" : ""}}'>{{item.text}}</view>
           <!-- <view class='nav-item-button {{navIndex == index ? "nav-item-button-active" : ""}}' wx:if='{{index == 1}}'>{{navList[index]["list"].length}}本</view> -->

parents/pages/growth_track/growth_track.js

@@ -200,7 +200,7 @@ Page({
     if (!hasVipService()) return
     UserReadInfo({ data: { libId, vipId }, continuousFn }).then(res => {
       const { rankList, monthList, themeInfoList, themeTopList, yearList} = res.data
-      console.log(rankList, monthList, themeInfoList, themeTopList, yearList)
+      // console.log(rankList, monthList, themeInfoList, themeTopList, yearList)
       this.setData({ rankList, themeInfoList, monthList, themeTopList, yearList, isLoaded: true })
       this.goodBooksPicture()
       this.nearTwentyEight()

parents/pages/information/information.js

@@ -21,7 +21,8 @@ Page({
       parentName: '',
       phone: '',
       parentRole: '',
-      libId:''
+      libId:'',
+      league_name:''
     },
     isSchool:false,
     gradeArray: ['一年级', '二年级', '三年级', '四年级', '五年级', '六年级', '七年级', '八年级', '九年级'],
@@ -49,9 +50,8 @@ Page({
     if (options.zindex!=3){
       options.vipId = getGlobalVal('vipId', `vipId_${getGlobalVal('userId')}`) || ''
     }
-    console.log(options)
     const {vip}=this.data
-      vip.school = options.name || ''
+      vip.school = options.school || ''
       vip.sex = options.sex || ''
       vip.phone = options.phone || ''
       vip.parentName = options.parentName || ''
@@ -60,10 +60,13 @@ Page({
       vip.childName = options.childName || ''
       vip.imgUrl = options.imgUrl || ''
       vip.vipId = options.vipId
+      vip.libId = options.libId
+      vip.league_name = options.league_name
+      // console.log(vip)
     this.setData({ options, vip, isLoaded: 1})
     if (!options.isSchool){
       this.getData()
-    }
+    } 
   },
 
   /**
@@ -80,7 +83,6 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
   },
 
   /**
@@ -170,9 +172,9 @@ Page({
   pickerGradeCtl: function (e) {
     const { value } = e.detail
     const { gradeArray, gradeIndex,vip } = this.data
-    if (value == gradeIndex) {
-      return
-    }
+    // if (value == gradeIndex) {
+    //   return
+    // }
     vip.grade = gradeArray[value]
     this.setData({ vip, gradeIndex: value })
   },
@@ -231,7 +233,7 @@ Page({
     } else if (type == 2) {
       if (!vip['childName']) {
         wx.showToast({
-          title: '请填写完姓名',
+          title: '请填写姓名',
           icon: 'none'
         })
         return
@@ -248,7 +250,9 @@ Page({
           })
         }
         setTimeout(() => {
-          navigateBack()
+          navigateBack({
+            delta:3
+          })
         }, 2000)
       })
     }

parents/pages/information/information.wxml

@@ -42,14 +42,21 @@
             <image class="image"  src='../../../assets/arrow_gray.png' />
           </view>
       </view>
-       <view class='li' data-url='parents/pages/School_library/School_library' data-zindex='3' data-paras='{{({isAdd:1,childName:vip.childName,sex:vip.sex,grade:vip.grade,school:vip.school,phone:vip.phone,parentRole:vip.parentRole,parentName:vip.parentName,imgUrl:vip.imgUrl,zindex:options.zindex,vipId:options.vipId})}}' bindtap='redirectTo' >
-         <view class='li-label'>所读学校 (必填)</view>
+     <view class='li' data-url='parents/pages/School_library/School_library' data-zindex='3' data-paras='{{({isAdd:options.isAdd,childName:vip.childName,sex:vip.sex,grade:vip.grade,school:vip.school,phone:vip.phone,parentRole:vip.parentRole,parentName:vip.parentName,imgUrl:vip.imgUrl,zindex:options.zindex,vipId:options.vipId,league_name:vip.league_name})}}' bindtap='navigateTo' >
+         <view class='li-label'>选择学校 (必填)</view>
         <view class='li-picker'>{{vip.school|| '请填写就读学校'}}</view>
          <view class="icon">
             <image class="image"  src='../../../assets/arrow_gray.png' />
           </view>
       </view>
-       <view class='li'>
+      <view class='li' data-url='parents/pages/library/library' data-zindex='3' data-paras='{{({isAdd:options.isAdd,childName:vip.childName,sex:vip.sex,grade:vip.grade,school:vip.school,phone:vip.phone,parentRole:vip.parentRole,parentName:vip.parentName,imgUrl:vip.imgUrl,zindex:options.zindex,vipId:options.vipId,league_name:vip.league_name})}}' bindtap='navigateTo'  wx:if='{{options.isAdd==1}}' >
+         <view class='li-label'>选定图书馆 (必填)</view>
+        <view class='li-picker'>{{vip.league_name|| '请选择图书馆'}}</view>
+         <view class="icon">
+            <image class="image"  src='../../../assets/arrow_gray.png' />
+          </view>
+      </view>
+      <view class='li'>
         <view class='li-label'>孩子性别 (选填)</view>
         <picker bindchange='pickerSexCtl' value='{{sexIndex}}' range='{{sexArray}}'>
           <view class='li-picker'>{{vip.sex == 1 ? '男' : vip.sex == 2 ? '女'  : '请选择性别'}}</view>
@@ -62,6 +69,8 @@
         <view class='li-label'>联系方式 (选填)</view>
         <input class='li-input' type='text' placeholder='' placeholder-class='input-placeholder' value='{{vip.phone}}' bindinput='inputCtl' data-type='phone'></input>
       </view>
+      
+        
     </view>
     <view class='footer-box'>
       <view class='footer-box-item' wx:for='{{footerArray}}' wx:key='index' data-type='{{item.type}}' bindtap='submitCtl'>{{item.text}}</view>

parents/pages/information/information.wxss

@@ -76,7 +76,7 @@
 .li-input,
 .li-picker,
 .li-text {
-  width: 400rpx;
+  width: 370rpx;
   font-size: 30rpx;
   color: #999;
   text-align: right;

parents/pages/library/library.js

@@ -16,8 +16,13 @@ Page({
     longitude: '',
     pageNo: 1,
     pageSize: 10,
+    content: '',
+    isResult: false,
     libraryList: [],
     isAll: 0,
+    nodataArray: {
+      text: "搜索无结果"
+    }
   },
 
   /**
@@ -27,15 +32,16 @@ Page({
     if (!options.isAdd){
       options.vipId = getGlobalVal('vipId', `vipId_${getGlobalVal('userId')}`) || ''
     }
-    this.setData({ options })
-    if (options.isAdd){
+    if (options.isAdd==1){
       this.getLocation(res => {
         this.setData({ isLoaded: 1 })
       })
     }else{
       this.getData()
     }
-   
+    this.setData({ options })
+    console.log(options)
+    // console.log(options.isAdd)
     // this.getLocation(res => {
     //   this.setData({ isLoaded: 1 })
     // })
@@ -55,6 +61,17 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    let _this = this
+    wx.getStorage({
+      key: 'setStoragelibraryList',
+      success: function (res) {
+        const setStoragelibraryList = res.data
+        _this.setData({
+          setStoragelibraryList: setStoragelibraryList,
+        })
+        // console.log(setStoragelibraryList)
+      }
+    })
 
   },
 
@@ -71,6 +88,31 @@ Page({
   onUnload: function () {
 
   },
+  returnBack:function(){
+    wx.navigateBack({
+      
+    })
+  },
+  /**
+    * 输入搜索值
+    */
+  inputSearchCtl: function (e) {
+    const { value } = e.detail
+    const { content } = this.data
+    if (content == value) {
+      return
+    }
+    this.setData({ content: value, pageNo: 1 })
+    this.setData({ isResult: true })
+    this.getLibrary()
+  },
+
+  /**
+   * 清除搜索值
+   */
+  clearSearchCtl: function () {
+    this.setData({ content: '' })
+  },
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
@@ -143,16 +185,18 @@ Page({
       const data = (list => {
         const arr = []
         for (const v of list) {
-          const { lname = '', lib_id = ''} = v
+          const { lname = '', lib_id = '',type=''} = v
           arr.push({
-            league_name: lname ,
-            id: lib_id
+            league_name: lname,
+            id: lib_id,
+            type:type
           })
         }
         return arr
       })(vipList)
+      console.log(data)
       if (data.length>0){
-        this.setData({ libraryList: data, isLoaded: 1 })
+        this.setData({ libraryList: data, isLoaded:1})
       }else{
         this.getLocation(res => {
           this.setData({ isLoaded: 1 })
@@ -169,9 +213,9 @@ Page({
    */
   getLibrary: function (cb) {
     const continuousFn = { fn: this.getLibrary, param: { ...arguments } }
-    const { options, latitude, longitude, pageNo, pageSize, libraryList } = this.data
+    const { options, latitude, longitude, pageNo, pageSize, libraryList, content } = this.data
     const { vipId } = options
-    GetLibrary({ data: { vipId, pageNo, pageSize, leagueLat: latitude, leagueLng: longitude }, continuousFn }).then(res => {
+    GetLibrary({ data: { vipId, pageNo, pageSize, leagueLat: latitude, leagueLng: longitude, leagueName: content }, continuousFn }).then(res => {
       const { list } = res.data
       let listTemp = []
       if (pageNo == 1) {
@@ -197,10 +241,12 @@ Page({
     const { index } = e.currentTarget.dataset
     const { libraryList,options } = this.data
     const { id, league_name } = libraryList[index]
-    const { vipId = '', sex = '', school = '', grade = '', childName = ''}=options
+    const { vipId = '', sex = '', school = '', grade = '', childName = '',isAdd,phone='',parentRole='',parentName='',imgUrl='',zindex}=options
+    wx.setStorageSync('setStoragelibraryList', libraryList[index])
+    console.log(isAdd)
     if (id) {
-      if (options.isAdd){
-        redirectTo({ url: 'parents/pages/information/information', paras: { zindex: 3, vipId, sex, school, grade, childName, libId: id, league_name} })
+      if (isAdd==1){
+        redirectTo({ url: 'parents/pages/information/information', paras: { zindex: 3, vipId, sex, school, grade, childName, libId: id, league_name, isAdd,phone,parentRole,parentName,imgUrl,isSchool:1} })
       }else{
         getApp().globalData.library = libraryList[index]
         wx.setStorageSync('library', libraryList[index])

parents/pages/library/library.wxml

@@ -1,13 +1,41 @@
 <!--parents/pages/library/library.wxml-->
+<import src="../../../templates/nodata/nodata.wxml" />
 <import src="../../../templates/loading/loading.wxml" /> 
 <view class='container'>
   <template is='loading' wx:if='{{!isLoaded}}'></template> 
   <view class='wrapper' wx:else>
-    <view class='section-label'>
+    <view class='header {{content.length > 0 ? "header-active" : ""}}'>
+      <view class='search-container'>
+        <view class='search-wrapper'>
+          <image class='search-icon' src='../../../assets/search.png'></image>
+          <input class='search-input' type='text' value='{{content}}' placeholder='' placeholder-class='search-placeholder' confirm-type='search' bindconfirm='inputSearchCtl'></input>
+          <image class='search-icon' wx:if='{{content.length > 0}}' src='../../../assets/error_gray.png' bindtap='clearSearchCtl'></image>
+        </view>
+        <view bindtap='returnBack' class='search-cancel'>取消</view>
+      </view>
+    </view>
+    <view class='list-items-title' wx:if='{{isResult&&libraryList.length>0}}'>搜索结果</view>
+  
+    <view class='section-label' wx:if='{{setStoragelibraryList}}'>
       <image class='section-icon' src='../../../assets/address_gray.png'></image>
       <text class='section-text'>定位地址</text>
     </view>
-    <view class='section-list'>   
+    <view class="section-position-add" wx:if='{{options.isAdd==1&&setStoragelibraryList}}'>
+    <view class='section-list'>  
+      <view class='section-li'>
+        <view class='section-row'>
+           <view class='section-title  section-flex-blue'>{{setStoragelibraryList.league_name||setStoragelibraryList.lname}}</view>
+        </view>
+         <view class='section-row'>
+          <view class='section-context' wx:if='{{setStoragelibraryList.league_address}}'>地址: {{setStoragelibraryList.league_address}}</view>
+          <view class='section-text' wx:if='{{setStoragelibraryList.juli}}'>距离{{setStoragelibraryList.juli}}km</view>
+        </view>
+    
+      </view>
+      
+    </view>
+    </view>
+    <view class='section-list'  wx:if='{{options.isAdd==0}}'>   
      
       <view class='section-li' data-index='0' bindtap='selectLibraryCtl' wx:if='{{libraryList.length>0}}'>
         <view class='section-row'>
@@ -15,16 +43,18 @@
             <view class='section-title'>{{libraryList[0].league_name||libraryList[0].lname}}</view>
             <view class='section-context'>{{libraryList[0].league_address}}</view>
           </view>
-          <view class='section-button' wx:if='{{libraryList[0].stype}}'>年卡服务</view>
+          <view class='section-button' wx:if='{{libraryList[0].type=="C001"}}'>年卡服务</view>
+          <view class='section-button' wx:if='{{libraryList[0].type=="C002"}}'>半年卡服务</view>
+          <view class='section-button' wx:if='{{libraryList[0].type=="C003"}}'>月卡服务</view>
         </view>
       </view>
     </view> 
-    <view class='section-label'>
+    <view class='section-label' wx:if='{{libraryList.length>0}}'>
       <image class='section-icon-two' src='../../../assets/position_gray.png'></image>
       <text class='section-text'>附近地址</text>
     </view>
     <view class='section-list'>  
-      <view class='section-li' wx:for='{{libraryList}}' wx:key='{{index}}' data-index='{{index}}' bindtap='selectLibraryCtl'>
+      <view class='section-li' wx:for='{{libraryList}}' wx:key='index' data-index='{{index}}' bindtap='selectLibraryCtl'>
         <view class='section-row'>
           <view class='section-title  section-flex'>{{item.league_name||item.lname}}</view>
           <view class='section-text' wx:if='{{item.juli}}'>距离{{item.juli}}km</view>
@@ -33,5 +63,6 @@
       </view>
       
     </view>
+    <template is='nodata' data='{{...nodataArray}}' wx:if='{{isResult&&libraryList.length==0}}'></template>
   </view>
 </view>

parents/pages/library/library.wxss

@@ -1,4 +1,5 @@
 /* parents/pages/library/library.wxss */
+@import '../../../templates/nodata/nodata.wxss';
 @import '../../../templates/loading/loading.wxss'; 
 .section-label {
   padding: 24rpx 30rpx;
@@ -62,4 +63,27 @@
   color: rgba(0,183,255,1);
   padding: 16rpx 20rpx;
   margin-left: 20rpx;
+}
+.search-cancel{
+  color: #00B7FF;
+  font-size: 30rpx;
+  margin: auto;
+}
+.header {
+  /* background: #FAFAFA; */
+  padding: 24rpx 40rpx;
+}
+
+.section-position-add{
+margin: 24rpx 30rpx;
+padding: 24rpx 30rpx;
+background:rgba(255,255,255,1);
+box-shadow:0px 2px 29px 2px rgba(0, 0, 0, 0.1);
+border-radius:18px;
+}
+.section-flex-blue{
+  font-size:34rpx;
+font-family:PingFang SC;
+font-weight:800;
+color:rgba(0,183,255,1);
 }

parents/pages/main/main.js

@@ -285,7 +285,7 @@ Page({
   getLibrary: function (cb) {
     const continuousFn = { fn: this.getLibrary, param: { ...arguments } }
     const { options, latitude, longitude, pageNo, pageSize } = this.data
-    const { vipId } = options
+    const { vipId} = options
     GetLibrary({ data: { vipId, pageNo, pageSize, leagueLat: latitude, leagueLng: longitude }, continuousFn }).then(res => {
       const { list } = res.data
       if (list[0]['id']) {
@@ -314,7 +314,8 @@ Page({
    */
   selectRouteCtl: function (e) {
     const { index } = e.currentTarget.dataset
-    const { routers } = this.data
+    const { routers,options} = this.data
+    const { vipId,libId} =options
     const { url, zindex } = routers[index]
     if(index==0){
       this.scanCtl()
@@ -322,7 +323,7 @@ Page({
       navigateTo({ url, zindex })
     }else{
       if (!hasVipService()) return
-      navigateTo({ url, zindex })
+      navigateTo({ url, zindex,paras: { vipId,libId }})
     }
   },
 

parents/pages/me/me.js

@@ -44,7 +44,7 @@ Page({
         zindex: 3
       },
       // {
-      //   icon: '../../../assets/qie_huan_jue_se.png',
+      //   icon: '../../../assets/qiehuan_icon.png',
       //   text: '角色切换',
       //   time: '',
       //   paras: {},
@@ -59,14 +59,14 @@ Page({
       //   url: 'pages/question/question',
       //   zindex: 3
       // },
-      // {
-      //   icon: '../../../assets/aijia_icon.png',
-      //   text: '关于私塾家',
-      //   time: '',
-      //   paras: {},
-      //   url: 'pages/about_aijia/about_aijia',
-      //   zindex: 3
-      // },
+      {
+        icon: '../../../assets/aijia_icon.png',
+        text: '关于私塾家',
+        time: '',
+        paras: {},
+        url: 'pages/about_aijia/about_aijia',
+        zindex: 3
+      },
     ],
     routerThree: [
       {
@@ -122,6 +122,7 @@ Page({
     options.vip = getGlobalVal('vip', `vip_${userId}`)
     options.userId = userId
     options.userInfo = getGlobalVal('userInfo')
+    console.log(options)
     this.setData({ options, isLoaded: 1 })
     getWxloginCode(code => {
       this.setData({ code })
@@ -142,6 +143,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    // wx.hideHomeButton() 
     this.getVipList()
     this.getCheckRole()
   },
@@ -180,8 +182,7 @@ Page({
     const {value}=e.detail
     const {list=[]}=this.data;
     if (list[value].type==0){
-      wx.setStorageSync('library', { id: list[value].libId, league_name: list[value].libName})
-      redirectTo({ url: 'parents/pages/main/main', paras: { libId:list[value].libId } })
+      redirectTo({ url: 'parents/pages/me/me', paras: {} })
     }else{
       wx.setStorageSync('list', [list[value]])
       redirectTo({ url: 'president/pages/home/home', paras: { libId: list[value].libId } })
@@ -217,6 +218,19 @@ Page({
     const continuousFn = { fn: this.getVipList, param: { ...arguments } }
     const userId = getGlobalVal('userId')
     const { options}=this.data
+    const fn = (i, v) => {
+      globalData['vip'] = v
+      wx.setStorageSync(`vip_${userId}`, v)
+
+      var obj={"league_name":v.lname,"id":v.lib_id,"type":v.type}
+      wx.setStorageSync('library', obj)
+      
+      globalData['vipIndex'] = i
+      wx.setStorageSync(`vipIndex_${userId}`, i)
+
+      globalData['vipId'] = v['vip_id']
+      wx.setStorageSync(`vipId_${userId}`, v['vip_id'])
+    }
     GetMineInfo({ continuousFn }).then(res => {
       const { vipList = null } = res.data
       if (vipList.length > 0) {
@@ -225,6 +239,8 @@ Page({
             options.vipIndex = i
             getApp().globalData['vipIndex'] = i
             wx.setStorageSync(`vipIndex_${userId}`, i)
+            fn(i, vipList[i]) 
+            break
           }
         }
         this.setData({ vipList, options})
@@ -247,7 +263,7 @@ Page({
       navigateTo({ url, zindex })
     }else{
       if (!hasVipService()) return
-      navigateTo({ url, zindex })
+      navigateTo({ url, zindex,isAdd:0 })
     }
     
   },
@@ -266,7 +282,7 @@ Page({
   addchildPage: function () {
     const { routerTwo } = this.data
     const { url, zindex } = routerTwo[0]
-    if (!hasVipService()) return
+    // if (!hasVipService()) return
     wx.scanCode({
       success: res => {
         const webUrl = res.result
@@ -279,7 +295,7 @@ Page({
           return
         }
         // console.log(vipId)
-        navigateTo({ url, paras: { vipId, zindex: 3} }) 
+        navigateTo({ url, paras: { vipId, zindex: 3, isAdd: 1} }) 
       }
     })
     // 
@@ -291,9 +307,9 @@ Page({
     const { index } = e.currentTarget.dataset
     const { options, vipList} = this.data
     const { vipIndex,  userId } = options
-    if (index == vipIndex) {
-      return
-    }
+    // if (index == vipIndex) {
+    //   return
+    // }
     const { vip_id } = vipList[index]
     if (vip_id) {
       options.vip = vipList[index]
@@ -304,13 +320,15 @@ Page({
       getApp().globalData['vipIndex'] = index
       wx.setStorageSync(`vipIndex_${userId}`, index)
 
+      var obj={"league_name":vipList[index].lname,"id":vipList[index].lib_id,"type":vipList[index].type}
+      wx.setStorageSync('library', obj)
+
       options.vipId = vip_id
       getApp().globalData['vipId'] = vip_id
       wx.setStorageSync(`vipId_${userId}`, vip_id)
 
-      wx.removeStorageSync('library')
+      // wx.removeStorageSync('library')
     }
-
     this.setData({ options, isShowVipModal: 0 })
   },
  

parents/pages/me/me.wxml

@@ -9,16 +9,17 @@
         <view>
           <view class='section-text-black'wx:if='{{options.userInfo}}'>{{options.vip?options.vip.child_name:options.userInfo.nickName}}</view>
           <button class='section-text-login' wx:if='{{!options.userInfo}}' open-type="getUserInfo"  bindgetuserinfo="getUserInfoCtl">授权登陆</button>
-          <view  data-url='parents/pages/library/library' data-zindex='3' bindtap='redirectTo'>
+          <view  data-url='parents/pages/library/library'data-paras='{{({isAdd:0})}}' data-zindex='3' bindtap='navigateTo'>
             <image class=''class='section-icon-address' src='../../../assets/position_black.png'></image>
-            <text class='section-text-add'  wx:if='{{options.library}}'>{{options.library.league_name}}</text>
+            <text class='section-text-add' >{{options.vip?options.vip.lname:options.library.league_name}}</text> 
           </view>
         </view>
        </view>
       <view>
-        <view class='header-images' bindtap='{{options.vipList.length>0?"toggleSelectVipCtl":""}}'>
-          <image class='header-icon' src='../../../assets/qie_huan.png' wx:if='{{options.vipList.length>0&&options.userInfo}}'></image>
-          <image class='header-nologin-icon' src='{{options.userInfo?options.userInfo.avatarUrl:"../../../assets/default_headicon.png"}}' style='border:{{options.userInfo?"10rpx solid #00B7FF":""}};'></image>
+        <view class='header-images'>
+          <image class='header-icon' src='../../../assets/qie_huan.png' wx:if='{{options.userInfo}}' bindtap='toggleSelectVipCtl'></image>
+          <image class='header-nologin-icon' src='{{options.vip.img_url?baseImgUrl+options.vip.img_url:"../../../assets/default_headicon.png"}}'  style='border:{{options.userInfo?"10rpx solid #00B7FF":""}};' wx:if='{{options.vip}}'></image>
+          <image class='header-nologin-icon' src='{{options.userInfo?options.userInfo.avatarUrl:"../../../assets/default_headicon.png"}}' style='border:{{options.userInfo?"10rpx solid #00B7FF":""}};'  wx:if='{{!options.vip}}'></image>
         </view>
       </view>
     </view>
@@ -45,7 +46,7 @@
         </view>
         <view class='section-li' wx:if='{{roleList.length>1}}'>
             <view>
-              <image class='section-icon' src='../../../assets/qie_huan_jue_se.png'></image>
+              <image class='section-icon' src='../../../assets/qiehuan_icon.png'></image>
               <text class='section-text'>身份切换</text>
             </view>
             <picker bindchange='pickerRoleCtl' value='{{0}}' range='{{roleList}}' class='li-picker'>
@@ -56,7 +57,7 @@
     </view>
     <view class='modal-container' wx:if='{{isShowVipModal}}' catchtouchmove='true' bindtap='toggleSelectVipCtl'>
       <view class='modal-wrapper'>
-        <view class='modal-list'>
+        <scroll-view scroll-y class='modal-list' style="height: {{vipList.length>2?'600rpx':'auto'}};">
           <view class='modal-li' wx:for='{{vipList}}' wx:key='index' data-index='{{index}}' catchtap='selectVipCtl'>
             <view class='modal-row'>
               <image class='modal-image' src='{{item.img_url ? baseImgUrl + item.img_url : "../../../assets/default_headicon.png"}}'></image>
@@ -64,8 +65,8 @@
             </view>
             <image class='modal-icon' wx:if='{{index == options.vipIndex}}' src='../../../assets/true_blue.png'></image>
           </view>
-          <view class='modal-text-addchild' bindtap='addchildPage'> + 添加孩子</view>
-        </view>
+        </scroll-view>
+        <view class='modal-text-addchild' bindtap='addchildPage'> + 添加孩子</view>
       </view>
     </view>
   </view>

parents/pages/me/me.wxss

@@ -59,6 +59,7 @@ page{
   font-size: 30rpx;
   color: #00B7FF;
 }
+
 .information-two{
   position: relative;
   min-width: 250rpx;
@@ -89,6 +90,10 @@ page{
   border-radius: 50%;
   
 }
+.modal-list{
+  
+  overflow: scroll
+}
 .header-text-black {
   font-size: 38rpx;
   color: #333;
@@ -225,9 +230,9 @@ page{
   align-items: center;
   padding: 30rpx 40rpx;
 }
-.modal-li:nth-last-of-type(1) {
+/* .modal-li:nth-last-of-type(1) {
   border-bottom: none;
-}
+} */
 .modal-row {
   display: flex;
   justify-content: flex-start;

president/pages/People_search/People_search.wxml

@@ -28,7 +28,7 @@
             <view class="li_type"  wx:if='{{vipList.length>0}}'>会员</view>
             <view class='li' wx:for='{{vipList}}' wx:key='index' data-index='{{index}}' bindtap='toggleSelectLiCtl'>
               <view class="li-box">
-                <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl + thumbnail : "../../../assets/default_headicon.png"}}'></image>
+                <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl: "../../../assets/default_headicon.png"}}'></image>
               </view>
               <view class="li-col">
                 <view class="li-text">
@@ -46,7 +46,7 @@
              <view class="li_type" wx:if='{{managerList.length>0}}'>馆内人员</view>
             <view class='li'   wx:for='{{managerList}}' wx:key='index' data-index='{{index}}'bindtap='toggleSelectLiCtl'>
                   <view class="li-box">
-                    <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl + thumbnail : "../../../assets/default_headicon.png"}}'></image>
+                    <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl: "../../../assets/default_headicon.png"}}'></image>
                   </view>
                   <view class="li-col">
                     <view class="li-text">
@@ -70,7 +70,7 @@
           
             <view class='li'    wx:for='{{addmanagerList}}' wx:key='index' data-index='{{index}}' bindtap='toggleSelectLiCtl'>
                   <view class="li-box">
-                    <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl + thumbnail : "../../../assets/default_headicon.png"}}'></image>
+                    <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl: "../../../assets/default_headicon.png"}}'></image>
                   </view>
                   <view class="li-col">
                     <view class="li-text">

president/pages/People_search/People_search.wxss

@@ -4,6 +4,17 @@
 page{
   background: #fff
 }
+.search-wrapper {
+flex: 1;
+display: flex;
+justify-content: flex-start;
+align-items: center;
+padding: 16rpx 30rpx;
+margin-right: 30rpx;
+box-shadow: 0px 4rpx 10rpx 0px rgba(11,71,94,0.2);
+border-radius: 86rpx;
+background:rgba(246,245,251,1);
+}
 
 .search-cancel{
   color: #00B7FF;
@@ -118,7 +129,7 @@ page{
 }
 .li_type{
   height: 38rpx;
-  background: #f1efef;
+  background:rgba(246,245,251,1);
   padding:15rpx 40rpx;
   line-height:38rpx;
   color:rgba(110, 107, 107, 0.8);

president/pages/Personnel_details/Personnel_details.js

@@ -256,6 +256,11 @@ Page({
   changeDate: function (e) {
     const { value } = e.detail;
     this.setData({ endTime: value })
+  },
+    /**
+* 确定修改有效服务日期
+*/
+  trueBookCtl: function () {
     this.submitCtl(res => {
       this.setData({ isShowVipModal: false })
     })

president/pages/Personnel_details/Personnel_details.wxml

@@ -55,7 +55,7 @@
                 <picker class="picker" mode="date" disabled="true" fields="month" value="{{starttime}}" start="2017-10" end="2097-10" bindchange="changeDate">
                     <view class='head-month'>
                       <text>{{starttime}}</text>
-                        <image class='section-select' src='../../../assets/selecticon.png'></image>
+                           <image class='section-select' ></image>
                     </view>
                 </picker>
                 </view>
@@ -72,7 +72,7 @@
               </view>
             <view class='model-list-footer'>
               <view class='model-list-footer-cancel' bindtap='allShowModel'>取消</view>
-              <view class='model-list-footer-sure' bindtap='delBookCtl'>确定</view>
+              <view class='model-list-footer-sure' bindtap='trueBookCtl'>确定</view>
             </view>
             
         </view>

president/pages/Personnel_details/Personnel_details.wxss

@@ -42,11 +42,11 @@
 }
 .information-flex{
   display:inline-block;
-  padding: 50rpx;
+  padding: 20rpx 50rpx;
 }
 .information-flexs{
   display:inline-block;
-
+  margin:0rpx 0rpx 40rpx 100rpx;
 }
 .section-text-members{
   font-size: 36rpx;
@@ -64,10 +64,10 @@
 }
 .section-text-pastdata{
   font-size: 30rpx;
-  color: #00B7FF;
+  font-family:PingFang SC;
+  font-weight:500;
+  color:rgba(0,183,255,1);
   position:relative;
-
-
 }
 .section-text-data{
   font-size: 30rpx;
@@ -123,7 +123,7 @@
   text-align: center;
 }
 .model-topic{
-  margin:50rpx auto;
+  margin:30rpx auto;
   font-size:34rpx;
   text-align:center;
    color: rgb(2, 2, 2);
@@ -256,9 +256,6 @@ bottom:-11rpx;
   font-size: 32rpx;
   margin: 30rpx;
 }
-.head-item{
-  margin:15rpx;
-}
 .picker-day{
   display:inline-block;
   font-weight:700;

president/pages/Personnel_edit/Personnel_edit.wxss

@@ -37,11 +37,12 @@
   color:#ffff;
 }
 .uploadImg{
-  width:200rpx;
+  width:220rpx;
   height:220rpx;
   border-radius:50%;
   background-color:#ebebeb;
   margin:0 auto;
+  margin-left:220rpx;
   text-align:center;
   line-height:30rpx;
 }
@@ -60,8 +61,10 @@
   height:58rpx;
   text-align: center;
   line-height: 58rpx;
-  color: rgba(255,100,100,1);
-  font-size: 26rpx;
+  font-size:30rpx;
+  font-family:PingFang SC;
+  font-weight:500;
+  color:rgba(255,84,43,1);
   margin-top: 30rpx;
 }
 .list-items-del-text{

president/pages/Personnel_management/Personnel_management.wxml

@@ -1,4 +1,4 @@
-<!--parents//pages/borrow_record/borrow_record.wxml-->
+
 <import src="../../../templates/nodata/nodata.wxml" />
 <import src="../../../templates/loading/loading.wxml" /> 
 <import src="../../../templates/footer/footer.wxml" />
@@ -25,7 +25,7 @@
     <view class='list' wx:if='{{navIndex == 0}}'>
        <view class='li' wx:for='{{list}}' wx:key='index' data-index='{{index}}' bindtap='toggleSelectLiCtl'>
         <view class="li-box">
-          <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl + thumbnail : "../../../assets/default_headicon.png"}}'></image>
+          <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl+item.imgUrl: "../../../assets/default_headicon.png"}}'></image>
         </view>
         <view class="li-col">
           <view class="li-text">
@@ -43,13 +43,13 @@
     </view>
       <!-- 馆内人员管理 -->
       <view  class="pickChange" wx:if='{{navIndex == 1}}'>
-      <view class="pickChange_text">馆内人员：{{managerpages}}人</view>
+      <view class="pickChange_text">馆内人员：{{managerList.length}}人</view>
       <view class="pickChange_time" data-url='president/pages/People_search/People_search?addNum=1' data-paras='{{({type: 1})}}' data-zindex='3' bindtap='navigateTo'>添加人员+</view>
     </view>
     <view class='list' wx:if='{{navIndex == 1}}'>
        <view class='li' wx:for='{{managerList}}' wx:key='index' data-index='{{index}}' bindtap='toggleSelectLiCtl'>
         <view class="li-box">
-          <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl + thumbnail : "../../../assets/default_headicon.png"}}'></image>
+          <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl: "../../../assets/default_headicon.png"}}'></image>
         </view>
         <view class="li-col">
           <view class="li-text">

president/pages/Personnel_management/Personnel_management.wxss

@@ -1,4 +1,4 @@
-/* parents//pages/borrow_record/borrow_record.wxss */
+
 @import '../../../templates/nodata/nodata.wxss';
 @import '../../../templates/loading/loading.wxss'; 
 @import '../../../templates/footer/footer.wxss';
@@ -9,8 +9,8 @@ page{
   box-shadow:0px 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.06);
 }
 .list {
-padding: 10rpx 40rpx;
-
+ padding: 10rpx 40rpx;
+  margin-bottom: 98rpx;
 }
 
 .list-detail{
@@ -57,8 +57,8 @@ font-weight:500;
 }
 .li-box {
   position: relative;
-  width: 154rpx;
-  min-height: 158rpx;
+  width: 108rpx;
+  min-height: 150rpx;
 }
 .li-img {
   position: absolute;
@@ -70,7 +70,7 @@ font-weight:500;
   background: white;
 }
 .li-col {
-   width:80%;
+  width:85%;
   display: flex;
   justify-content: flex-start;
   align-items: flex-start;

president/pages/Search_sign_number/Search_sign_number.wxml

@@ -24,7 +24,7 @@
         <view class='li'wx:for='{{list}}' wx:key='index' data-index='{{index}}' bindtap='toggleSelectLiCtl'>
           <image class='li-circle' src='{{item.isCheck == 1 ? "../../../assets/circle_blue.png" : "../../../assets/circle_gray.png"}}'></image>
           <view class="li-box">
-            <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl + thumbnail : "../../../assets/default_headicon.png"}}'></image>
+            <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl: "../../../assets/default_headicon.png"}}'></image>
           </view>
           <view class="li-col">
             <view class="li-text-black" >{{item.childName || ''}}</view>

president/pages/allocate_books_record/allocate_books_record.js

@@ -28,6 +28,10 @@ Page({
     isManage: 0,
     totalNum: 0,
     isDelete: false,
+    nodataArray: {
+      text: "暂无历史记录",
+      image: '../../../assets/nodata_3.png',
+    }
   },
 
   /**
@@ -37,7 +41,7 @@ Page({
     options.vipId = getGlobalVal('vipId', `vipId_${getGlobalVal('userId')}`) || ''
     options.libId = getGlobalVal('list').length > 0 ? getGlobalVal('list')[0].libId : ''
     wx.setNavigationBarTitle({
-      title: `调书`,
+      title: `调书申请记录`,
     })
     this.setData(options)
     this.getData(res => {

president/pages/allocate_books_record/allocate_books_record.wxml

@@ -1,5 +1,6 @@
 <!--president/pages/apply_bookLists/apply_booklists.wxml-->
 <import src="../../../templates/loading/loading.wxml" /> 
+<import src="../../../templates/nodata/nodata.wxml" />
 <view class='container'>
   <view class='wrapper'>
     <view class='list'>
@@ -7,23 +8,21 @@
       <!-- 新书申请目录 -->
       <view wx:for='{{list}}'  wx:if='{{isShowBooklists == 0}}' wx:key='index' data-index='{{index}}'>
          <view class='header'>
-           <view class='apply-dot'></view>
+           <view class='apply-dot'  wx:if='{{item.showTime}}'></view>
           <view class='apply-time'>{{item.showTime}}</view>
           <view class='apply-text' wx:if='{{item.stat == 2}}'>等待配送</view>
           <view class='apply-text' wx:if='{{item.stat == 3}}'>已完成</view>
       </view>
            <view class='li li-center-directory'>
-          <view>
               <view class='li-center-info'>  
                 <view class='li-text-title'>{{item.showWords || ''}}</view>
-                <view class="cheack-info">
-                    <view class='li-text-info' data-id='{{item.id}}'  bindtap='booklistInfo' >查看详情</view>
+                <view class="cheack-info" wx:if='{{item.stat == 3}}'>
+                    <view class='li-text-info'  data-id='{{item.id}}'  bindtap='booklistInfo' >查看详情</view>
                     <view class="icon">
                       <image class="image"  src='../../../assets/arrow_gray.png' />
                     </view>
                 </view>
               </view>
-          </view>
         <view>
         </view>
       </view>
@@ -59,12 +58,7 @@
             <image src='../../../assets/zai_jia.png' class='load-img'></image>
             <view>正在玩命加载...</view>
           </view>
-    <view class='list' wx:if='{{isShowBooklists == 1&&ApplyInfoList.length==0}}'>
-      <view class='Nodata'>
-          <image class="image-Nodata"src='../../../assets/nodata_1.png'></image>
-          <view class="text-Nodata">暂无调书申请记录</view>
-      </view>
-    </view>
+  <template is='nodata' data='{{...nodataArray}}'  wx:if='{{isShowBooklists == 1&&ApplyInfoList.length==0}}'></template>
   </view>
 </view>
 

president/pages/allocate_books_record/allocate_books_record.wxss

@@ -1,8 +1,12 @@
 /* president/pages/apply_bookLists/apply_booklists.wxss */
 @import '../../../templates/loading/loading.wxss';
+@import '../../../templates/nodata/nodata.wxss';
 .header {
 
-  padding: 24rpx 30rpx;
+font-size:30rpx;
+font-family:PingFang SC;
+font-weight:500;
+color:rgba(108,108,128,1);
 }
 .header-active {
   background: #fff;
@@ -19,6 +23,7 @@
 }
 .li-center-info{
   display: inline-block;
+  width:100%;
 }
 .li-col {
   flex: 1;
@@ -93,12 +98,14 @@
 .li-center {
   align-items: center;
   padding: 0 !important;
-   background: rgba(247, 247, 247, 0.984);
+ background:rgba(255,255,255,1);
 }
 .li-center-directory{
   align-items: center;
   padding: 40rpx 20rpx 40rpx 60rpx;
-  background: rgba(247, 247, 247, 0.984);
+height:158rpx;
+background:rgba(246,245,251,1);
+border-radius:18rpx;
 
 }
 .cheack-info{
@@ -123,9 +130,11 @@
 .apply-text{
   text-align:right;
   display:inline-block;
-  font-size: 25rpx;
+  font-size: 30rpx;
   float:right;
-  color:#FF5711;
+font-family:PingFang SC;
+font-weight:500;
+color:rgba(255,87,17,1);
 }
 .addBooks{
   height:60rpx;

president/pages/book_delete_list/book_delete_list.wxml

@@ -33,7 +33,7 @@
          <view class='book-container'>
           <view class='book-wrapper'>
             <view class='book-images'>
-              <image class='book-image' mode='aspectFill' src='{{item.local_image ? baseImgUrl + item.local_image + thumbnail : "../../../assets/default_headicon.png"}}' data-images='{{([item.local_image])}}' data-baseurl='{{baseImgUrl}}' bindtap='viewImage'></image>
+              <image class='book-image' mode='aspectFill' src='{{item.local_image ? baseImgUrl + item.local_image: "../../../assets/default_headicon.png"}}' data-images='{{([item.local_image])}}' data-baseurl='{{baseImgUrl}}' bindtap='viewImage'></image>
             </view>
             <view class='book-content'>
               <view class='book-title'>{{item.title}}</view>

president/pages/borrow_books/borrow_books.wxml

@@ -20,7 +20,7 @@
     data-id='{{item.id}}'  bindtap='selectNavCtl'
       >
         <view class="li-box">
-          <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl + thumbnail : "../../../assets/default_headicon.png"}}'></image>
+          <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl: "../../../assets/default_headicon.png"}}'></image>
         </view>
         <view class="li-col">
           <view class="li-text-black" >{{item.childName || ''}}</view>

president/pages/borrow_car/borrow_car.wxss

@@ -59,7 +59,7 @@ page{
   line-height: 34rpx;
 }
 .list-down-footer-num{
-  color: #00B7FF;
+  color: #FF80A8;
   font-size: 26rpx;
   line-height: 34rpx;
 }

president/pages/borrow_record/borrow_record.js

@@ -75,18 +75,9 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    options.vipId = getGlobalVal('vipId', `vipId_${getGlobalVal('userId')}`) || ''
-    if (!options.state) {
-      options.libId = getGlobalVal('list').length > 0 ? getGlobalVal('list')[0].libId : ''
-    }
-    if (options.state) {
-      if (options.state ==1) { 
-        this.setData({ navIndex: 0 })
-      }
-      if (options.state == 2) {
-        this.setData({ navIndex: 1 })
-      }
-    }
+    console.log(options)
+    // options.vipId = getGlobalVal('vipId', `vipId_${getGlobalVal('userId')}`) || ''
+    // options.libId = getGlobalVal('list').length > 0 ? getGlobalVal('list')[0].libId : ''
     this.setData(options)
     this.getData(res => {
       this.setData({ isLoaded: 1 })
@@ -204,12 +195,12 @@ Page({
     this.setData({ navIndex: index, list: [], pageNo: 1, isDown: false })
     if (index == 0) {
       this.setData({ isreturn: 0 })
-      this.setData({ 'type': 1 })
+      this.setData({ type: 1 })
       if (navList[index]['list'].length == 0) {
         this.getData()
       }
     } else if (index == 1) {
-      this.setData({ 'type':3 })
+      this.setData({ type:3 })
       this.setData({ isreturn: 1 })
       this.getData()
     }

president/pages/borrow_record/borrow_record.wxss

@@ -1,4 +1,4 @@
-/* parents//pages/borrow_record/borrow_record.wxss */
+
 @import '../../../templates/nodata/nodata.wxss';
 @import '../../../templates/loading/loading.wxss'; 
 page{

president/pages/data_statistics/data_statistics.wxss

@@ -58,7 +58,7 @@ ff-canvas {
   border:2rpx solid rgba(0,183,255,1);
   border-radius:29rpx;
   text-align: center;
-  line-height: 41rpx;
+  line-height: 48rpx;
   color: rgba(0,183,255,1);
   font-size: 28rpx;
   margin: 30rpx auto;

president/pages/good_books_new/good_books_new.wxml

@@ -135,11 +135,13 @@
                   </view>
               </view> -->
             </view>
-            <view class='screen-footer'></view>
-            <view class='screen-btn'>
+            <view class='screen-footer'>
+                 <view class='screen-btn'>
                 <view class='screen-btn-rest' bindtap='getReset'>重置</view>
                 <view class='screen-btn-sure' bindtap='getSubmit'>确定</view>
             </view>
+            </view>
+         
           </scroll-view>
       </view>
       <!-- 随机点击弹框 -->

president/pages/good_books_new/good_books_new.wxss

@@ -186,11 +186,7 @@
   color: #fff;
   font-size: 28rpx;
   line-height: 68rpx;
-  position: fixed;
-  bottom: 30rpx;
-  right: 47rpx;
   display: flex;
-  margin-top: 120rpx;
 }
 .screen-btn-rest{
   background: #51CEFF;

president/pages/home/home.js

@@ -3,7 +3,7 @@ import { routers, viewImage, sharePage, isFn, getGlobalVal, getWxLocationSetting
 import { GetLibrary, GetParentHome, GetBorrowBookNum, ScanningBooks, GoodIndex, ScanningBackBooks,IndexBarList} from '../../../utils/api.js'
 const { navigateTo, redirectTo, navigateBack } = routers()
 const { globalData, hasLibraryService, hasVipService } = getApp()
-const { baseImgUrl, qrcodeInvalidToastText } = globalData
+const { baseImgUrl, qrcodeInvalidToastText,thumbnail} = globalData
 Page({
 
   /**
@@ -11,6 +11,7 @@ Page({
    */
   data: {
     baseImgUrl,
+    thumbnail,
     isFirst: 0,
     latitude: '',
     longitude: '',

president/pages/home/home.wxss

@@ -49,8 +49,10 @@ page{
   border-radius: 30rpx;
 }
 .li-items {
-  margin: 40rpx 0;
+  margin: 40rpx 10rpx;
   text-align:center;
+  display: flex;
+  justify-content: flex-start;
 }
 .li-item-bgc{
 text-align:center;
@@ -80,11 +82,11 @@ border-radius:45rpx;
 padding:10rpx;
 }
 .li-item {
-  display:inline-block;
+  /* display:inline-block;
   width:33.333%;
-  text-align: left;
+  text-align: left; */
   cursor: pointer;
-   height: 110rpx;
+  margin-right:76rpx;
 }
 .item-Tops{
   color:#41414C;
@@ -93,15 +95,16 @@ padding:10rpx;
   font-weight:700;
 }
 .li-item-icon {
-  width: 90rpx;
-  height: 90rpx;
+  width: 64rpx;
+  height: 64rpx;
 }
 .li-item-text {
   text-align:center;
   font-size: 28rpx;
   color: #41414C;
-    height: 40rpx;
   width:120rpx;
+  margin:20rpx 0;
+  font-weight:500;
 }
 .li-circles{
   color: #41414C;

president/pages/library_books/library_books.js

@@ -181,6 +181,7 @@ Page({
   },
   selectNavCtl: function (e) {
     const { index } = e.currentTarget.dataset
+    const {vipId,libId}=this.data
     if (index == 0) {
       navigateTo({
         url: 'president/pages/book_classification/book_classification',
@@ -188,7 +189,7 @@ Page({
     }
     if (index == 1) {
       navigateTo({
-        url: 'president/pages/borrow_record/borrow_record',
+        url: 'president/pages/borrow_record/borrow_record',paras: { vipId,libId }
       })
     }
   },

president/pages/library_books/library_books.wxml

@@ -86,11 +86,13 @@
                 </view>
               </view>
             </view>
-            <view class='screen-footer'></view>
-            <view class='screen-btn'>
+            <view class='screen-footer'>
+                <view class='screen-btn'>
                 <view class='screen-btn-rest' bindtap='getReset'>重置</view>
                 <view class='screen-btn-sure' bindtap='getSubmit'>确定</view>
             </view>
+            </view>
+        
           </scroll-view>
       </view>
       <!-- 提示弹框 -->

president/pages/library_books/library_books.wxss

@@ -130,11 +130,11 @@
   background:rgba(235,246,250,1) !important;
   color: #00B7FF !important;
 }
-.screen-footer{
+/* .screen-footer{
   padding: 80rpx;
 
   z-index:99999999;
-}
+} */
 .screen-items-content{
   padding: 20rpx 28rpx;
   background:rgba(240,242,242,1);
@@ -154,8 +154,8 @@
   color: #fff;
   font-size: 28rpx;
   line-height: 68rpx;
-  position: fixed;
-  bottom: 130rpx;
+  /* position: fixed;
+  bottom: 130rpx; */
   right: 47rpx;
   display: flex;
   margin: auto;

president/pages/library_sign_num/library_sign_num.wxml

@@ -14,7 +14,7 @@
       </view>
       <view class='li' wx:for='{{list}}' wx:key='index' data-index='{{index}}' wx:if='{{isMonthData==2 && list.length > 0}}' bindtap='toggleSelectLiCtl'>
         <view class="li-box">
-          <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl + thumbnail : "../../../assets/default_headicon.png"}}'></image>
+          <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl: "../../../assets/default_headicon.png"}}'></image>
         </view>
         <view class="li-col">
           <view class="li-text-black" >{{item.childName || ''}}</view>
@@ -27,7 +27,7 @@
       </view>
       <view class='li' wx:key='index' wx:for='{{list}}' data-index='{{index}}'wx:if='{{isMonthData==1}}' bindtap='toggleSelectLiCtl'>
         <view class="li-box">
-          <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl + thumbnail : "../../../assets/default_headicon.png"}}'></image>
+          <image class='li-img' mode='aspectFill' src='{{item.imgUrl ? baseImgUrl + item.imgUrl: "../../../assets/default_headicon.png"}}'></image>
         </view>
           <view class="li-text-black" >{{item.childName || ''}}</view>
         <view class="li-text-block" >

president/pages/management_loan_records/management_loan_records.wxml

@@ -1,4 +1,4 @@
-<!--parents//pages/borrow_record/borrow_record.wxml-->
+
 <import src="../../../templates/nodata/nodata.wxml" />
 <import src="../../../templates/loading/loading.wxml" /> 
 <view class='container'>
@@ -21,7 +21,7 @@
             <view class='list-dedail-item' wx:for='{{item.valueList}}' wx:key='key' wx:for-item='val' wx:for-key='{{key}}'>
               <view class='list-item'>
                   <view class='list-item-img'>
-                   <image  class='list-item-img-items'  src='{{val.local_image ? baseImgUrl + val.local_image + thumbnail : "../../../assets/banner1.png"}}'></image>
+                   <image  class='list-item-img-items'  src='{{val.local_image ? baseImgUrl + val.local_image: "../../../assets/banner1.png"}}'></image>
                   </view>
                   <view class='list-item-content'>
                       <view>{{val.title}}</view>

president/pages/management_loan_records/management_loan_records.wxss

@@ -1,4 +1,4 @@
-/* parents//pages/borrow_record/borrow_record.wxss */
+
 @import '../../../templates/nodata/nodata.wxss';
 @import '../../../templates/loading/loading.wxss'; 
 page{

president/pages/me/me.wxml

@@ -8,8 +8,8 @@
        <view class='header-flex'>
         <view>
           <view class='section-text-black'wx:if='{{options.userInfo}}'>{{options.userInfo.nickName}}</view>
-          <view class='section-text-title'>校长助理</view>
-           <view class='section-text-title'>学习导师</view>
+          <!-- <view class='section-text-title'>校长助理</view>
+           <view class='section-text-title'>学习导师</view> -->
           <view>
             <text class='section-text'  wx:if='{{options.list}}'>{{options.list[0].libName}}</text>
                 <image class='head-month-img' src='../../../assets/selecticon.png'></image>

president/pages/newbooks_apply_record/newbooks_apply_record.js

@@ -34,6 +34,11 @@ Page({
     selecetAdd: false ,
     pageNoUserApply:1, 
     pageSizeUserApply:10, 
+    nodataArray: {
+      text: "暂无历史记录",
+      image: '../../../assets/nodata_3.png',
+      margin: '400rpx auto'
+    }
   },
 
   /**

president/pages/newbooks_apply_record/newbooks_apply_record.wxml

@@ -1,4 +1,5 @@
 <!--president/pages/apply_bookLists/apply_booklists.wxml-->
+<import src="../../../templates/nodata/nodata.wxml" />
 <import src="../../../templates/loading/loading.wxml" /> 
 <view class='container'>
   <view class='wrapper'>
@@ -11,7 +12,6 @@
           <view class='apply-time'>{{item.showTime}}</view>
       </view>
            <view class='li li-center-directory'>
-          <view>
               <view class='li-center-info'>  
                 <view class='li-text-title'>{{item.showWords || ''}}</view>
                 <view class="cheack-info">
@@ -21,7 +21,6 @@
                     </view>
                 </view>
               </view>
-          </view>
         <view>
         </view>
       </view>
@@ -32,14 +31,14 @@
        <view class='list-items'>
                 <view class='list-item'>
                     <text  class='list-item-index'>{{index+1}}</text>
-                    <view class='list-item-img'>
+                    <view class='list-item-img'  wx:if='{{item.bookImg}}'>
                       <image src='{{item.bookImg?baseImgUrl+item.bookImg:""}}' class='list-item-img-items'></image>
                     </view>
                     <view class='list-item-content'>
                         <view>{{item.title}}</view>
-                        <view class='list-item-content-tips'>{{item.publish}}</view>
-                        <view class='list-item-content-label'>
-                          <view class='list-item-content-label-one' wx:if='{{item.themeName}}'>{{item.themeName}}</view>
+                        <view class='list-item-content-tips' wx:if='{{item.publish}}'>{{item.publish}}</view>
+                        <view class='list-item-content-label' wx:if='{{item.themeName}}'>
+                          <view class='list-item-content-label-one'>{{item.themeName}}</view>
                         </view>
                     </view>
                 </view>
@@ -75,18 +74,8 @@
             <image src='../../../assets/zai_jia.png' class='load-img'></image>
             <view>正在玩命加载...</view>
           </view>
-    <view class='list' wx:if='{{isShowBooklists == 1&&ApplyInfoList.length==0}}'>
-      <view class='Nodata'>
-          <image class="image-Nodata"src='../../../assets/nodata_1.png'></image>
-          <view class="text-Nodata">暂无新书申请记录</view>
-      </view>
-    </view>
-      <view class='list' wx:if='{{isShowBooklists == 0&&list.length==0}}'>
-      <view class='Nodata'>
-          <image class="image-Nodata"src='../../../assets/nodata_1.png'></image>
-          <view class="text-Nodata">暂无新书申请记录</view>
-      </view>
-    </view>
+            <template is='nodata' data='{{...nodataArray}}'  wx:if='{{isShowBooklists == 1&&ApplyInfoList.length==0}}'></template>
+              <template is='nodata' data='{{...nodataArray}}' wx:if='{{isShowBooklists == 0&&list.length==0}}'></template>
 
     <!-- wx:if='{{isreturn == 0 && arryIndex==1 && list.length > 0}}' -->
        <view class='list-down-tips' bindtap='sureDelete'wx:if='{{isShowBooklists == 3}}' >

president/pages/newbooks_apply_record/newbooks_apply_record.wxss

@@ -1,8 +1,11 @@
 /* president/pages/apply_bookLists/apply_booklists.wxss */
 @import '../../../templates/loading/loading.wxss';
+@import '../../../templates/nodata/nodata.wxss';
 .header {
-
-  padding: 24rpx 30rpx;
+font-size:30rpx;
+font-family:PingFang SC;
+font-weight:500;
+color:rgba(108,108,128,1);
 }
 .header-active {
   background: #fff;
@@ -19,6 +22,7 @@
 }
 .li-center-info{
   display: inline-block;
+  width: 100%;
 }
 .footer-box{
   height:5%;
@@ -194,12 +198,15 @@ color:rgba(0,183,255,1);
 .li-center {
   align-items: center;
   padding: 0 !important;
-   background: rgba(247, 247, 247, 0.984);
+ background:rgba(255,255,255,1);
 }
 .li-center-directory{
   align-items: center;
   padding: 40rpx 20rpx 40rpx 60rpx;
-  background: rgba(247, 247, 247, 0.984);
+  height:158rpx;
+  background:rgba(246,245,251,1);
+  border-radius:18rpx;
+
 
 }
 .cheack-info{

president/pages/pavilion_record/pavilion_record.wxss

@@ -5,7 +5,7 @@
 @import '../../../templates/loading/loading.wxss';
 .calendar_title{
   width: 70%; 
-  margin: 50rpx auto; 
+  margin: 10rpx auto; 
   justify-content: space-between;
   font-size: 34rpx;
   color: #41414C;
@@ -23,7 +23,7 @@
 /* 日历 */
 .calendar{
   width: 100%;
-  margin-top: 75rpx;
+  margin-top: 20rpx;
   background: #fff;
   border-bottom-right-radius: 20rpx;
   border-bottom-left-radius: 20rpx;
@@ -110,7 +110,7 @@
   padding:20rpx 30rpx;
 }
 .sign_in_leave{
-  margin:30rpx;
+  margin:20rpx 0rpx;
 }
 .sign__in_icon{
   width:50rpx;

president/pages/sign_leave_in/sign_leave_in.wxss

@@ -205,7 +205,7 @@ line-height:36rpx;
   height: 60rpx;
   line-height:60rpx;
   margin-bottom: 160rpx;
-  background-color: rgba(243, 239, 239, 0.984);
+  /* background-color: rgba(243, 239, 239, 0.984); */
 }
 .load-img{
   width: 40rpx;

project.config.json

@@ -9,8 +9,22 @@
 		"postcss": true,
 		"minified": true,
 		"newFeature": true,
+		"coverView": true,
 		"autoAudits": false,
-		"uglifyFileName": false
+		"showShadowRootInWxmlPanel": true,
+		"scopeDataCheck": false,
+		"uglifyFileName": false,
+		"checkInvalidKey": true,
+		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"babelSetting": {
+			"ignore": [],
+			"disablePlugins": [],
+			"outputPath": ""
+		},
+		"useIsolateContext": true,
+		"useCompilerModule": true,
+		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.9.1",

utils/api.js

@@ -135,6 +135,17 @@ export const DispatcherRecovery = fetchFn('/wxapi/reading/dispatcherRecovery')
 // 确认收入或者入库
 export const ConfirmRecovery = fetchFn('/wxapi/reading/confirmRecovery')
 
+
+// 图书调度员--根据扫码二维码获取书籍信息 (新增)
+export const ScanForBookDetail = fetchFn('/wxapi/reading/scanForBookDetail')
+
+// 图书调度员--解绑图书 (新增)
+export const RemoveBookLib = fetchFn('/wxapi/reading/removeBookLib')
+
+// 图书调度员--归还图书 (新增)
+export const BackBookLib = fetchFn('/wxapi/reading/backBookLib')
+
+
 // 书籍详情
 export const BookDetailView = fetchFn('/wxapi/readingcurator/bookDetailView')
 
@@ -308,3 +319,6 @@ export const SearchUserApplyList = fetchFn('/wxapi/readingcurator/userApplyList'
 
 // 馆内人员添加搜索
 export const CheckNext = fetchFn('/wxapi/readingcurator/checkNext')
+// 关于私塾家
+export const AboutSharingSchool = fetchFn('/api/problem/aboutSharingSchool')
+