frontend-uniapp / Civil-Affairs-Bureau-WeChar

Commit f1a4d9dcdcd637a9d2b81c16c157721f9b9ac915

Authored by 起风了
2 parents 174797bb a4fe6287

gps

Inline Side-by-side
Showing 18 changed files with 116 additions and 94 deletions
1   -Subproject commit 265e64e9a0cbb670ab3ba7d3d113ab4863bb0058
  1 +Subproject commit 3eb65c13bdf332339d04370e771ce91fc6e3ad6a
... ...
apis/modules/ly.js
  View file @f1a4d9d
... ... @@ -13,6 +13,10 @@ export default {
13 13 getpolicyDocument(data){
14 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 21 getplie(data){
18 22 return request.get('/areBoundary/plie/list',data)
... ...
apis/modules/oauth.js
  View file @f1a4d9d
... ... @@ -27,6 +27,10 @@ export default {
27 27 getfbgl(data){
28 28 return request.get("/funeral/related/list",data)
29 29 },
  30 + // 获取殡葬文化、普法、办事、详情
  31 + getfbgldata(data){
  32 + return request.get("/funeral/related/"+data)
  33 + },
30 34 // 获取殡葬服务机构列表
31 35 getjg(){
32 36 return request.get('/funeral/agencies/list?pageNum=1&pageSize=10');
... ...
pages.json
  View file @f1a4d9d
... ... @@ -155,7 +155,8 @@
155 155 }, {
156 156 "path": "pages/maptask/maptask",
157 157 "style": {
158   - "navigationStyle": "custom"
  158 + "navigationBarTitleText": "我的任务",
  159 + "enablePullDownRefresh": false
159 160 }
160 161 }, {
161 162 "path": "pages/maptaskdetail/maptaskdetail",
... ...
pages/funeralculture/funeralculture.vue
  View file @f1a4d9d
... ... @@ -9,7 +9,7 @@
9 9 <view class="name">
10 10 <text>{{item.title}}</text>
11 11 </view>
12   - <view class="edit" @click="tzdetail(item)">
  12 + <view class="edit" @click="tzdetail(item.id)">
13 13 <image src="../../static/right2.png"></image>
14 14 </view>
15 15 </view>
... ... @@ -48,7 +48,7 @@
48 48 computed:{
49 49 pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
50 50 },
51   - onShow() {
  51 + onLoad() {
52 52 this.getfbgl();
53 53 },
54 54 methods: {
... ...
pages/funeralguide/funeralguide.vue
  View file @f1a4d9d
... ... @@ -9,7 +9,7 @@
9 9 <view class="name">
10 10 <text>{{item.title}}</text>
11 11 </view>
12   - <view class="edit" @click="tzdetail(item)">
  12 + <view class="edit" @click="tzdetail(item.id)">
13 13 <image src="../../static/right2.png"></image>
14 14 </view>
15 15 </view>
... ... @@ -48,7 +48,7 @@
48 48 computed:{
49 49 pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
50 50 },
51   - onShow() {
  51 + onLoad() {
52 52 this.getfbgl();
53 53 },
54 54 methods: {
... ...
pages/funerallaw/funerallaw.vue
  View file @f1a4d9d
... ... @@ -9,7 +9,7 @@
9 9 <view class="name">
10 10 <text>{{item.title}}</text>
11 11 </view>
12   - <view class="edit" @click="tzdetail(item)">
  12 + <view class="edit" @click="tzdetail(item.id)">
13 13 <image src="../../static/right2.png"></image>
14 14 </view>
15 15 </view>
... ... @@ -48,7 +48,7 @@
48 48 computed:{
49 49 pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
50 50 },
51   - onShow() {
  51 + onLoad() {
52 52 this.getfbgl();
53 53 },
54 54 methods: {
... ... @@ -71,7 +71,7 @@
71 71 tzdetail(item){
72 72 console.log("ress",item);
73 73 uni.navigateTo({
74   - url:'/pages/xxdetail/xxdetail?info=' + JSON.stringify(item)
  74 + url:'/pages/xxdetail/xxdetail?info=' + item
75 75 })
76 76 }
77 77 },
... ...
pages/funeralproblem/funeralproblem.vue
  View file @f1a4d9d
... ... @@ -9,7 +9,7 @@
9 9 <view class="name">
10 10 <text>{{item.title}}</text>
11 11 </view>
12   - <view class="edit" @click="tzdetail(item)">
  12 + <view class="edit" @click="tzdetail(item.id)">
13 13 <image src="../../static/right2.png"></image>
14 14 </view>
15 15 </view>
... ... @@ -48,7 +48,7 @@
48 48 computed:{
49 49 pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
50 50 },
51   - onShow() {
  51 + onLoad() {
52 52 this.getfbgl();
53 53 },
54 54 methods: {
... ...
pages/home/home.vue
  View file @f1a4d9d
... ... @@ -128,7 +128,7 @@
128 128 },
129 129 toponym() {
130 130 uni.navigateTo({
131   - url:"/pages/toponym/toponym"
  131 + url:"/pages/declaration/declaration?type=4"
132 132 })
133 133 },
134 134 tzyl(){
... ...
pages/maptask/maptask.scss
  View file @f1a4d9d
... ... @@ -4,28 +4,20 @@
4 4 }
5 5 .content {
6 6 width: 100%;
7   - padding-top: 100rpx;
  7 +
8 8 }
9 9 .coupon-tab {
10   - position: fixed;
11   - left: 0;
12   - top: 0;
13   - z-index: 10;
14 10 display: flex;
15 11 align-items: center;
16 12 width: 100%;
17   - height: 190rpx;
18   - /* #ifdef MP-WEIXIN */
19   - height: 220rpx;
20   - /* #endif */
21 13 background-color: #ffffff;
  14 +
22 15 .tab {
23 16 position: relative;
24 17 display: flex;
25 18 align-items: center;
26 19 justify-content: center;
27 20 width: 33%;
28   - height: 100%;
29 21 text {
30 22 font-size: 28rpx;
31 23 color: #7C7C7C;
... ...
pages/maptask/maptask.vue
  View file @f1a4d9d
1   -<template>
  1 +<template>
2 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 4 <view class="tab" :class="{'action':TabShow===0}" @click="onCouponTab(0)">
6   - <text>全部</text>
  5 + <text style="margin-bottom: 20rpx;">全部</text>
7 6 <text class="line"></text>
8 7 </view>
9 8 <view class="tab" :class="{'action':TabShow===1}" @click="onCouponTab(1)">
10   - <text>未处理</text>
  9 + <text style="margin-bottom: 20rpx;">未处理</text>
11 10 <text class="line"></text>
12 11 </view>
13 12 <view class="tab" :class="{'action':TabShow===2}" @click="onCouponTab(2)">
14   - <text>已处理</text>
  13 + <text style="margin-bottom: 20rpx;">已处理</text>
15 14 <text class="line"></text>
16 15 </view>
17 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 32 </view>
30 33 </view>
31 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 41 return {
41 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 68 onShow() {
64 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 76 this.list = res.rows
72 77 })
73 78 },
74   - onCouponTab(type){
  79 + onCouponTab(type) {
75 80 this.TabShow = type;
76   - if(type == 0){
  81 + if (type == 0) {
77 82 this.pages.taskStatus = ''
78 83 }
79   - if(type == 1){
  84 + if (type == 1) {
80 85 this.pages.taskStatus = '未处理'
81 86 }
82   - if(type == 2){
  87 + if (type == 2) {
83 88 this.pages.taskStatus = '已处理'
84 89 }
85 90  
... ... @@ -91,10 +96,10 @@
91 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 106 \ No newline at end of file
... ...
pages/maptaskdetail/maptaskdetail.scss
  View file @f1a4d9d
... ... @@ -160,8 +160,8 @@
160 160 width: 94%;
161 161 position: fixed;
162 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 165 .bottom-two {
166 166 display: flex;
167 167 justify-content: space-between;
... ...
pages/my/my.vue
  View file @f1a4d9d
... ... @@ -10,7 +10,7 @@
10 10 <view class="my-top">
11 11 <view class="user-info">
12 12 <view class="portrait" @click="tzmy">
13   - <image :src="user.avatar"></image>
  13 + <image :src="Baseapi + user.avatar"></image>
14 14 </view>
15 15 <view class="info">
16 16 <view class="nickname">
... ...
pages/myreservationdetail/myreservationdetail.vue
  View file @f1a4d9d
... ... @@ -144,7 +144,7 @@
144 144 width: 10,
145 145 arrowLine: true,
146 146 borderWidth: 2 //线的边框宽度，还有很多参数，请看文档
147   - }]
  147 + }]
148 148 };
149 149 },
150 150 onPageScroll(e) {this.$refs.nv.pageScroll(e)},
... ... @@ -276,7 +276,7 @@
276 276 width: 4,
277 277 arrowLine: true,
278 278 // borderWidth: 2 //线的边框宽度，还有很多参数，请看文档
279   - }]
  279 + }]
280 280 }
281 281  
282 282 })
... ...
pages/policy/policy.vue
  View file @f1a4d9d
1 1 <template>
2 2 <view>
3 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 5 <view class="box_item">
6 6 <view class="box_left">
7 7 <span class="f1">{{item.title}}</span>
... ...
pages/policy/policydetail.vue
  View file @f1a4d9d
... ... @@ -56,14 +56,21 @@
56 56 }
57 57 },
58 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 64 // this.OrderType = params.type;
65 65 },
66 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 74 downfile(e) {
68 75  
69 76 let that = this
... ...
pages/receiptRegistration/receiptRegistrationList.vue
  View file @f1a4d9d
... ... @@ -2,7 +2,7 @@
2 2 <view>
3 3 <view>
4 4 <view v-for="(item, index) in list" :key="index" class="top-box" @click="gopath('/pages/receiptRegistration/receiptRegistrationDetail?item=' +JSON.stringify(item))">
5   - <view>{{item.chiAdoptCaseRegistrationPo.reportTime}}<span style="margin-left: 20rpx;color: #547DFF;">{{item.chiAdoptCaseFlowExecuteNodeHistoryList[item.chiAdoptCaseFlowExecuteNodeHistoryList.length-1].approvalStatus}}</span></view>
  5 + <view>{{item.chiAdoptCaseRegistrationPo.reportTime}}<span style="margin-left: 20rpx;color: #547DFF;">{{item.chiAdoptCaseFlowExecuteNodeHistoryList[item.chiAdoptCaseFlowExecuteNodeHistoryList.length-1].nodeName}}</span></view>
6 6 <view class="top-box-img">
7 7 <image src="../../static/right2.png" mode="widthFix"></image>
8 8 </view>
... ...
pages/xxdetail/xxdetail.vue
  View file @f1a4d9d
... ... @@ -49,11 +49,20 @@
49 49 },
50 50 onLoad(item) {
51 51 console.log("res",item);
52   - this.info = JSON.parse(item.info)
53   - this.nvConfig.title = this.info.title + "详情页"
  52 +
  53 + this.gain(item.info)
  54 + // this.info = JSON.parse(item.info)
  55 + // this.nvConfig.title = this.info.title + "详情页"
54 56 },
55 57 methods: {
56   -
  58 + gain(e) {
  59 + this.API.getfbgldata(e).then(res => {
  60 + console.log(res);
  61 + this.info = res.data
  62 + // this.info = JSON.parse(item.info)
  63 + this.nvConfig.title = this.info.title + "详情页"
  64 + })
  65 + },
57 66 }
58 67 }
59 68 </script>
... ...