From b967789538acda36acd946ec0c989eb113f7db25 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sat, 31 Aug 2024 15:08:07 +0800
Subject: [PATCH] uu

---
 common/api/order.js              |  5 +++++
 common/api/url.js                |  3 +++
 pages/complaint/complaint.vue    | 10 +++++-----
 pages/complaint/edit.vue         | 18 +++++++++++-------
 pages/service/articlelist.vue    |  4 ++++
 pages/tabBar/sending/sending.vue | 17 +++++++++++++----
 pages/user/certification.vue     |  4 ++--
 7 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/common/api/order.js b/common/api/order.js
index 67751f2..02b1b23 100644
--- a/common/api/order.js
+++ b/common/api/order.js
@@ -111,3 +111,8 @@ export const exportWarehouseInTpl = (data = {})=> {
 export const getWarehouseInList = (data = {})=> {
 	return coreRequest(url.getWarehouseInList, data, {}, "GET")
 }
+
+// 扫码下单寄件-checke
+export const scanCheckBillCode = (data = {})=> {
+	return coreRequest(url.scanCheckBillCode, data, {})
+}
diff --git a/common/api/url.js b/common/api/url.js
index 353045e..5c05a34 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -56,5 +56,8 @@ export default {
   addComplaints: `/oms2c/emisWaybillComplaints/addComplaints`, // 新增投诉  -- DONE
   getComplainInfo: `/oms2c/emisWaybillComplaints/getInfoById`, // 投诉详情  -- DONE
   
+  scanCheckBillCode: `/oms2c/emisWaybill/scanCheckBillCode`, // 扫码下单寄件-checke  -- DONE
+  
+  
 }
 
diff --git a/pages/complaint/complaint.vue b/pages/complaint/complaint.vue
index 1bc0263..3e29b1b 100644
--- a/pages/complaint/complaint.vue
+++ b/pages/complaint/complaint.vue
@@ -9,7 +9,7 @@
 						<view v-for="(item) in resData.list" class="com-jianju" style="padding-top: 30rpx;">
 							<view class="com-radius" style="background-color: #fff;padding: 26rpx 30rpx;">
 								<u-row justify="between">
-									<u-text size="30" color="#0E0708" :bold="true" text="T7080123982301"></u-text>
+									<u-text size="30" color="#0E0708" :bold="true" :text="item.billCode"></u-text>
 								</u-row>
 								<u-line color="#D9D9D9" margin="26rpx 0"></u-line>
 								
@@ -17,23 +17,23 @@
 									<view class="mr-10">
 										<u-text size="28" color="#333" :bold="true" text="投诉原因:"></u-text>
 									</view>	
-									<u-text size="26" color="#999" text="×××"></u-text>	
+									<u-text size="26" color="#999" :text="item.cpReason"></u-text>	
 								</u-row>
 								
 								<u-row align="top" custom-style="margin-top:30rpx;">
 									<view class="mr-10">
 										<u-text size="28" color="#333" :bold="true" text="投诉描述:"></u-text>
 									</view>	
-									<u-text size="26" color="#999"  text="×××"></u-text>	
+									<u-text size="26" color="#999"  :text="item.remark || '-'"></u-text>	
 								</u-row>
 								<u-row align="top" custom-style="margin-top:30rpx;">
 									<view class="mr-10">
 										<u-text size="28" color="#333" :bold="true" text="投诉时间:"></u-text>
 									</view>	
-									<u-text size="26" color="#999"  text="2023-11-20 13:28:56"></u-text>	
+									<u-text size="26" color="#999"  :text="item.createTime"></u-text>	
 								</u-row>
 								
-								<view @click="goto(`complaint/edit`)"  style="padding-top:20rpx;margin-top: 20rpx;border-top: 2rpx solid #D9D9D9">
+								<view @click="goto(`complaint/edit?cmpId=${item.id}`)"  style="padding-top:20rpx;margin-top: 20rpx;border-top: 2rpx solid #D9D9D9">
 									<u-row justify="between">
 										<u-text align="left" size="28" text="查看详情"></u-text>
 										<view>
diff --git a/pages/complaint/edit.vue b/pages/complaint/edit.vue
index d8b8476..6d30aad 100644
--- a/pages/complaint/edit.vue
+++ b/pages/complaint/edit.vue
@@ -2,7 +2,7 @@
 	<tpx-page>
 		<tpx-layout>
 			<template v-slot:body>
-				<view class="com-jianju pos-rlt pb-30" style="padding-top: 2rpx;">
+				<view v-if="!pageLoading" class="com-jianju pos-rlt pb-30" style="padding-top: 2rpx;">
 					
 					<view class="blcok-white radius-20">
 						<view class="">
@@ -13,7 +13,7 @@
 							<view class="mt-30">
 								<tpx-select 
 									v-model:value="submitParam.cpSiteCode" v-model:text="submitParam.siteName" v-model:resObject="wayRes"
-									:getListFun="getSendSiteList" :transKeyVal="{valKey: 'siteName',titleKey: 'siteName'}" 
+									:getListFun="getSendSiteList" :transKeyVal="{valKey: 'siteCode',titleKey: 'siteName'}" 
 									:searchParam="siteSearchParam" placeholder="请选择投诉网点" 
 								></tpx-select>
 								
@@ -35,7 +35,7 @@
 			</template>
 			
 			<template v-slot:footer>
-				<view class="blcok-white-noradius">
+				<view v-if="!queryOption.cmpId" class="blcok-white-noradius">
 					<u-button @click="handleSubmit()" type="primary" size="large" shape="circle" 
 						custom-style="height:80rpx;font-size: 30rpx;"
 					>确定</u-button>
@@ -78,7 +78,8 @@
 					billCode: { required: true, requiredMsg: '运单号不能为空' },
 					cpSiteCode: { required: true, requiredMsg: '投诉网点不能为空' },
 					cpReason: { required: true, requiredMsg: '投诉原因不能为空' },
-				}, 
+				},
+				pageLoading: true,
 			}
 		},
 		onLoad(queryOption) {
@@ -90,11 +91,14 @@
 		},
 		methods: {
 			getSendSiteList: apiService.getSendSiteList,
-			initData() {
-				this.queryOption.cmpId && this.getDetailData()
+			async initData() {
+				if(this.queryOption.cmpId) {
+					await this.getDetailData()
+				}
+				this.pageLoading = false
 			},
 			async getDetailData(){
-				let res = apiService.getComplainInfo({id: ''})
+				let res = await apiService.getComplainInfo({id: this.queryOption.cmpId, _loading: true })
 				res.data && (this.submitParam = res.data)
 			},
 			handleFormChange() {
diff --git a/pages/service/articlelist.vue b/pages/service/articlelist.vue
index 0fc1be7..2db093f 100644
--- a/pages/service/articlelist.vue
+++ b/pages/service/articlelist.vue
@@ -66,6 +66,10 @@
 				queryOption: {},
 			}
 		},
+		onShow(){
+			this.triggerListReload()
+			this.initData()
+		},
 		onLoad(queryOption) {
 			this.queryOption = queryOption
 			this.initData();
diff --git a/pages/tabBar/sending/sending.vue b/pages/tabBar/sending/sending.vue
index afa17f1..1477e13 100644
--- a/pages/tabBar/sending/sending.vue
+++ b/pages/tabBar/sending/sending.vue
@@ -65,6 +65,7 @@
 	
 	import getCdnUrl from "@/common/getCdnUrl"
 	import { goto, scanCode } from "@/common/untool"
+	import * as apiService from "@/common/api"
 	
 	export default {
 		props: {
@@ -87,7 +88,7 @@
 					{  title: '信息速递', subTitle: "快递信息列表", icon: getCdnUrl(`sdg/t-xuzhi.png`), url: 'service/articlelist' },
 					// {  title: 'HSCODE', subTitle: "海关归类信息", icon: getCdnUrl(`sdg/t-HS.png`), url: '' },
 					// {  title: 'RECP', subTitle: "优惠税率安排查询", icon: getCdnUrl(`sdg/t-RE.png`), url: '' },
-					{  title: '扫码寄件', subTitle: "扫描条码发货", icon: getCdnUrl(`sdg/t-saoma.png`), url: 'action:smjj' },
+					{  title: '扫码寄件', subTitle: "扫描条码发货", icon: getCdnUrl(`sdg/t-saoma.png`), url: 'action:scan' },
 					{  title: '快递查询', subTitle: "快递单跟踪查询", icon: getCdnUrl(`sdg/t-yundan.png`), url: 'post/query' },
 				],
 				showFollow: false
@@ -103,14 +104,22 @@
 			getCdnUrl,
 			goto,
 			async handleToolItemClict(item) {
-				if(item.url == 'action:smjj') {
-					const code = await scanCode()
+				if(item.url == 'action:scan') {
+					this.handleCheckOpenPost()
 				} else {
 					goto(item.url)
 				}
 			},
+			async handleCheckOpenPost(){
+				const code = await scanCode()
+				let res = await apiService.scanCheckBillCode({ billCode: code })
+				if(res?.data?.billCode) {
+					let cpData = { billCode: res.data.billCode }
+					this.goto(`post/post?defaultSubParams=${encodeURIComponent(JSON.stringify(cpData))}&type=create`)	
+				}
+			},
 			officialOnload(e) {
-				this.showFollow = true
+				// this.showFollow = true // 先隐藏
 				console.log('公众号组件加载成功===', e.detail.status)
 			},
 			officialOnError(e) {
diff --git a/pages/user/certification.vue b/pages/user/certification.vue
index b2d8f9b..4ef1467 100644
--- a/pages/user/certification.vue
+++ b/pages/user/certification.vue
@@ -100,7 +100,7 @@
 				this.getCertDetail()
 			},
 			async getCertDetail(){
-				let res = apiService.getIdVerification()
+				let res = await apiService.getIdVerification()
 				res.data && (this.submitParam = res.data)
 			},
 			handleFormChange() {
@@ -110,7 +110,7 @@
 				let params = { ...this.submitParam }
 				await checkParams(params, this.submitValidConfig)
 				let res = await apiService.idVerification(params)
-				this.showToast('提交成功')
+				this.showToast('提交成功,请等待审核')
 				this.getCertDetail()
 			},
 		}