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

liuyg

2022-03-08 57d09501adaafa148000c0326f177a9262bad4c9

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

 pages/grabOrders/taskCount/taskCount.vue

@@ -30,15 +30,16 @@
                <view v-for="i in data" class="advisory-model" @click="goDetail(i)">
                    <view class="advisory-left">
                        <view class="advisory-title-top">
                            <view class="advisory-title">{{i.access}}</view>
                            <view class="advisory-title">{{i.rname}}</view>
                        </view>
                        <view class="advisory-title-down">
                            <view class="advisory-title-time">{{i.time}}</view>
                        </view>
                    </view>
                    <view class="advisory-right">
                        <view v-if="i.type =='2'" class="advisory-title-integral">- {{i.integral}}</view>
                        <view v-if="i.type =='1'" class="advisory-title-integraladd">+{{i.integral}}</view>
                        <view v-if="i.rtype =='0'" class="advisory-title-integral">正在进行</view>
                        <view v-if="i.rtype =='1'" class="advisory-title-integralwc">已完成</view>
                        <view v-if="i.rtype =='2'" class="advisory-title-integraladd">未开始</view>
                    </view>
                    <u-line class="advisory-line" color="#ebebeb" />
                </view>
@@ -65,15 +66,11 @@
                        value: 1,
                    },
                    {
                        label: '治安防范巡逻',
                        label: '正在进行',
                        value: 2,
                    },
                    {
                        label: '治安防范宣传',
                        value: 3,
                    },
                    {
                        label: '治安防范培训',
                        label: '已完成',
                        value: 3,
                    }
                ],
@@ -89,12 +86,12 @@
            getData(e){
                var that = this;
                uni.request({
                    url:that.$store.state.piAPI + '/integral/selectCount?uid='+this.$store.state.puserID+"&type="+e,
                    method:'POST',
                    url:that.$store.state.piAPI + '/taskqd/taskCount?id='+this.$store.state.puserID+"&type="+e,
                    method:'get',
                    success(res) {
                        that.dqjf = res.data.data.sjf;
                        that.ljjf = res.data.data.zjf.integral;
                        that.data = res.data.data.list;
                        that.dqjf = res.data.data.wwc;
                        that.ljjf = res.data.data.ywc;
                        that.data = res.data.data.data;
                    }
                });
            },
@@ -235,7 +232,7 @@

    .advisory-right {
        // background-color: #222222;
        left: 25%;
        left: 20%;
        top: 30%;
        position: relative;
    }
@@ -256,10 +253,15 @@
    }
    
    .advisory-title-integraladd{
        color: #00aaff;
        color: #ffaa00;
    }
    
    .advisory-title-integral{
        color: #ff0000;
        color: #7789ff;
    }
	
    .advisory-title-integralwc{
        color: #00aaff;
    }
	
</style>

 store/apiConfig.js

@@ -3,7 +3,7 @@
    var api = 'http://223.82.109.183:2082/api/';
    var wsapi = 'ws://223.82.109.183:2082/wss/websocket';
} else if (i == 0) { //曾
    var api = 'http://192.168.0.108:83/';
    var api = 'http://localhost:83/';
    var wsapi = 'ws://192.168.0.108:9034/websocket';
} else if (i == 2) { //唐
    var api = 'http://192.168.0.110:83/';