Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

shuishen

2022-02-19 99bbd2f96dfa2b4ff94c183d2eda3f1b740f3933

 pages.json

@@ -257,7 +257,7 @@
                     "bottom": "0",
                     "background": "transparent",
                     "zindex": 1
				

                  }
               }, {
                  "id": "input-box",
@@ -450,42 +450,68 @@
         "style": {
            "navigationBarTitleText": "500"
         }
      }, {
         "path": "pages/alarm_list/integral/integral",
         "style": {
            "navigationBarTitleText": "查积分",
            "navigationBarBackgroundColor": "#103289",
            "navigationBarTextStyle": "white"
         }

      }, {
         "path": "pages/alarm_list/organ/organ",
         "style": {
            "navigationBarTitleText": "组织申请",
            "navigationBarBackgroundColor": "#103289",
            "navigationBarTextStyle": "white"
         }

      }, {
         "path": "pages/alarm_list/industry/industry",
         "style": {
            "navigationBarTitleText": "行业政策",
            "navigationBarBackgroundColor": "#103289",
            "navigationBarTextStyle": "white"
         }

      }, {
         "path": "pages/alarm_list/industry/industry_detail",
         "style": {
            "navigationBarTitleText": "行业政策",
            "navigationBarBackgroundColor": "#103289",
            "navigationBarTextStyle": "white"
         }

      }, {
         "path": "pages/voting/vote",
         "style": {
            "navigationBarTitleText": "参与投票",
            "navigationBarBackgroundColor": "#103289",
            "navigationBarTextStyle": "white"
         }

      }, {
         "path": "pages/voting/voteManage",
         "style": {
            "navigationBarTitleText": "我的投票",
            "navigationBarBackgroundColor": "#103289",
            "navigationBarTextStyle": "white"
         }

      }, {
         "path": "pages/voting/voteDetail",
         "style": {
            "navigationBarTitleText": "投票详情",
            "navigationBarBackgroundColor": "#103289",
            "navigationBarTextStyle": "white"
         }

      }
       ,{
            "path" : "pages/alarm_list/integral/integral",
            "path" : "pages/voting/votRanking",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "查积分",
                "navigationBarBackgroundColor": "#103289",
                "navigationBarTextStyle": "white"
            }
            
        }
        ,{
            "path" : "pages/alarm_list/organ/organ",
            "style" :                                                                                    
            {
               "navigationBarTitleText": "组织申请",
               "navigationBarBackgroundColor": "#103289",
               "navigationBarTextStyle": "white"
            }
            
        }
        ,{
            "path" : "pages/alarm_list/industry/industry",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "行业政策",
                "navigationBarBackgroundColor": "#103289",
                "navigationBarTextStyle": "white"
            }
            
        }
        ,{
            "path" : "pages/alarm_list/industry/industry_detail",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "行业政策",
                "navigationBarTitleText": "投票排名",
                "navigationBarBackgroundColor": "#103289",
                "navigationBarTextStyle": "white"
            }