gas-market / market-insight-app

Download as
Browse Code »

Commit b19423d0207a3238fd52329f497efc953af7774b

Authored by 郭伟龙
1 parent 7fda7ea3
Exists in develop and in 1 other branch charge

fix: 对齐接口字段 修复版本问题

Showing 7 changed files with 145 additions and 48 deletions   Show diff stats
@@ -14,7 +14,10 @@ export default { @@ -14,7 +14,10 @@ export default {
14 // #endif 14 // #endif
15 }, 15 },
16 onShow: function () { 16 onShow: function () {
17 - this.$store.dispatch('loadDictDatas') 17 + console.log(this);
  18 + if(this.$store.getters.accessToken){
  19 + this.$store.dispatch('loadDictDatas')
  20 + }
18 console.log('App Show') 21 console.log('App Show')
19 }, 22 },
20 onHide: function () { 23 onHide: function () {
pages/login/mobile.vue
  Diff comments   View file @b19423d
@@ -113,7 +113,9 @@ @@ -113,7 +113,9 @@
113 type: this.currentModeIndex, 113 type: this.currentModeIndex,
114 data: data 114 data: data
115 }).then(res => { 115 }).then(res => {
116 - uni.$u.toast('登录成功') 116 + uni.$u.toast('登录成功');
  117 + //获取全部字典信息 保存至store
  118 + this.$store.dispatch('loadDictDatas')
117 setTimeout(() => { 119 setTimeout(() => {
118 uni.switchTab({ 120 uni.switchTab({
119 url: '/pages/market/index' 121 url: '/pages/market/index'
pages/market/components/reportModule3.vue
  Diff comments   View file @b19423d
@@ -541,13 +541,17 @@ @@ -541,13 +541,17 @@
541 cardType: 1, 541 cardType: 1,
542 required: true, 542 required: true,
543 title: '数量', 543 title: '数量',
544 - value: "" 544 + value: "",
  545 + key:"cityResidentHousehold",
  546 + id:'0'
545 }, 547 },
546 { 548 {
547 cardType: 1, 549 cardType: 1,
548 required: true, 550 required: true,
549 title: '异常情况说明', 551 title: '异常情况说明',
550 - value: "" 552 + value: "",
  553 + key:"cityResidentHousehold",
  554 + id:'1'
551 }, 555 },
552 { 556 {
553 cardType: 3, 557 cardType: 3,
@@ -558,13 +562,17 @@ @@ -558,13 +562,17 @@
558 cardType: 1, 562 cardType: 1,
559 required: true, 563 required: true,
560 title: '数量', 564 title: '数量',
561 - value: "" 565 + value: "",
  566 + key:"cityUseHousehold",
  567 + id:'0'
562 }, 568 },
563 { 569 {
564 cardType: 1, 570 cardType: 1,
565 required: true, 571 required: true,
566 title: '异常情况说明', 572 title: '异常情况说明',
567 - value: "" 573 + value: "",
  574 + key:"cityUseHousehold",
  575 + id:'1'
568 }, 576 },
569 { 577 {
570 cardType: 3, 578 cardType: 3,
@@ -575,13 +583,17 @@ @@ -575,13 +583,17 @@
575 cardType: 1, 583 cardType: 1,
576 required: true, 584 required: true,
577 title: '数量', 585 title: '数量',
578 - value: "" 586 + value: "",
  587 + key:"continuousUseHousehold",
  588 + id:'0'
579 }, 589 },
580 { 590 {
581 cardType: 1, 591 cardType: 1,
582 required: true, 592 required: true,
583 title: '异常情况说明', 593 title: '异常情况说明',
584 - value: "" 594 + value: "",
  595 + key:"continuousUseHousehold",
  596 + id:'1'
585 }, 597 },
586 { 598 {
587 cardType: 3, 599 cardType: 3,
@@ -592,13 +604,17 @@ @@ -592,13 +604,17 @@
592 cardType: 1, 604 cardType: 1,
593 required: true, 605 required: true,
594 title: '数量', 606 title: '数量',
595 - value: "" 607 + value: "",
  608 + key:"uninstallHousehold",
  609 + id:'0'
596 }, 610 },
597 { 611 {
598 cardType: 1, 612 cardType: 1,
599 required: true, 613 required: true,
600 title: '异常情况说明', 614 title: '异常情况说明',
601 - value: "" 615 + value: "",
  616 + key:"uninstallHousehold",
  617 + id:'1'
602 }, 618 },
603 { 619 {
604 cardType: 3, 620 cardType: 3,
@@ -609,13 +625,17 @@ @@ -609,13 +625,17 @@
609 cardType: 1, 625 cardType: 1,
610 required: true, 626 required: true,
611 title: '数量', 627 title: '数量',
612 - value: "" 628 + value: "",
  629 + key:"receivableHousehold",
  630 + id:'0'
613 }, 631 },
614 { 632 {
615 cardType: 1, 633 cardType: 1,
616 required: true, 634 required: true,
617 title: '异常情况说明', 635 title: '异常情况说明',
618 - value: "" 636 + value: "",
  637 + key:"receivableHousehold",
  638 + id:'1'
619 }, 639 },
620 { 640 {
621 cardType: 3, 641 cardType: 3,
@@ -626,13 +646,17 @@ @@ -626,13 +646,17 @@
626 cardType: 1, 646 cardType: 1,
627 required: true, 647 required: true,
628 title: '数量', 648 title: '数量',
629 - value: "" 649 + value: "",
  650 + key:"remainHousehold",
  651 + id:'0'
630 }, 652 },
631 { 653 {
632 cardType: 1, 654 cardType: 1,
633 required: true, 655 required: true,
634 title: '异常情况说明', 656 title: '异常情况说明',
635 - value: "" 657 + value: "",
  658 + key:"remainHousehold",
  659 + id:'1'
636 } 660 }
637 ], 661 ],
638 data6: [{ 662 data6: [{
@@ -649,43 +673,57 @@ @@ -649,43 +673,57 @@
649 cardType: 1, 673 cardType: 1,
650 required: true, 674 required: true,
651 title: `${parseInt(this.fiscalYear) - 4}财年`, 675 title: `${parseInt(this.fiscalYear) - 4}财年`,
652 - value: "" 676 + value: "",
  677 + key:"confirmInstallNumber",
  678 + id:"0"
653 }, 679 },
654 { 680 {
655 cardType: 1, 681 cardType: 1,
656 required: true, 682 required: true,
657 title: `${parseInt(this.fiscalYear) - 3}财年`, 683 title: `${parseInt(this.fiscalYear) - 3}财年`,
658 - value: "" 684 + value: "",
  685 + key:"confirmInstallNumber",
  686 + id:"1"
659 }, 687 },
660 { 688 {
661 cardType: 1, 689 cardType: 1,
662 required: true, 690 required: true,
663 title: `${parseInt(this.fiscalYear) - 2}财年`, 691 title: `${parseInt(this.fiscalYear) - 2}财年`,
664 - value: "" 692 + value: "",
  693 + key:"confirmInstallNumber",
  694 + id:"2"
665 }, 695 },
666 { 696 {
667 cardType: 1, 697 cardType: 1,
668 required: true, 698 required: true,
669 title: `${parseInt(this.fiscalYear) - 1}财年`, 699 title: `${parseInt(this.fiscalYear) - 1}财年`,
670 - value: "" 700 + value: "",
  701 + key:"confirmInstallNumber",
  702 + id:"3"
671 }, 703 },
672 { 704 {
673 cardType: 1, 705 cardType: 1,
674 required: true, 706 required: true,
675 title: `${parseInt(this.fiscalYear)}财年(预计)`, 707 title: `${parseInt(this.fiscalYear)}财年(预计)`,
676 - value: "" 708 + value: "",
  709 + key:"confirmInstallNumber",
  710 + id:"4"
677 }, 711 },
678 { 712 {
679 cardType: 1, 713 cardType: 1,
680 required: true, 714 required: true,
681 title: `${parseInt(this.fiscalYear)+1}财年(预计)`, 715 title: `${parseInt(this.fiscalYear)+1}财年(预计)`,
682 - value: "" 716 + value: "",
  717 + key:"confirmInstallNumber",
  718 + id:"5"
683 }, 719 },
684 { 720 {
685 cardType: 1, 721 cardType: 1,
686 required: true, 722 required: true,
687 title: `${parseInt(this.fiscalYear)+2}财年(预计)`, 723 title: `${parseInt(this.fiscalYear)+2}财年(预计)`,
688 - value: "" 724 + value: "",
  725 + key:"confirmInstallNumber",
  726 + id:"6"
689 }, 727 },
690 728
691 { 729 {
@@ -697,43 +735,57 @@ @@ -697,43 +735,57 @@
697 cardType: 1, 735 cardType: 1,
698 required: true, 736 required: true,
699 title: `${parseInt(this.fiscalYear) - 4}财年`, 737 title: `${parseInt(this.fiscalYear) - 4}财年`,
700 - value: "" 738 + value: "",
  739 + key:"newRefundHousehold",
  740 + id:"0"
701 }, 741 },
702 { 742 {
703 cardType: 1, 743 cardType: 1,
704 required: true, 744 required: true,
705 title: `${parseInt(this.fiscalYear) - 3}财年`, 745 title: `${parseInt(this.fiscalYear) - 3}财年`,
706 - value: "" 746 + value: "",
  747 + key:"newRefundHousehold",
  748 + id:"1"
707 }, 749 },
708 { 750 {
709 cardType: 1, 751 cardType: 1,
710 required: true, 752 required: true,
711 title: `${parseInt(this.fiscalYear) - 2}财年`, 753 title: `${parseInt(this.fiscalYear) - 2}财年`,
712 - value: "" 754 + value: "",
  755 + key:"newRefundHousehold",
  756 + id:"2"
713 }, 757 },
714 { 758 {
715 cardType: 1, 759 cardType: 1,
716 required: true, 760 required: true,
717 title: `${parseInt(this.fiscalYear) - 1}财年`, 761 title: `${parseInt(this.fiscalYear) - 1}财年`,
718 - value: "" 762 + value: "",
  763 + key:"newRefundHousehold",
  764 + id:"3"
719 }, 765 },
720 { 766 {
721 cardType: 1, 767 cardType: 1,
722 required: true, 768 required: true,
723 title: `${parseInt(this.fiscalYear)}财年(预计)`, 769 title: `${parseInt(this.fiscalYear)}财年(预计)`,
724 - value: "" 770 + value: "",
  771 + key:"newRefundHousehold",
  772 + id:"4"
725 }, 773 },
726 { 774 {
727 cardType: 1, 775 cardType: 1,
728 required: true, 776 required: true,
729 title: `${parseInt(this.fiscalYear)+1}财年(预计)`, 777 title: `${parseInt(this.fiscalYear)+1}财年(预计)`,
730 - value: "" 778 + value: "",
  779 + key:"newRefundHousehold",
  780 + id:"5"
731 }, 781 },
732 { 782 {
733 cardType: 1, 783 cardType: 1,
734 required: true, 784 required: true,
735 title: `${parseInt(this.fiscalYear)+2}财年(预计)`, 785 title: `${parseInt(this.fiscalYear)+2}财年(预计)`,
736 - value: "" 786 + value: "",
  787 + key:"newRefundHousehold",
  788 + id:"6"
737 }, 789 },
738 790
739 { 791 {
@@ -745,43 +797,57 @@ @@ -745,43 +797,57 @@
745 cardType: 1, 797 cardType: 1,
746 required: true, 798 required: true,
747 title: `${parseInt(this.fiscalYear) - 4}财年`, 799 title: `${parseInt(this.fiscalYear) - 4}财年`,
748 - value: "" 800 + value: "",
  801 + key:"oldRefundAmount",
  802 + id:"0"
749 }, 803 },
750 { 804 {
751 cardType: 1, 805 cardType: 1,
752 required: true, 806 required: true,
753 title: `${parseInt(this.fiscalYear) - 3}财年`, 807 title: `${parseInt(this.fiscalYear) - 3}财年`,
754 - value: "" 808 + value: "",
  809 + key:"oldRefundAmount",
  810 + id:"1"
755 }, 811 },
756 { 812 {
757 cardType: 1, 813 cardType: 1,
758 required: true, 814 required: true,
759 title: `${parseInt(this.fiscalYear) - 2}财年`, 815 title: `${parseInt(this.fiscalYear) - 2}财年`,
760 - value: "" 816 + value: "",
  817 + key:"oldRefundAmount",
  818 + id:"2"
761 }, 819 },
762 { 820 {
763 cardType: 1, 821 cardType: 1,
764 required: true, 822 required: true,
765 title: `${parseInt(this.fiscalYear) - 1}财年`, 823 title: `${parseInt(this.fiscalYear) - 1}财年`,
766 - value: "" 824 + value: "",
  825 + key:"oldRefundAmount",
  826 + id:"3"
767 }, 827 },
768 { 828 {
769 cardType: 1, 829 cardType: 1,
770 required: true, 830 required: true,
771 title: `${parseInt(this.fiscalYear)}财年(预计)`, 831 title: `${parseInt(this.fiscalYear)}财年(预计)`,
772 - value: "" 832 + value: "",
  833 + key:"oldRefundAmount",
  834 + id:"4"
773 }, 835 },
774 { 836 {
775 cardType: 1, 837 cardType: 1,
776 required: true, 838 required: true,
777 title: `${parseInt(this.fiscalYear)+1}财年(预计)`, 839 title: `${parseInt(this.fiscalYear)+1}财年(预计)`,
778 - value: "" 840 + value: "",
  841 + key:"oldRefundAmount",
  842 + id:"5"
779 }, 843 },
780 { 844 {
781 cardType: 1, 845 cardType: 1,
782 required: true, 846 required: true,
783 title: `${parseInt(this.fiscalYear)+2}财年(预计)`, 847 title: `${parseInt(this.fiscalYear)+2}财年(预计)`,
784 - value: "" 848 + value: "",
  849 + key:"oldRefundAmount",
  850 + id:"6"
785 }, 851 },
786 ], 852 ],
787 data7: [{ 853 data7: [{
@@ -1801,6 +1867,21 @@ @@ -1801,6 +1867,21 @@
1801 } 1867 }
1802 }); 1868 });
1803 1869
  1870 + this.data5.forEach(data => {
  1871 + if (data.key in this.reportData) {
  1872 + let Arr = this.reportData[data.key].split(",");
  1873 + data.value = Arr[data.id];
  1874 + }
  1875 + });
  1876 +
  1877 +
  1878 + this.data6.forEach(data => {
  1879 + if (data.key in this.reportData) {
  1880 + let Arr = this.reportData[data.key].split(",");
  1881 + data.value = Arr[data.id];
  1882 + }
  1883 + });
  1884 +
1804 this.data7.forEach(data => { 1885 this.data7.forEach(data => {
1805 if (data.key in this.reportData) { 1886 if (data.key in this.reportData) {
1806 data.value = this.reportData[data.key]; 1887 data.value = this.reportData[data.key];
pages/market/index.vue
  Diff comments   View file @b19423d
@@ -138,7 +138,7 @@ @@ -138,7 +138,7 @@
138 ...this.queryParameter, 138 ...this.queryParameter,
139 ...Params 139 ...Params
140 }; 140 };
141 - console.log(111111, Params); 141 + console.log("查询参数", Params);
142 getInfoMarketInformationlist(Params).then(res => { 142 getInfoMarketInformationlist(Params).then(res => {
143 // console.log(res); 143 // console.log(res);
144 if (res.code === 200) { 144 if (res.code === 200) {
pages/market/newsDetails.vue
  Diff comments   View file @b19423d
1 <template> 1 <template>
2 <view class="ConCss"> 2 <view class="ConCss">
3 - <u-navbar class="navBarCss" title="资讯详情" :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}" leftClick="leftClick"  
4 - :autoBack="true" safeAreaInsetTop placeholder /> 3 + <u-navbar class="navBarCss" title="资讯详情" :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}"
  4 + leftClick="leftClick" :autoBack="true" safeAreaInsetTop placeholder />
5 <view class="titleCss"> 5 <view class="titleCss">
6 {{ detailsContent.title }} 6 {{ detailsContent.title }}
7 </view> 7 </view>
@@ -15,7 +15,9 @@ @@ -15,7 +15,9 @@
15 </template> 15 </template>
16 16
17 <script> 17 <script>
18 - import {getInfoMarketInformationDetail} from '@/api/infoMarketInformation.js' 18 + import {
  19 + getInfoMarketInformationDetail
  20 + } from '@/api/infoMarketInformation.js'
19 export default { 21 export default {
20 components: {}, 22 components: {},
21 props: { 23 props: {
@@ -23,22 +25,22 @@ @@ -23,22 +25,22 @@
23 }, 25 },
24 data() { 26 data() {
25 return { 27 return {
26 - detailsContent:{},  
27 - id:"", 28 + detailsContent: {},
  29 + id: "",
28 } 30 }
29 }, 31 },
30 computed: { 32 computed: {
31 33
32 }, 34 },
33 onLoad(data) { 35 onLoad(data) {
34 - if(data.id){ 36 + if (data.id) {
35 this.id = data.id; 37 this.id = data.id;
36 } 38 }
37 this.initData(); 39 this.initData();
38 }, 40 },
39 methods: { 41 methods: {
40 - initData(){  
41 - getInfoMarketInformationDetail(this.id).then((res) =>{ 42 + initData() {
  43 + getInfoMarketInformationDetail(this.id).then((res) => {
42 this.detailsContent = res.data; 44 this.detailsContent = res.data;
43 }) 45 })
44 }, 46 },
@@ -54,7 +56,7 @@ @@ -54,7 +56,7 @@
54 padding: 0 30rpx; 56 padding: 0 30rpx;
55 } 57 }
56 58
57 - .navBarCss{ 59 + .navBarCss {
58 font-family: '苹方 粗体', '苹方 中等', '苹方', sans-serif 60 font-family: '苹方 粗体', '苹方 中等', '苹方', sans-serif
59 } 61 }
60 62
@@ -82,4 +84,13 @@ @@ -82,4 +84,13 @@
82 font-size: 24rpx; 84 font-size: 24rpx;
83 } 85 }
84 86
  87 + img {
  88 + width: 100%;
  89 + height: 100%;
  90 + margin: 20rpx 0;
  91 + }
  92 +
  93 + p {
  94 + line-height: 200%;
  95 + }
85 </style> 96 </style>
pages/market/reportDetails.vue
  Diff comments   View file @b19423d
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 }, { 76 }, {
77 name: '未来发展规划、 所需资源配置 ' 77 name: '未来发展规划、 所需资源配置 '
78 }, { 78 }, {
79 - name: '目标思路建 ' 79 + name: '目标思路建议'
80 }], 80 }],
81 } 81 }
82 }, 82 },
@@ -160,4 +160,4 @@ @@ -160,4 +160,4 @@
160 } 160 }
161 161
162 .bodyCss {} 162 .bodyCss {}
163 -</style>  
164 \ No newline at end of file 163 \ No newline at end of file
  164 +</style>
store/mudules/user.js
  Diff comments   View file @b19423d
1 import { getUserInfo } from '@/api/user' 1 import { getUserInfo } from '@/api/user'
2 import { passwordLogin, smsLogin, weixinMiniAppLogin, logout } from '@/api/auth' 2 import { passwordLogin, smsLogin, weixinMiniAppLogin, logout } from '@/api/auth'
  3 +import { listSimpleDictDatas } from '@/api/dict'
3 4
4 const AccessTokenKey = 'ACCESS_TOKEN' 5 const AccessTokenKey = 'ACCESS_TOKEN'
5 const RefreshTokenKey = 'REFRESH_TOKEN' 6 const RefreshTokenKey = 'REFRESH_TOKEN'
@@ -45,7 +46,6 @@ const user = { @@ -45,7 +46,6 @@ const user = {
45 uni.setStorageSync('entityName', entityNameString) 46 uni.setStorageSync('entityName', entityNameString)
46 uni.setStorageSync(AccessTokenKey, access_token) 47 uni.setStorageSync(AccessTokenKey, access_token)
47 // uni.setStorageSync(RefreshTokenKey, refresh_token) 48 // uni.setStorageSync(RefreshTokenKey, refresh_token)
48 -  
49 // 加载用户信息 49 // 加载用户信息
50 // this.dispatch('ObtainUserInfo') 50 // this.dispatch('ObtainUserInfo')
51 }, 51 },