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

liuyg

2022-03-08 a9602adbed4fed7a595e43963b987cba7f47824c

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

 pages.json

@@ -358,7 +358,7 @@
            "path": "pages/grabOrders/grabOrdersZAXC/grabOrders",
            "name": "grabOrdersZAXC",
            "style": {
                "navigationBarTitleText": "治安巡查",
                "navigationBarTitleText": "治安防范巡查",
                "navigationBarBackgroundColor": "#103289",
                "navigationBarTextStyle": "white"
            }
@@ -394,7 +394,7 @@
            "path": "pages/grabOrders/grabOrdersZAYWXC/grabOrders",
            "name": "grabOrdersZAYWXC",
            "style": {
                "navigationBarTitleText": "治安义务宣传",
                "navigationBarTitleText": "治安防范宣传",
                "navigationBarBackgroundColor": "#103289",
                "navigationBarTextStyle": "white"
            }

 pages/alarm_list/alarm_list.vue

@@ -28,7 +28,7 @@
                        icon: 'cell',
                        title: '查积分',
                    }, {
                        path: '/pages/grabOrders/taskCount/taskCount/grabOrders',
                        path: '/pages/grabOrders/taskCount/taskCount',
                        icon: 'sticky',
                        title: '查任务',
                    }]

 store/state.js

@@ -9,16 +9,16 @@
    queTypeArr:[0,0,0,0,0],
    loging: false,
    message: {
        useName: '过客',
        useName: '过客',	
    },
    roleid:'',//角色id
    logPath: '',
    piAPI: apis.api,
    // piAPI: 'http://223.82.109.183:2082/api/',
    //  piAPI: 'http://192.168.0.110:83/',
     piAPI: 'http://192.168.0.222:83/',
    //piAPI: 'http://192.168.0.110:83/',
     //piAPI: 'http://192.168.0.222:83/',
    //piAPI: 'http://223.82.109.183:2082/api/',
    // BaopiAPI: 'http://223.82.109.183:2080/api/',
    BaopiAPI: 'http://223.82.109.183:2080/api/',
    puserName: '',
    puserID: '',
    puserIphone: '',