Merge branch 'master' of http://121.37.83.100:3000/sooka_edyj/sooka_edyj_minapp

app.json

@@ -26,7 +26,14 @@
     "pages/notice/notice_details",
     "pages/material/material",
     "pages/denglu/denglu",
-    "pages/material/material_details"
+    "pages/material/details/material_details",
+    "pages/teamlist/teamlist",
+    "pages/teamlist/details/team_details",
+    "pages/warehouselist/warehouselist",
+    "pages/warehouselist/details/warehouse_details",
+    "pages/material/serch/material_serch",
+    "pages/warehouselist/serch/warehouse_serch",
+    "pages/teamlist/serch/team_serch"
  
   
   ],

app.wxss

@@ -130,7 +130,69 @@ page{
     margin-left: auto;
     font-size: 40rpx;
   }
+  .list_li3{
+    display: flex;
+    flex-direction: row;
+    height: auto;
+    line-height: 50rpx;
+    padding-bottom: 20rpx;
+    padding-top: 20rpx;
+    border-bottom: 1px solid #f2f2f2;
+  }
+  .list_li3:active{
+ background-color: rgb(255, 247, 243);
 
+  }
+  .list_li3 .li_tit{
+    overflow: hidden;
+white-space: nowrap;
+text-overflow: ellipsis;
+font-size: 34rpx;
+color: #181818;
+text-align: left;
+  }
+  .list_li3 .li_time{
+    font-size: 29rpx;
+color: #666;
+  }
+  .list_li3 .li_time text{
+    margin-right: 40rpx;
+  }
+  .list_li3 .notice_li{
+    width: 80%;
+    display: flex;
+    flex-direction: column;
+  }
+  .list_li3 .icon-tongzhigonggao{
+    font-size: 50rpx;
+    color: rgb(238, 148, 125);
+    width: 10%;
+  }
+  .list_li3  .list_right{
+    width: 10%;
+    text-align: right;
+    font-size:70rpx ;
+    line-height: 100rpx;
+    color:rgb(238, 238, 238);
+  }
+  .list_li3 .iconfont{
+    margin-right: 0px!important;
+  }
+  .list_li3 .icon-wuzichubei{
+    font-size: 50rpx;
+    color: rgb(125, 238, 163);
+    width: 10%;
+  }
+  .list_li3 .icon-cangkukucun{
+    font-size: 50rpx;
+    color: rgb(125, 196, 238);
+    width: 10%;
+  }
+  .list_li3 .icon-dangjian_duiwujianshe{
+    font-size: 50rpx;
+    color: rgb(238, 217, 125);
+    width: 10%;
+  }
   /* 暂无数据 */
 .zwsj{
   font-size: 260rpx!important;
@@ -182,4 +244,40 @@ page{
 }
 .float_btn2:active{
   background-color: #f1c120;
+}
+
+/* 列表详情 */
+
+.notice_tit{
+  font-size: 32rpx;
+color: #181818;
+text-align: left;
+display: flex;
+flex-direction: column;
+}
+.notice_tit .tit{
+  color: #f94b0e;
+  list-style: circle;
+  font-size: 34rpx;
+  font-weight: 500;
+  height: 60rpx;
+  line-height: 60rpx;
+  margin-bottom: 30rpx;
+}
+
+.notice_tit .bor{
+  width: 92%;
+  padding: 3% 4%;
+  box-shadow: 0px 0px 10rpx #e9e9e9;
+  border-radius: 14rpx;
+  margin-bottom: 30rpx;
+}
+.notice_tit .icon-weibiaoti--{
+  font-size: 36rpx;
+  color: #ffaa8a;
+  margin-right: 14rpx;
+}
+.notice_tit .icon-dian{
+  font-size: 38rpx;
+  color: #f94b0e;
 }

base/httputil.js

@@ -5,7 +5,7 @@
 
 
 
-//  let BASE_Server = "https://192.168.1.100:18080"
+  //let BASE_Server = "https://192.168.1.100:18080"
 let BASE_Server = "https://sookajs.top:18080"
 
 let app = getApp()

iconfont.wxss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3264694 */
-  src: url('//at.alicdn.com/t/c/font_3264694_gxhod5vh9pc.woff2?t=1672883976549') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3264694_gxhod5vh9pc.woff?t=1672883976549') format('woff'),
-       url('//at.alicdn.com/t/c/font_3264694_gxhod5vh9pc.ttf?t=1672883976549') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_3264694_dnngszco0u.woff2?t=1673329063637') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3264694_dnngszco0u.woff?t=1673329063637') format('woff'),
+       url('//at.alicdn.com/t/c/font_3264694_dnngszco0u.ttf?t=1673329063637') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-route-fill:before {
+  content: "\e680";
+}
+
+.icon-luxianchaxun:before {
+  content: "\e623";
+}
+
+.icon-weibiaoti--:before {
+  content: "\e611";
+}
+
+.icon-tongzhigonggao:before {
+  content: "\e65e";
+}
+
 .icon-yunongtongqingchuhuancun:before {
   content: "\e638";
 }

pages/index/index.js

@@ -98,6 +98,18 @@ Page({
       url: '../material/material',
     })
   },
