diff --git a/common/api/common.js b/common/api/common.js
index 95384fd..ad89944 100644
--- a/common/api/common.js
+++ b/common/api/common.js
@@ -42,8 +42,8 @@ export const parseAddress = (data = {})=> {
return coreRequest(url.parseAddress, data, {}, "GET")
}
-export const getAppHomeStatData = (data = {})=> {
- return coreRequest(url.getAppHomeStatData, data, {}, "GET")
+export const getCustOrderStatData = (data = {})=> {
+ return coreRequest(url.getCustOrderStatData, data, {}, "GET")
}
// 获取下单隐私协议
@@ -75,3 +75,19 @@ export const getIdVerification = (data = {})=> {
export const idVerification = (data = {})=> {
return coreRequest(url.idVerification, data, {})
}
+
+
+// 投诉列表
+export const getComplaintsList = (data = {})=> {
+ return coreRequest(url.getComplaintsList, data, {}, 'get')
+}
+
+// 新增投诉
+export const addComplaints = (data = {})=> {
+ return coreRequest(url.addComplaints, data, {})
+}
+
+// 投诉详情
+export const getComplainInfo = (data = {})=> {
+ return coreRequest(url.getComplainInfo, data, {}, 'get')
+}
diff --git a/common/api/url.js b/common/api/url.js
index 67a2e06..353045e 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -11,7 +11,7 @@ export default {
getEmisCountry: `/oms2c/emisCountry/listSimple`, // 获取国家列表 -- DONE
getEmisRegion: `/oms2c/emisRegion/listSimple`,// 获取省市区列表 -- DONE
getDicDataJson: `/common/getDicDataJson`, // 获取枚举字段 -- DONE
- getAppHomeStatData: `/oms2c/commonTools/getAppHomeStatData`,// 首页统计数据
+ getCustOrderStatData: `/oms2c/emisWaybill/getCustOrderStatData`,// 我的收寄件信息统计 -- DONE
getCustomerUserAddressList: `/oms2c/emisCustomerAddress/listSimple`, // 获取客户地址列表 -- DONE
setDefaultAddressById: `/oms2c/emisCustomerAddress/setDefaultAddressById`, // 设置默认地址 -- DONE
deleteAddressById: `/oms2c/emisCustomerAddress/deleteAddressById`, // 删除地址 -- DONE
@@ -46,12 +46,15 @@ export default {
deleteBindSalemen: `/oms2c/emisWaybill/deleteBindSalemen`, // 删除绑定快递员 -- DONE
setDefaultBindSalesmen: `/oms2c/emisWaybill/setDefaultBindSalesmen`, // 设置默认快递员 -- DONE
queryWaybillTraceInfo: `/oms2c/emisTmsScanRecord/queryWaybillTraceInfo`, // 物流轨迹 -- DONE
-
queryArticleList: `/oms2c/emisArticle/listSimple`, // 信息速递列表 -- DONE
queryArticleDetail: `/oms2c/emisArticle/getDetail`, // 获取文档详情 -- DONE
articleGiveLike: `/oms2c/emisArticle/giveLike`, // 文章点赞 -- DONE
getIdVerification: `/oms2c/emisCustomerUser/getIdVerification`, // 获取实名认证信息 -- DONE
idVerification: `/oms2c/emisCustomerUser/idVerification`, // 提交实名认证 -- DONE
+
+ getComplaintsList: `/oms2c/emisWaybillComplaints/listSimple`, // 投诉列表 -- DONE
+ addComplaints: `/oms2c/emisWaybillComplaints/addComplaints`, // 新增投诉 -- DONE
+ getComplainInfo: `/oms2c/emisWaybillComplaints/getInfoById`, // 投诉详情 -- DONE
}
diff --git a/pages/complaint/complaint.vue b/pages/complaint/complaint.vue
index 46bcc5f..1bc0263 100644
--- a/pages/complaint/complaint.vue
+++ b/pages/complaint/complaint.vue
@@ -1,81 +1,101 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
-
- 新增
-
-
-
-
+
+
+
+
+ 新增
+
+
+
+
+
+
diff --git a/pages/tabBar/mine/mine.vue b/pages/tabBar/mine/mine.vue
index d7d1911..b765546 100644
--- a/pages/tabBar/mine/mine.vue
+++ b/pages/tabBar/mine/mine.vue
@@ -28,7 +28,7 @@
-
@@ -71,7 +71,15 @@
computed: {
userInfo() {
return this.$store.getters.userInfo
- }
+ },
+ staticDataList(){
+ let { recieveNum, sendNum } = this.staticInfo
+ let list = [
+ { title: `${sendNum || 0}单`, subTitle: "寄件", icon: getCdnUrl(`mine/jijian.png`), url: '' },
+ { title: `${recieveNum || 0}单`, subTitle: "收件", icon: getCdnUrl(`mine/shjian.png`), url: '' }
+ ]
+ return list
+ },
},
props: {
// hasLeftWin: {
@@ -81,13 +89,7 @@
data() {
return {
staticInfo: {
- commStat: {},
- orderStat: {},
},
- mainBtnlist: [
- { title: '0单', subTitle: "寄件", icon: getCdnUrl(`mine/jijian.png`), url: '' },
- { title: '0单', subTitle: "收件", icon: getCdnUrl(`mine/shjian.png`), url: '' }
- ],
toolBtnlist: [
{ title: '运单列表', subTitle: "", icon: getCdnUrl(`mine/ydlib.png`), url: 'tabBar/search/search' },
{ title: '进仓单', subTitle: "", icon: getCdnUrl(`mine/jcdan.png`), url: 'warehousing/list' },
@@ -118,15 +120,15 @@
}
},
async initData(){
- this.getAppHomeStatData()
+ this.getOrderStatData()
this.getPrivateRuleData()
},
async getPrivateRuleData(){
let res = await apiService.getAgreementTxt()
this.privacyModal.content = res?.data || ''
},
- async getAppHomeStatData(){
- let res = await apiService.getAppHomeStatData()
+ async getOrderStatData(){
+ let res = await apiService.getCustOrderStatData()
this.staticInfo = res.data
},
async handleUnlogin() {
diff --git a/pages/user/certification.vue b/pages/user/certification.vue
index 1eb85ef..b2d8f9b 100644
--- a/pages/user/certification.vue
+++ b/pages/user/certification.vue
@@ -43,8 +43,8 @@
- 提交实名
+ {{submitParam.idVerifyStatus == 1 ?'已实名':'提交实名'}}
@@ -71,7 +71,8 @@
return {
// 基础表单数据
submitParam: {
- idType: this.$store.getters.dicData?.emis_id_type?.[0]?.value
+ idType: this.$store.getters.dicData?.emis_id_type?.[0]?.value,
+ // "idVerifyStatus": "1-已实名 0-未实名"
},
submitValidConfig: {
realName: { required: true, requiredMsg: '姓名不能为空' },
diff --git a/store/modules/common.js b/store/modules/common.js
index ffcca5e..95e2525 100644
--- a/store/modules/common.js
+++ b/store/modules/common.js
@@ -37,7 +37,7 @@ export default {
let key = Object.keys(item).filter(i=> i != 'desc')[0]
if(key) {
let list = []
- if(['emis_signs_remark', 'emis_express_code', 'emis_order_remark_list'].indexOf(key) > -1) {
+ if(['emis_signs_remark', 'emis_express_code', 'emis_order_remark_list', 'emis_complaints_type'].indexOf(key) > -1) {
// 特殊枚举值， label、value一致
list = transListKeyTitle({ valKey:'label', titleKey: 'label', list: item[key] })
} else {