diff --git a/App.vue b/App.vue
index e2d2bd9..763b539 100644
--- a/App.vue
+++ b/App.vue
@@ -14,7 +14,10 @@ export default {
     // #endif
   },
   onShow: function () {
-    this.$store.dispatch('loadDictDatas')
+    console.log(this);
+    if(this.$store.getters.accessToken){
+      this.$store.dispatch('loadDictDatas')
+    }
     console.log('App Show')
   },
   onHide: function () {
diff --git a/pages/login/mobile.vue b/pages/login/mobile.vue
index f0aeb3d..e0b0294 100644
--- a/pages/login/mobile.vue
+++ b/pages/login/mobile.vue
@@ -113,7 +113,9 @@
           type: this.currentModeIndex,
           data: data
         }).then(res => {
-          uni.$u.toast('登录成功')
+          uni.$u.toast('登录成功');
+          //获取全部字典信息 保存至store
+          this.$store.dispatch('loadDictDatas')
           setTimeout(() => {
             uni.switchTab({
               url: '/pages/market/index'
diff --git a/pages/market/components/reportModule3.vue b/pages/market/components/reportModule3.vue
index f1710e8..c7c969b 100644
--- a/pages/market/components/reportModule3.vue
+++ b/pages/market/components/reportModule3.vue
@@ -541,13 +541,17 @@
             cardType: 1,
             required: true,
             title: '数量',
-            value: ""
+            value: "",
+            key:"cityResidentHousehold",
+            id:'0'
           },
           {
             cardType: 1,
             required: true,
             title: '异常情况说明',
-            value: ""
+            value: "",
+            key:"cityResidentHousehold",
+            id:'1'
           },
           {
             cardType: 3,
@@ -558,13 +562,17 @@
             cardType: 1,
             required: true,
             title: '数量',
-            value: ""
+            value: "",
+            key:"cityUseHousehold",
+            id:'0'
           },
           {
             cardType: 1,
             required: true,
             title: '异常情况说明',
-            value: ""
+            value: "",
+            key:"cityUseHousehold",
+            id:'1'
           },
           {
             cardType: 3,
@@ -575,13 +583,17 @@
             cardType: 1,
             required: true,
             title: '数量',
-            value: ""
+            value: "",
+            key:"continuousUseHousehold",
+            id:'0'
           },
           {
             cardType: 1,
             required: true,
             title: '异常情况说明',
-            value: ""
+            value: "",
+            key:"continuousUseHousehold",
+            id:'1'
           },
           {
             cardType: 3,
@@ -592,13 +604,17 @@
             cardType: 1,
             required: true,
             title: '数量',
-            value: ""
+            value: "",
+            key:"uninstallHousehold",
+            id:'0'
           },
           {
             cardType: 1,
             required: true,
             title: '异常情况说明',
-            value: ""
+            value: "",
+            key:"uninstallHousehold",
+            id:'1'
           },
           {
             cardType: 3,
@@ -609,13 +625,17 @@
             cardType: 1,
             required: true,
             title: '数量',
-            value: ""
+            value: "",
+            key:"receivableHousehold",
+            id:'0'
           },
           {
             cardType: 1,
             required: true,
             title: '异常情况说明',
-            value: ""
+            value: "",
+            key:"receivableHousehold",
+            id:'1'
           },
           {
             cardType: 3,
@@ -626,13 +646,17 @@
             cardType: 1,
             required: true,
             title: '数量',
-            value: ""
+            value: "",
+            key:"remainHousehold",
+            id:'0'
           },
           {
             cardType: 1,
             required: true,
             title: '异常情况说明',
-            value: ""
+            value: "",
+            key:"remainHousehold",
+            id:'1'
           }
         ],
         data6: [{
@@ -649,43 +673,57 @@
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear) - 4}财年`,
-            value: ""
+            value: "",
+            key:"confirmInstallNumber",
+            id:"0"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear) - 3}财年`,
-            value: ""
+            value: "",
+            key:"confirmInstallNumber",
+            id:"1"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear) - 2}财年`,
-            value: ""
+            value: "",
+            key:"confirmInstallNumber",
+            id:"2"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear) - 1}财年`,
-            value: ""
+            value: "",
+            key:"confirmInstallNumber",
+            id:"3"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear)}财年(预计)`,
-            value: ""
+            value: "",
+            key:"confirmInstallNumber",
+            id:"4"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear)+1}财年(预计)`,
-            value: ""
+            value: "",
+            key:"confirmInstallNumber",
+            id:"5"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear)+2}财年(预计)`,
-            value: ""
+            value: "",
+            key:"confirmInstallNumber",
+            id:"6"
           },
 
           {
@@ -697,43 +735,57 @@
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear) - 4}财年`,
-            value: ""
+            value: "",
+            key:"newRefundHousehold",
+            id:"0"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear) - 3}财年`,
-            value: ""
+            value: "",
+            key:"newRefundHousehold",
+            id:"1"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear) - 2}财年`,
-            value: ""
+            value: "",
+            key:"newRefundHousehold",
+            id:"2"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear) - 1}财年`,
-            value: ""
+            value: "",
+            key:"newRefundHousehold",
+            id:"3"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear)}财年(预计)`,
-            value: ""
+            value: "",
+            key:"newRefundHousehold",
+            id:"4"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear)+1}财年(预计)`,
-            value: ""
+            value: "",
+            key:"newRefundHousehold",
+            id:"5"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear)+2}财年(预计)`,
-            value: ""
+            value: "",
+            key:"newRefundHousehold",
+            id:"6"
           },
 
           {
@@ -745,43 +797,57 @@
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear) - 4}财年`,
-            value: ""
+            value: "",
+            key:"oldRefundAmount",
+            id:"0"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear) - 3}财年`,
-            value: ""
+            value: "",
+            key:"oldRefundAmount",
+            id:"1"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear) - 2}财年`,
-            value: ""
+            value: "",
+            key:"oldRefundAmount",
+            id:"2"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear) - 1}财年`,
-            value: ""
+            value: "",
+            key:"oldRefundAmount",
+            id:"3"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear)}财年(预计)`,
-            value: ""
+            value: "",
+            key:"oldRefundAmount",
+            id:"4"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear)+1}财年(预计)`,
-            value: ""
+            value: "",
+            key:"oldRefundAmount",
+            id:"5"
           },
           {
             cardType: 1,
             required: true,
             title: `${parseInt(this.fiscalYear)+2}财年(预计)`,
-            value: ""
+            value: "",
+            key:"oldRefundAmount",
+            id:"6"
           },
         ],
         data7: [{
@@ -1801,6 +1867,21 @@
           }
         });
 