+  //队伍跳转
+  bindViewDuiWu() {
+    wx.navigateTo({
+      url: '../teamlist/teamlist',
+    })
+  },
+  //仓库跳转
+  bindViewCangKu() {
+    wx.navigateTo({
+      url: '../warehouselist/warehouselist',
+    })
+  },
   // 新手指南跳转
   bindViewNewComer() {
     wx.navigateTo({
@@ -197,6 +209,10 @@ Page({
       this.bindViewGengDuo()
     } else if (name == "bindViewWuZi") {
       this.bindViewWuZi()
+    } else if (name == "bindViewDuiWu") {
+      this.bindViewDuiWu()
+    } else if (name == "bindViewCangKu") {
+      this.bindViewCangKu()
     }
   },
 
@@ -209,7 +225,7 @@ Page({
   },
 
   initIndexPageSuccess(res) {
-    
+
     if (res.code == 200) {
       this.setData({
         xunjianImgCount: res.data.xunjianImgCount,

pages/index/index.wxml

@@ -52,7 +52,7 @@
 
   <!-- 通知公告 -->
   <view class="tzgg">
-    <image class="img" src="{{host}}/images/xcx_lb.png" />
+  <view class="img"><image src="{{host}}/images/xcx_lb.png" /></view>
     <!-- <b>[待办]</b> -->
     <text>{{NoticeTitle}}</text>
     <view class="more" data-fun="bindViewGengDuo" bindtap="init_userInfo">更多></view>
@@ -107,13 +107,13 @@
       </view>
         <text>物资</text>
       </view>
-      <view class="icon_vi">
+      <view class="icon_vi" bindtap="bindViewCangKu">
         <view class="icon_bg icon_ck">
         <i class="iconfont icon-cangkukucun"></i>
       </view>
         <text>仓库</text>
       </view>
-      <view class="icon_vi">
+      <view class="icon_vi" bindtap="bindViewDuiWu">
         <view class="icon_bg icon_dw">
         <i class="iconfont icon-dangjian_duiwujianshe"></i>
       </view>

pages/index/index.wxss

@@ -167,23 +167,35 @@ background: none;
   border-bottom: 2px solid #eee;
 }
 .tzgg .img{
- width: 60rpx;
- height: 60rpx;
+ width: 10%;
  margin-right: 20rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
 }
+.tzgg .img image{
+  width: 60rpx;
+  height: 60rpx;
+ }
 .tzgg b{
   font-size: 32rpx;
   color: #181818;
   padding-right: 5rpx;
  }
 .tzgg text{
+  width: 75%;
   font-size: 32rpx;
   color: #181818;
+  overflow: hidden;
+white-space: nowrap;
+text-overflow: ellipsis;
  }
 .tzgg .more{
+  width: 15%;
   margin-left:auto;
   font-size: 28rpx;
   color: #7b7b7b;
+  text-align: right;
  }
  .con_banner .img{
    height: auto;

pages/material/details/material_details.wxml

@@ -0,0 +1,62 @@
+<!-- 物资详情页面 -->
+<view class="container">
+  <view class="notice_tit">
+
+  <view class="tit"><i class="iconfont icon-dian"></i>物资名称</view>
+    <view class="bor">
+  <i>{{materialName}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>所属仓库名称</view>
+    <view class="bor">
+  <i>{{enterpriseDetails.warehouseName}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>负责人</view>
+    <view class="bor">
+  <i>{{connector}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>联系电话</view>
+    <view class="bor">
+    <i class="iconfont icon-weibiaoti--"></i>
+  <i class="phone" bindtap="Call">{{connectorPhone}}</i>
+
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>创建人</view>
+    <view class="bor">
+  <i>{{createBy}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>生产日期</view>
+    <view class="bor">
+  <i>{{productionDate}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>技术状况</view>
+    <view class="bor">
+  <i>{{technology}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>品牌、型号</view>
+    <view class="bor">
+  <i>{{materialParms}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>主要功能和用途</view>
+    <view class="bor">
+  <i>{{purpose}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>物资类型</view>
+    <view class="bor">
+  <i>{{materialType}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>数量</view>
+    <view class="bor">
+  <i>{{num}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>备注</view>
+    <view class="bor">
+  <i>{{remark}}</i>
+  </view>
+<!-- <view class="phone" bindtap="Call">
+  <span>负责人电话：</span>
+  <i>{{enterpriseDetails.mainPersonPhone}}</i>
+</view> -->
+
+</view>
+</view>
+

pages/material/details/material_details.wxss

@@ -0,0 +1,46 @@
+/* pages/material/material_details.wxss */
+.container{
+  margin: 30rpx 30rpx;
+}
+.notice_tit{
+  font-size: 32rpx;
+color: #181818;
+text-align: left;
+display: flex;
+flex-direction: column;
+}
+.tit{
+  color: #f94b0e;
+  list-style: circle;
+  font-size: 34rpx;
+  font-weight: 500;
+  height: 60rpx;
+  line-height: 60rpx;
+  margin-bottom: 30rpx;
+}
+.notice_tit_s{
+  display: flex;
+  flex-direction: column;
+  align-items: left;
+  padding-bottom: 40rpx;
+}
+.notice_tit_s i{
+  font-size: 32rpx;
+  color: #181818;
+}
+.bor{
+  width: 92%;
+  padding: 3% 4%;
+  box-shadow: 0px 0px 10rpx #e9e9e9;
+  border-radius: 14rpx;
+  margin-bottom: 30rpx;
+}
+.icon-weibiaoti--{
+  font-size: 36rpx;
+  color: #ffaa8a;
+  margin-right: 14rpx;
+}
+.icon-dian{
+  font-size: 38rpx;
+  color: #f94b0e;
+}

pages/material/material.js

@@ -28,7 +28,7 @@ Page({
     let obj = new Object()
     obj.pageNum = this.data.pageNum
     obj.pageSize = 10
-    obj.reasonable= false
+    obj.reasonable = false
     http.send_get("/system/AppMaterialController/geMaterialList", obj, this.getQiyeEnterpriseListSuccess)
 
 
@@ -36,59 +36,59 @@ Page({
 
   getQiyeEnterpriseListSuccess(res) {
 
-console.log("@@@@",res)
-if(res.code==200){
-     // 显示加载图标
-     wx.showLoading({
-      title: '玩命加载中',
-    })
-    var that = this
-
-    if(res.data.rows.length==0){
-      wx.showToast({
-        title: '暂无更多数据',
-        icon:"none"
-      })
-    }
-    if (this.data.isRefresh) {
-      this.setData({
-        enterpriseList: res.data.rows,
-        total: res.data.total
+    console.log("@@@@", res)
+    if (res.code == 200) {
+      // 显示加载图标
+      wx.showLoading({
+        title: '玩命加载中',
       })
-
-
-
-      // 隐藏导航栏加载框
-      setTimeout(function () {
-        that.setData({
-          loadingData: false
-        });
-        wx.hideNavigationBarLoading();
-        // 停止下拉动作
-        wx.stopPullDownRefresh();
-        wx.hideLoading()
-
-      }, 1000)
-
+      var that = this
+
+      if (res.data.rows.length == 0) {
+        wx.showToast({
+          title: '暂无更多数据',
+          icon: "none"
+        })
+      }
+      if (this.data.isRefresh) {
+        this.setData({
+          enterpriseList: res.data.rows,
+          total: res.data.total
+        })
+
+
+
+        // 隐藏导航栏加载框
+        setTimeout(function () {
+          that.setData({
+            loadingData: false
+          });
+          wx.hideNavigationBarLoading();
+          // 停止下拉动作
+          wx.stopPullDownRefresh();
+          wx.hideLoading()
+
+        }, 1000)
+
+      } else {
+        this.setData({
+          enterpriseList: this.data.enterpriseList.concat(res.data.rows)
+        })
+        // 隐藏加载框
+
+        setTimeout(function () {
+          that.setData({
+            hidden: true,
+            loadingData: false
+          });
+
+          wx.hideLoading();
+        }, 1000)
+
+      }
     } else {
-      this.setData({
-        enterpriseList: this.data.enterpriseList.concat(res.data.rows)
-      })
-      // 隐藏加载框
-
-      setTimeout(function () {
-        that.setData({
-          hidden: true,
-          loadingData: false
-        });
-
-        wx.hideLoading();
-      }, 1000)
-
+      console.log("@@!", "请求失败")
     }
-  }else{
-    console.log("@@!","请求失败")
-  }
   },
   onPullDownRefresh: function () {
     // 显示顶部刷新图标
@@ -110,7 +110,7 @@ if(res.code==200){
   onReachBottom: function () {
     let that = this
     var loadingData = that.data.loadingData
-   
+
     var hidden = that.data.hidden
     // 页数+1
     that.setData({
@@ -131,13 +131,13 @@ if(res.code==200){
       loadingData: true
     });
 
-    
+
     //console.log("@@@@"+Math.ceil(this.data.total/10))
-   // if(Math.ceil(that.data.total/10)>=that.data.pageNum){
-      that.loadData();
-  
+    // if(Math.ceil(that.data.total/10)>=that.data.pageNum){
+    that.loadData();
+
     // }else{
-     
+
     //   setTimeout(function () {
     //     that.setData({
     //       hidden: true,
@@ -146,18 +146,23 @@ if(res.code==200){
     //   }, 2000)
     // }
 
-   
-  },
 
+  },
 
+  // 搜索结果跳页
+  bindViewSearchEnd() {
+    wx.navigateTo({
+      url: '../material/serch/material_serch'
+    })
+  },
   bindViewDetails(e) {
     let material_details = e.currentTarget.dataset.index
-   
- 
 
- 
+
+
+
     wx.navigateTo({
-      url: '../material/material_details?details='+JSON.stringify(material_details)
+      url: '../material/details/material_details?details=' + JSON.stringify(material_details)
     })
   }
 })

pages/material/material.wxml

@@ -12,11 +12,18 @@
   </view>
   <!-- 列表 -->
 <view class="list_vi">
-    <view class="list_li" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
+    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
       <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
       <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
-      <text>{{item.materialName}}</text>
-      <text>{{item.connector}}</text>
+      <i class="iconfont icon-wuzichubei"></i>
+      <view class="notice_li">
+      
+      <view class="li_tit">{{item.materialName}}</view>
+      <view class="li_time">
+      <text>所属仓库:{{item.warehouseName}}</text>
+      </view>
+      </view>
+  
       <i class="iconfont icon-xiangyou list_right"></i>
     </view>
 </view>

pages/material/material_details copy.wxml

@@ -1,32 +0,0 @@
-<view class="container">
-  <view>
-        <span>标题：</span>
-        <i>{{noticeTitle}}</i>
-      </view>
-      <view>
-        <span>时间：</span>
-        <i>{{noticeTime}}</i>
-      </view>
-      <view>
-        <span>作者：</span>
-        <i>{{noticeBy}}</i>
-      </view>
-
-      <view>
-        <span>类型：</span>
-        <i>{{noticeType=='1'?'通知':'公告'}}</i>
-      </view>
-      <view>
-        <span>内容：</span>
-        <i>{{noticeContent}}</i>
-      </view>
-
-</view>
-
-
-
-
-
-
-
-

pages/material/material_details.wxml

@@ -1,61 +0,0 @@
-<!-- 物资详情页面 -->
-<view class="container">
-<view class="map_view">
-
-
-
-<view>
-  <span>物资名称：</span>
-  <i>{{materialName}}</i>
-</view>
-<view>
-  <span>所属仓库名称：</span>
-  <i>{{enterpriseDetails.warehouseName}}</i>
-</view>
-<view>
-  <span>负责人：</span>
-  <i>{{connector}}</i>
-</view>
- <view class="phone" bindtap="Call"></view>>
-  <span>联系电话：</span>
-  <i>{{connectorPhone}}</i>
-</view>
-<view>
-  <span>创建人：</span>
-  <i>{{createBy}}</i>
-</view>
-<view>
-  <span>生产日期：</span>
-  <i>{{productionDate}}</i>
-</view>
-<view>
-  <span>技术状况：</span>
-  <i>{{technology}}</i>
-</view>
-<view>
-  <span>品牌、型号：</span>
-  <i>{{materialParms}}</i>
-</view>
-<view>
-  <span>主要功能和用途：</span>
-  <i>{{purpose}}</i>
-</view>
-<view>
-  <span>物资类型：</span>
-  <i>{{materialType}}</i>
-</view>
-<!-- <view class="phone" bindtap="Call">
-  <span>负责人电话：</span>
-  <i>{{enterpriseDetails.mainPersonPhone}}</i>
-</view> -->
-<view>
-  <span>数量：</span>
-  <i>{{num}}</i>
-</view>
-<view>
-  <span>备注：</span>
-  <i>{{remark}}</i>
-</view>
-
-</view>
-

pages/material/serch/material_serch.js

@@ -0,0 +1,49 @@
+import http from '../../../base/httputil'
+const app = getApp()
+Page({
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    host: app.globalData.host,
+    materialList: [],
+  },
+  onLoad() {
+   // this.list(null)
+  },
+  // 搜索结果跳页
+  bindViewSearchEnd() {
+    // wx.navigateTo({
+      // url: '../search/search'
+    // })
+  },
+  // 物资详情页
+  bindViewDetails(e) {
+    let material_details = e.currentTarget.dataset.index
+
+    wx.navigateTo({
+      url: '../details/material_details?details=' + JSON.stringify(material_details)
+    })
+  },
+
+  searchEnterprise(e) {
+    var obj = new Object()
+    obj.materialName = e.detail.value
+    
+    this.list(obj)
+  },
+
+  list(data) {
+    http.send_get("/system/AppMaterialController/geMaterialList", data, this.getMaterListSuccess)
+  },
+
+  getMaterListSuccess(res) {
+    console.log("!!!!",res.data.rows.length)
+    this.setData({
+      materialList: res.data.rows
+    })
+
+
+  }
+
+})

pages/material/serch/material_serch.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {},
+  "navigationBarBackgroundColor": "#f94b0e",
+    "navigationBarTextStyle": "white",
+    "navigationBarTitleText": "搜索结果"
+}

pages/material/serch/material_serch.wxml

@@ -0,0 +1,33 @@
+<view class="container">
+  <!-- 搜索 -->
+  <view class="search-container">
+    <view class="search-left">
+      <input type="text" bindinput="searchEnterprise" placeholder="搜索" />
+    </view>
+    <button bindtap="bindViewSearchEnd" class="search-right">
+      <text class="iconfont icon-sousuo"></text>
+    </button>
+  </view>
+
+  <!-- 列表 -->
+  <view class="list_vi">
+    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{materialList}}" wx:key="index" data-index="{{item}}">
+      <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
+      <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
+      <i class="iconfont icon-wuzichubei"></i>
+      <view class="notice_li">
+      
+      <view class="li_tit">{{item.materialName}}</view>
+      <view class="li_time">
+      <text>{{item.connector}}</text>
+      </view>
+      </view>
+  
+      <i class="iconfont icon-xiangyou list_right"></i>
+    </view>
+</view>
+
+
+
+
+</view>

pages/material/serch/material_serch.wxss

@@ -0,0 +1 @@
+/* pages/material/serch/material_serch.wxss */

pages/me/me.wxss

@@ -22,8 +22,8 @@
   height: 100rpx;
 }
 .wd_img{
-  width: 160rpx;
-  height: 160rpx;
+  width: 130rpx;
+  height: 130rpx;
   border-radius: 50%;
   display: flex;
   align-items: center;

pages/notice/notice.wxml

@@ -4,10 +4,19 @@
 
 <!-- 列表 -->
 <view class="list_vi">
-    <view class="list_li" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
+    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
       <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
       <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
-      <text>{{item.noticeTitle}}</text>
+      <i class="iconfont icon-tongzhigonggao"></i>
+      <view class="notice_li">
+      
+      <view class="li_tit">{{item.noticeTitle}}</view>
+      <view class="li_time">
+      <text>发布人:{{item.createBy}}</text>
+      <text>{{item.createTime}}</text>
+      </view>
+      </view>
+  
       <i class="iconfont icon-xiangyou list_right"></i>
     </view>
     <view class='data-loading' hidden='{{hidden}}'>

pages/notice/notice.wxss

@@ -44,4 +44,4 @@
   background-color: #fff;
   text-align: center;
   font-size: 14px;
-}
+}

pages/notice/notice_details.wxml

@@ -1,22 +1,23 @@
 <view class="container">
-  <view>
-        <span>标题：</span>
+  <view class="notice_tit">
         <i>{{noticeTitle}}</i>
       </view>
-      <view>
-        <span>时间：</span>
-        <i>{{noticeTime}}</i>
-      </view>
-      <view>
-        <span>作者：</span>
-        <i>{{noticeBy}}</i>
-      </view>
 
-      <view>
-        <span>类型：</span>
+      <view class="notice_tit_s">
+    
         <i>{{noticeType=='1'?'通知':'公告'}}</i>
+   
+
+        <i>{{noticeBy}}</i>
+     
+        <i>{{noticeTime}}</i>
+       
+
       </view>
-      <view>
+     
+
+      
+      <view class="notice_new">
         <span>内容：</span>
         <i>{{noticeContent}}</i>
       </view>

pages/notice/notice_details.wxss

@@ -1 +1,30 @@
-/* pages/notice/notice_details.wxss */
+/* pages/notice/notice_details.wxss */
+.container{
+  margin: 30rpx 30rpx;
+}
+.notice_tit{
+  font-size: 40rpx;
+font-weight: 500;
+color: #181818;
+text-align: center;
+margin-bottom: 30rpx;
+padding-top: 20rpx;
+line-height: 60rpx;
+}
+
+.notice_tit_s{
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  font-size: 30rpx;
+  color: #c9c9c9;
+  align-items: center;
+  padding-bottom: 40rpx;
+  border-bottom: 1rpx solid rgb(240, 240, 240);
+  margin-bottom: 40rpx;
+}
+.notice_new{
+  font-size: 32rpx;
+  color: #181818;
+  line-height: 66rpx;
+}

pages/teamlist/details/team_details.js

@@ -0,0 +1,112 @@
+// pages/material/material_details.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    charger: "",
+    createBy: "",
+    createTime: "",
+
+    deptName: "",
+    emergencyPhone: "",
+    equipmentNum: "",
+    goodat: "",
+
+    remark: "",
+    searchValue: "",
+    teamCategory: "",
+
+    teamName: "",
+    teamNature: "",
+    teamPnum: "",
+    teamPos: ""
+
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    let details = JSON.parse(options.details)
+    this.setData({
+      charger: details.charger,
+      createBy: details.createBy,
+      createTime: details.createTime,
+  
+      deptName: details.deptName,
+      emergencyPhone: details.emergencyPhone,
+      equipmentNum: details.equipmentNum,
+      goodat: details.goodat,
+  
+      remark: details.remark,
+      searchValue:details.searchValue,
+      teamCategory: details.teamCategory,
+  
+      teamName: details.teamName,
+      teamNature: details.teamNature,
+      teamPnum: details.teamPnum,
+      teamPos: details.teamPos
+  
+
+    })
+
+  },
+  //拨打电话
+  Call() {
+    console.log("@@##" + this.data.connectorPhone)
+    wx.makePhoneCall({
+      phoneNumber: this.data.connectorPhone
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/teamlist/details/team_details.json

@@ -0,0 +1,13 @@
+{
+  "component": true, 
+  "usingComponents": {
+    
+  },
+
+
+  "navigationBarBackgroundColor": "#f94b0e",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "队伍详情"
+
+}
+

pages/teamlist/details/team_details.wxml

@@ -0,0 +1,56 @@
+<!-- 队伍详情页面 -->
+<view class="container">
+  <view class="notice_tit">
+
+  <view class="tit"><i class="iconfont icon-dian"></i>队伍名称</view>
+    <view class="bor">
+  <i>{{teamName}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>队伍分类</view>
+    <view class="bor">
+  <i>{{teamCategory}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>队伍性质</view>
+    <view class="bor">
+  <i>{{teamNature}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>队伍人数</view>
+    <view class="bor">
+  <i>{{teamPnum}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>核心装备及数量</view>
+    <view class="bor">
+  <i>{{equipmentNum}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>部门名称</view>
+    <view class="bor">
+  <i>{{deptName}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>负责人</view>
+    <view class="bor">
+  <i>{{charger}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>应急联系人及电话</view>
+    <view class="bor">
+  <i>{{emergencyPhone}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>所在地点</view>
+    <view class="bor">
+  <i>{{teamPos}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>备注</view>
+    <view class="bor">
+  <i>{{remark}}</i>
+  </view>
+
+
+</view>
+</view>
+
+
+<!-- <view class="phone" bindtap="Call">
+  <span>负责人电话：</span>
+  <i>{{enterpriseDetails.mainPersonPhone}}</i>
+</view> -->
+
+

pages/teamlist/details/team_details.wxss

@@ -0,0 +1,4 @@
+/* pages/material/material_details.wxss */
+.container{
+  margin: 30rpx 30rpx;
+}

pages/teamlist/serch/team_serch.js

@@ -0,0 +1,50 @@
+import http from '../../../base/httputil'
+const app = getApp()
+Page({
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    host: app.globalData.host,
+    teamList: [],
+  },
+  onLoad() {
+   // this.list(null)
+  },
+  // 搜索结果跳页
+  bindViewSearchEnd() {
+    // wx.navigateTo({
+      // url: '../search/search'
+    // })
+  },
+  // 企业详细页
+  bindViewDetails(e) {
+    let warehouse_details = e.currentTarget.dataset.index
+
+    wx.navigateTo({
+      url: '../details/team_details?details=' + JSON.stringify(warehouse_details)
+    })
+  },
+
+  searchEnterprise(e) {
+    var obj = new Object()
+    obj.teamName = e.detail.value
+    
+    this.list(obj)
+  },
+
+  list(data) {
+    http.send_get("/system/AppTeamController/getTeamList", data, this.getTeamListSuccess)
+  },
+
+  getTeamListSuccess(res) {
+  
+    console.log("$$$",res)
+    this.setData({
+      teamList: res.data.rows
+    })
+
+
+  }
+
+})

pages/teamlist/serch/team_serch.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {},
+  "navigationBarBackgroundColor": "#f94b0e",
+    "navigationBarTextStyle": "white",
+    "navigationBarTitleText": "搜索结果"
+}

pages/teamlist/serch/team_serch.wxml

@@ -0,0 +1,33 @@
+<view class="container">
+  <!-- 搜索 -->
+  <view class="search-container">
+    <view class="search-left">
+      <input type="text" bindinput="searchEnterprise" placeholder="搜索" />
+    </view>
+    <button bindtap="bindViewSearchEnd" class="search-right">
+      <text class="iconfont icon-sousuo"></text>
+    </button>
+  </view>
+
+  <!-- 列表 -->
+  <view class="list_vi">
+    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{teamList}}" wx:key="index" data-index="{{item}}">
+      <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
+      <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
+      <i class="iconfont icon-dangjian_duiwujianshe"></i>
+      <view class="notice_li">
+      
+      <view class="li_tit">{{item.teamName}}</view>
+      <view class="li_time">
+      <text>负责人:{{item.charger}}</text>
+      </view>
+      </view>
+  
+      <i class="iconfont icon-xiangyou list_right"></i>
+    </view>
+</view>
+
+
+
+
+</view>

pages/teamlist/serch/team_serch.wxss

@@ -0,0 +1 @@
+/* pages/material/serch/material_serch.wxss */

pages/teamlist/teamlist.js

@@ -0,0 +1,169 @@
+import http from '../../base/httputil'
+const app = getApp()
+
+Page({
+  data: {
+
+    /**
+     * 控制上拉到底部时是否出现 "数据加载中..."
+     */
+    hidden: true,
+    /**
+     * 数据是否正在加载中，避免数据多次加载
+     */
+    loadingData: false,
+    enterpriseList: [],
+    isRefresh: true,
+    total: 0,
+    pageNum: 1 // 页码
+  },
+  onLoad: function () {
+    // wx.showLoading({
+    //   title: '加载中'
+    // })
+    this.loadData()
+  },
+  //加载数据
+  loadData: function () {
+    let obj = new Object()
+    obj.pageNum = this.data.pageNum
+    obj.pageSize = 10
+    obj.reasonable= false
+    http.send_get("/system/AppTeamController/getTeamList", obj, this.getQiyeEnterpriseListSuccess)
+
+
+  },
+
+  getQiyeEnterpriseListSuccess(res) {
+
+console.log("@@@@",res)
+if(res.code==200){
+     // 显示加载图标
+     wx.showLoading({
+      title: '玩命加载中',
+    })
+  
+    var that = this
+
+    if(res.data.rows.length==0){
+      wx.showToast({
+        title: '暂无更多数据',
+        icon:"none"
+      })
+      wx.hideLoading()
+    }
+    if (this.data.isRefresh) {
+      this.setData({
+        enterpriseList: res.data.rows,
+        total: res.data.total
+      })
+
+
+
+      // 隐藏导航栏加载框
+      setTimeout(function () {
+        that.setData({
+          loadingData: false
+        });
+        wx.hideNavigationBarLoading();
+        // 停止下拉动作
+        wx.stopPullDownRefresh();
+        wx.hideLoading()
+
+      }, 1000)
+
+    } else {
+      this.setData({
+        enterpriseList: this.data.enterpriseList.concat(res.data.rows)
+      })
+      // 隐藏加载框
+
+      setTimeout(function () {
+        that.setData({
+          hidden: true,
+          loadingData: false
+        });
+
+        wx.hideLoading();
+      }, 1000)
+
+    }
+  }else{
+    console.log("@@!","请求失败")
+  }
+  },
+  onPullDownRefresh: function () {
+    // 显示顶部刷新图标
+    wx.showNavigationBarLoading();
+    var that = this;
+    var loadingData = this.data.loadingData
+    if (loadingData) {
+      return;
+    }
+    that.setData({
+      pageNum: 1,
+      isRefresh: true
+    })
+    this.loadData()
+  },
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    let that = this
+    var loadingData = that.data.loadingData
+   
+    var hidden = that.data.hidden
+    // 页数+1
+    that.setData({
+      pageNum: that.data.pageNum + 1,
+      isRefresh: false
+    })
+    if (hidden) {
+      that.setData({
+        hidden: false
+      });
+      console.info(that.data.hidden);
+    }
+
+    if (loadingData) {
+      return;
+    }
+    that.setData({
+      loadingData: true
+    });
+
+    
+    //console.log("@@@@"+Math.ceil(this.data.total/10))
+   // if(Math.ceil(that.data.total/10)>=that.data.pageNum){
+      that.loadData();
+  
+    // }else{
+     
+    //   setTimeout(function () {
+    //     that.setData({
+    //       hidden: true,
+    //     });
+
+    //   }, 2000)
+    // }
+
+   
+  },
+
+
+  bindViewDetails(e) {
+    let teamlist_details = e.currentTarget.dataset.index
+   
+    wx.navigateTo({
+      url: '../teamlist/details/team_details?details='+JSON.stringify(teamlist_details)
+    })
+  },
+   // 搜索结果跳页
+   bindViewSearchEnd() {
+    wx.navigateTo({
+      url:'../teamlist/serch/team_serch'
+   
+    })
+  },
+})

pages/teamlist/teamlist.json

@@ -0,0 +1,14 @@
+{
+  "component": true, 
+  "usingComponents": {
+  },
+
+
+  "navigationBarBackgroundColor": "#f94b0e",
+  "navigationBarTextStyle": "white",
+  "enablePullDownRefresh": true,
+  "onPullDownRefresh": true,
+  "onReachBottom": true,
+  "navigationBarTitleText": "救援队伍"
+
+}

pages/teamlist/teamlist.wxml

@@ -0,0 +1,40 @@
+<!--pages/teamlist/teamlist.wxml-->
+<!-- 队伍列表页面 -->
+<view class="container">
+  <!-- 搜索 -->
+  <view class="search-container">
+    <view class="search-left">
+      <input type="text" bindtap="bindViewSearchEnd" placeholder="搜索" />
+    </view>
+    <button bindtap="bindViewSearchEnd" class="search-right">
+      <text class="iconfont icon-sousuo"></text>
+    </button>
+  </view>
+  <!-- 列表 -->
+  <view class="list_vi">
+    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
+      <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
+      <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
+      <i class="iconfont icon-dangjian_duiwujianshe"></i>
+      <view class="notice_li">
+      
+      <view class="li_tit">{{item.teamName}}</view>
+      <view class="li_time">
+      <text>负责人:{{item.charger}}</text>
+      </view>
+      </view>
+  
+      <i class="iconfont icon-xiangyou list_right"></i>
+    </view>
+</view>
+    <view class='data-loading' hidden='{{hidden}}'>
+    数据加载中...
+  </view>
+    </view>
+
+
+
+
+
+
+

pages/teamlist/teamlist.wxss

@@ -0,0 +1,47 @@
+.qy_con {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  text-align: center;
+  margin: 30rpx 30rpx;
+}
+
+.qy_con view {
+  height: 140rpx;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  padding: 15rpx 40rpx;
+  position: relative;
+}
+
+.qy_con view image {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  height: 100%;
+  z-index: -1;
+}
+
+.qy_con view h2 {
+  font-size: 58rpx;
+  font-weight: bolder;
+  padding-top: 10rpx;
+}
+
+.qy_con view p {
+  font-size: 35rpx;
+}
+
+.icon-jiahao {
+  font-size: 60rpx;
+}
+
+.data-loading {
+  height: 100rpx;
+  line-height: 100rpx;
+  background-color: #fff;
+  text-align: center;
+  font-size: 14px;
+}

pages/warehouselist/details/warehouse_details.js

@@ -0,0 +1,116 @@
+// pages/material/material_details.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    latitude: "",
+    longitude: "",
+    deptName: "",
+    warehouseName: "",
+    warehouseId:"",
+    remark: "",
+//标记点
+markers: [{
+  id: 0,
+  name: "编程小石头",
+ 
+  latitude: 43.8691319,
+  longitude: 125.3504459,
+  width: 35,
+  height: 50
+}]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+    let details = JSON.parse(options.details)
+    this.setData({
+      warehouseName:details.warehouseName,
+      warehouseId:details.warehouseId,
+      latitude: details.latitude,
+      longitude: details.longitude,
+      deptName: details.deptName,
+      remark: details.remark,
+      markers: [{
+        id: details.warehouseId,
+        name: details.warehouseName,
+      
+        latitude: Number(details.latitude),
+        longitude: Number(details.longitude),
+        width: 35,
+        height: 50
+      }]
+
+    })
+
+  },
+ //导航
+ navRoad() {
+ // console.log("%%%",event)
+  let that=this
+  wx.getLocation({ //获取当前经纬度
+    type: 'wgs84', //返回可以用于wx.openLocation的经纬度，
+    success: function (res) {
+      wx.openLocation({ //​使用微信内置地图查看位置。
+        latitude: Number(that.data.latitude), //要去的纬度-地址
+        longitude: Number(that.data.longitude), //要去的经度-地址
+        name: that.data.warehouseName,
+        address: that.data.warehouseName
+      })
+    }
+  })
+},
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/warehouselist/details/warehouse_details.json

@@ -0,0 +1,13 @@
+{
+  "component": true, 
+  "usingComponents": {
+    
+  },
+
+
+  "navigationBarBackgroundColor": "#f94b0e",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "队伍详情"
+
+}
+

pages/warehouselist/details/warehouse_details.wxml

@@ -0,0 +1,44 @@
+<!-- 企业详情页面 -->
+<view class="container">
+  <view class="map">
+    <map longitude="{{longitude}}" latitude="{{latitude}}" scale="17" markers="{{markers}}" data-marker="{{markers[0]}}" show-location />
+
+    <!-- <view class="map_btn">
+    <text class="iconfont icon-wenjianguanli" bindtap="bindViewXunChaJiLu"></text>
+    <text class="iconfont icon-icon-test" bindtap="bindViewQiYeXiangQingTable"></text>
+    <text class="iconfont icon-pinleishanchu" bindtap="bindViewQiYeDelete"></text>
+    </view> -->
+
+
+
+    <view class="map_view">
+
+
+
+      <view>
+        <span>经度：</span>
+        <i>{{longitude}}</i>
+      </view>
+      <view>
+        <span>纬度：</span>
+        <i>{{latitude}}</i>
+      </view>
+      <view>
+        <span>仓库名称：</span>
+        <i>{{warehouseName}}</i>
+      </view>
+      <view>
+        <span>部门名称：</span>
+        <i>{{deptName}}</i>
+      </view>
+      <view>
+        <span>备注：</span>
+        <i>{{remark}}</i>
+      </view>
+      
+  </view>
+  </view>
+
+  <view class="float_btn" style="bottom: 280rpx;" bindtap="navRoad"><i class="iconfont icon-route-fill"></i></view>
+
+</view>

pages/material/material_details.wxss

@@ -57,3 +57,6 @@ word-wrap:break-word
   display: none;
 }
 
+.icon-route-fill {
+  font-size: 50rpx;
+}

pages/warehouselist/serch/warehouse_serch.js

@@ -0,0 +1,49 @@
+import http from '../../../base/httputil'
+const app = getApp()
+Page({
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    host: app.globalData.host,
+    warehouseList: [],
+  },
+  onLoad() {
+   // this.list(null)
+  },
+  // 搜索结果跳页
+  bindViewSearchEnd() {
+    // wx.navigateTo({
+      // url: '../search/search'
+    // })
+  },
+  // 企业详细页
+  bindViewDetails(e) {
+    let warehouse_details = e.currentTarget.dataset.index
+
+    wx.navigateTo({
+      url: '../details/warehouse_details?details=' + JSON.stringify(warehouse_details)
+    })
+  },
+
+  searchEnterprise(e) {
+    var obj = new Object()
+    obj.warehouseName = e.detail.value
+    
+    this.list(obj)
+  },
+
+  list(data) {
+    http.send_get("/system/AppWarehouseController/getWarehouseList", data, this.getWareHouseListSuccess)
+  },
+
+  getWareHouseListSuccess(res) {
+  
+    this.setData({
+      warehouseList: res.data.rows
+    })
+
+
+  }
+
+})

pages/warehouselist/serch/warehouse_serch.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {},
+  "navigationBarBackgroundColor": "#f94b0e",
+    "navigationBarTextStyle": "white",
+    "navigationBarTitleText": "搜索结果"
+}

pages/warehouselist/serch/warehouse_serch.wxml

@@ -0,0 +1,32 @@
+<view class="container">
+  <!-- 搜索 -->
+  <view class="search-container">
+    <view class="search-left">
+      <input type="text" bindinput="searchEnterprise" placeholder="搜索" />
+    </view>
+    <button bindtap="bindViewSearchEnd" class="search-right">
+      <text class="iconfont icon-sousuo"></text>
+    </button>
+  </view>
+
+  <!-- 列表 -->
+  <view class="list_vi">
+    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{warehouseList}}" wx:key="index" data-index="{{item}}">
+      <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
+      <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
+      <i class="iconfont icon-cangkukucun"></i>
+      <view class="notice_li">
+      
+      <view class="li_tit">{{item.warehouseName}}</view>
+      <view class="li_time">
+      <text>部门名称:{{item.deptName}}</text>
+      </view>
+      </view>
+      <i class="iconfont icon-xiangyou list_right"></i>
+    </view>
+</view>
+
+
+
+
+</view>

pages/warehouselist/serch/warehouse_serch.wxss

@@ -0,0 +1 @@
+/* pages/material/serch/material_serch.wxss */

pages/warehouselist/warehouselist.js

@@ -0,0 +1,172 @@
+import http from '../../base/httputil'
+const app = getApp()
+
+Page({
+  data: {
+
+    /**
+     * 控制上拉到底部时是否出现 "数据加载中..."
+     */
+    hidden: true,
+    /**
+     * 数据是否正在加载中，避免数据多次加载
+     */
+    loadingData: false,
+    enterpriseList: [],
+    isRefresh: true,
+    total: 0,
+    pageNum: 1 // 页码
+  },
+  onLoad: function () {
+    // wx.showLoading({
+    //   title: '加载中'
+    // })
+    this.loadData()
+  },
+  //加载数据
+  loadData: function () {
+    let obj = new Object()
+    obj.pageNum = this.data.pageNum
+    obj.pageSize = 10
+    obj.reasonable= false
+    http.send_get("/system/AppWarehouseController/getWarehouseList", obj, this.getQiyeEnterpriseListSuccess)
+
+
+  },
+
+  getQiyeEnterpriseListSuccess(res) {
+
+console.log("@@@@",res)
+if(res.code==200){
+     // 显示加载图标
+     wx.showLoading({
+      title: '玩命加载中',
+    })
+  
+    var that = this
+
+    if(res.data.rows.length==0){
+      wx.showToast({
+        title: '暂无更多数据',
+        icon:"none"
+      })
+      wx.hideLoading()
+    }
+    if (this.data.isRefresh) {
+      this.setData({
+        enterpriseList: res.data.rows,
+        total: res.data.total
+      })
+
+
+
+      // 隐藏导航栏加载框
+      setTimeout(function () {
+        that.setData({
+          loadingData: false
+        });
+        wx.hideNavigationBarLoading();
+        // 停止下拉动作
+        wx.stopPullDownRefresh();
+        wx.hideLoading()
+
+      }, 1000)
+
+    } else {
+      this.setData({
+        enterpriseList: this.data.enterpriseList.concat(res.data.rows)
+      })
+      // 隐藏加载框
+
+      setTimeout(function () {
+        that.setData({
+          hidden: true,
+          loadingData: false
+        });
+
+        wx.hideLoading();
+      }, 1000)
+
+    }
+  }else{
+    console.log("@@!","请求失败")
+  }
+  },
+  onPullDownRefresh: function () {
+    // 显示顶部刷新图标
+    wx.showNavigationBarLoading();
+    var that = this;
+    var loadingData = this.data.loadingData
+    if (loadingData) {
+      return;
+    }
+    that.setData({
+      pageNum: 1,
+      isRefresh: true
+    })
+    this.loadData()
+  },
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    let that = this
+    var loadingData = that.data.loadingData
+   
+    var hidden = that.data.hidden
+    // 页数+1
+    that.setData({
+      pageNum: that.data.pageNum + 1,
+      isRefresh: false
+    })
+    if (hidden) {
+      that.setData({
+        hidden: false
+      });
+      console.info(that.data.hidden);
+    }
+
+    if (loadingData) {
+      return;
+    }
+    that.setData({
+      loadingData: true
+    });
+
+    
+    //console.log("@@@@"+Math.ceil(this.data.total/10))
+   // if(Math.ceil(that.data.total/10)>=that.data.pageNum){
+      that.loadData();
+  
+    // }else{
+     
+    //   setTimeout(function () {
+    //     that.setData({
+    //       hidden: true,
+    //     });
+
+    //   }, 2000)
+    // }
+
+   
+  },
+
+
+  bindViewDetails(e) {
+    let teamlist_details = e.currentTarget.dataset.index
+   
+ 
+
+ 
+    wx.navigateTo({
+      url: '../warehouselist/details/warehouse_details?details='+JSON.stringify(teamlist_details)
+    })
+  },
+   // 搜索结果跳页
+   bindViewSearchEnd() {
+    wx.navigateTo({
+      url:'../warehouselist/serch/warehouse_serch'
+   
+    })
+  },
+})

pages/warehouselist/warehouselist.json

@@ -0,0 +1,14 @@
+{
+  "component": true, 
+  "usingComponents": {
+  },
+
+
+  "navigationBarBackgroundColor": "#f94b0e",
+  "navigationBarTextStyle": "white",
+  "enablePullDownRefresh": true,
+  "onPullDownRefresh": true,
+  "onReachBottom": true,
+  "navigationBarTitleText": "仓库"
+
+}

pages/warehouselist/warehouselist.wxml

@@ -0,0 +1,40 @@
+<!--pages/teamlist/teamlist.wxml-->
+<!-- 队伍列表页面 -->
+<view class="container">
+  <!-- 搜索 -->
+  <view class="search-container">
+    <view class="search-left">
+      <input type="text" bindtap="bindViewSearchEnd" placeholder="搜索" />
+    </view>
+    <button bindtap="bindViewSearchEnd" class="search-right">
+      <text class="iconfont icon-sousuo"></text>
+    </button>
+  </view>
+  <!-- 列表 -->
+  <view class="list_vi">
+    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
+      <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
+      <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
+      <i class="iconfont icon-cangkukucun"></i>
+      <view class="notice_li">
+      
+      <view class="li_tit">{{item.warehouseName}}</view>
+      <view class="li_time">
+      <text>部门名称:{{item.deptName}}</text>
+      </view>
+      </view>
+      <i class="iconfont icon-xiangyou list_right"></i>
+    </view>
+</view>
+    <view class='data-loading' hidden='{{hidden}}'>
+    数据加载中...
+  </view>
+    </view>
+
+    
+
+
+
+
+
+

pages/warehouselist/warehouselist.wxss

@@ -0,0 +1,56 @@
+map{
+  height: 40vh;
+  width: 100vw;
+}
+.map{
+  height: 40vh;
+  width: 100vw;
+  position: relative;
+}
+.map canvas{
+  width:100%;
+  height: 100%;
+}
+.map_view{
+  margin: 30rpx 30rpx;
+}
+.map_view view{
+  display: flex;
+  flex-direction: row;
+  font-size: 34rpx;
+  line-height: 50rpx;
+  padding-bottom: 10rpx;
+}
+.map_view view span{
+  width: 240rpx;
+  text-align: right;
+  color: #181818;
+}
+.map_view view i{
+ color: rgb(146, 146, 146);
+ white-space:normal;
+word-break:break-all;
+word-wrap:break-word
+}
+.map_btn{
+  background: rgba(0, 0, 0, 0.479);
+  display: flex;
+  flex-direction: row;
+  width: 220rpx;
+  height: 70rpx;
+  position: absolute;
+  right:20rpx;
+  bottom:20rpx;
+  z-index: 99999;
+  border-radius: 50rpx;
+  justify-content: space-evenly;
+  align-items: center;
+}
+.map_btn .iconfont{
+  color: #fff;
+  font-size: 50rpx;
+}
+.logo-text{
+  display: none;
+}
+