解决冲突，合并代码

app.json

@@ -22,9 +22,11 @@
     "pages/xunjiancz/xunjiancz",
     "pages/qianming/qianming",
     "pages/xunjianmore/xunjianmore",
-    "pages/notice/notice"
+    "pages/notice/notice",
+    "pages/material/material",
+    "pages/denglu/denglu"
+  
   ],
-
   "requiredPrivateInfos": [
     "getLocation"
   ],

pages/denglu/denglu.js

@@ -0,0 +1,66 @@
+// pages/denglu/denglu.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/denglu/denglu.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {},
+  "navigationBarBackgroundColor": "#f57c2a",
+  "navigationStyle": "custom",
+  "navigationBarTextStyle": "white"
+}

pages/denglu/denglu.wxml

@@ -0,0 +1,25 @@
+<!--pages/denglu/denglu.wxml-->
+<!-- 自定义顶部栏 -->
+<view class="nav-bar">
+ <image src="../images/top_nav_04.png"  class="nav-bar-img"/>
+<view class="nav-barback" ></view>
+</view>
+<!-- 占位，高度与顶部栏一样 -->
+<view style="height:450rpx;"></view>
+<view class="container">
+<view class="bg">
+  <image src="../images/top_nav_06.png" class="img" mode="widthFix" />
+  <view class="dl_tit">登录</view>
+</view>
+
+  <!-- 中间内容 -->
+  <view class="form_con">
+    <view class="form_vi">
+      <input class="weui-input"  placeholder="请输入用户名"/>
+      <input class="weui-input" password type="text" placeholder="这是一个密码输入框" />
+      <button type="" class="dl_btn">登录</button>
+      <button type="" class="qx_btn">取消</button>
+    </view>
+  </view>
+  <view class="btm_tit">长春市二道应急局</view>
+</view>

pages/denglu/denglu.wxss

