miniprogram / liqizhuang · 提交

转到一个项目

作者 朱振飞
提交 b8952f9bcb2f550e4f083b7dae4576f05addcefb 1 个父辈 c3c70311

修改

内嵌 并排对比
正在显示 44 个修改的文件 包含 436 行增加 和 183 行删除
@@ -82,6 +82,25 @@ App({ @@ -82,6 +82,25 @@ App({
82 }); 82 });
83 return promise; 83 return promise;
84 }, 84 },
  85 + timeFormate(timestamp, timeType) {
  86 + if (timestamp) {
  87 + var timeStamp = timestamp.length == 13 ? timestamp : timestamp * 1000
  88 + var date = new Date(timeStamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
  89 + var Y = date.getFullYear() + '-';
  90 + var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
  91 + var D = date.getDate() + ' ';
  92 + var h = date.getHours() + ':';
  93 + var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
  94 + var s = date.getSeconds();
  95 + if (timeType == 'YYMMDD') {
  96 + return Y + M + D;
  97 + } else if (timeType == 'YYMMDDHHMM') {
  98 + return Y + M + D + " " + h + m;
  99 + } else {
  100 + return h + m;
  101 + }
  102 + }
  103 + },
85 globalData: { 104 globalData: {
86 userInfo: null, 105 userInfo: null,
87 baseUrl:'https://lqz.w.brotop.cn' 106 baseUrl:'https://lqz.w.brotop.cn'
1 <!--pages/attract/articleDetail/articleDetail.wxml--> 1 <!--pages/attract/articleDetail/articleDetail.wxml-->
2 <view class='title margin_set'>{{detail.title}}</view> 2 <view class='title margin_set'>{{detail.title}}</view>
3 <view class='content margin_set'> 3 <view class='content margin_set'>
  4 + <view class='article'>
  5 + <view class='from' hidden='{{!detail.source}}'>来源：{{detail.source}}</view>
  6 + <view class='time'>{{detail.create_time_text}}</view>
  7 + </view>
4 <import src="/wxParse/wxParse.wxml" /> 8 <import src="/wxParse/wxParse.wxml" />
5 <template is="wxParse" data="{{wxParseData:contentHtml.nodes}}" /> 9 <template is="wxParse" data="{{wxParseData:contentHtml.nodes}}" />
6 </view> 10 </view>
@@ -14,3 +14,13 @@ padding: 52rpx 0 40rpx; @@ -14,3 +14,13 @@ padding: 52rpx 0 40rpx;
14 .content{ 14 .content{
15 padding-bottom: 40rpx; 15 padding-bottom: 40rpx;
16 } 16 }
  17 +.article{
  18 + margin-bottom: 20rpx;
  19 + display: flex;
  20 + font-size: 28rpx;
  21 + color: #666;
  22 + font-weight: normal;
  23 +}
  24 +.form{
  25 + margin-right: 30rpx;
  26 +}
@@ -33,8 +33,8 @@ Page({ @@ -33,8 +33,8 @@ Page({
33 windowWidth: res.windowWidth, 33 windowWidth: res.windowWidth,
34 tabWidth: res.windowWidth - 39 34 tabWidth: res.windowWidth - 39
35 }) 35 })
36 - },  
37 - }); 36 + }
  37 + }),this.policyType();
