diff --git a/components/CustomTabBar.vue b/components/CustomTabBar.vue
index d9fc9ca..862a2a7 100644
--- a/components/CustomTabBar.vue
+++ b/components/CustomTabBar.vue
@@ -10,7 +10,7 @@
- 闪电评估
+ 工作证
{
},
});
+}
+const get = (url, data, returndata) => {
+
+ var token =uni.getStorageSync('userToken');
+ uni.request({
+ url: api_url + url+"?token="+token ,
+ data: data,
+ header: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json',
+ },
+ method: 'GET',
+ success: (response) => {
+ const result = response.data;
+ if (result.code == 401) {
+ uni.removeStorageSync('userToken');
+ uni.showToast({
+ title: result.msg,
+ icon: 'none'
+ })
+ setTimeout(function() {
+ uni.navigateTo({
+ url: '/pages/login/login'
+ })
+ }, 1000)
+ }
+ returndata(result);
+ },
+ fail: (error) => {
+ uni.showLoading({
+ title: '网络错误'
+ });
+ uni.hideLoading();
+ if (error && error.response) {
+ uni.showToast({ title: error.response , icon: 'none' })
+ } else {
+
+ }
+
+ },
+ });
+
}
const upload = (url, data, returndata) => {
console.log(data)
@@ -141,7 +183,7 @@ export const personlogin = (data, callback) => post('api/recover/person/personlo
export const applyCertification = (data, callback) => post('api/recover/person/applyCertification', data, callback);
export const checkPayPassword = (data, callback) => post('api/recover/person/checkPayPassword', data, callback);
export const verifyPayPassword = (data, callback) => post('api/recover/person/verifyPayPassword', data, callback);
-export const priceList = (data, callback) => post('api/recover/personmoneylog/index', data, callback);
+export const priceList = (data, callback) => get('api/recover/personmoney/index', data, callback);
export const uploadImg = (data, callback) => upload('api/feedback/upload', data, callback);
export const allarealist = (data, callback) => post('api/recover/area/allarealist', data, callback);
export const qrcode = (data, callback) => post('api/promotion/generate', data, callback);
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2a24850..1da1966 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -50,12 +50,12 @@
-
+
- {{countTime(item.order_time)}}分钟内
- (10:17前)上门
+
+ {{item.order_time_text}}
{{item.distance}}公里
@@ -109,12 +109,11 @@
-
-
+
- 36分钟内
- (10:17前)上门
+
+ {{item.order_time_text}}
1.5公里
@@ -426,7 +425,7 @@
page2: 1,
lastPage1: '',
lastPage2: '',
- limit: 1
+ limit: 10
}
},
components: {
@@ -666,7 +665,7 @@
if(res.code == '1'){
this.qiangdanArr = this.qiangdanArr.concat(res.data.list.data)
// this.recycleList = res.data.type
- this.lastPage1 = res.data.list.last_page
+ this.lastPage1 = Math.ceil(res.data.total/this.limit)
uni.stopPullDownRefresh();
}
})
@@ -680,9 +679,9 @@
}
this.$api.recycleOrderList(data,res=>{
if(res.code == '1'){
- console.log(res.data.list,res.data.list.data,'dddd')
- this.recycleList = res.data.list.data
- this.lastPage2 = res.data.list.last_page
+ console.log(res.data.list,res.data.list.data,res.data.total,'dddd')
+ this.recycleList = this.recycleList.concat(res.data.list)
+ this.lastPage2 = Math.ceil(res.data.total/this.limit)
uni.stopPullDownRefresh();
}
})
diff --git a/pages/mine/apply.vue b/pages/mine/apply.vue
index ebdc19a..4be664c 100644
--- a/pages/mine/apply.vue
+++ b/pages/mine/apply.vue
@@ -136,8 +136,8 @@
},
methods: {
confirmProvince(val){
- console.log(val,val.value[0])
- this.cityList = val.value[0].children[0].children
+ console.log(val,val.value[0],val.value[0].children)
+ this.cityList = val.value[0].children
this.provinceName = val.value[0].label
this.showProvince = false
},
diff --git a/pages/mine/orderConfig.vue b/pages/mine/orderConfig.vue
index 5736fd8..97a6a78 100644
--- a/pages/mine/orderConfig.vue
+++ b/pages/mine/orderConfig.vue
@@ -8,7 +8,8 @@
人身保险
- 已上传
+ 已上传
+ 待上传
@@ -17,7 +18,8 @@
健康证
- 已上传
+ 已上传
+ 待上传
@@ -50,6 +52,7 @@
高空作业证
+ >已上传
待上传
@@ -58,6 +61,7 @@
电工证
+ 已上传
待上传
@@ -65,14 +69,16 @@
焊工证
- 已上传
+ 已上传
+ 待上传
绿色回收认证证书
- 已上传
+ 已上传
+ 待上传
@@ -147,7 +153,12 @@
-
+
+
@@ -274,11 +285,12 @@
var _this = this;
_this.$api.userInfo({},res=>{
if(res.code == '1'){
- if(res.data.user.avatar){
- _this.avatar = res.data.user.avatar
- }
- _this.nickname = res.data.user.nickname
- _this.userinfo = res.data.user
+ // if(res.data.user.avatar){
+ // _this.avatar = res.data.user.avatar
+ // }
+ // _this.nickname = res.data.user.nickname
+ // _this.userinfo = res.data.user
+ _this.userinfo = res.data.person
}else{
}
})