Commit b9de76dca6b412d5f233055be324479fe7e90348

Authored by 李宇
1 parent 3eb65c13

1

apis/modules/ly.js
@@ -13,6 +13,10 @@ export default { @@ -13,6 +13,10 @@ export default {
13 getpolicyDocument(data){ 13 getpolicyDocument(data){
14 return request.get('/arePlaceName/policyDocument/list',data) 14 return request.get('/arePlaceName/policyDocument/list',data)
15 }, 15 },
  16 + // 政策文件详情
  17 + getpolicyDocumentone(data){
  18 + return request.get('/arePlaceName/policyDocument/'+data)
  19 + },
16 // 行政区 20 // 行政区
17 getplie(data){ 21 getplie(data){
18 return request.get('/areBoundary/plie/list',data) 22 return request.get('/areBoundary/plie/list',data)
pages.json
@@ -155,7 +155,8 @@ @@ -155,7 +155,8 @@
155 }, { 155 }, {
156 "path": "pages/maptask/maptask", 156 "path": "pages/maptask/maptask",
157 "style": { 157 "style": {
158 - "navigationStyle": "custom" 158 + "navigationBarTitleText": "我的任务",
  159 + "enablePullDownRefresh": false
159 } 160 }
160 }, { 161 }, {
161 "path": "pages/maptaskdetail/maptaskdetail", 162 "path": "pages/maptaskdetail/maptaskdetail",
pages/home/home.vue
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
128 }, 128 },
129 toponym() { 129 toponym() {
130 uni.navigateTo({ 130 uni.navigateTo({
131 - url:"/pages/toponym/toponym" 131 + url:"/pages/declaration/declaration?type=4"
132 }) 132 })
133 }, 133 },
134 tzyl(){ 134 tzyl(){
pages/maptask/maptask.scss
@@ -4,28 +4,20 @@ @@ -4,28 +4,20 @@
4 } 4 }
5 .content { 5 .content {
6 width: 100%; 6 width: 100%;
7 - padding-top: 100rpx; 7 +
8 } 8 }
9 .coupon-tab { 9 .coupon-tab {
10 - position: fixed;  
11 - left: 0;  
12 - top: 0;  
13 - z-index: 10;  
14 display: flex; 10 display: flex;
15 align-items: center; 11 align-items: center;
16 width: 100%; 12 width: 100%;
17 - height: 190rpx;  
18 - /* #ifdef MP-WEIXIN */  
19 - height: 220rpx;  
20 - /* #endif */  
21 background-color: #ffffff; 13 background-color: #ffffff;
  14 +
22 .tab { 15 .tab {
23 position: relative; 16 position: relative;
24 display: flex; 17 display: flex;
25 align-items: center; 18 align-items: center;
26 justify-content: center; 19 justify-content: center;
27 width: 33%; 20 width: 33%;
28 - height: 100%;  
29 text { 21 text {
30 font-size: 28rpx; 22 font-size: 28rpx;
31 color: #7C7C7C; 23 color: #7C7C7C;
pages/maptask/maptask.vue
1 -<template> 1 +<template>
2 <view class="page"> 2 <view class="page">
3 - <pyh-nv ref="nv" :config="nvConfig"></pyh-nv>  
4 - <view class="coupon-tab" :style="{'padding-top':(pageTop+'px')}"> 3 + <view class="coupon-tab" >
5 <view class="tab" :class="{'action':TabShow===0}" @click="onCouponTab(0)"> 4 <view class="tab" :class="{'action':TabShow===0}" @click="onCouponTab(0)">
6 - <text>全部</text> 5 + <text style="margin-bottom: 20rpx;">全部</text>
7 <text class="line"></text> 6 <text class="line"></text>
8 </view> 7 </view>
9 <view class="tab" :class="{'action':TabShow===1}" @click="onCouponTab(1)"> 8 <view class="tab" :class="{'action':TabShow===1}" @click="onCouponTab(1)">
10 - <text>未处理</text> 9 + <text style="margin-bottom: 20rpx;">未处理</text>
11 <text class="line"></text> 10 <text class="line"></text>
12 </view> 11 </view>
13 <view class="tab" :class="{'action':TabShow===2}" @click="onCouponTab(2)"> 12 <view class="tab" :class="{'action':TabShow===2}" @click="onCouponTab(2)">
14 - <text>已处理</text> 13 + <text style="margin-bottom: 20rpx;">已处理</text>
15 <text class="line"></text> 14 <text class="line"></text>
16 </view> 15 </view>
17 </view> 16 </view>
18 - <view class="listBox" :style="{'padding-top':(pageTop+'px')}">  
19 - <view class="content">  
20 - <!-- 列表 -->  
21 - <view class="user-list">  
22 - <view class="list" v-for="item in list" @click="maptaskdetail(item)">  
23 - <view class="title">  
24 - <view >{{item.taskName}}</view>  
25 - <!-- <text>{{item.taskStatus}}</text> -->  
26 - </view>  
27 - <view class="more-content">  
28 - <view class="more-content-img"><text class="more-content-text">{{item.taskStatus}}</text><image src="../../static/right.png"></image></view> 17 + <view class="listBox" >
  18 + <view class="content" >
  19 + <!-- 列表 -->
  20 + <view class="user-list">
  21 + <view class="list" v-for="item in list" @click="maptaskdetail(item)">
  22 + <view class="title">
  23 + <view>{{item.taskName}}</view>
  24 + <!-- <text>{{item.taskStatus}}</text> -->
  25 + </view>
  26 + <view class="more-content">
  27 + <view class="more-content-img"><text class="more-content-text" :style="item.taskStatus=='已处理'?'background: #00D970;':''">{{item.taskStatus}}</text>
  28 + <image src="../../static/right.png"></image>
  29 + </view>
  30 + </view>
  31 + </view>
29 </view> 32 </view>
30 </view> 33 </view>
31 </view> 34 </view>
32 - </view>  
33 - </view>  
34 - </view>  
35 -</template>  
36 -  
37 -<script>  
38 - export default {  
39 - data() { 35 + </view>
  36 +</template>
  37 +
  38 +<script>
  39 + export default {
  40 + data() {
40 return { 41 return {
41 TabShow: 0, 42 TabShow: 0,
42 - nvConfig:{  
43 - title:"我的任务",  
44 - bgColor:"#ffffff",  
45 - color:"#000000",  
46 - fixedAssist:{  
47 - hide:true, 43 + nvConfig: {
  44 + title: "我的任务",
  45 + bgColor: "#ffffff",
  46 + color: "#000000",
  47 + fixedAssist: {
  48 + hide: true,
48 }, 49 },
49 }, 50 },
50 - list:[],  
51 - pages:{  
52 - pageNum:1,  
53 - pageSize:10,  
54 - taskStatus:'',  
55 - toUser:uni.getStorageSync('USERS_KEY').phonenumber  
56 - }  
57 - } 51 + list: [],
  52 + pages: {
  53 + pageNum: 1,
  54 + pageSize: 10,
  55 + taskStatus: '',
  56 + toUser: uni.getStorageSync('USERS_KEY').phonenumber
  57 + }
  58 + }
  59 + },
  60 + onPageScroll(e) {
  61 + this.$refs.nv.pageScroll(e)
58 }, 62 },
59 - onPageScroll(e) {this.$refs.nv.pageScroll(e)},  
60 - computed:{  
61 - pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight} 63 + computed: {
  64 + pageTop() {
  65 + return parseInt(88 * uni.getSystemInfoSync().windowWidth / 750) + uni.getSystemInfoSync().statusBarHeight
  66 + }
62 }, 67 },
63 onShow() { 68 onShow() {
64 this.getwdrwlist(); 69 this.getwdrwlist();
65 }, 70 },
66 - methods:{ 71 + methods: {
67 // 获取我的任务的列表 72 // 获取我的任务的列表
68 - getwdrwlist(){  
69 - this.API.getwdrwlist(this.pages).then(res=>{  
70 - console.log("我的任务列表",res); 73 + getwdrwlist() {
  74 + this.API.getwdrwlist(this.pages).then(res => {
  75 + console.log("我的任务列表", res);
71 this.list = res.rows 76 this.list = res.rows
72 }) 77 })
73 }, 78 },
74 - onCouponTab(type){ 79 + onCouponTab(type) {
75 this.TabShow = type; 80 this.TabShow = type;
76 - if(type == 0){ 81 + if (type == 0) {
77 this.pages.taskStatus = '' 82 this.pages.taskStatus = ''
78 } 83 }
79 - if(type == 1){ 84 + if (type == 1) {
80 this.pages.taskStatus = '未处理' 85 this.pages.taskStatus = '未处理'
81 } 86 }
82 - if(type == 2){ 87 + if (type == 2) {
83 this.pages.taskStatus = '已处理' 88 this.pages.taskStatus = '已处理'
84 } 89 }
85 90
@@ -91,10 +96,10 @@ @@ -91,10 +96,10 @@
91 url: '/pages/maptaskdetail/maptaskdetail?info=' + info 96 url: '/pages/maptaskdetail/maptaskdetail?info=' + info
92 }) 97 })
93 }, 98 },
94 - }  
95 - }  
96 -</script>  
97 -  
98 -<style scoped lang="scss">  
99 - @import 'maptask.scss';  
100 -</style> 99 + }
  100 + }
  101 +</script>
  102 +
  103 +<style scoped lang="scss">
  104 + @import 'maptask.scss';
  105 +</style>
101 \ No newline at end of file 106 \ No newline at end of file
pages/maptaskdetail/maptaskdetail.scss
@@ -160,8 +160,8 @@ @@ -160,8 +160,8 @@
160 width: 94%; 160 width: 94%;
161 position: fixed; 161 position: fixed;
162 bottom: 30rpx; 162 bottom: 30rpx;
163 - background: rgba(255,255,255,0.63);  
164 - border-radius: 30rpx; 163 + // background: rgba(255,255,255,0.63);
  164 + // border-radius: 30rpx;
165 .bottom-two { 165 .bottom-two {
166 display: flex; 166 display: flex;
167 justify-content: space-between; 167 justify-content: space-between;
pages/policy/policy.vue
1 <template> 1 <template>
2 <view> 2 <view>
3 <view v-if="list.length>0"> 3 <view v-if="list.length>0">
4 - <view class="content" @click="xwtz('/pages/policy/policydetail?cent='+JSON.stringify(item))" v-for="(item,index) in list" :key="index"> 4 + <view class="content" @click="xwtz('/pages/policy/policydetail?id='+item.id)" v-for="(item,index) in list" :key="index">
5 <view class="box_item"> 5 <view class="box_item">
6 <view class="box_left"> 6 <view class="box_left">
7 <span class="f1">{{item.title}}</span> 7 <span class="f1">{{item.title}}</span>
pages/policy/policydetail.vue
@@ -56,14 +56,21 @@ @@ -56,14 +56,21 @@
56 } 56 }
57 }, 57 },
58 onLoad(params) { 58 onLoad(params) {
59 - console.log(11111)  
60 -  
61 - this.info = JSON.parse(params.cent)  
62 - this.nvConfig.title = this.info.title  
63 - console.log(this.info) 59 + console.log(params.id)
  60 + this.gain(params.id)
  61 + // this.info = JSON.parse(params.cent)
  62 + // this.nvConfig.title = this.info.title
  63 + // console.log(this.info)
64 // this.OrderType = params.type; 64 // this.OrderType = params.type;
65 }, 65 },
66 methods: { 66 methods: {
  67 + gain(e) {
  68 + this.API.getpolicyDocumentone(e).then(res => {
  69 + console.log(res);
  70 + this.info = res.data
  71 + this.nvConfig.title = this.info.title
  72 + })
  73 + },
67 downfile(e) { 74 downfile(e) {
68 75
69 let that = this 76 let that = this