Merge remote-tracking branch 'origin/master'

zengh

2021-06-23 4a30ac9d771c5b990a856fc0a4902b643b909704

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/alarm_list/alarm_list.vue

 pages/alarm_list/alarm_list.vue

@@ -42,8 +42,8 @@
    export default{
        data(){
            return{
                // pathUrl:"http://localhost:89",
                pathUrl:"http://s16s652780.51mypc.cn/api",
                pathUrl:"http://localhost:82",
                // pathUrl:"http://s16s652780.51mypc.cn/api/blade-jfpts",
                totalColor:"#51A2FE",
                loadColor:"#000000",
                loadBeforeColor:"#000000",
@@ -116,7 +116,7 @@
                if(this.$store.state.puserID){
                    //获取全部的数据
                    uni.request({
                        url:this.pathUrl + "/alarm/alarm/APP-getAlarmListPage",
                        url:this.$store.state.piAPI + "alarm/alarm/APP-getAlarmListPage",
                        method:"GET",
                        data:{
                            securityId:this.$store.state.puserID,
@@ -175,7 +175,7 @@
            },
            //接收任务
            receives() {
                var url = this.$store.state.piAPI + "/alarm/alarm/APP-setAlarm",
                var url = this.$store.state.piAPI + "alarm/alarm/APP-setAlarm",
                    Pid = this.itemData.id,
                    id = this.$store.state.puserID, //警察id
                    name = this.$store.state.puserName, //警察id
@@ -185,7 +185,6 @@
                        alarmPeople: name
                    },
                    that = this;
                console.log(data);
                uni.request({
                    url: url,
                    data: data,

 pages/loging/loging.vue

@@ -58,7 +58,7 @@
                    }
                    this.$store.commit('getUse', data)
                    wx.reLaunch({
                        url: '/pages/workbench/workbench?login=' + data.userName
                        url: '/pages/alarm_list/alarm_list?login=' + data.userName
                    })
                }
            },
@@ -101,7 +101,7 @@
                    this.passwords = '******';
                    uni.hideNavigationBarLoading();
                    uni.reLaunch({
                        url: '../workbench/workbench'
                        url: '../alarm_list/alarm_list'
                    })
                    return '成功登入'
                } else {

 pages/reported/reported.vue

@@ -49,7 +49,7 @@
                imgs: [],
                videos: [],
                // pathUrl:'http://s16s652780.51mypc.cn/api/blade-jfpts',
                pathUrl:'http://localhost:89',
                pathUrl:'http://localhost:82',
            }
        },
        methods: {
@@ -82,6 +82,7 @@
                        // console.log(i[k].src)
                        dataList.tpaddress += i[k].src + ','
                    }
                    dataList.tpaddress = dataList.tpaddress.substring(0,dataList.tpaddress.length-1);
                }
                if (this.videos.length > 0) {
                    var i = this.videos;
@@ -89,6 +90,7 @@
                        // console.log(i[k].src)
                        dataList.spaddress += i[k].src + ','
                    }
                    dataList.spaddress = dataList.spaddress.substring(0,dataList.spaddress.length-1);
                }
                // console.log(dataList)
                uni.showLoading({
@@ -96,7 +98,7 @@
                    mask: true
                })
                uni.request({
                    url: this.pathUrl + '/feedback/feedback/saves', 
                    url: this.$store.state.piAPI + 'feedback/feedback/saves', 
                    data: dataList,
                    method: 'POST',
                    header: {

 store/state.js

@@ -4,7 +4,8 @@
        useName: '过客 ',
    },
    logPath: '',
    piAPI: 'http://s16s652780.51mypc.cn/api/',
    // piAPI: 'http://s16s652780.51mypc.cn/api/',
    piAPI: 'http://localhost:82/',
    puserName: '',
    puserID: '',
    puserIphone:'',