miniprogram / liqizhuang · 提交

转到一个项目

作者 乔爽
提交 55ea74442dd56d7e61fa58aed4b57d24bc09f2e8 1 个父辈 7cf9c383

更新

内嵌 并排对比
正在显示 13 个修改的文件 包含 190 行增加 和 133 行删除
1 { 1 {
2 "pages": [ 2 "pages": [
3 - "pages/myInform/myInform",  
4 "pages/my/approveInfo/approveInfo", 3 "pages/my/approveInfo/approveInfo",
  4 + "pages/myInform/myInform",
  5 +
5 "pages/my/approve/approve", 6 "pages/my/approve/approve",
6 "pages/matrix/article/article", 7 "pages/matrix/article/article",
7 "pages/myComments/myComments", 8 "pages/myComments/myComments",
@@ -16,7 +17,6 @@ @@ -16,7 +17,6 @@
16 "pages/interact/interact", 17 "pages/interact/interact",
17 "pages/my/myAttention/myAttention", 18 "pages/my/myAttention/myAttention",
18 "pages/my/my", 19 "pages/my/my",
19 - "pages/matrix/article/article",  
20 "pages/matrix/company/company", 20 "pages/matrix/company/company",
21 "pages/attract/attract", 21 "pages/attract/attract",
22 "pages/attract/detail/detail" 22 "pages/attract/detail/detail"
@@ -36,13 +36,13 @@ @@ -36,13 +36,13 @@
36 "selectedIconPath": "images/02_nav_fill@2x.png" 36 "selectedIconPath": "images/02_nav_fill@2x.png"
37 }, 37 },
38 { 38 {
39 - "pagePath": "pages/matrix/matrix", 39 + "pagePath": "pages/enterprise_q&a/enterprise_q&a",
40 "text": "政企互动", 40 "text": "政企互动",
41 "iconPath": "/images/03_nav@2x.png", 41 "iconPath": "/images/03_nav@2x.png",
42 "selectedIconPath": "images/03_nav_fill@2x.png" 42 "selectedIconPath": "images/03_nav_fill@2x.png"
43 }, 43 },
44 { 44 {
45 - "pagePath": "pages/matrix/matrix", 45 + "pagePath": "pages/my/my",
46 "text": "政企服务", 46 "text": "政企服务",
47 "iconPath": "/images/04_nav@2x.png", 47 "iconPath": "/images/04_nav@2x.png",
48 "selectedIconPath": "images/04_nav_fill@2x.png" 48 "selectedIconPath": "images/04_nav_fill@2x.png"
@@ -14,6 +14,11 @@ Page({ @@ -14,6 +14,11 @@ Page({
14 onLoad: function (options) { 14 onLoad: function (options) {
15 15
16 }, 16 },
  17 + btn_matrix(){
  18 + wx.navigateTo({
  19 + url: '/pages/matrix/article/article',
  20 + })
  21 + },
17 chooseLocation(){ 22 chooseLocation(){
18 wx.chooseLocation({ 23 wx.chooseLocation({
19 success: function(res) {}, 24 success: function(res) {},
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <!-- 新闻 --> 21 <!-- 新闻 -->
22 <view class='news_detail_container'> 22 <view class='news_detail_container'>
23 <view class='news_detail_items'> 23 <view class='news_detail_items'>
24 - <view class='news_detail_item'> 24 + <view class='news_detail_item ' bindtap='btn_matrix'>
25 <view class='new_info'> 25 <view class='new_info'>
26 <view class='new_title'>市国土管局关于同意西青李七庄街天骄北道侧工业地块农用地转用土地征收实施方案的函</view> 26 <view class='new_title'>市国土管局关于同意西青李七庄街天骄北道侧工业地块农用地转用土地征收实施方案的函</view>
27 27
@@ -4,7 +4,16 @@ Page({ @@ -4,7 +4,16 @@ Page({
4 * 页面的初始数据 4 * 页面的初始数据
5 */ 5 */
6 data: { 6 data: {
7 - 7 + navbar: [{
  8 + name: '企业问答'
  9 + },
  10 + {
  11 + name: '企话吧'
  12 + }
  13 +
  14 +
  15 + ],
  16 + currentTab: 0,
8 }, 17 },
9 18
10 /** 19 /**
@@ -13,7 +22,23 @@ Page({ @@ -13,7 +22,23 @@ Page({
13 onLoad: function (options) { 22 onLoad: function (options) {
14 23
15 }, 24 },
  25 + navbarTap: function (e) {
  26 + console.log(88)
  27 + let that = this;
  28 + this.setData({
  29 + currentTab: e.currentTarget.dataset.idx,
  30 + })
  31 + },
  32 + jump(){
  33 + wx.navigateTo({
  34 + url: '',
  35 + })
16 36
  37 + wx.switchTab({
  38 + url: '',
  39 + })
  40 + },
  41 +
17 /** 42 /**
18 * 生命周期函数--监听页面初次渲染完成 43 * 生命周期函数--监听页面初次渲染完成
19 */ 44 */
@@ -2,13 +2,19 @@ @@ -2,13 +2,19 @@
2 <view class='container'> 2 <view class='container'>
3 3
4 4
5 - <view class='top'> 5 + <!-- <view class='top'>
6 <view class='top_left'>企业问答</view> 6 <view class='top_left'>企业问答</view>
7 <view class='top_right'>企话吧</view> 7 <view class='top_right'>企话吧</view>
8 - </view> 8 + </view> -->
  9 +
  10 + <view class="nav mainindex_nav top">
  11 +<view wx:for="{{navbar}}" data-idx="{{index}}" class="nav_item {{currentTab==index ? 'active' : ''}}" wx:key="unique" bindtap="navbarTap" data-categoryid="{{item.id}}">{{item.name}}
  12 + </view>
  13 + </view>
  14 +
9 <!-- 企业问答 --> 15 <!-- 企业问答 -->
10 - <view class='box_left' style='display:block'>  
11 - <view class='mid'> 16 + <view class='box_left' wx:if="{{currentTab==0}}">
  17 + <view class='mid' bindtap="jump">
12 <view class='mid_item'> 18 <view class='mid_item'>
13 <!-- 左边感叹号 --> 19 <!-- 左边感叹号 -->
14 <view class='mid_item_left'> 20 <view class='mid_item_left'>
@@ -109,7 +115,7 @@ @@ -109,7 +115,7 @@
109 </view> 115 </view>
110 116
111 <!-- 企话吧 --> 117 <!-- 企话吧 -->
112 - <view class='box_right' style='display:none'> 118 + <view class='box_right' wx:if="{{currentTab==1}}">
113 <view class='mid'> 119 <view class='mid'>
114 <!-- 标题 --> 120 <!-- 标题 -->
115 <view class='mid_title'> 121 <view class='mid_title'>
@@ -136,6 +142,19 @@ @@ -136,6 +142,19 @@
136 <view class='mid_item_text'> 142 <view class='mid_item_text'>
137 新个人所得税法近日备受关注。关于个人所得税，想必大家都十分关心，让我们通过以下问题！ 143 新个人所得税法近日备受关注。关于个人所得税，想必大家都十分关心，让我们通过以下问题！
138 </view> 144 </view>
  145 + <!-- 图片 -->
  146 + <view class='mid_pic_box'>
  147 + <view class='mid_pic_box_item'>
  148 + <image src='../../images/weirenzheng@3x.png'></image>
  149 + </view>
  150 + <view class='mid_pic_box_item'>
  151 + <image src='../../images/weirenzheng@3x.png'></image>
  152 + </view>
  153 + <view class='mid_pic_box_item'>
  154 + <image src='../../images/weirenzheng@3x.png'></image>
  155 + </view>
  156 +
  157 + </view>
139 <!-- 底部 --> 158 <!-- 底部 -->
140 <view class='mid_item_like'> 159 <view class='mid_item_like'>
141 <view class='mid_item_like_left'> 160 <view class='mid_item_like_left'>
@@ -190,6 +209,19 @@ @@ -190,6 +209,19 @@
190 <view class='mid_item_text'> 209 <view class='mid_item_text'>
191 新个人所得税法近日备受关注。关于个人所得税，想必大家都十分关心，让我们通过以下问题！ 210 新个人所得税法近日备受关注。关于个人所得税，想必大家都十分关心，让我们通过以下问题！
192 </view> 211 </view>
  212 + <!-- 图片 -->
  213 + <view class='mid_pic_box'>
  214 + <view class='mid_pic_box_item'>
  215 + <image src='../../images/weirenzheng@3x.png'></image>
  216 + </view>
  217 + <view class='mid_pic_box_item'>
  218 + <image src='../../images/weirenzheng@3x.png'></image>
  219 + </view>
  220 + <view class='mid_pic_box_item'>
  221 + <image src='../../images/weirenzheng@3x.png'></image>
  222 + </view>
  223 +
  224 + </view>
193 <!-- 底部 --> 225 <!-- 底部 -->
194 <view class='mid_item_like'> 226 <view class='mid_item_like'>
195 <view class='mid_item_like_left'> 227 <view class='mid_item_like_left'>
@@ -7,12 +7,33 @@ page{ @@ -7,12 +7,33 @@ page{
7 flex-flow: column; 7 flex-flow: column;
8 8
9 } 9 }
  10 +.nav_item{
  11 + width: 169rpx;
  12 + text-align: center
  13 +
  14 +}
  15 +.active{
  16 + color: #169BD5;
  17 + position: relative;
  18 +}
  19 +.active:before{
  20 + content: "";
  21 + width: 169rpx;
  22 + height: 2px;
  23 + background: #169BD5;
  24 + position: absolute;
  25 + bottom: 0;
  26 + left:0;
  27 + right:0;
  28 +
  29 +}
  30 +
10 .top{ 31 .top{
11 width: 100%; 32 width: 100%;
12 height: 80rpx; 33 height: 80rpx;
13 line-height: 80rpx; 34 line-height: 80rpx;
14 display: flex; 35 display: flex;
15 - justify-content: space-around; 36 + justify-content: space-between;
16 37
17 font-size:26rpx; 38 font-size:26rpx;
18 font-family:PingFang SC; 39 font-family:PingFang SC;
@@ -20,6 +41,10 @@ page{ @@ -20,6 +41,10 @@ page{
20 color: #999999; 41 color: #999999;
21 background: #fff; 42 background: #fff;
22 opacity:1; 43 opacity:1;
  44 + box-sizing: border-box;
  45 + padding: 0 150rpx;
  46 + position: fixed;
  47 + z-index: 999;
23 } 48 }
24 .top_left{ 49 .top_left{
25 width: 169rpx; 50 width: 169rpx;
@@ -28,7 +53,6 @@ page{ @@ -28,7 +53,6 @@ page{
28 text-align: center; 53 text-align: center;
29 } 54 }
30 .mid{ 55 .mid{
31 - margin-top: 16rpx;  
32 width: 100%; 56 width: 100%;
33 display: flex; 57 display: flex;
34 align-items: center; 58 align-items: center;
@@ -286,3 +310,25 @@ page{ @@ -286,3 +310,25 @@ page{
286 .mid_item_bottom view:last-child{ 310 .mid_item_bottom view:last-child{
287 margin-top: 10rpx; 311 margin-top: 10rpx;
288 } 312 }
  313 +.box_left{
  314 + margin-top: 96rpx;
  315 +}
  316 +.box_right{
  317 + margin-top: 96rpx;
  318 +}
  319 +.mid_pic_box{
  320 + display: flex;
  321 + flex-wrap: wrap;
  322 +}
  323 +.mid_pic_box_item{
  324 + width:218rpx;
  325 + height:218rpx;
  326 + margin-right: 10rpx;
  327 + background:rgba(0,0,0,0);
  328 + opacity:1;
  329 + display: flex;
  330 +}
  331 +.mid_pic_box_item image{
  332 + width: 100%;
  333 + height: 100%;
  334 +}
@@ -14,7 +14,12 @@ Page({ @@ -14,7 +14,12 @@ Page({
14 onLoad: function (options) { 14 onLoad: function (options) {
15 15
16 }, 16 },
17 - 17 + btn_approve() {
  18 + wx.navigateTo({
  19 + url: '/pages/my/approveInfo/approveInfo',
  20 + })
  21 + },
  22 +
18 /** 23 /**
19 * 生命周期函数--监听页面初次渲染完成 24 * 生命周期函数--监听页面初次渲染完成
20 */ 25 */
@@ -50,4 +50,4 @@ @@ -50,4 +50,4 @@
50 </view> 50 </view>
51 </view> 51 </view>
52 52
53 -<view class='bottom_btn'>认证</view>  
  53 +<view class='bottom_btn' bindtap='btn_approve'>认证</view>
@@ -14,7 +14,14 @@ Page({ @@ -14,7 +14,14 @@ Page({
14 onLoad: function (options) { 14 onLoad: function (options) {
15 15
16 }, 16 },
  17 + post_btn() {
17 18
  19 + wx.navigateTo({
  20 + url: '/pages/interact/interactPost/interactPost',
  21 + })
  22 + },
  23 +
  24 +
18 /** 25 /**
19 * 生命周期函数--监听页面初次渲染完成 26 * 生命周期函数--监听页面初次渲染完成
20 */ 27 */
@@ -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='myInfo'>发表帖子</view> 12 + <view class='list_btn list_active' bindtap='post_btn'>发表帖子</view>
13 <view class='list_btn ' bindtap='goHome'>返回首页</view> 13 <view class='list_btn ' bindtap='goHome'>返回首页</view>
14 </view> 14 </view>
15 </view> 15 </view>
@@ -5,7 +5,7 @@ Page({ @@ -5,7 +5,7 @@ Page({
5 * 页面的初始数据 5 * 页面的初始数据
6 */ 6 */
7 data: { 7 data: {
8 - 8 + status:false
9 }, 9 },
10 10
11 /** 11 /**
@@ -14,7 +14,44 @@ Page({ @@ -14,7 +14,44 @@ Page({
14 onLoad: function (options) { 14 onLoad: function (options) {
15 15
16 }, 16 },
  17 + open_btn() {
  18 + wx.navigateTo({
  19 + url: '/pages/my/approve/approve',
  20 + })
  21 + this.setData({
  22 + status:true
  23 + })
  24 + },
  25 + btn_post() {
  26 +
  27 + wx.navigateTo({
  28 + url: '../myPost/myPost',
  29 + })
  30 + },
  31 + btn_attention() {
  32 +
  33 + wx.navigateTo({
  34 + url: '/pages/my/myAttention/myAttention',
  35 + })
  36 + },
  37 + btn_like() {
17 38
  39 + wx.navigateTo({
  40 + url: '/pages/myLike/myLike',
  41 + })
  42 + },
  43 + btn_comment() {
  44 +
  45 + wx.navigateTo({
  46 + url: '/pages/myComments/myComments',
  47 + })
  48 + },
  49 + btn_inform() {
  50 +
  51 + wx.navigateTo({
  52 + url: '/pages/myInform/myInform',
  53 + })
  54 + },
18 /** 55 /**
19 * 生命周期函数--监听页面初次渲染完成 56 * 生命周期函数--监听页面初次渲染完成
20 */ 57 */
@@ -15,17 +15,17 @@ @@ -15,17 +15,17 @@
15 </view> 15 </view>
16 </view> 16 </view>
17 <!-- --> 17 <!-- -->
18 -<view class='content_box' wx:if=''>  
19 - <view class='item_list' bindtap='TB'> 18 +<view class='content_box' wx:if='{{status}}'>
  19 + <view class='item_list' bindtap='TB' bindtap="btn_post">
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>
23 <view class='list_item_box'> 23 <view class='list_item_box'>
24 - <view>我的帖子</view> 24 + <view >我的帖子</view>
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'> 28 + <view class='item_list' bindtap='vipCharge' 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'> 37 + <view class='item_list' bindtap='reportList' bindtap='btn_like'>
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'> 46 + <view class='item_list' bindtap='reportList' bindtap='btn_comment'>
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>
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 <view class='iconfont icon-go'></view> 52 <view class='iconfont icon-go'></view>
53 </view> 53 </view>
54 </view> 54 </view>
55 - <view class='item_list' bindtap='articlList'> 55 + <view class='item_list' bindtap='articlList' bindtap='btn_inform'>
56 <view class='list_icon'> 56 <view class='list_icon'>
57 <text class='iconfont icon-tongzhi'></text> 57 <text class='iconfont icon-tongzhi'></text>
58 </view> 58 </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'> 68 +<view class='null_data_box' wx:else>
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'>开通企业认证 ></view> 71 + <view class='list_btn' bindtap='open_btn'>开通企业认证 ></view>
72 <view> ~~ 企业认证后开启更多服务 ~~</view> 72 <view> ~~ 企业认证后开启更多服务 ~~</view>
73 </view> 73 </view>
74 </view> 74 </view>
@@ -3,107 +3,7 @@ @@ -3,107 +3,7 @@
3 3
4 4
5 5
6 - <!-- 企业问答 -->  
7 - <view class='box_left' style='display:none'>  
8 - <view class='mid'>  
9 - <view class='mid_item'>  
10 - <!-- 左边感叹号 -->  
11 - <view class='mid_item_left'>  
12 - <image src='../../images/tishi@3x.png'></image>  
13 - </view>  
14 - <!-- 右边标题 -->  
15 - <view class='mid_item_right'>  
16 - <view class='mid_item_right_top'>  
17 - 校区门口停车难，镇政府是否可协调交管局规划车位，方便学生家长停车？  
18 - <view class='mid_label'>  
19 - <image src='../../images/huifujishi@3x.png'></image>  
20 - </view>  
21 - </view>  
22 - <view class='mid_item_right_bottom'>  
23 - 发布时间： 07-21 21:00  
24 - </view>  
25 - <!-- 回复 -->  
26 - <view class='response_box'>  
27 - <!-- 回复内容 -->  
28 - <view class='mid_item_right_response'>  
29 - <text class='color_blue'>回复:</text>  
30 - 贵单位的问题已反应到相关单位，具体实施方案将在7个工作日内反馈  
31 -  
32 - </view>  
33 - <!-- 回复时间 -->  
34 - <view class='mid_item_right_bottom'>  
35 - 回复时间：07-21 21:00  
36 - </view>  
37 - </view>  
38 -  
39 - </view>  
40 - </view>  
41 -  
42 - <view class='mid_item'>  
43 - <!-- 左边感叹号 -->  
44 - <view class='mid_item_left'>  
45 - <image src='../../images/tishi@3x.png'></image>  
46 - </view>  
47 - <!-- 右边标题 -->  
48 - <view class='mid_item_right'>  
49 - <view class='mid_item_right_top'>  
50 - 校区门口停车难，镇政府是否可协调交管局规划车位，方便学生家长停车？  
51 - <view class='mid_label'>  
52 - <image src='../../images/huifuyiban@3x.png'></image>  
53 - </view>  
54 - </view>  
55 - <view class='mid_item_right_bottom'>  
56 - 发布时间：07-21 21:00  
57 - </view>  
58 - <!-- 回复 -->  
59 - <view class='response_box'>  
60 - <!-- 回复内容 -->  
61 - <view class='mid_item_right_response'>  
62 - <text class='color_blue'>回复:</text>  
63 - 贵单位的问题已反应到相关单位，具体实施方案将在7个工作日内反馈  
64 -  
65 - </view>  
66 - <!-- 回复时间 -->  
67 - <view class='mid_item_right_bottom'>  
68 - 回复时间：07-21 21:00  
69 - </view>  
70 - </view>  
71 -  
72 - </view>  
73 - </view>  
74 -  
75 - <view class='mid_item'>  
76 - <!-- 左边感叹号 -->  
77 - <view class='mid_item_left'>  
78 - <image src='../../images/tishi@3x.png'></image>  
79 - </view>  
80 - <!-- 右边标题 -->  
81 - <view class='mid_item_right'>  
82 - <view class='mid_item_right_top'>  
83 - 校区门口停车难，镇政府是否可协调交管局规划车位，方便学生家长停车？  
84 - <view class='mid_label'>  
85 - <image src='../../images/huifuzhihuan @3x.png'></image>  
86 - </view>  
87 - </view>  
88 - <view class='mid_item_right_bottom'>  
89 - 发布时间：07-21 21:00  
90 - </view>  
91 -  
92 - <!-- 等待回复 -->  
93 - <view class='waiting_response'>  
94 - 等待回复中.....  
95 - </view>  
96 - </view>  
97 - </view>  
98 -  
99 - </view>  
100 - <!-- 提问 -->  
101 - <view class='bottom'>  
102 - <view class='bottom_question'>  
103 - 提问  
104 - </view>  
105 - </view>  
106 - </view> 6 +
107 7
108 <!-- 企话吧 --> 8 <!-- 企话吧 -->
109 <view class='box_right'> 9 <view class='box_right'>
@@ -178,20 +78,20 @@ @@ -178,20 +78,20 @@
178 78
179 <view class='mid_item_like_right'> 79 <view class='mid_item_like_right'>
180 <!-- 点赞 --> 80 <!-- 点赞 -->
181 - <view class='mid_like color_blue'>  
182 - <image src='../../images/thumb-up-button@3x.png'></image> 81 + <view class='mid_like '>
  82 + <image src='../../images/zan@3x.png'></image>
183 </view> 83 </view>
184 <!-- 数量 --> 84 <!-- 数量 -->
185 - <view class='mid_number color_blue'> 85 + <view class='mid_number '>
186 46 86 46
187 </view> 87 </view>
188 88
189 - <!-- 点赞 --> 89 + <!-- 消息 -->
190 <view class='mid_like'> 90 <view class='mid_like'>
191 - <image src='../../images/pinglun@3x.png'></image> 91 + <image src='../../images/pinglun_fill@3x.png'></image>
192 </view> 92 </view>
193 <!-- 数量 --> 93 <!-- 数量 -->
194 - <view class='mid_number'> 94 + <view class='mid_number color_blue'>
195 46 95 46
196 </view> 96 </view>
197 </view> 97 </view>