From 126fec636acb923045ff15a86c7625ef5dbd73a8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 08 Mar 2022 20:13:39 +0800
Subject: [PATCH] 注册调整
---
pages/grabOrders/taskCount/taskCount.vue | 36 +++++++++++++++++++-----------------
store/apiConfig.js | 2 +-
store/state.js | 2 +-
3 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/pages/grabOrders/taskCount/taskCount.vue b/pages/grabOrders/taskCount/taskCount.vue
index 3325f45..12a6767 100644
--- a/pages/grabOrders/taskCount/taskCount.vue
+++ b/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>
diff --git a/store/apiConfig.js b/store/apiConfig.js
index 7896d1e..ac88034 100644
--- a/store/apiConfig.js
+++ b/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/';
diff --git a/store/state.js b/store/state.js
index 2898bd1..baf39aa 100644
--- a/store/state.js
+++ b/store/state.js
@@ -17,7 +17,7 @@
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.222:83/',
//piAPI: 'http://223.82.109.183:2082/api/',
BaopiAPI: 'http://223.82.109.183:2080/api/',
puserName: '',
--
Gitblit v1.9.3