队伍 物资 仓库详情新建details文件夹

app.json

@@ -26,11 +26,11 @@
     "pages/notice/notice_details",
     "pages/material/material",
     "pages/denglu/denglu",
-    "pages/material/material_details",
+    "pages/material/details/material_details",
     "pages/teamlist/teamlist",
-    "pages/teamlist/team_details",
+    "pages/teamlist/details/team_details",
     "pages/warehouselist/warehouselist",
-    "pages/warehouselist/warehouse_details"
+    "pages/warehouselist/details/warehouse_details"
  
   
   ],

pages/index/index.js

@@ -100,8 +100,8 @@ Page({
       url: '../material/material',
     })
   },
-   //队伍跳转
-   bindViewDuiWu() {
+  //队伍跳转
+  bindViewDuiWu() {
     wx.navigateTo({
       url: '../teamlist/teamlist',
     })
@@ -211,9 +211,9 @@ Page({
       this.bindViewGengDuo()
     } else if (name == "bindViewWuZi") {
       this.bindViewWuZi()
-    }else if(name=="bindViewDuiWu"){
+    } else if (name == "bindViewDuiWu") {
       this.bindViewDuiWu()
-    }else if(name=="bindViewCangKu"){
+    } else if (name == "bindViewCangKu") {
       this.bindViewCangKu()
     }
   },
@@ -227,7 +227,7 @@ Page({
   },
 
   initIndexPageSuccess(res) {
-    
+
     if (res.code == 200) {
       this.setData({
         xunjianImgCount: res.data.xunjianImgCount,

pages/material/material.js

@@ -157,7 +157,7 @@ if(res.code==200){
 
  
     wx.navigateTo({
-      url: '../material/material_details?details='+JSON.stringify(material_details)
+      url: '../material/details/material_details?details='+JSON.stringify(material_details)
     })
   }
 })

pages/teamlist/teamlist.js

@@ -159,7 +159,7 @@ if(res.code==200){
 
  
     wx.navigateTo({
-      url: '../teamlist/team_details?details='+JSON.stringify(teamlist_details)
+      url: '../teamlist/details/team_details?details='+JSON.stringify(teamlist_details)
     })
   }
 })

pages/warehouselist/details/warehouse_details.js

@@ -0,0 +1,115 @@
+// 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(event) {
+  console.log(event)
+  wx.getLocation({ //获取当前经纬度
+    type: 'wgs84', //返回可以用于wx.openLocation的经纬度，
+    success: function (res) {
+      wx.openLocation({ //​使用微信内置地图查看位置。
+        latitude: event.currentTarget.dataset.marker.latitude, //要去的纬度-地址
+        longitude: event.currentTarget.dataset.marker.longitude, //要去的经度-地址
+        name: event.currentTarget.dataset.marker.name,
+        address: event.currentTarget.dataset.marker.address
+      })
+    }
+  })
+},
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/warehouselist/details/warehouse_details.wxml

@@ -0,0 +1,41 @@
+<!-- 企业详情页面 -->
+<view class="container">
+  <view class="map">
+    <map longitude="{{longitude}}" latitude="{{latitude}}" scale="17" markers="{{markers}}" bindmarkertap="navRoad" 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>

pages/warehouselist/warehouse_details.js

@@ -1,112 +0,0 @@
-// 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/warehouselist/warehouse_details.wxml

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

pages/warehouselist/warehouselist.js

@@ -29,7 +29,7 @@ Page({
     obj.pageNum = this.data.pageNum
     obj.pageSize = 10
     obj.reasonable= false
-    http.send_get("/system/AppTeamController/getTeamList", obj, this.getQiyeEnterpriseListSuccess)
+    http.send_get("/system/AppWarehouseController/getWarehouseList", obj, this.getQiyeEnterpriseListSuccess)
 
 
   },
@@ -159,7 +159,7 @@ if(res.code==200){
 
  
     wx.navigateTo({
-      url: '../teamlist/team_details?details='+JSON.stringify(teamlist_details)
+      url: '../warehouselist/details/warehouse_details?details='+JSON.stringify(teamlist_details)
     })
   }
 })

pages/warehouselist/warehouselist.wxml

@@ -15,7 +15,7 @@
     <view class="list_li" 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.teamName}}</text>
+      <text>{{item.warehouseName}}</text>
       
       <i class="iconfont icon-xiangyou list_right"></i>
     </view>

pages/warehouselist/warehouselist.wxss

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