合并分支 'wj' 到 'master'

Wj



查看合并请求 !18

 {
   "pages": [
-      "pages/yujing/yujingsearch/yujingsearch",
-    "pages/changqu/changqu",
-    
-    "pages/companybox/zhishudetail/member/member",
- 
-    "pages/mine/mine",
-    "pages/mine/changemima/changemima",
-    
-    "pages/mine/yijianfankui/yijianfankui",
     "pages/companybox/qiyeyuebao/qiyeyuebao",
-    "pages/companybox/defendetail/defendetail",
     "pages/companybox/zhishudetail/shebei/shebeidetail/shebeidetail",
     "pages/companybox/zhishudetail/shebei/shebeilist/shebeilist",
     "pages/companybox/qiyedetail/qiyedetail",
-    
+    "pages/companybox/zhishudetail/member/member",
     "pages/companybox/zhishudetail/car/car",
+     
+    "pages/companybox/defendetail/defendetail",
+    "pages/companybox/zhishudetail/chengpin/chengpin",
     "pages/companybox/zhishudetail/yuanliaomsg/yuanliao/yuanliao",
     "pages/qiye/qiye",
+    "pages/changqu/changqu",
+  
+    
+    "pages/companybox/zhishudetail/yuanliaomsg/yuanliaoDetail/yuanliaoDetail",
+    
     "pages/companybox/zhishudetail/qiyeyongdian/detail/detail",
     "pages/companybox/jichuxinxi/jichuxinxi",
     "pages/login/login",
+    "pages/mine/mine",
     "pages/index/index",
     "pages/logs/logs",
     "pages/yujing/yujing/yujing",
     "pages/companybox/zhishudetail/qiyeyongdian/qyyd/qyyd",
-    "pages/companybox/zhishudetail/chengpin/chengpin",
-    "pages/companybox/zhishudetail/yuanliaomsg/yuanliaoDetail/yuanliaoDetail",
     "pages/yujing/yujingSet/yujingSet/yujingSet",
     "pages/yujing/yujingSet/yujingAdd/yujingAdd",
     "pages/yujing/yujingSet/yujingType/yujingType",
     "pages/yujing/yujingSet/yujingPerson/yujingPerson",
     "pages/yujing/yujingDetail/yujingDetail",
-    "pages/yujing/yujingDetail/yujingRemark/yujingRemark"
-    
+    "pages/yujing/yujingDetail/yujingRemark/yujingRemark",
+    "pages/yujing/yujingDetail/yujingSucc/yujingSucc"
   ],
   "window": {
     "backgroundTextStyle": "light",

@@ -5,6 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    haveData:true,
     list:[
       {
         date:"2019/06/15  16:23:00",

@@ -2,15 +2,15 @@
 <view class="search">
   <view>预警信息</view>
   <view class="search_icon">
-    <image src='/img/search.png'></image>
+    <image src='{{haveData?"/img/search.png":"/img/noSearch.png"}}'></image>
   </view>
 </view>
-<view class="warn_msg" wx:for="{{list}}" wx:key="">
+<view class="warn_msg" wx:for="{{list}}" wx:key="" wx:if="{{haveData}}">
   <view class="warn_time">{{item.date}}</view>
   <view class="msg_detail">
     <view class="msg_box">
       <view class="detail_single detail_title">
-        <view class="{{item.type == 1?'detail_symbol':''}}" ></view>
+        <view class="{{item.type == 1?'detail_symbol':''}}"></view>
         <view>{{item.title}}</view>
       </view>
       <view class="detail_single">企业名称：{{item.name}}</view>
@@ -25,3 +25,9 @@
     </view>
   </view>
 </view>
+<view class="no_data" wx:if="{{!haveData}}">
+    <view class="no_icon">
+      <image src='/img/noData.png'></image>
+      <view class="no_tips">暂无数据~</view>
+    </view>
+</view>
\ No newline at end of file

@@ -88,3 +88,25 @@ page {
   width: 30rpx;
   height: 30rpx;
 }
+/* 无数据 */
+.no_data{
+  width: 100%;
+  height: 100%;
+  padding: 222rpx 0 400rpx;
+  background-color: #fff;
+  border-top: 1rpx solid #f5f5f5;
+}
+.no_icon{
+  width: 480rpx;
+  height: 486rpx;
+  margin: 0 auto;
+  position: relative
+}
+.no_tips{
+  position: absolute;
+  bottom: 70rpx;
+  left: 40%;
+  font-size: 24rpx;
+  color: #666;
+  z-index: 999;
+}

@@ -7,7 +7,11 @@ Page({
   data: {
 
   },
-
+  submit(){
+    wx.redirectTo({
+      url: '/pages/yujing/yujingDetail/yujingSucc/yujingSucc',
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */

 <!--pages/yujing/yujingDetail/yujingRemark/yujingRemark.wxml-->
 <view class="ramark_area">
-  <textarea></textarea>
+  <view class="reamrk_box">
+    <textarea placeholder='输入备注信息'></textarea>
+  </view>
 </view>
+<view class="submit_btn">
+  <view class="btn" bindtap='submit'>提交</view>
+</view>
\ No newline at end of file

 /* pages/yujing/yujingDetail/yujingRemark/yujingRemark.wxss */
-page{
-  background-color: #f5f5f5
+
+page {
+  background-color: #f5f5f5;
 }
-.ramark_area{
+
+.ramark_area {
   padding: 50rpx 30rpx;
 }
-textarea{
-  background-color:#fff;
+
+.reamrk_box {
   width: 100%;
-  border-radius: 10rpx; 
-}
\ No newline at end of file
+}
+
+textarea {
+  background-color: #fff;
+  width: 92%;
+  border-radius: 10rpx;
+  padding: 30rpx;
+  color: #b1b1b1;
+  font-size: 24rpx;
+}
+
+.submit_btn {
+  padding: 0 30rpx;
+}
+.btn{
+  text-align: center;
+  width: 100%;
+  height: 80rpx;
+  background: rgba(255, 206, 139, 1);
+  border-radius: 12rpx;
+  line-height: 80rpx;
+  color: #fff;
+  font-size: 32rpx;
+}

+// pages/yujing/yujingDetail/yujingSucc/yujingSucc.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+  goBack(){
+    wx.redirectTo({
+      url: '/pages/yujing/yujingDetail/yujingDetail',
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

+{
+  "navigationBarTextStyle": "black",
+  "navigationBarTitleText": "备注",
+  "usingComponents": {}
+}
\ No newline at end of file

+<!--pages/yujing/yujingDetail/yujingSucc/yujingSucc.wxml-->
+<view class="succ">
+  <view class="succ_icon">
+    <image src='/img/succ.png'></image>
+  </view>
+  <view>提交成功</view>
+</view>
+<view class="back" bindtap='goBack'>返回</view>
\ No newline at end of file

+/* pages/yujing/yujingDetail/yujingSucc/yujingSucc.wxss */
+
+.succ {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-around;
+  padding: 258rpx 0 367rpx;
+  border-top: 1rpx solid #f5f5f5;
+  font-size: 36rpx;
+  color: #333;
+}
+
+.succ_icon {
+  width: 185rpx;
+  height: 185rpx;
+  margin-bottom: 47rpx;
+}
+
+.back {
+  width: 260rpx;
+  height: 80rpx;
+  background: rgba(255, 148, 0, 1);
+  border-radius: 10px;
+  font-size: 30rpx;
+  line-height: 80rpx;
+  text-align: center;
+  color: rgba(255, 255, 255, 1);
+  margin:0 auto;
+}

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 11,
+			"current": 12,
 			"list": [
 				{
 					"id": -1,
@@ -122,6 +122,13 @@
 					"id": -1,
 					"name": "预警详情备注",
 					"pathName": "pages/yujing/yujingDetail/yujingRemark/yujingRemark",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "预警详情备注成功",
+					"pathName": "pages/yujing/yujingDetail/yujingSucc/yujingSucc",
 					"scene": null
 				}
 			]