miniprogram / appui · 提交

转到一个项目

作者 lihongjuan
提交 ec7f5fbb4edf020e41986eb60df3503e772368a8 2 个父辈 e1cabbfa fca99a4b

Merge branch 'master' of http://114.215.101.231:8099/miniprogram/appui into lhj 

# Conflicts:
#	app.json
内嵌 并排对比
正在显示 15 个修改的文件 包含 205 行增加 和 25 行删除
1 { 1 {
2 "pages": [ 2 "pages": [
3 - "pages/yujing/yujingsearch/yujingsearch",  
4 - "pages/changqu/changqu",  
5 -  
6 - "pages/companybox/zhishudetail/member/member",  
7 -  
8 - "pages/mine/mine",  
9 - "pages/mine/changemima/changemima",  
10 -  
11 - "pages/mine/yijianfankui/yijianfankui",  
12 "pages/companybox/qiyeyuebao/qiyeyuebao", 3 "pages/companybox/qiyeyuebao/qiyeyuebao",
13 - "pages/companybox/defendetail/defendetail",  
14 "pages/companybox/zhishudetail/shebei/shebeidetail/shebeidetail", 4 "pages/companybox/zhishudetail/shebei/shebeidetail/shebeidetail",
15 "pages/companybox/zhishudetail/shebei/shebeilist/shebeilist", 5 "pages/companybox/zhishudetail/shebei/shebeilist/shebeilist",
16 "pages/companybox/qiyedetail/qiyedetail", 6 "pages/companybox/qiyedetail/qiyedetail",
  7 + "pages/companybox/zhishudetail/member/member",
17 "pages/companybox/zhishudetail/car/car", 8 "pages/companybox/zhishudetail/car/car",
  9 +
  10 + "pages/companybox/defendetail/defendetail",
  11 + "pages/companybox/zhishudetail/chengpin/chengpin",
18 "pages/companybox/zhishudetail/yuanliaomsg/yuanliao/yuanliao", 12 "pages/companybox/zhishudetail/yuanliaomsg/yuanliao/yuanliao",
19 "pages/qiye/qiye", 13 "pages/qiye/qiye",
  14 + "pages/changqu/changqu",
  15 +
  16 +
  17 + "pages/companybox/zhishudetail/yuanliaomsg/yuanliaoDetail/yuanliaoDetail",
  18 +
20 "pages/companybox/zhishudetail/qiyeyongdian/detail/detail", 19 "pages/companybox/zhishudetail/qiyeyongdian/detail/detail",
21 "pages/companybox/jichuxinxi/jichuxinxi", 20 "pages/companybox/jichuxinxi/jichuxinxi",
22 "pages/login/login", 21 "pages/login/login",
  22 + "pages/mine/mine",
23 "pages/index/index", 23 "pages/index/index",
24 "pages/logs/logs", 24 "pages/logs/logs",
25 "pages/yujing/yujing/yujing", 25 "pages/yujing/yujing/yujing",
26 "pages/companybox/zhishudetail/qiyeyongdian/qyyd/qyyd", 26 "pages/companybox/zhishudetail/qiyeyongdian/qyyd/qyyd",
27 - "pages/companybox/zhishudetail/chengpin/chengpin",  
28 - "pages/companybox/zhishudetail/yuanliaomsg/yuanliaoDetail/yuanliaoDetail",  
29 "pages/yujing/yujingSet/yujingSet/yujingSet", 27 "pages/yujing/yujingSet/yujingSet/yujingSet",
30 "pages/yujing/yujingSet/yujingAdd/yujingAdd", 28 "pages/yujing/yujingSet/yujingAdd/yujingAdd",
31 "pages/yujing/yujingSet/yujingType/yujingType", 29 "pages/yujing/yujingSet/yujingType/yujingType",
32 "pages/yujing/yujingSet/yujingPerson/yujingPerson", 30 "pages/yujing/yujingSet/yujingPerson/yujingPerson",
33 "pages/yujing/yujingDetail/yujingDetail", 31 "pages/yujing/yujingDetail/yujingDetail",
34 - "pages/yujing/yujingDetail/yujingRemark/yujingRemark"  
35 - 32 + "pages/yujing/yujingDetail/yujingRemark/yujingRemark",
  33 + "pages/yujing/yujingDetail/yujingSucc/yujingSucc"
36 ], 34 ],
37 "window": { 35 "window": {
38 "backgroundTextStyle": "light", 36 "backgroundTextStyle": "light",
@@ -5,6 +5,7 @@ Page({ @@ -5,6 +5,7 @@ Page({
5 * 页面的初始数据 5 * 页面的初始数据
6 */ 6 */
7 data: { 7 data: {
  8 + haveData:true,
8 list:[ 9 list:[
9 { 10 {
10 date:"2019/06/15 16:23:00", 11 date:"2019/06/15 16:23:00",
@@ -2,15 +2,15 @@ @@ -2,15 +2,15 @@
2 <view class="search"> 2 <view class="search">
3 <view>预警信息</view> 3 <view>预警信息</view>
4 <view class="search_icon"> 4 <view class="search_icon">
5 - <image src='/img/search.png'></image> 5 + <image src='{{haveData?"/img/search.png":"/img/noSearch.png"}}'></image>
6 </view> 6 </view>
7 </view> 7 </view>
8 -<view class="warn_msg" wx:for="{{list}}" wx:key=""> 8 +<view class="warn_msg" wx:for="{{list}}" wx:key="" wx:if="{{haveData}}">
9 <view class="warn_time">{{item.date}}</view> 9 <view class="warn_time">{{item.date}}</view>
10 <view class="msg_detail"> 10 <view class="msg_detail">
11 <view class="msg_box"> 11 <view class="msg_box">
12 <view class="detail_single detail_title"> 12 <view class="detail_single detail_title">
13 - <view class="{{item.type == 1?'detail_symbol':''}}" ></view> 13 + <view class="{{item.type == 1?'detail_symbol':''}}"></view>
14 <view>{{item.title}}</view> 14 <view>{{item.title}}</view>
15 </view> 15 </view>
16 <view class="detail_single">企业名称：{{item.name}}</view> 16 <view class="detail_single">企业名称：{{item.name}}</view>
@@ -25,3 +25,9 @@ @@ -25,3 +25,9 @@
25 </view> 25 </view>
26 </view> 26 </view>
27 </view> 27 </view>
  28 +<view class="no_data" wx:if="{{!haveData}}">
  29 + <view class="no_icon">
  30 + <image src='/img/noData.png'></image>
  31 + <view class="no_tips">暂无数据~</view>
  32 + </view>
  33 +</view>
@@ -88,3 +88,25 @@ page { @@ -88,3 +88,25 @@ page {
88 width: 30rpx; 88 width: 30rpx;
89 height: 30rpx; 89 height: 30rpx;
90 } 90 }
  91 +/* 无数据 */
  92 +.no_data{
  93 + width: 100%;
  94 + height: 100%;
  95 + padding: 222rpx 0 400rpx;
  96 + background-color: #fff;
  97 + border-top: 1rpx solid #f5f5f5;
  98 +}
  99 +.no_icon{
  100 + width: 480rpx;
  101 + height: 486rpx;
  102 + margin: 0 auto;
  103 + position: relative
  104 +}
  105 +.no_tips{
  106 + position: absolute;
  107 + bottom: 70rpx;
  108 + left: 40%;
  109 + font-size: 24rpx;
  110 + color: #666;
  111 + z-index: 999;
  112 +}
@@ -7,7 +7,11 @@ Page({ @@ -7,7 +7,11 @@ Page({
7 data: { 7 data: {
8 8
9 }, 9 },
10 - 10 + submit(){
  11 + wx.redirectTo({
  12 + url: '/pages/yujing/yujingDetail/yujingSucc/yujingSucc',
  13 + })
  14 + },
11 /** 15 /**
12 * 生命周期函数--监听页面加载 16 * 生命周期函数--监听页面加载
13 */ 17 */
1 <!--pages/yujing/yujingDetail/yujingRemark/yujingRemark.wxml--> 1 <!--pages/yujing/yujingDetail/yujingRemark/yujingRemark.wxml-->
2 <view class="ramark_area"> 2 <view class="ramark_area">
3 - <textarea></textarea> 3 + <view class="reamrk_box">
  4 + <textarea placeholder='输入备注信息'></textarea>
  5 + </view>
  6 +</view>
  7 +<view class="submit_btn">
  8 + <view class="btn" bindtap='submit'>提交</view>
4 </view> 9 </view>
1 /* pages/yujing/yujingDetail/yujingRemark/yujingRemark.wxss */ 1 /* pages/yujing/yujingDetail/yujingRemark/yujingRemark.wxss */
2 -page{  
3 - background-color: #f5f5f5 2 +
  3 +page {
  4 + background-color: #f5f5f5;
4 } 5 }
5 -.ramark_area{ 6 +
  7 +.ramark_area {
6 padding: 50rpx 30rpx; 8 padding: 50rpx 30rpx;
7 } 9 }
8 -textarea{  
9 - background-color:#fff; 10 +
  11 +.reamrk_box {
10 width: 100%; 12 width: 100%;
  13 +}
  14 +
  15 +textarea {
  16 + background-color: #fff;
  17 + width: 92%;
11 border-radius: 10rpx; 18 border-radius: 10rpx;
  19 + padding: 30rpx;
  20 + color: #b1b1b1;
  21 + font-size: 24rpx;
  22 +}
  23 +
  24 +.submit_btn {
  25 + padding: 0 30rpx;
  26 +}
  27 +.btn{
  28 + text-align: center;
  29 + width: 100%;
  30 + height: 80rpx;
  31 + background: rgba(255, 206, 139, 1);
  32 + border-radius: 12rpx;
  33 + line-height: 80rpx;
  34 + color: #fff;
  35 + font-size: 32rpx;
12 } 36 }
  1 +// pages/yujing/yujingDetail/yujingSucc/yujingSucc.js
  2 +Page({
  3 +
  4 + /**
  5 + * 页面的初始数据
  6 + */
  7 + data: {
  8 +
  9 + },
  10 + goBack(){
  11 + wx.redirectTo({
  12 + url: '/pages/yujing/yujingDetail/yujingDetail',
  13 + })
  14 + },
  15 + /**
  16 + * 生命周期函数--监听页面加载
  17 + */
  18 + onLoad: function (options) {
  19 +
  20 + },
  21 +
  22 + /**
  23 + * 生命周期函数--监听页面初次渲染完成
  24 + */
  25 + onReady: function () {
  26 +
  27 + },
  28 +
  29 + /**
  30 + * 生命周期函数--监听页面显示
  31 + */
  32 + onShow: function () {
  33 +
  34 + },
  35 +
  36 + /**
  37 + * 生命周期函数--监听页面隐藏
  38 + */
  39 + onHide: function () {
  40 +
  41 + },
  42 +
  43 + /**
  44 + * 生命周期函数--监听页面卸载
  45 + */
  46 + onUnload: function () {
  47 +
  48 + },
  49 +
  50 + /**
  51 + * 页面相关事件处理函数--监听用户下拉动作
  52 + */
  53 + onPullDownRefresh: function () {
  54 +
  55 + },
  56 +
  57 + /**
  58 + * 页面上拉触底事件的处理函数
  59 + */
  60 + onReachBottom: function () {
  61 +
  62 + },
  63 +
  64 + /**
  65 + * 用户点击右上角分享
  66 + */
  67 + onShareAppMessage: function () {
  68 +
  69 + }
  70 +})
  1 +{
  2 + "navigationBarTextStyle": "black",
  3 + "navigationBarTitleText": "备注",
  4 + "usingComponents": {}
  5 +}
  1 +<!--pages/yujing/yujingDetail/yujingSucc/yujingSucc.wxml-->
  2 +<view class="succ">
  3 + <view class="succ_icon">
  4 + <image src='/img/succ.png'></image>
  5 + </view>
  6 + <view>提交成功</view>
  7 +</view>
  8 +<view class="back" bindtap='goBack'>返回</view>
  1 +/* pages/yujing/yujingDetail/yujingSucc/yujingSucc.wxss */
  2 +
  3 +.succ {
  4 + display: flex;
  5 + flex-direction: column;
  6 + align-items: center;
  7 + justify-content: space-around;
  8 + padding: 258rpx 0 367rpx;
  9 + border-top: 1rpx solid #f5f5f5;
  10 + font-size: 36rpx;
  11 + color: #333;
  12 +}
  13 +
  14 +.succ_icon {
  15 + width: 185rpx;
  16 + height: 185rpx;
  17 + margin-bottom: 47rpx;
  18 +}
  19 +
  20 +.back {
  21 + width: 260rpx;
  22 + height: 80rpx;
  23 + background: rgba(255, 148, 0, 1);
  24 + border-radius: 10px;
  25 + font-size: 30rpx;
  26 + line-height: 80rpx;
  27 + text-align: center;
  28 + color: rgba(255, 255, 255, 1);
  29 + margin:0 auto;
  30 +}
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 "list": [] 39 "list": []
40 }, 40 },
41 "miniprogram": { 41 "miniprogram": {
42 - "current": 11, 42 + "current": 12,
43 "list": [ 43 "list": [
44 { 44 {
45 "id": -1, 45 "id": -1,
@@ -122,6 +122,13 @@ @@ -122,6 +122,13 @@
122 "id": -1, 122 "id": -1,
123 "name": "预警详情备注", 123 "name": "预警详情备注",
124 "pathName": "pages/yujing/yujingDetail/yujingRemark/yujingRemark", 124 "pathName": "pages/yujing/yujingDetail/yujingRemark/yujingRemark",
  125 + "query": "",
  126 + "scene": null
  127 + },
  128 + {
  129 + "id": -1,
  130 + "name": "预警详情备注成功",
  131 + "pathName": "pages/yujing/yujingDetail/yujingSucc/yujingSucc",
125 "scene": null 132 "scene": null
126 } 133 }
127 ] 134 ]