+        this.data5.forEach(data => {
+          if (data.key in this.reportData) {
+            let Arr = this.reportData[data.key].split(",");
+            data.value = Arr[data.id];
+          }
+        });
+        
+
+        this.data6.forEach(data => {
+          if (data.key in this.reportData) {
+            let Arr = this.reportData[data.key].split(",");
+            data.value = Arr[data.id];
+          }
+        });
+
         this.data7.forEach(data => {
           if (data.key in this.reportData) {
             data.value = this.reportData[data.key];
diff --git a/pages/market/index.vue b/pages/market/index.vue
index c7200e6..a8a1c74 100644
--- a/pages/market/index.vue
+++ b/pages/market/index.vue
@@ -138,7 +138,7 @@
           ...this.queryParameter,
           ...Params
         };
-        console.log(111111, Params);
+        console.log("查询参数", Params);
         getInfoMarketInformationlist(Params).then(res => {
           // console.log(res);
           if (res.code === 200) {
diff --git a/pages/market/newsDetails.vue b/pages/market/newsDetails.vue
index 53e3912..1ebcbd1 100644
--- a/pages/market/newsDetails.vue
+++ b/pages/market/newsDetails.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="ConCss">
-    <u-navbar class="navBarCss" title="资讯详情" :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}" leftClick="leftClick"
-     :autoBack="true" safeAreaInsetTop placeholder />
+    <u-navbar class="navBarCss" title="资讯详情" :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}"
+      leftClick="leftClick" :autoBack="true" safeAreaInsetTop placeholder />
     <view class="titleCss">
       {{ detailsContent.title }}
     </view>
@@ -15,7 +15,9 @@
 </template>
 
 <script>
-  import {getInfoMarketInformationDetail} from '@/api/infoMarketInformation.js'
+  import {
+    getInfoMarketInformationDetail
+  } from '@/api/infoMarketInformation.js'
   export default {
     components: {},
     props: {
@@ -23,22 +25,22 @@
     },
     data() {
       return {
-        detailsContent:{},
-        id:"",
+        detailsContent: {},
+        id: "",
       }
     },
     computed: {
 
     },
     onLoad(data) {
-      if(data.id){
+      if (data.id) {
         this.id = data.id;
       }
       this.initData();
     },
     methods: {
-      initData(){
-        getInfoMarketInformationDetail(this.id).then((res) =>{
+      initData() {
+        getInfoMarketInformationDetail(this.id).then((res) => {
           this.detailsContent = res.data;
         })
       },
@@ -54,7 +56,7 @@
     padding: 0 30rpx;
   }
 
-  .navBarCss{
+  .navBarCss {
     font-family: '苹方 粗体', '苹方 中等', '苹方', sans-serif
   }
 
@@ -82,4 +84,13 @@
     font-size: 24rpx;
   }
 
+  img {
+    width: 100%;
+    height: 100%;
+    margin: 20rpx 0;
+  }
+
+  p {
+    line-height: 200%;
+  }
 </style>
diff --git a/pages/market/reportDetails.vue b/pages/market/reportDetails.vue
index e508f17..ca58304 100644
--- a/pages/market/reportDetails.vue
+++ b/pages/market/reportDetails.vue
@@ -76,7 +76,7 @@
         }, {
           name: '未来发展规划、 所需资源配置 '
         }, {
-          name: '目标思路建 '
+          name: '目标思路建议'
         }],
       }
     },
@@ -160,4 +160,4 @@
   }
 
   .bodyCss {}
-</style>
\ No newline at end of file
+</style>
diff --git a/store/mudules/user.js b/store/mudules/user.js
index de10641..f53dbf3 100644
--- a/store/mudules/user.js
+++ b/store/mudules/user.js
@@ -1,5 +1,6 @@
 import { getUserInfo } from '@/api/user'
 import { passwordLogin, smsLogin, weixinMiniAppLogin, logout } from '@/api/auth'
+import { listSimpleDictDatas } from '@/api/dict'
 
 const AccessTokenKey = 'ACCESS_TOKEN'
 const RefreshTokenKey = 'REFRESH_TOKEN'
@@ -45,7 +46,6 @@ const user = {
       uni.setStorageSync('entityName', entityNameString)
       uni.setStorageSync(AccessTokenKey, access_token)
       // uni.setStorageSync(RefreshTokenKey, refresh_token)
-
       // 加载用户信息
       // this.dispatch('ObtainUserInfo')
     },
--
libgit2 0.21.2