38 }, 38 },
39 policyType(){ 39 policyType(){
40 let url = '/api/Article/category',a = this; 40 let url = '/api/Article/category',a = this;
@@ -46,7 +46,6 @@ Page({ @@ -46,7 +46,6 @@ Page({
46 a.getList(res[0].id,1) 46 a.getList(res[0].id,1)
47 }) 47 })
48 }, 48 },
49 -  
50 chooseLocation(){ 49 chooseLocation(){
51 wx.chooseLocation({ 50 wx.chooseLocation({
52 success: function(res) {}, 51 success: function(res) {},
@@ -96,7 +95,7 @@ Page({ @@ -96,7 +95,7 @@ Page({
96 * 生命周期函数--监听页面显示 95 * 生命周期函数--监听页面显示
97 */ 96 */
98 onShow: function () { 97 onShow: function () {
99 - this.policyType() 98 +
100 }, 99 },
101 100
102 /** 101 /**
1 <!--pages/attract/attract.wxml--> 1 <!--pages/attract/attract.wxml-->
2 -<view class='top_banner'> 2 +<view class='top_view'>
  3 + <view class='top_banner'>
3 <image src='/images/zhaoshang.png' width='100%' mode='widthFix' bindtap='bannerDetail' id='1'></image> 4 <image src='/images/zhaoshang.png' width='100%' mode='widthFix' bindtap='bannerDetail' id='1'></image>
4 </view> 5 </view>
5 6
@@ -12,10 +13,12 @@ @@ -12,10 +13,12 @@
12 </view> 13 </view>
13 </block> 14 </block>
14 </scroll-view> 15 </scroll-view>
15 - <view class='paixun'> 16 + <!-- <view class='paixun'>
16 <image src='/images/shaixuan@3x.png' mode='widthFix'></image> 17 <image src='/images/shaixuan@3x.png' mode='widthFix'></image>
17 - </view> 18 + </view> -->
  19 +</view>
18 </view> 20 </view>
  21 +
19 <!-- 新闻 --> 22 <!-- 新闻 -->
20 <scroll-view bindscroll="scroll" bindscrolltolower="getMore" class="news_detail_container" hidden='{{!ifData}}' scrollTop="{{scrollTop}}" scrollY="true" style="height:{{windowHeight-200}}px;"> 23 <scroll-view bindscroll="scroll" bindscrolltolower="getMore" class="news_detail_container" hidden='{{!ifData}}' scrollTop="{{scrollTop}}" scrollY="true" style="height:{{windowHeight-200}}px;">
21 <view class='news_detail_items'> 24 <view class='news_detail_items'>
@@ -24,12 +27,12 @@ @@ -24,12 +27,12 @@
24 <view class='new_info'> 27 <view class='new_info'>
25 <view class='new_title'><text class='recommond' wx:if='{{item.recommend}}'>推荐</text>{{item.title}}</view> 28 <view class='new_title'><text class='recommond' wx:if='{{item.recommend}}'>推荐</text>{{item.title}}</view>
26 <view class='new_time_address'> 29 <view class='new_time_address'>
27 - <view class='form' wx:if="{{item.from}}">{{item.from}}</view> 30 + <view class='form' wx:if="{{item.from}}">{{item.source}}</view>
28 <view class='time'>{{item.create_time_text}}</view> 31 <view class='time'>{{item.create_time_text}}</view>
29 </view> 32 </view>
30 </view> 33 </view>
31 <view class='new_info_image' wx:if="{{item.photos.length>0}}"> 34 <view class='new_info_image' wx:if="{{item.photos.length>0}}">
32 - <image src='{{item.photos[0]}}' mode='widthFix'></image> 35 + <image src='{{item.thumb_image}}' mode='widthFix'></image>
33 </view> 36 </view>
34 </navigator> 37 </navigator>
35 </block> 38 </block>
@@ -5,11 +5,15 @@ page{ @@ -5,11 +5,15 @@ page{
5 .top_banner image{ 5 .top_banner image{
6 width: 100%; 6 width: 100%;
7 } 7 }
  8 +.top_view{
  9 + background: #F7F7F7;
  10 +}
8 .top_banner{ 11 .top_banner{
9 position: fixed; 12 position: fixed;
10 top: 0; 13 top: 0;
11 left: 0; 14 left: 0;
12 width: 100%; 15 width: 100%;
  16 + z-index: 101;
13 } 17 }
14 .menu_content{ 18 .menu_content{
15 display: flex; 19 display: flex;
@@ -17,6 +21,7 @@ page{ @@ -17,6 +21,7 @@ page{
17 top: 320rpx; 21 top: 320rpx;
18 left: 0; 22 left: 0;
19 width: 100%; 23 width: 100%;
  24 + z-index: 101;
20 } 25 }
21 .menu_items{ 26 .menu_items{
22 display: flex; 27 display: flex;
@@ -62,7 +67,8 @@ page{ @@ -62,7 +67,8 @@ page{
62 } 67 }
63 .news_detail_container{ 68 .news_detail_container{
64 background: #FFF; 69 background: #FFF;
65 - margin-top: 390rpx; 70 + margin-top: 195px;
  71 + position: relative;
66 } 72 }
67 .news_detail_items{ 73 .news_detail_items{
68 margin: 0 32rpx; 74 margin: 0 32rpx;
@@ -30,7 +30,14 @@ Page({ @@ -30,7 +30,14 @@ Page({
30 WxParse.wxParse('contentHtml', 'html', r.content, d, 5); 30 WxParse.wxParse('contentHtml', 'html', r.content, d, 5);
31 }) 31 })
32 }, 32 },
33 - 33 + makePhone(e){
  34 + wx.makePhoneCall({
  35 + phoneNumber: e.currentTarget.dataset.phone,
  36 + success: function(res) {},
  37 + fail: function(res) {},
  38 + complete: function(res) {},
  39 + })
  40 + },
34 /** 41 /**
35 * 生命周期函数--监听页面初次渲染完成 42 * 生命周期函数--监听页面初次渲染完成
36 */ 43 */
@@ -21,27 +21,27 @@ @@ -21,27 +21,27 @@
21 <view class='zixun_container'> 21 <view class='zixun_container'>
22 <view class='zixun_item'> 22 <view class='zixun_item'>
23 <view class='zixun_icon phone'> 23 <view class='zixun_icon phone'>
24 - <image src='/images/zuoji@3x.png' mode='aspectFit'></image> 24 + <image src='/images/zuoji@3x.png' mode='widthFix'></image>
25 </view> 25 </view>
26 - <view class='zixun_content'>{{detail.phone}}</view> 26 + <view class='zixun_content' bindtap='makePhone' data-phone='{{detail.phone}}'>{{detail.phone}}</view>
27 </view> 27 </view>
28 <view class='zixun_item'> 28 <view class='zixun_item'>
29 <view class='zixun_icon email'> 29 <view class='zixun_icon email'>
30 - <image src='/images/mail@3x.png' mode='aspectFit'></image> 30 + <image src='/images/mail@3x.png' mode='widthFix'></image>
31 </view> 31 </view>
32 <view class='zixun_content'>{{detail.email}}</view> 32 <view class='zixun_content'>{{detail.email}}</view>
33 </view> 33 </view>
34 - <view class='zixun_item'>  
35 - <view class='zixun_icon '>  
36 - <image src='/images/erweima@3x.png' mode='aspectFit'></image> 34 + <view class='zixun_item' hidden="{{detail.wechat.length==0}}">
  35 + <view class='zixun_icon chat'>
  36 + <image src='/images/wechat.png' mode='widthFix'></image>
37 </view> 37 </view>
38 <view class='zixun_content'> 38 <view class='zixun_content'>
39 <view class='erwei_code'> 39 <view class='erwei_code'>
40 - <view class='img_box'>  
41 - <image src='/images/erwer_code.png' mode='widthFix'></image> 40 + <view class='img_box' wx:for='{{detail.wechat}}' wx:key=''>
  41 + <image src='{{item}}' mode='widthFix'></image>
42 </view> 42 </view>
43 <view class='img_box'> 43 <view class='img_box'>
44 - <image src='/images/erwer_code.png' mode='widthFix'></image> 44 + <image src='{{item}}' mode='widthFix'></image>
45 </view> 45 </view>
46 </view> 46 </view>
47 <view>扫描二维码，关注公众号</view> 47 <view>扫描二维码，关注公众号</view>
@@ -49,4 +49,7 @@ @@ -49,4 +49,7 @@
49 </view> 49 </view>
50 </view> 50 </view>
51 </view> 51 </view>
  52 + <view class='note'>
  53 + <text>李七庄街的产能价值，期待归企业的挖掘!</text>
  54 + </view>
52 </view> 55 </view>
1 1
2 /* pages/attract/detail/detail.wxss */ 2 /* pages/attract/detail/detail.wxss */
  3 +page{
  4 + height: 100%;
  5 +}
3 .video_box { 6 .video_box {
4 width: 100%; 7 width: 100%;
5 height: 430rpx; 8 height: 430rpx;
@@ -7,6 +10,10 @@ @@ -7,6 +10,10 @@
7 background-color: rgba(0,0,0,.6); 10 background-color: rgba(0,0,0,.6);
8 position: relative; 11 position: relative;
9 } 12 }
  13 +.main_container{
  14 + position: relative;
  15 + min-height: 100%;
  16 +}
10 .video_icon{ 17 .video_icon{
11 width: 96rpx; 18 width: 96rpx;
12 height: 96rpx; 19 height: 96rpx;
@@ -33,8 +40,9 @@ @@ -33,8 +40,9 @@
33 40
34 .single_item_container{ 41 .single_item_container{
35 margin-top: 30rpx; 42 margin-top: 30rpx;
36 - border-bottom: 2rpx solid #f5f5f5;  
37 - min-height: 400rpx; 43 +}
  44 +.main_container .single_item_container::last-child{
  45 + height: auto;
38 } 46 }
39 .top_label{ 47 .top_label{
40 padding: 20rpx 0; 48 padding: 20rpx 0;
@@ -62,30 +70,33 @@ @@ -62,30 +70,33 @@
62 } 70 }
63 .zixun_container{ 71 .zixun_container{
64 padding-left: 56rpx; 72 padding-left: 56rpx;
  73 + padding-bottom: 70rpx;
65 } 74 }
66 .zixun_item{ 75 .zixun_item{
67 display: flex; 76 display: flex;
68 justify-content: flex-start; 77 justify-content: flex-start;
69 margin: 30rpx 0; 78 margin: 30rpx 0;
  79 + align-items: center;
70 } 80 }
71 81
72 .zixun_icon{ 82 .zixun_icon{
  83 + width: 46rpx;
73 height: 46rpx; 84 height: 46rpx;
74 - width: 60rpx;  
75 align-self: flex-start; 85 align-self: flex-start;
76 } 86 }
  87 +.chat{
  88 + width: 54rpx;
  89 + position: relative;
  90 + left: -4rpx;
  91 +}
77 .email{ 92 .email{
78 width: 46rpx; 93 width: 46rpx;
79 - height: 30rpx;  
80 } 94 }
81 .phone{ 95 .phone{
82 - width: 42rpx;  
83 - height: 42rpx; 96 + width: 46rpx;
84 } 97 }
85 .zixun_icon image { 98 .zixun_icon image {
86 width: 100%; 99 width: 100%;
87 - height: 100%;  
88 - display: block;  
89 } 100 }
90 .zixun_content{ 101 .zixun_content{
91 font-size: 28rpx; 102 font-size: 28rpx;
@@ -108,4 +119,38 @@ @@ -108,4 +119,38 @@
108 } 119 }
109 .zhaoshang_desc{ 120 .zhaoshang_desc{
110 margin: 0 40rpx; 121 margin: 0 40rpx;
  122 + padding: 30rpx 0;
  123 +}
  124 +.note{
  125 + display: flex;
  126 + align-items: center;
  127 + justify-content: center;
  128 + font-size: 28rpx;
  129 + color: #666;
  130 + height: 120rpx;
  131 + position: absolute;
  132 + left: 0;
  133 + bottom: 0;
  134 + width: 100%;
  135 +}
  136 +.note text{
  137 + position: relative;
  138 +}
  139 +.note text:before{
  140 + position: absolute;
  141 + top: 50%;
  142 + width: 50rpx;
  143 + height: 2rpx;
  144 + content: '';
  145 + background-color:#999;
  146 + left: -60rpx;
  147 +}
  148 +.note text:after{
  149 + position: absolute;
  150 + top: 50%;
  151 + width: 50rpx;
  152 + height: 2rpx;
  153 + content: '';
  154 + background-color:#999;
  155 + right: -60rpx;
111 } 156 }
@@ -15,13 +15,14 @@ Page({ @@ -15,13 +15,14 @@ Page({
15 t.setData({ 15 t.setData({
16 id:options.id 16 id:options.id
17 }),t.d(options.id),t.c() 17 }),t.d(options.id),t.c()
  18 +
18 }, 19 },
19 d(id){ 20 d(id){
20 let url = '/api/interact/getPostsDetail',params = { 21 let url = '/api/interact/getPostsDetail',params = {
21 id:id 22 id:id
22 },t = this; 23 },t = this;
23 A.post(url,params).then((r)=>{ 24 A.post(url,params).then((r)=>{
24 - console.log(r) 25 + r.images = r.images.split(',');
25 t.setData({ 26 t.setData({
26 detail:r 27 detail:r
27 }) 28 })
@@ -78,6 +79,30 @@ Page({ @@ -78,6 +79,30 @@ Page({
78 startComment: true 79 startComment: true
79 }) 80 })
80 }, 81 },
  82 + delArticle(e) {
  83 + let t = this, id = e.currentTarget.id, url = '/api/interact/deletePosts', params = {
  84 + id: id
  85 + }, index = e.currentTarget.dataset.indx;
  86 + wx.showModal({
  87 + title: '提示',
  88 + content: '确认删除这个帖子吗？',
  89 + success: (r) => {
  90 + if (r.confirm) {
  91 + A.post(url, params).then((rt) => {
  92 + wx.showToast({
  93 + title: '删除成功',
  94 + icon: 'none',
  95 + duration: 1300
  96 + })
  97 + setTimeout(() => {
  98 + wx.navigateBack({ })
  99 + }, 1000);
  100 +
  101 + })
  102 + }
  103 + }
  104 + })
  105 + },
81 /** 106 /**
82 * 生命周期函数--监听页面初次渲染完成 107 * 生命周期函数--监听页面初次渲染完成
83 */ 108 */
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 {{detail.create_time_text}} 29 {{detail.create_time_text}}
30 </view> 30 </view>
31 <!-- 删除 --> 31 <!-- 删除 -->
32 - <view class='item_delete' hidden='{{detail.is_mine==0}}' bindtap='del'> 32 + <view class='item_delete' hidden='{{detail.is_mine==0}}' bindtap='delArticle' id='{{detail.id}}'>
33 删除 33 删除
34 </view> 34 </view>
35 </view> 35 </view>
@@ -81,9 +81,9 @@ @@ -81,9 +81,9 @@
81 <view class='time_bottom_left'> 81 <view class='time_bottom_left'>
82 {{item.create_time_text}} 82 {{item.create_time_text}}
83 </view> 83 </view>
84 - <view class='time_bottom_left'> 84 + <view class='time_bottom_left' bindtap='zan' id='{{item.id}}' data-indx = '{{index}}' data-type='{{item.is_like}}'>
85 <view>{{item.likes}}</view> 85 <view>{{item.likes}}</view>
86 - <view class='time_bottom_left_pic' bindtap='zan' id='{{item.id}}' data-indx = '{{index}}' data-type='{{item.is_like}}'> 86 + <view class='time_bottom_left_pic'>
87 <image src='/images/zan@3x.png' wx:if="{{item.is_like==0}}"></image> 87 <image src='/images/zan@3x.png' wx:if="{{item.is_like==0}}"></image>
88 <image src='/images/thumb-up-button@3x.png' wx:else></image> 88 <image src='/images/thumb-up-button@3x.png' wx:else></image>
89 </view> 89 </view>
@@ -31,8 +31,8 @@ page{ @@ -31,8 +31,8 @@ page{
31 opacity:1; 31 opacity:1;
32 } 32 }
33 .item_mid_box_pic{ 33 .item_mid_box_pic{
34 - width:256rpx;  
35 - height:256rpx; 34 + width:216rpx;
  35 + height:216rpx;
36 background:rgba(0,0,0,0); 36 background:rgba(0,0,0,0);
37 opacity:1; 37 opacity:1;
38 display: flex; 38 display: flex;
@@ -32,6 +32,11 @@ Page({ @@ -32,6 +32,11 @@ Page({
32 }, 32 },
33 }), this.postList(); 33 }), this.postList();
34 }, 34 },
  35 + subArticle() {
  36 + wx.navigateTo({
  37 + url: '/pages/interact/interactPost/interactPost',
  38 + })
  39 + },
35 zan(e){ 40 zan(e){
36 let url = '/api/interact/setLike',params = { 41 let url = '/api/interact/setLike',params = {
37 object_id: e.currentTarget.id, 42 object_id: e.currentTarget.id,
@@ -45,6 +50,32 @@ Page({ @@ -45,6 +50,32 @@ Page({
45 }) 50 })
46 }) 51 })
47 }, 52 },
  53 + delArticle(e) {
  54 + console.log(e)
  55 + let t = this, id = e.currentTarget.id, url = '/api/interact/deletePosts', params = {
  56 + id: id
  57 + }, index = e.currentTarget.dataset.indx;
  58 + wx.showModal({
  59 + title: '提示',
  60 + content: '确认删除这个帖子吗？',
  61 + success: (r) => {
  62 + if (r.confirm) {
  63 + A.post(url, params).then((rt) => {
  64 + wx.showToast({
  65 + title: '删除成功',
  66 + icon: 'none',
  67 + duration: 1300
  68 + })
  69 + t.data.postList.splice(index, 1);
  70 + t.setData({
  71 + postList: t.data.postList
  72 + })
  73 +
  74 + })
  75 + }
  76 + }
  77 + })
  78 + },
48 navdetail(e) { 79 navdetail(e) {
49 wx.navigateTo({ 80 wx.navigateTo({
50 url: '/pages/colleagues_2/colleagues_2?id='+e.currentTarget.id, 81 url: '/pages/colleagues_2/colleagues_2?id='+e.currentTarget.id,
@@ -52,10 +83,13 @@ Page({ @@ -52,10 +83,13 @@ Page({
52 }, 83 },
53 getzixun() { 84 getzixun() {
54 let url = '/api/interact/getQuestionList', d = this, params = { 85 let url = '/api/interact/getQuestionList', d = this, params = {
55 - header: true,  
56 page: d.data.page 86 page: d.data.page
57 }; 87 };
58 A.post(url, params, false).then((r) => { 88 A.post(url, params, false).then((r) => {
  89 + for(let b of r.data){
  90 + b.create_time = A.timeFormate(b.create_time, 'YYMMDDHHMM')
  91 + b.reply_time = A.timeFormate(b.reply_time,'YYMMDDHHMM')
  92 + }
59 let list = d.data.zixunList.concat(r.data); 93 let list = d.data.zixunList.concat(r.data);
60 d.setData({ 94 d.setData({
61 zixunList: list 95 zixunList: list
@@ -77,17 +111,33 @@ Page({ @@ -77,17 +111,33 @@ Page({
77 page: d.data.page 111 page: d.data.page
78 }; 112 };
79 A.post(url, params, false).then((r) => { 113 A.post(url, params, false).then((r) => {
  114 + for(let b of r.data){
  115 + b.images = b.images.split(',')
  116 + }
80 let list = d.data.postList.concat(r.data); 117 let list = d.data.postList.concat(r.data);
81 d.setData({ 118 d.setData({
82 - postList: list 119 + postList: list,
  120 + comment: r.new_comment
83 }) 121 })
84 list.length == 0 ? d.setData({ 122 list.length == 0 ? d.setData({
85 ifData: !0, 123 ifData: !0,
86 }) : (r.data.length < r.per_page ? d.setData({ 124 }) : (r.data.length < r.per_page ? d.setData({
87 noMore: !0 125 noMore: !0
88 }) : "") 126 }) : "")
89 - 127 + wx.stopPullDownRefresh()
  128 + })
  129 + },
  130 + getMore(){
  131 + console.log(1)
  132 + let t = this;
  133 + t.setData({
  134 + page: t.data.page++
90 }) 135 })
  136 + !t.data.noMore ? (t.data.currentTab == '0' ? t.getzixun():t.postList()):wx.showToast({
  137 + title: '没有更多了',
  138 + icon:'none'
  139 + })
  140 +
91 }, 141 },
92 142
93 askQuestion() { 143 askQuestion() {
@@ -145,10 +195,13 @@ Page({ @@ -145,10 +195,13 @@ Page({
145 * 生命周期函数--监听页面显示 195 * 生命周期函数--监听页面显示
146 */ 196 */
147 onShow: function () { 197 onShow: function () {
  198 + this.checkstatus()
148 this.setData({ 199 this.setData({
149 - zixunList: [] 200 + zixunList: [],
  201 + postList:[],
  202 + page: 1
150 }) 203 })
151 - this.checkstatus() 204 + this.data.currentTab=='0'?this.getzixun():this.postList()
152 }, 205 },
153 206
154 /** 207 /**
@@ -169,14 +222,19 @@ Page({ @@ -169,14 +222,19 @@ Page({
169 * 页面相关事件处理函数--监听用户下拉动作 222 * 页面相关事件处理函数--监听用户下拉动作
170 */ 223 */
171 onPullDownRefresh: function () { 224 onPullDownRefresh: function () {
172 - 225 + this.checkstatus()
  226 + this.setData({
  227 + zixunList: [],
  228 + postList: [],
  229 + page: 1
  230 + })
  231 + this.data.currentTab == '0' ? this.getzixun() : this.postList()
173 }, 232 },
174 233
175 /** 234 /**
176 * 页面上拉触底事件的处理函数 235 * 页面上拉触底事件的处理函数
177 */ 236 */
178 onReachBottom: function () { 237 onReachBottom: function () {
179 -  
180 }, 238 },
181 239
182 /** 240 /**
@@ -2,5 +2,6 @@ @@ -2,5 +2,6 @@
2 "usingComponents": {}, 2 "usingComponents": {},
3 "navigationBarTitleText": "政企服务平台", 3 "navigationBarTitleText": "政企服务平台",
4 "navigationBarBackgroundColor": "#169BD5", 4 "navigationBarBackgroundColor": "#169BD5",
5 - "navigationBarTextStyle": "white" 5 + "navigationBarTextStyle": "white",
  6 + "enablePullDownRefresh": true
6 } 7 }
1 <view class="nav mainindex_nav top"> 1 <view class="nav mainindex_nav top">
2 <view wx:for="{{navbar}}" data-idx="{{index}}" class="nav_item {{currentTab==index ? 'active' : ''}}" wx:key="unique" bindtap="navbarTap" data-categoryid="{{item.id}}">{{item.name}}</view> 2 <view wx:for="{{navbar}}" data-idx="{{index}}" class="nav_item {{currentTab==index ? 'active' : ''}}" wx:key="unique" bindtap="navbarTap" data-categoryid="{{item.id}}">{{item.name}}</view>
3 </view> 3 </view>
4 - <scroll-view wx:if='{{auth=="2"}}' style='height:{{winHeight}}px' scroll-y="true"> 4 +
  5 +
  6 +<scroll-view wx:if='{{auth=="2"}}' class='main_container' style='height:{{winHeight}}px' scroll-y="true" bindscrolltolower='getMore'>
5 <view class="none-box" hidden="{{!ifData}}"> 7 <view class="none-box" hidden="{{!ifData}}">
6 <view>暂无相关咨询</view> 8 <view>暂无相关咨询</view>
7 </view> 9 </view>
@@ -21,7 +23,7 @@ @@ -21,7 +23,7 @@
21 </view> 23 </view>
22 </view> 24 </view>
23 <view class='mid_item_right_bottom'> 25 <view class='mid_item_right_bottom'>
24 - 发布时间： {{item.create_time_text}} 26 + 发布时间： {{item.create_time}}
25 </view> 27 </view>
26 <!-- 回复 --> 28 <!-- 回复 -->
27 <view class='response_box' hidden='{{item.state==0}}'> 29 <view class='response_box' hidden='{{item.state==0}}'>
@@ -31,7 +33,7 @@ @@ -31,7 +33,7 @@
31 </view> 33 </view>
32 <!-- 回复时间 --> 34 <!-- 回复时间 -->
33 <view class='mid_item_right_bottom'> 35 <view class='mid_item_right_bottom'>
34 - 回复时间：{{item.reply_time_text}} 36 + 回复时间：{{item.reply_time}}
35 </view> 37 </view>
36 </view> 38 </view>
37 <view class='waiting_response' hidden='{{item.state!=0}}'> 39 <view class='waiting_response' hidden='{{item.state!=0}}'>
@@ -50,10 +52,13 @@ @@ -50,10 +52,13 @@
50 </view> 52 </view>
51 <!-- 企话吧 --> 53 <!-- 企话吧 -->
52 <view class='box_right' wx:if="{{currentTab==1}}"> 54 <view class='box_right' wx:if="{{currentTab==1}}">
  55 + <view class='add_notice' bindtap='subArticle'>
  56 + <image src='../../images/add.png' mode='widthFix'></image>
  57 + </view>
53 <view class='mid'> 58 <view class='mid'>
54 <!-- 标题 --> 59 <!-- 标题 -->
55 - <view class='mid_title'>  
56 - 有一条新评论 > 60 + <view class='mid_title' hidden='{{!comment}}'>
  61 + 有{{comment.length}}条新评论 >
57 </view> 62 </view>
58 <!-- 条目 --> 63 <!-- 条目 -->
59 <view class='mid_item' wx:for='{{postList}}' wx:key=''> 64 <view class='mid_item' wx:for='{{postList}}' wx:key=''>
@@ -77,15 +82,15 @@ @@ -77,15 +82,15 @@
77 {{item.content}} 82 {{item.content}}
78 </view> 83 </view>
79 <!-- 图片 --> 84 <!-- 图片 -->
80 - <view class='mid_pic_box' wx:if='{{item.images}}'> 85 + <view class='mid_pic_box' wx:if='{{item.images}}' bindtap='navdetail' id='{{item.id}}'>
81 <view class='mid_pic_box_item' wx:for="{{item.images}}" wx:key='' wx:for-item='sec'> 86 <view class='mid_pic_box_item' wx:for="{{item.images}}" wx:key='' wx:for-item='sec'>
82 <image src='{{sec}}'></image> 87 <image src='{{sec}}'></image>
83 </view> 88 </view>
84 </view> 89 </view>
85 <!-- 底部 --> 90 <!-- 底部 -->
86 <view class='mid_item_like'> 91 <view class='mid_item_like'>
87 - <view class='mid_item_like_left' >  
88 - <text hidden='{{item.is_can_del=="0"}}' id='{{item.id}}' bindtap='delete'>删除</text> 92 + <view class='mid_item_like_left'>
  93 + <text hidden='{{item.is_can_del=="0"}}' id='{{item.id}}' bindtap='delArticle' data-indx='{{index}}'>删除</text>
89 </view> 94 </view>
90 <view class='mid_item_like_right'> 95 <view class='mid_item_like_right'>
91 <!-- 点赞 --> 96 <!-- 点赞 -->
@@ -108,14 +113,15 @@ @@ -108,14 +113,15 @@
108 </view> 113 </view>
109 </view> 114 </view>
110 </view> 115 </view>
111 - </scroll-view> 116 +</scroll-view>
112 117
113 118
114 - <!-- 没有权限 -->  
115 - <view class='null_data_box' wx:else> 119 +<!-- 没有权限 -->
  120 +<view class='null_data_box' wx:else>
116 <view class='data_box'> 121 <view class='data_box'>
117 <image src='/images/weirenzheng@2x.png'></image> 122 <image src='/images/weirenzheng@2x.png'></image>
118 <view class='list_btn' bindtap='open_btn' data-type='{{auth}}' bindtap='renzheng'>{{auth=='0'?'开通企业认证 >':auth=='1'?'企业认证中 请等待':""}}</view> 123 <view class='list_btn' bindtap='open_btn' data-type='{{auth}}' bindtap='renzheng'>{{auth=='0'?'开通企业认证 >':auth=='1'?'企业认证中 请等待':""}}</view>
119 <view wx:if='{{auth=="0"}}'> ~~ 企业认证后开启更多服务 ~~</view> 124 <view wx:if='{{auth=="0"}}'> ~~ 企业认证后开启更多服务 ~~</view>
120 </view> 125 </view>
121 - </view>  
  126 +</view>
  127 +
@@ -34,7 +34,6 @@ page{ @@ -34,7 +34,6 @@ page{
34 line-height: 80rpx; 34 line-height: 80rpx;
35 display: flex; 35 display: flex;
36 justify-content: space-between; 36 justify-content: space-between;
37 -  
38 font-size:26rpx; 37 font-size:26rpx;
39 font-family:PingFang SC; 38 font-family:PingFang SC;
40 font-weight:600; 39 font-weight:600;
@@ -45,6 +44,8 @@ page{ @@ -45,6 +44,8 @@ page{
45 padding: 0 150rpx; 44 padding: 0 150rpx;
46 position: fixed; 45 position: fixed;
47 z-index: 999; 46 z-index: 999;
  47 + top: 0;
  48 + left: 0;
48 } 49 }
49 .top_left{ 50 .top_left{
50 width: 169rpx; 51 width: 169rpx;
@@ -315,9 +316,7 @@ page{ @@ -315,9 +316,7 @@ page{
315 /* .box_left{ 316 /* .box_left{
316 margin-top: 96rpx; 317 margin-top: 96rpx;
317 } */ 318 } */
318 -.box_right{  
319 - margin-top: 96rpx;  
320 -} 319 +
321 .mid_pic_box{ 320 .mid_pic_box{
322 display: flex; 321 display: flex;
323 flex-wrap: wrap; 322 flex-wrap: wrap;
@@ -376,3 +375,19 @@ page{ @@ -376,3 +375,19 @@ page{
376 .none-box{ 375 .none-box{
377 position: relative 376 position: relative
378 } 377 }
  378 +.add_notice{
  379 + width: 80rpx;
  380 + height: 80rpx;
  381 + position: fixed;
  382 + border-radius: 50%;
  383 + overflow: hidden;
  384 + bottom: 200rpx;
  385 + right: 30rpx;
  386 + z-index: 10000;
  387 +}
  388 +.add_notice image{
  389 + width: 100%
  390 +}
  391 +.main_container{
  392 + margin-top: 50px;
  393 +}
@@ -122,7 +122,7 @@ Page({ @@ -122,7 +122,7 @@ Page({
122 }, 122 },
123 subArticle(){ 123 subArticle(){
124 let t = this, url ='/api/interact/setPosts',params= t.data.params; 124 let t = this, url ='/api/interact/setPosts',params= t.data.params;
125 - params.images = params.images.length?params.images.join(','):''; 125 + params.images = t.data.images.length ? t.data.images:'';
126 !params.title?(wx.showToast({ 126 !params.title?(wx.showToast({
127 title: '请输入主题', 127 title: '请输入主题',
128 icon:'none' 128 icon:'none'
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 </textarea> 9 </textarea>
10 </view> 10 </view>
11 <view class='upload_box'> 11 <view class='upload_box'>
12 - <block wx:for="{{params.images}}" wx:for-item="image" wx:key="index"> 12 + <block wx:for="{{images}}" wx:for-item="image" wx:key="index">
13 <view class='upload_img'> 13 <view class='upload_img'>
14 <view class='icon_box'> 14 <view class='icon_box'>
15 <view class='iconfont icon-shanchu' catchtap="deleteImg" data-index="{{index}}"></view> 15 <view class='iconfont icon-shanchu' catchtap="deleteImg" data-index="{{index}}"></view>
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <image src='{{image}}' data-index="{{index}}" mode="aspectFill" bindtap="previewImg"></image> 17 <image src='{{image}}' data-index="{{index}}" mode="aspectFill" bindtap="previewImg"></image>
18 </view> 18 </view>
19 </block> 19 </block>
20 - <view class='upload_img' bindtap="choose" hidden='{{params.images.length>9}}'> 20 + <view class='upload_img' bindtap="choose" hidden='{{images.length>9}}'>
21 <view class='iconfont icon-jia1'></view> 21 <view class='iconfont icon-jia1'></view>
22 </view> 22 </view>
23 </view> 23 </view>
@@ -63,7 +63,7 @@ page { @@ -63,7 +63,7 @@ page {
63 font-size: 100rpx; 63 font-size: 100rpx;
64 } 64 }
65 65
66 -.upload_img:nth-child(5), .upload_img:nth-child(10) { 66 +.upload_img:nth-child(3n){
67 margin-right: 0; 67 margin-right: 0;
68 } 68 }
69 69
1 <!--pages/matrix/company/company.wxml--> 1 <!--pages/matrix/company/company.wxml-->
2 <view class='main_container'> 2 <view class='main_container'>
3 <view class='banner_top'> 3 <view class='banner_top'>
4 - <image src='/images/company_banner.png' mode='widthFix'></image> 4 + <image src='{{detailInfo.banner_image}}' mode='widthFix'></image>
5 </view> 5 </view>
6 <!-- detailInfo --> 6 <!-- detailInfo -->
7 <view class='compony_info'> 7 <view class='compony_info'>
8 <view class='compony_title'> 8 <view class='compony_title'>
9 <view class='compony_left'>{{detailInfo.name}}</view> 9 <view class='compony_left'>{{detailInfo.name}}</view>
10 - <view class='focus_button cancle_focus' wx:if='{{detailInfo.is_like}}' bindtap='onfocus'>已关注</view>  
11 - <view class='focus_button' bindtap='onfocus' wx:else>+ 关注</view>  
12 - 10 + <view class='focus_button cancle_focus' wx:if='{{detailInfo.is_like==0}}' data-like="{{detailInfo.is_like}}" bindtap='onfocus'>已关注</view>
  11 + <view class='focus_button' bindtap='onfocus' data-like="{{detailInfo.is_like}}" wx:else><text class='add'>+</text>关注</view>
13 </view> 12 </view>
14 13
15 <view class='detailInfo_items'> 14 <view class='detailInfo_items'>
16 <view class='detailInfo_item'> 15 <view class='detailInfo_item'>
17 <view class='detail_icon'> 16 <view class='detail_icon'>
18 - <image src='/images/dianhua_hui@3x.png' mode='aspectFit'></image> 17 + <image src='/images/zuoji.png' mode='aspectFit'></image>
19 </view> 18 </view>
20 <view class='detail_text'>{{detailInfo.phone}}</view> 19 <view class='detail_text'>{{detailInfo.phone}}</view>
21 </view> 20 </view>
22 <view class='detailInfo_item'> 21 <view class='detailInfo_item'>
23 <view class='detail_icon'> 22 <view class='detail_icon'>
24 - <image src='/images/mail@3x.png' mode='aspectFit'></image> 23 + <image src='/images/mail.png' mode='aspectFit'></image>
25 </view> 24 </view>
26 <view class='detail_text'>{{detailInfo.email}}</view> 25 <view class='detail_text'>{{detailInfo.email}}</view>
27 </view> 26 </view>
28 <view class='detailInfo_item'> 27 <view class='detailInfo_item'>
29 <view class='detail_icon'> 28 <view class='detail_icon'>
30 - <image src='/images/dingwei@3x.png' mode='aspectFit'></image> 29 + <image src='/images/map.png' mode='aspectFit'></image>
31 </view> 30 </view>
32 <view class='detail_text'>{{detailInfo.address}}</view> 31 <view class='detail_text'>{{detailInfo.address}}</view>
33 </view> 32 </view>
@@ -8,7 +8,7 @@ page{ @@ -8,7 +8,7 @@ page{
8 background-color: #FFF; 8 background-color: #FFF;
9 } 9 }
10 .banner_top{ 10 .banner_top{
11 - height: 236rpx; 11 + height: auto;
12 } 12 }
13 .banner_top image{ 13 .banner_top image{
14 width: 100% 14 width: 100%
@@ -26,6 +26,9 @@ page{ @@ -26,6 +26,9 @@ page{
26 font-size: 30rpx; 26 font-size: 30rpx;
27 font-weight: bold; 27 font-weight: bold;
28 } 28 }
  29 +.tuijian_item{
  30 + padding: 12rpx 0;
  31 +}
29 .focus_button{ 32 .focus_button{
30 width: 128rpx; 33 width: 128rpx;
31 height: 48rpx; 34 height: 48rpx;
@@ -61,6 +64,8 @@ page{ @@ -61,6 +64,8 @@ page{
61 } 64 }
62 .detail_icon image{ 65 .detail_icon image{
63 height: 100%; 66 height: 100%;
  67 + -webkit-filter: grayscale(60%); /* Chrome, Safari, Opera */
  68 + filter: grayscale(60%);
64 } 69 }
65 .detailInfo_desc{ 70 .detailInfo_desc{
66 color: #999; 71 color: #999;
@@ -113,7 +118,6 @@ page{ @@ -113,7 +118,6 @@ page{
113 right: 0; 118 right: 0;
114 } 119 }
115 .tuijian_content{ 120 .tuijian_content{
116 - height: 174rpx;  
117 display: flex; 121 display: flex;
118 align-items: flex-start; 122 align-items: flex-start;
119 flex-flow: column; 123 flex-flow: column;
@@ -122,6 +126,10 @@ page{ @@ -122,6 +126,10 @@ page{
122 font-size: 26rpx; 126 font-size: 26rpx;
123 border-top: 2rpx solid #F5F5F5; 127 border-top: 2rpx solid #F5F5F5;
124 } 128 }
  129 +.add{
  130 + position:relative;
  131 + top:-2rpx;
  132 +}
125 .cancle_focus{ 133 .cancle_focus{
126 color: #999; 134 color: #999;
127 border: 2rpx solid #999; 135 border: 2rpx solid #999;
@@ -17,7 +17,8 @@ Page({ @@ -17,7 +17,8 @@ Page({
17 companyList:[], 17 companyList:[],
18 page:1, 18 page:1,
19 ifData:!1, 19 ifData:!1,
20 - navScrollLeft:0 20 + navScrollLeft:0,
  21 + noMore:!0
21 }, 22 },
22 changeShow(){ 23 changeShow(){
23 this.setData({ 24 this.setData({
@@ -59,18 +60,16 @@ Page({ @@ -59,18 +60,16 @@ Page({
59 park:park||'', 60 park:park||'',
60 page: b.data.page 61 page: b.data.page
61 } 62 }
  63 + let companylist = b.data.page == 1 ? []:b.data.companylist;
62 app.post(url,params).then((res)=>{ 64 app.post(url,params).then((res)=>{
63 b.setData({ 65 b.setData({
64 - companyList: b.data.companyList.concat(res.data), 66 + companyList: companylist.concat(res.data),
65 totalPage: res.total, 67 totalPage: res.total,
66 currpage: res.current_page, 68 currpage: res.current_page,
67 - }), b.data.companyList.length > 0 ? b.setData({  
68 - ifData: !0  
69 - }) : b.setData({  
70 - ifData: !1  
71 - }), res.data.length < res.per_page ? b.setData({  
72 - noMore: !0,  
73 - }) : '' 69 + ifData: companylist.concat(res.data).length>0?!0:!1,
  70 + noMore: res.last_page>res.current_page?!1:!0
  71 + })
  72 + wx.stopPullDownRefresh();
74 }) 73 })
75 }, 74 },
76 // 更新token 75 // 更新token
@@ -88,11 +87,14 @@ Page({ @@ -88,11 +87,14 @@ Page({
88 getMore(){ 87 getMore(){
89 let t = this; 88 let t = this;
90 !t.data.noMore?(t.setData({ 89 !t.data.noMore?(t.setData({
91 - page:t.data.page++  
92 - }), t.getCompanyList(t.data.category_id,t.data.park)):"" 90 + page:t.data.page+1
  91 + }), t.getCompanyList(t.data.category_id,t.data.park)):wx.showToast({
  92 + title: '没有更多了',
  93 + icon:'none'
  94 + })
93 }, 95 },
94 tabCharge(e) { 96 tabCharge(e) {
95 - let s = this, singleWidth = s.data.windowWidth / 5, cur = e.currentTarget.dataset.index+1; 97 + let s = this, singleWidth = s.data.windowWidth / 7, cur = e.currentTarget.dataset.index+1;
96 s.setData({ 98 s.setData({
97 companyList:[], 99 companyList:[],
98 page:1, 100 page:1,
@@ -103,6 +105,8 @@ Page({ @@ -103,6 +105,8 @@ Page({
103 s.getCompanyList(e.currentTarget.dataset.current, s.data.park) 105 s.getCompanyList(e.currentTarget.dataset.current, s.data.park)
104 }, 106 },
105 scroll(){ 107 scroll(){
  108 + },
  109 + reload(){
106 110
107 }, 111 },
108 112
@@ -153,7 +157,10 @@ Page({ @@ -153,7 +157,10 @@ Page({
153 * 页面相关事件处理函数--监听用户下拉动作 157 * 页面相关事件处理函数--监听用户下拉动作
154 */ 158 */
155 onPullDownRefresh: function() { 159 onPullDownRefresh: function() {
156 - 160 + console.log(1)
  161 + let t = this;t.setData({
  162 + page: 1
  163 + }), t.getCompanyList(t.data.category_id, t.data.park);
157 }, 164 },
158 165
159 /** 166 /**
@@ -2,5 +2,6 @@ @@ -2,5 +2,6 @@
2 "usingComponents": {}, 2 "usingComponents": {},
3 "navigationBarTitleText": "政企服务平台", 3 "navigationBarTitleText": "政企服务平台",
4 "navigationBarBackgroundColor": "#169BD5", 4 "navigationBarBackgroundColor": "#169BD5",
5 - "navigationBarTextStyle": "white" 5 + "navigationBarTextStyle": "white",
  6 + "enablePullDownRefresh": true
6 } 7 }
@@ -26,7 +26,7 @@ page { @@ -26,7 +26,7 @@ page {
26 color: #999; 26 color: #999;
27 display: inline-block; 27 display: inline-block;
28 position: relative; 28 position: relative;
29 - width: 20%; 29 + padding: 0 20rpx;
30 height: 100%; 30 height: 100%;
31 text-align: center; 31 text-align: center;
32 } 32 }
@@ -175,6 +175,7 @@ page { @@ -175,6 +175,7 @@ page {
175 .list_content { 175 .list_content {
176 font-size: 26rpx; 176 font-size: 26rpx;
177 color: #666; 177 color: #666;
  178 + height: 68rpx;
178 margin-top: 4rpx; 179 margin-top: 4rpx;
179 display: -webkit-box; 180 display: -webkit-box;
180 -webkit-box-orient: vertical; 181 -webkit-box-orient: vertical;
@@ -212,7 +213,7 @@ page { @@ -212,7 +213,7 @@ page {
212 } 213 }
213 .scroll-content{ 214 .scroll-content{
214 margin-top: 45px; 215 margin-top: 45px;
215 - background: #FFF; 216 + background: #f5f5f5;
216 } 217 }
217 218
218 .none-box { 219 .none-box {
@@ -147,13 +147,10 @@ Page({ @@ -147,13 +147,10 @@ Page({
147 wx.hideNavigationBarLoading() 147 wx.hideNavigationBarLoading()
148 wx.hideLoading() 148 wx.hideLoading()
149 if (res.statusCode == 200) { 149 if (res.statusCode == 200) {
150 - // console.log(res)  
151 let dat = JSON.parse(res.data); 150 let dat = JSON.parse(res.data);
152 - // console.log(dat);  
153 that.setData({ 151 that.setData({
154 "proData.images": that.data.proData.images.concat(dat.data.url) 152 "proData.images": that.data.proData.images.concat(dat.data.url)
155 }) 153 })
156 - // console.log(that.data.proData.images);  
157 154
158 } else { 155 } else {
159 wx.showModal({ 156 wx.showModal({
@@ -221,14 +218,16 @@ Page({ @@ -221,14 +218,16 @@ Page({
221 duration: 1300 218 duration: 1300
222 }) 219 })
223 return false; 220 return false;
224 - } else if (b.data.proData.images.length == 0){  
225 - wx.showToast({  
226 - title: '请上传营业执照',  
227 - icon: "none",  
228 - duration: 1300  
229 - })  
230 - return false;  
231 - }else { 221 + }
  222 + // else if (b.data.proData.images.length == 0){
  223 + // wx.showToast({
  224 + // title: '请上传营业执照',
  225 + // icon: "none",
  226 + // duration: 1300
  227 + // })
  228 + // return false;
  229 + // }
  230 + else {
232 b.setData({ 231 b.setData({
233 "proData.header": true 232 "proData.header": true
234 }) 233 })
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 12
13 .list_title { 13 .list_title {
14 width: 140rpx; 14 width: 140rpx;
15 - font-size: 32rpx; 15 + font-size: 28rpx;
16 color: #333; 16 color: #333;
17 margin-right: 26rpx; 17 margin-right: 26rpx;
18 text-align: center; 18 text-align: center;
@@ -81,6 +81,10 @@ @@ -81,6 +81,10 @@
81 color: rgb(236, 201, 201); 81 color: rgb(236, 201, 201);
82 box-sizing: border-box; 82 box-sizing: border-box;
83 } 83 }
  84 +.add_btn text{
  85 + position: relative;
  86 + top: -12rpx;
  87 +}
84 .img_box { 88 .img_box {
85 /* position: relative; */ 89 /* position: relative; */
86 border: none; 90 border: none;
@@ -138,6 +142,7 @@ @@ -138,6 +142,7 @@
138 height: 100%; 142 height: 100%;
139 border-radius: 10rpx; 143 border-radius: 10rpx;
140 padding-left: 20rpx; 144 padding-left: 20rpx;
  145 + font-size: 28rpx;
141 } 146 }
142 .cancle_action{ 147 .cancle_action{
143 width: 100rpx; 148 width: 100rpx;
@@ -158,6 +163,7 @@ @@ -158,6 +163,7 @@
158 flex: 1; 163 flex: 1;
159 width: 100%; 164 width: 100%;
160 background: #fff; 165 background: #fff;
  166 + overflow-y: scroll;
161 } 167 }
162 .adress_list { 168 .adress_list {
163 width: 100%; 169 width: 100%;
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <view class='list_content'> 9 <view class='list_content'>
10 <view class='list_info'>提交成功！</view> 10 <view class='list_info'>提交成功！</view>
11 <view>您已成功提交企业资料，请等待平台审核...</view> 11 <view>您已成功提交企业资料，请等待平台审核...</view>
12 - <view class='list_btn list_active' bindtap='post_btn'>发表帖子</view>  
13 - <view class='list_btn ' bindtap='goHome'>返回首页</view> 12 + <!-- <view class='list_btn list_active' bindtap='post_btn'>发表帖子</view> -->
  13 + <view class='list_btn list_active' bindtap='goHome'>返回首页</view>
14 </view> 14 </view>
15 </view> 15 </view>
@@ -38,12 +38,12 @@ @@ -38,12 +38,12 @@
38 38
39 .list_btn { 39 .list_btn {
40 width: 464rpx; 40 width: 464rpx;
41 - height: 96rpx; 41 + height: 88rpx;
42 border: 1rpx solid #e6e6e6; 42 border: 1rpx solid #e6e6e6;
43 border-radius: 8rpx; 43 border-radius: 8rpx;
44 - font-size: 34rpx; 44 + font-size: 30rpx;
45 color: #333; 45 color: #333;
46 - line-height: 96rpx; 46 + line-height: 88rpx;
47 text-align: center; 47 text-align: center;
48 margin-top: 50rpx; 48 margin-top: 50rpx;
49 margin: 40rpx auto; 49 margin: 40rpx auto;
@@ -15,8 +15,8 @@ @@ -15,8 +15,8 @@
15 </view> 15 </view>
16 </view> 16 </view>
17 <!-- --> 17 <!-- -->
18 -<view class='content_box' hidden='{{auth!=2}}'>  
19 - <view class='item_list' bindtap='TB' bindtap="btn_post"> 18 +<view class='content_box'>
  19 + <view class='item_list' bindtap='TB' bindtap="btn_post" hidden='{{auth!=2}}'>
20 <view class='list_icon'> 20 <view class='list_icon'>
21 <text class='iconfont icon-wodetiezi'></text> 21 <text class='iconfont icon-wodetiezi'></text>
22 </view> 22 </view>
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <view class='iconfont icon-go'></view> 25 <view class='iconfont icon-go'></view>
26 </view> 26 </view>
27 </view> 27 </view>
28 - <view class='item_list' bindtap='vipCharge' bindtap="btn_attention"> 28 + <view class='item_list' bindtap="btn_attention">
29 <view class='list_icon'> 29 <view class='list_icon'>
30 <text class='iconfont icon-xing'></text> 30 <text class='iconfont icon-xing'></text>
31 </view> 31 </view>
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 <text class='iconfont icon-go'></text> 34 <text class='iconfont icon-go'></text>
35 </view> 35 </view>
36 </view> 36 </view>
37 - <view class='item_list' bindtap='reportList' bindtap='btn_like'> 37 + <view class='item_list' bindtap='reportList' bindtap='btn_like' hidden='{{auth!=2}}'>
38 <view class='list_icon'> 38 <view class='list_icon'>
39 <text class='iconfont icon-zan21'></text> 39 <text class='iconfont icon-zan21'></text>
40 </view> 40 </view>
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 <view class='iconfont icon-go'></view> 43 <view class='iconfont icon-go'></view>
44 </view> 44 </view>
45 </view> 45 </view>
46 - <view class='item_list' bindtap='reportList' bindtap='btn_comment'> 46 + <view class='item_list' bindtap='reportList' bindtap='btn_comment' hidden='{{auth!=2}}'>
47 <view class='list_icon'> 47 <view class='list_icon'>
48 <text class='iconfont icon-pinglun1'></text> 48 <text class='iconfont icon-pinglun1'></text>
49 </view> 49 </view>
@@ -65,10 +65,10 @@ @@ -65,10 +65,10 @@
65 </view> 65 </view>
66 </view> 66 </view>
67 </view> 67 </view>
68 -<view class='null_data_box' hidden='{{auth==2}}'> 68 +<!-- <view class='null_data_box' hidden='{{auth==2}}'>
69 <view class='data_box'> 69 <view class='data_box'>
70 <image src='/images/weirenzheng@2x.png'></image> 70 <image src='/images/weirenzheng@2x.png'></image>
71 <view class='list_btn' bindtap='open_btn' data-type='{{auth}}' bindtap='renzheng'>{{auth=='0'?'开通企业认证 >':auth=='1'?'企业认证中 请等待':""}}</view> 71 <view class='list_btn' bindtap='open_btn' data-type='{{auth}}' bindtap='renzheng'>{{auth=='0'?'开通企业认证 >':auth=='1'?'企业认证中 请等待':""}}</view>
72 <view wx:if='{{auth=="0"}}'> ~~ 企业认证后开启更多服务 ~~</view> 72 <view wx:if='{{auth=="0"}}'> ~~ 企业认证后开启更多服务 ~~</view>
73 </view> 73 </view>
74 -</view>  
  74 +</view> -->
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 2
3 page { 3 page {
4 background: #f5f5fa; 4 background: #f5f5fa;
  5 + overflow-x:hidden;
5 } 6 }
6 7
7 .banner_box { 8 .banner_box {
@@ -52,16 +53,16 @@ page { @@ -52,16 +53,16 @@ page {
52 } 53 }
53 54
54 .banner_label { 55 .banner_label {
55 - width: 160rpx;  
56 font-size: 22rpx; 56 font-size: 22rpx;
57 color: #169bd5; 57 color: #169bd5;
58 background: rgba(22, 155, 213, 0.2); 58 background: rgba(22, 155, 213, 0.2);
59 border-radius: 24rpx; 59 border-radius: 24rpx;
60 padding: 5rpx 10rpx; 60 padding: 5rpx 10rpx;
61 - display: flex; 61 + display: inline-flex;
62 align-items: center; 62 align-items: center;
63 justify-content: center; 63 justify-content: center;
64 margin-top: 14rpx; 64 margin-top: 14rpx;
  65 + min-width: 160rpx;
65 } 66 }
66 67
67 .banner_label image { 68 .banner_label image {
@@ -27,10 +27,20 @@ Page({ @@ -27,10 +27,20 @@ Page({
27 console.log(res); 27 console.log(res);
28 b.setData({ 28 b.setData({
29 followList: res.data, 29 followList: res.data,
30 - ifData: res.data.length>0?true:false 30 + ifData: res.data.length>0?true:false,
  31 + noMore: res.last_page==res.current_page?!0:!1
31 }) 32 })
32 }) 33 })
33 }, 34 },
  35 + getMore(){
  36 + this.setData({
  37 + page: this.data.page++
  38 + })
  39 + !this.data.noMore?this.getFollowList():wx.showToast({
  40 + title: '没有更多了',
  41 + icon:'none'
  42 + })
  43 + },
34 44
35 /** 45 /**
36 * 生命周期函数--监听页面初次渲染完成 46 * 生命周期函数--监听页面初次渲染完成
1 <!--pages/my/myAttention/myAttention.wxml--> 1 <!--pages/my/myAttention/myAttention.wxml-->
2 -<scroll-view class='box' scroll-y='true' hidden='{{!ifData}}'> 2 +<scroll-view class='box' scroll-y='true' hidden='{{!ifData}}' bindscrolltolower='getMore'>
3 <view class='item_list' wx:for='{{followList}}' wx:key="index"> 3 <view class='item_list' wx:for='{{followList}}' wx:key="index">
4 <image src='{{item.logo_image}}'></image> 4 <image src='{{item.logo_image}}'></image>
5 <view class='list_right'> 5 <view class='list_right'>
@@ -26,7 +26,9 @@ Page({ @@ -26,7 +26,9 @@ Page({
26 page: b.data.page 26 page: b.data.page
27 }; 27 };
28 a.post(url, params).then((res) => { 28 a.post(url, params).then((res) => {
29 - console.log(res); 29 + for(let b of res.data){
  30 + b.images = b.images.split(',')
  31 + }
30 b.setData({ 32 b.setData({
31 commentsList: b.data.commentsList.concat(res.data) 33 commentsList: b.data.commentsList.concat(res.data)
32 }) 34 })
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 <!-- 图片内容 --> 51 <!-- 图片内容 -->
52 <view class='mid_pic_box'> 52 <view class='mid_pic_box'>
53 <view class='mid_pic_item' wx:for="{{item.images}}" wx:key="index"> 53 <view class='mid_pic_item' wx:for="{{item.images}}" wx:key="index">
54 - <image src='{{item}}'></image> 54 + <image src='{{item}}' mode='widthFix'></image>
55 </view> 55 </view>
56 </view> 56 </view>
57 </view> 57 </view>
@@ -305,8 +305,8 @@ page{ @@ -305,8 +305,8 @@ page{
305 height: 100%; 305 height: 100%;
306 } 306 }
307 .mid_pic_item{ 307 .mid_pic_item{
308 - width:352rpx;  
309 - height:352rpx; 308 + width:218rpx;
  309 + height:218rpx;
310 background:rgba(0,0,0,0); 310 background:rgba(0,0,0,0);
311 opacity:1; 311 opacity:1;
312 display: flex; 312 display: flex;
@@ -315,7 +315,6 @@ page{ @@ -315,7 +315,6 @@ page{
315 } 315 }
316 .mid_pic_item image{ 316 .mid_pic_item image{
317 width: 100%; 317 width: 100%;
318 - height: 100%;  
319 } 318 }
320 .mid_item_content{ 319 .mid_item_content{
321 margin-top: 24rpx; 320 margin-top: 24rpx;
@@ -38,6 +38,15 @@ Page({ @@ -38,6 +38,15 @@ Page({
38 }) : '' 38 }) : ''
39 }) 39 })
40 }, 40 },
  41 + getMore() {
  42 + this.setData({
  43 + page: this.data.page++
  44 + })
  45 + !this.data.noMore ? this.getInformList() : wx.showToast({
  46 + title: '没有更多了',
  47 + icon: 'none'
  48 + })
  49 + },
41 50
42 /** 51 /**
43 * 生命周期函数--监听页面初次渲染完成 52 * 生命周期函数--监听页面初次渲染完成
1 - <scroll-view scroll-y='true' style='height:{{winHeight}}px' hidden='{{!ifData}}'> 1 + <scroll-view scroll-y='true' style='height:{{winHeight}}px' hidden='{{!ifData}}' bindscrolltolower='getMore'>
2 <view class='mid'> 2 <view class='mid'>
3 <view class='mid_item' wx:for="{{noticeList}}" wx:key="index"> 3 <view class='mid_item' wx:for="{{noticeList}}" wx:key="index">
4 <view class='mid_item_top'> 4 <view class='mid_item_top'>
@@ -8,7 +8,8 @@ Page({ @@ -8,7 +8,8 @@ Page({
8 data: { 8 data: {
9 likeList: [], 9 likeList: [],
10 page: 1, 10 page: 1,
11 - ifData: !1 11 + ifData: !1,
  12 + noMore:!1
12 }, 13 },
13 14
14 /** 15 /**
@@ -25,10 +26,13 @@ Page({ @@ -25,10 +26,13 @@ Page({
25 page: b.data.page 26 page: b.data.page
26 }; 27 };
27 a.post(url, params).then((res) => { 28 a.post(url, params).then((res) => {
28 - console.log(res); 29 + for(let b of res.data){
  30 + b.images = b.images.split(',')
  31 + }
29 b.setData({ 32 b.setData({
30 - likeList: res.data,  
31 - ifData: res.data.length>0?true:false 33 + likeList: b.data.likeList.concat(res.data),
  34 + ifData: res.data.length>0?true:false,
  35 + noMore: res.data.length < res.per_page?!0:!1
32 }) 36 })
33 }) 37 })
34 }, 38 },
@@ -73,10 +77,13 @@ Page({ @@ -73,10 +77,13 @@ Page({
73 */ 77 */
74 onReachBottom: function() { 78 onReachBottom: function() {
75 let that = this; 79 let that = this;
76 - that.setData({ 80 + !this.data.noMore ? (that.setData({
77 page: that.data.page + 1, 81 page: that.data.page + 1,
78 - });  
79 - that.getLikeList(); 82 + }), that.getLikeList()):wx.showToast({
  83 + title: '没有更多了',
  84 + icon: 'none'
  85 + })
  86 +
80 }, 87 },
81 88
82 /** 89 /**
@@ -292,13 +292,16 @@ page{ @@ -292,13 +292,16 @@ page{
292 } 292 }
293 .mid_pic_box_p{ 293 .mid_pic_box_p{
294 margin-top: 16rpx; 294 margin-top: 16rpx;
295 - margin-right: 18rpx; 295 + margin-right: 16rpx;
296 width:218rpx; 296 width:218rpx;
297 height:218rpx; 297 height:218rpx;
298 background:rgba(0,0,0,0); 298 background:rgba(0,0,0,0);
299 opacity:1; 299 opacity:1;
300 display: flex; 300 display: flex;
301 } 301 }
  302 +.mid_pic_box_p:nth-child(3n){
  303 + margin-right: 0;
  304 +}
302 .mid_pic_box_p image{ 305 .mid_pic_box_p image{
303 width: 100%; 306 width: 100%;
304 height: 100%; 307 height: 100%;
@@ -29,6 +29,9 @@ Page({ @@ -29,6 +29,9 @@ Page({
29 page: b.data.page 29 page: b.data.page
30 }; 30 };
31 a.post(url,params).then((r)=>{ 31 a.post(url,params).then((r)=>{
  32 + for(let b of r.data){
  33 + b.images = b.images.split(',');
  34 + }
32 let dataList = b.data.articleList.concat(r.data); 35 let dataList = b.data.articleList.concat(r.data);
33 b.setData({ 36 b.setData({
34 articleList: dataList, 37 articleList: dataList,
@@ -41,12 +44,16 @@ Page({ @@ -41,12 +44,16 @@ Page({
41 44
42 }) 45 })
43 }, 46 },
  47 + navdetail(e) {
  48 + wx.navigateTo({
  49 + url: '/pages/colleagues_2/colleagues_2?id=' + e.currentTarget.id,
  50 + })
  51 + },
44 delArticle(e){ 52 delArticle(e){
45 console.log(e) 53 console.log(e)
46 let t = this, id = e.currentTarget.id, url ='/api/interact/deletePosts',params={ 54 let t = this, id = e.currentTarget.id, url ='/api/interact/deletePosts',params={
47 - id:id,  
48 - header:true  
49 - }; 55 + id:id
  56 + },index = e.currentTarget.dataset.indx;
50 wx.showModal({ 57 wx.showModal({
51 title: '提示', 58 title: '提示',
52 content: '确认删除这个帖子吗？', 59 content: '确认删除这个帖子吗？',
@@ -58,7 +65,11 @@ Page({ @@ -58,7 +65,11 @@ Page({
58 icon:'none', 65 icon:'none',
59 duration: 1300 66 duration: 1300
60 }) 67 })
61 - t.articleList() 68 + t.data.articleList.splice(index,1);
  69 + t.setData({
  70 + articleList: t.data.articleList
  71 + })
  72 +
62 }) 73 })
63 } 74 }
64 } 75 }
@@ -3,17 +3,17 @@ @@ -3,17 +3,17 @@
3 <view class='item'> 3 <view class='item'>
4 <view class='item_top'>{{item.title}}</view> 4 <view class='item_top'>{{item.title}}</view>
5 <view class='item_mid'> 5 <view class='item_mid'>
6 - <view class='item_mid_text'>{{item.content}}</view> 6 + <view class='item_mid_text' bindtap='navdetail' id='{{item.id}}'>{{item.content}}</view>
7 <!-- 图片盒子 --> 7 <!-- 图片盒子 -->
8 - <view class='item_mid_box' wx:if="{{item.images}}">  
9 - <view class='item_mid_box_pic'>  
10 - <image src='{{item.images}}'></image> 8 + <view class='item_mid_box' hidden='{{item.images.length==0}}' bindtap='navdetail' id='{{item.id}}'>
  9 + <view class='item_mid_box_pic' wx:for="{{item.images}}" wx:for-item="sec" wx:key=''>
  10 + <image src='{{sec}}' mode='widthFix'></image>
11 </view> 11 </view>
12 </view> 12 </view>
13 </view> 13 </view>
14 <!-- 底部 --> 14 <!-- 底部 -->
15 <view class='item_bottom'> 15 <view class='item_bottom'>
16 - <view class='item_left' data-id='{{item.id}}' bindtap='delArticle'> 16 + <view class='item_left' id='{{item.id}}' bindtap='delArticle' data-indx = "{{index}}">
17 删除 17 删除
18 </view> 18 </view>
19 <view class='item_right'> 19 <view class='item_right'>
@@ -38,44 +38,7 @@ @@ -38,44 +38,7 @@
38 </view> 38 </view>
39 </view> 39 </view>
40 </view> 40 </view>
41 - <view class='item'>  
42 - <view class='item_top'>{{item.title}}</view>  
43 - <view class='item_mid'>  
44 - <view class='item_mid_text'>{{item.content}}</view>  
45 - <!-- 图片盒子 -->  
46 - <view class='item_mid_box' wx:if="{{item.images}}">  
47 - <view class='item_mid_box_pic'>  
48 - <image src='{{item.images}}'></image>  
49 - </view>  
50 - </view>  
51 - </view>  
52 - <!-- 底部 -->  
53 - <view class='item_bottom'>  
54 - <view class='item_left' id='{{item.id}}' bindtap='delArticle'>  
55 - 删除  
56 - </view>  
57 - <view class='item_right'>  
58 - <!-- 图片 -->  
59 - <view class='item_right_pic'>  
60 - <image src='../../images/chakan@3x.png'></image>  
61 - </view>  
62 - <!-- 数量 -->  
63 - <view class='item_right_number'>  
64 - {{item.browse_count}}  
65 - </view>  
66 -  
67 - <!-- 图片 -->  
68 - <view class='item_right_pic2'>  
69 - <image src='../../images/pinglun@3x.png'></image>  
70 - </view>  
71 - <!-- 数量 -->  
72 - <view class='item_right_number'>  
73 - {{item.comment_count}}  
74 - </view>  
75 41
76 - </view>  
77 - </view>  
78 - </view>  
79 </block> 42 </block>
80 43
81 44
@@ -41,17 +41,15 @@ page{ @@ -41,17 +41,15 @@ page{
41 background:rgba(0,0,0,0); 41 background:rgba(0,0,0,0);
42 opacity:1; 42 opacity:1;
43 display: flex; 43 display: flex;
44 - 44 + align-items: center;
  45 + overflow: hidden;
45 } 46 }
46 47
47 .item_mid_box{ 48 .item_mid_box{
48 display: flex; 49 display: flex;
49 flex-wrap: wrap; 50 flex-wrap: wrap;
50 } 51 }
51 -.item_mid_box_pic image{  
52 - width: 100%;  
53 - height: 100%;  
54 -} 52 +
55 .item_bottom{ 53 .item_bottom{
56 margin-top: 18rpx; 54 margin-top: 18rpx;
57 display: flex; 55 display: flex;
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 "ignore": [] 4 "ignore": []
5 }, 5 },
6 "setting": { 6 "setting": {
7 - "urlCheck": true, 7 + "urlCheck": false,
8 "es6": true, 8 "es6": true,
9 "postcss": true, 9 "postcss": true,
10 "minified": true, 10 "minified": true,
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 }, 13 },
14 "compileType": "miniprogram", 14 "compileType": "miniprogram",
15 "libVersion": "2.6.2", 15 "libVersion": "2.6.2",
16 - "appid": "wx75855734b0730d64", 16 + "appid": "wx6956a8b092f2f247",
17 "projectname": "%E6%9D%8E%E4%B8%83%E5%BA%84", 17 "projectname": "%E6%9D%8E%E4%B8%83%E5%BA%84",
18 "debugOptions": { 18 "debugOptions": {
19 "hidedInDevtools": [] 19 "hidedInDevtools": []
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 "list": [] 37 "list": []
38 }, 38 },
39 "miniprogram": { 39 "miniprogram": {
40 - "current": 36, 40 + "current": 40,
41 "list": [ 41 "list": [
42 { 42 {
43 "id": 0, 43 "id": 0,
@@ -297,6 +297,34 @@ @@ -297,6 +297,34 @@
297 "pathName": "pages/colleagues_2/colleagues_2", 297 "pathName": "pages/colleagues_2/colleagues_2",
298 "query": "id=1", 298 "query": "id=1",
299 "scene": null 299 "scene": null
  300 + },
  301 + {
  302 + "id": -1,
  303 + "name": "text_17",
  304 + "pathName": "pages/attract/attract",
  305 + "query": "",
  306 + "scene": null
  307 + },
  308 + {
  309 + "id": -1,
  310 + "name": "text_17",
  311 + "pathName": "pages/attract/detail/detail",
  312 + "query": "",
  313 + "scene": null
  314 + },
  315 + {
  316 + "id": -1,
  317 + "name": "text_17",
  318 + "pathName": "pages/my/approveInfo/approveInfo",
  319 + "query": "",
  320 + "scene": null
  321 + },
  322 + {
  323 + "id": -1,
  324 + "name": "text_17",
  325 + "pathName": "pages/enterprise/enterprise",
  326 + "query": "",
  327 + "scene": null
300 } 328 }
301 ] 329 ]
302 } 330 }