@@ -0,0 +1,115 @@
+/* pages/denglu/denglu.wxss */
+page{
+  /* background: linear-gradient(#f94b0e,#fff); */
+  background: #fff;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+
+}
+.img {
+  width: 100%;
+}
+
+.container{
+  border-radius: 45rpx;
+  display: flex;
+  margin-top: -100rpx;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+/* 导航 */
+.nav-bar {
+  position: fixed;
+  width: 100%;
+  top: 0;
+  color: rgb(255, 255, 255);
+  /* background: rgb(255, 255, 255); */
+  z-index: 10000;
+  height: 160rpx;
+  text-align: center;
+  
+  }
+  .nav-barback{
+    width: 100%;
+  position: relative;
+  top: 0;
+  z-index: 10001;
+  height: 160rpx;
+  line-height: 230rpx;
+  color: #fff;
+  font-size: 38rpx;
+  }
+  .nav-bar-img{
+    width: 100%;
+    height: 100%;
+  }
+  .nav-bar .search {
+  width: 60%;
+  color: #333;
+  font-size: 14px;
+  background: #fff;
+  position: absolute;
+  border-radius: 100px;
+  background: rgb(255, 255, 255);
+  padding-left: 14px;
+  z-index: 10002;
+  }
+ 
+.bg{
+  height: 500rpx;
+  position: absolute;
+  top:0rpx;
+  width: 100%;
+  z-index: -1;
+}
+.bg .img{
+  height: auto;
+  margin-top: 158rpx;
+}
+.dl_tit{
+  font-size: 50rpx;
+  color: #fff;
+  position: absolute;
+  top:230rpx;
+  left: 10%;
+  z-index: 2;
+  font-weight: 500;
+}
+.form_con{
+  background: #fff;
+width: 78%;
+margin: 0px auto;
+border-radius: 30rpx;
+padding: 10% 6% 14% 6%;
+box-shadow: 0rpx 0rpx 16rpx #ffe9e3;
+}
+.form_con input{
+  height: 120rpx;
+  line-height: 120rpx;
+  padding-left: 10rpx;
+  border-bottom: 1px solid rgb(228, 228, 228);
+  margin-bottom: 30rpx;
+}
+.form_con .dl_btn{
+margin-top: 120rpx;
+width: 100%!important;
+border-radius: 50rpx;
+background-color:#f85220 ;
+color: #fff;
+padding: 24rpx 0rpx;
+}
+.form_con .qx_btn{
+  margin-top: 50rpx;
+  width: 100%!important;
+  border-radius: 50rpx;
+  color: rgb(158, 158, 158);
+  padding: 24rpx 0rpx;
+  }
+.btm_tit{
+  font-size: 30rpx;
+  position: fixed;
+  bottom: 10%;
+  color: #a1a1a1;
+}

pages/details/details.js

@@ -7,9 +7,11 @@ Page({
 
   onLoad(e) {
     this.data.busEnterpriseId = e.busEnterpriseId
+  },
+  onShow(){
+    console.log("TAG","onShow")
     this.getEnterpriseDetails()
   },
-
   data: {
     host: app.globalData.host,
     busEnterpriseId: null,
@@ -107,5 +109,30 @@ Page({
       url: '../qiyexqtable/qiyexqtable?busEnterpriseId='+this.data.busEnterpriseId,
     })
     },
-
+    bindViewQiYeDelete(){
+        wx.showModal({
+          title: '提示',
+          content: '确认删除企业？',
+          complete: (res) => {
+            if (res.cancel) {
+              
+            }else {
+              this.deleteEnterprise()
+            }
+          }
+        })
+    },
+    deleteEnterprise() {
+      let obj = new Object();
+      obj.busEnterpriseId = this.data.busEnterpriseId
+      http.post("/system/AppEnterpriseController/deleteEnterprise", obj, this.deleteEnterpriseSuccess)
+    },
+    deleteEnterpriseSuccess(res) {
+      wx.showToast({
+        title: res.msg,
+      })
+      if(res.code == 200){
+        wx.navigateBack()
+      }
+    },
 })

pages/details/details.wxml

@@ -1,8 +1,12 @@
+<!-- 企业详情页面 -->
 <view class="container">
   <view class="map">
     <map longitude="{{enterpriseDetails.longitude}}" latitude="{{enterpriseDetails.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>
+    <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>
 
 

pages/index/index.js

@@ -59,9 +59,9 @@ Page({
 
   // 待办跳转
   bindViewDaiBan() {
-    wx.navigateTo({
-      url: '../daiban/daiban'
-    })
+    // wx.navigateTo({
+      // url: '../daiban/daiban'
+    // })
   },
   // 企业跳转
   bindViewQiYe() {
@@ -89,9 +89,9 @@ Page({
   },
   //巡检跳转
   bindViewXunJian() {
-    wx.navigateTo({
-      url: '../xunjian/xunjian',
-    })
+    // wx.navigateTo({
+      // url: '../xunjian/xunjian',
+    // })
   },
   // 使用攻略跳转
   bindViewIntroduction() {

pages/material/material.js

@@ -0,0 +1,66 @@
+// pages/material/material.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    dataList:[],
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    getDataList();
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/material/material.json

@@ -0,0 +1,11 @@
+{
+  "component": true, 
+  "usingComponents": {
+  },
+
+
+  "navigationBarBackgroundColor": "#f94b0e",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "物资"
+
+}

pages/material/material.wxml

@@ -0,0 +1,24 @@
+<!--pages/material/material.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_li" bindtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-enterpriseid="{{item.busEnterpriseId}}">
+      <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.businessName}}</text>
+      <i class="iconfont icon-xiangyou list_right"></i>
+    </view>
+
+  </view>
+    
+</view>

pages/material/material.wxss

@@ -0,0 +1,35 @@
+/* pages/material/material.wxss */.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;
+}

pages/qiye/qiye.js

@@ -6,7 +6,11 @@ Page({
    * 组件的初始数据
    */
   onLoad() {
-    this.initQiyePage()
+  
+  },
+  onShow(){
+    console.log("TAG","onShow");
+  this.initQiyePage()
   },
   data: {
     host: app.globalData.host,

pages/qiye/qiye.wxml

@@ -1,3 +1,4 @@
+<!-- 企业列表页面 -->
 <view class="container">
   <!-- 搜索 -->
   <view class="search-container">

pages/qiyemore/qiyemore.js

@@ -88,9 +88,10 @@ Page({
       icon: "none" 
     })
     if(e.code == 200){
-      wx.navigateTo({
-        url: '../qiye/qiye',
-      })
+      // wx.navigateTo({
+        // url: '../qiye/qiye',
+      // })
+      wx.navigateBack()
     }
   },
 

pages/qiyemore/qiyemore.wxml

@@ -1,4 +1,5 @@
 <!--pages/qiyemore/qiyemore.wxml-->
+<!-- 企业新增页面 -->
 <view class="container">
   <view class="page-section">
     <view class="input_vi">

pages/qiyexqtable/qiyexqtable.js

@@ -96,9 +96,10 @@ Page({
       title: res.msg,
     })
     if(res.code == 200){
-      wx.navigateTo({
-        url: '../details/details?busEnterpriseId=' + this.busEnterpriseId,
-      })
+      wx.navigateBack()
+      // wx.navigateTo({
+        // url: '../details/details?busEnterpriseId=' + this.busEnterpriseId,
+      // })
     }
   },
   deleteEnterprise() {

pages/qiyexqtable/qiyexqtable.wxml

@@ -1,4 +1,5 @@
 <!--pages/qiyexqtable/qiyexqtanle.wxml-->
+<!-- 企业编辑页面 -->
 <view class="container">
   <view class="page-section">
     <view class="input_vi">
@@ -56,7 +57,7 @@
   </view>
 
   <view class="table_btn">
-    <button type="warn" class="sc_btn" bindtap="deleteEnterprise">删除</button>
+    <!-- <button type="warn" class="sc_btn" bindtap="deleteEnterprise">删除</button> -->
 
     <button type="primary" class="tj_btn" bindtap="updateEnterprise">提交</button>
   </view>

pages/search/search.js

@@ -13,9 +13,9 @@ Page({
   },
   // 搜索结果跳页
   bindViewSearchEnd() {
-    wx.navigateTo({
-      url: '../search/search'
-    })
+    // wx.navigateTo({
+      // url: '../search/search'
+    // })
   },
   // 企业详细页
   bindViewDetails(e) {