From eafbc58bc08a1d594ea8c7614fba475181674483 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Wed, 31 Jul 2024 23:37:10 +0800
Subject: [PATCH] uu

---
 common/api/url.js                               |  2 +-
 common/custom.scss                              | 16 ++++++++++++++++
 components/buns-edit-sheet/buns-edit-sheet.vue  | 13 +++++++++++--
 .../bpd-send-reciever-tmp.vue                   | 13 +++++++++++--
 .../bpe-bindedpost-tmp.vue                      |  4 ++--
 .../bpe-gooditem-edit-tmp.vue                   | 15 +++++++--------
 .../bpe-gooditem-filed-edit-tmp.vue             |  8 ++++----
 .../bpe-gooditemsize-tmp.vue                    | 17 ++++-------------
 components/tpx-tags/tpx-tags.vue                |  4 ++--
 components/tpx-text-item/tpx-text-item.vue      |  6 ++++++
 pages/post/post.vue                             |  8 ++++----
 pages/post/query.vue                            |  6 +++---
 pages/tabBar/mine/mine.vue                      | 14 +++++++-------
 13 files changed, 78 insertions(+), 48 deletions(-)

diff --git a/common/api/url.js b/common/api/url.js
index 07e9b0b..6579bf2 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -39,7 +39,7 @@ export default {
   warehouseInList: `/oms2c/emisWarehouseIn/listSimple`, // 下单-进仓单列表
   getOrderList: `/oms2c/emisWaybill/listSimple`, // 订单列表 -- DONE
   getOrderDetail: `/oms2c/emisWaybill/getWaybillDetail`, // 订单详情 -- DONE
-  cancelOrder: `/emis/emisWaybill/cancelOrder`, // 取消订单 -- DONE
+  cancelOrder: `/oms2c/emisWaybill/cancelOrder`, // 取消订单 -- DONE
   sendBindMonthPayCode: `/oms2c/emisWaybill/bindMonthPayCode`, // 绑月结卡-发送邮件验证码 -- DONE
   verifyBindMonthPayCode: `/oms2c/emisWaybill/verifyBindMonthPayCode`, // 确认绑定月结卡 -- DONE
   scanRecord: `/oms2c/emisTmsScanRecord/scan`, // 扫描-  揽收
diff --git a/common/custom.scss b/common/custom.scss
index 3d15e04..8014d71 100644
--- a/common/custom.scss
+++ b/common/custom.scss
@@ -57,6 +57,22 @@
 		display: none;
 	}
 }
+.lbRequiredDot{
+	position: relative;
+	&::after{
+		height: 26rpx;
+		line-height: 26rpx;
+		display: block;
+		content: '*';
+		position: absolute;
+		color: red;
+		top: 50%;
+		margin-top: -10rpx;
+		left: -16rpx;
+		font-size: 30rpx;
+		font-weight: bold;
+	}
+}
 .smp-tag{
 	margin: 0 20rpx 20rpx 0; display: inline-block;
 }
diff --git a/components/buns-edit-sheet/buns-edit-sheet.vue b/components/buns-edit-sheet/buns-edit-sheet.vue
index 03c1165..b08975e 100644
--- a/components/buns-edit-sheet/buns-edit-sheet.vue
+++ b/components/buns-edit-sheet/buns-edit-sheet.vue
@@ -1,9 +1,13 @@
 <template>
-	<tpx-dialog :show="show" :title="title" @onClose="handleCloseModal()" rootStyle="min-height:auto;">
+	<tpx-dialog :show="show" :title="title" @onClose="handleCloseModal()" rootStyle="min-height:auto;"
+		:contentStyle="contentStyle"
+	>
 		<view :style="cptStyle">
 			<tpx-layout>
 				<template v-slot:body>
-					<slot v-if="show" :value="submitVals"></slot>
+					<view class="pl-30 pr-30">
+						<slot v-if="show" :value="submitVals"></slot>
+					</view>
 				</template>
 				
 				<template v-slot:footer>
@@ -41,6 +45,11 @@
 					return ''
 				}
 			},
+			contentStyle: {
+				default () {
+					return 'padding:0;'
+				}
+			},
 			percentHeight: {
 				default () {
 					return 60
diff --git a/components/buns-post-detail-templates/bpd-send-reciever-tmp.vue b/components/buns-post-detail-templates/bpd-send-reciever-tmp.vue
index d7e5955..894aa3d 100644
--- a/components/buns-post-detail-templates/bpd-send-reciever-tmp.vue
+++ b/components/buns-post-detail-templates/bpd-send-reciever-tmp.vue
@@ -17,7 +17,7 @@
 		</view>
 	</u-row>
 	
-	<view @click="goto(`post/detail?billCode=${modelInfo.billCode}`)">
+	<view @click="handleGoDetail">
 		<u-row custom-style="margin-top: 30rpx;" justify="center">
 			<u-col span="4">
 				<u-text :text="(sender.countryName + sender.provinceName)||'-'" size="30" :bold="true" align="center"></u-text>
@@ -82,6 +82,11 @@
 					return true
 				}
 			},
+			hideDetail: {
+				default () {
+					return false
+				}
+			},
 		},
 		data() {
 			return {}
@@ -97,7 +102,11 @@
 		},
 
 		methods: {
-			
+			handleGoDetail(){
+				if(!this.hideDetail) {
+					this.goto(`post/detail?billCode=${this.modelInfo.billCode}`)
+				}
+			}
 		}
 	}
 </script>
diff --git a/components/buns-post-edit-templates/bpe-bindedpost-tmp.vue b/components/buns-post-edit-templates/bpe-bindedpost-tmp.vue
index 8423171..592016a 100644
--- a/components/buns-post-edit-templates/bpe-bindedpost-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-bindedpost-tmp.vue
@@ -16,10 +16,10 @@
 			</view>
 		</u-row>
 		<u-row>
-			<view @click="handleConnect" class="text-center">
+			<!-- <view @click="handleConnect" class="text-center">
 				<u-icon name="kefu-ermai" size="40" custom-style="margin: 0 auto;"></u-icon>
 				<text class="pt-10">客服</text>
-			</view>
+			</view> -->
 		</u-row>
 	</u-row>
 </template>
diff --git a/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue b/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
index 218e922..498631b 100644
--- a/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
@@ -8,27 +8,26 @@
 	</view>
 	<view class="edm-input-item ">
 		<u-row align="top">
-			<text class="font-weight pr-30">货物名称</text>
+			<text class="font-weight pr-30 lbRequiredDot">货物名称</text>
 			<u-textarea v-model="modelInfo.goodsInfo" border="surround" height="100" placeholder=""
 				count></u-textarea>
 		</u-row>
 	</view>
 	<view class="edm-input-item mb-10">
 		<u-row justify="between">
-			<text class="font-28 font-weight">总件数</text>
+			<text class="font-28 font-weight lbRequiredDot">总件数</text>
 			<view>
-				<u-number-box v-model="modelInfo.parcelQty" :min="1" :max="100000" buttonSize="50" inputWidth="100" iconStyle="font-size: 18rpx;"></u-number-box>
+				<tpx-input v-model:value="modelInfo.parcelQty" placeholder="" type="number" inputAlign="right"></tpx-input>
 			</view>
 		</u-row>
 	</view>
 	
 	<view class="edm-input-item mt-20">
-		<u-row justify="between">
-			<text class="font-28 font-weight">包裹重量</text>
-			<view>
+		<tpx-text-item :required="true" label="包裹重量" >
+			<template #right>
 				<tpx-input v-model:value="modelInfo.billWeight" placeholder="" inputAlign="right" suffix="kg" _digit="5"></tpx-input>
-			</view>
-		</u-row>
+			</template>
+		</tpx-text-item>
 	</view>
 	
 	<view class="edm-input-item">
diff --git a/components/buns-post-edit-templates/bpe-gooditem-filed-edit-tmp.vue b/components/buns-post-edit-templates/bpe-gooditem-filed-edit-tmp.vue
index c5e1cae..1e56c60 100644
--- a/components/buns-post-edit-templates/bpe-gooditem-filed-edit-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-gooditem-filed-edit-tmp.vue
@@ -5,7 +5,7 @@
 		</view>
 		<view class="dt-cont">
 			<view class="dt-block mt-10">
-				<tpx-tags v-model:value="checkedGoodId" type="single" :list="hotGoods" @onChange="handleChooseGood"></tpx-tags>
+				<tpx-tags v-model:value="checkedGoodId" type="multiple" :list="hotGoods" @onChange="handleChooseGood"></tpx-tags>
 			</view>
 		</view>
 	</view>
@@ -194,9 +194,9 @@
 				this.$emit('update:value', this.modelInfo)
 				this.handleCloseModal()
 			},
-			handleChooseGood(val) {
-				const item = this.goodsRes.list.concat(this.hotGoods).filter(t=> t.val == val)[0]
-				Object.assign(this.modelInfo, item)
+			handleChooseGood(val, text) {
+				const goodsNames = text
+				this.modelInfo.goodsName = goodsNames
 			}
 		}
 	}
diff --git a/components/buns-post-edit-templates/bpe-gooditemsize-tmp.vue b/components/buns-post-edit-templates/bpe-gooditemsize-tmp.vue
index 28c880f..206cad9 100644
--- a/components/buns-post-edit-templates/bpe-gooditemsize-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-gooditemsize-tmp.vue
@@ -20,20 +20,11 @@
 			</u-row>
 		</view>
 		<view class="jsfm-item">
-			<u-row justify="between">
-				<u-row>
-					<text class="font-28 font-weight pr-10">件数</text>
-					
-				</u-row>
-				<u-row>
+			<tpx-text-item :required="true" label="件数" >
+				<template #right>
 					<tpx-input placeholder="请填写" v-model:value="modelInfo.cargoQty" inputAlign="right" type="number" suffix="件" :_maxNum="cargoQtyMaxNum"></tpx-input>
-					<!-- <text class="font-28 font-weight pr-10">体积</text>
-					<view style="">
-						{{modelInfo.volume || '0'}}
-						<text class="clr-sub">m³</text>
-					</view> -->
-				</u-row>
-			</u-row>
+				</template>
+			</tpx-text-item>
 		</view>
 	</view>	
 </template>
diff --git a/components/tpx-tags/tpx-tags.vue b/components/tpx-tags/tpx-tags.vue
index 7c998e4..bd6b04a 100644
--- a/components/tpx-tags/tpx-tags.vue
+++ b/components/tpx-tags/tpx-tags.vue
@@ -72,8 +72,8 @@
 			handleoItemClick({ curItem }) {
 				this.$emit('onItemClick', curItem)
 			},
-			handleChange(val) {
-				this.$emit('onChange', val)
+			handleChange(val, text, checkedList) {
+				this.$emit('onChange', val, text, checkedList)
 				this.$emit('update:value', val)
 			}
 		}
diff --git a/components/tpx-text-item/tpx-text-item.vue b/components/tpx-text-item/tpx-text-item.vue
index cba404a..801cbe4 100644
--- a/components/tpx-text-item/tpx-text-item.vue
+++ b/components/tpx-text-item/tpx-text-item.vue
@@ -1,6 +1,7 @@
 <template>
 	<u-row justify="between">
 		<u-row>
+			<view v-if="required" class="lbRequiredDot"></view>
 			<template v-if="!$slots.left">
 				<u-text :text="label" size="28" :bold="true"></u-text>
 			</template>
@@ -39,6 +40,11 @@
 					return ''
 				}
 			},
+			required: {
+				default () {
+					return false
+				}
+			},
 			placeholder: {
 				default () {
 					return '请选择'
diff --git a/pages/post/post.vue b/pages/post/post.vue
index 114e65e..1cb5f6c 100644
--- a/pages/post/post.vue
+++ b/pages/post/post.vue
@@ -28,7 +28,7 @@
 									:getListFun="getTransLineList" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}" 
 									:searchParam="waySearchParam" @onChange="handleWayChange" placeholder="请选择路线" 
 								>
-									<tpx-text-item label="路线" :value="submitParam.transLineTypeName"></tpx-text-item>
+									<tpx-text-item :required="true" label="路线" :value="submitParam.transLineTypeName"></tpx-text-item>
 								</tpx-select>
 							</view>
 						</view>
@@ -37,7 +37,7 @@
 							<tpx-select v-model:value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"
 								mode="drop" 
 							>
-								<tpx-text-item label="取件方式" :value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"></tpx-text-item>
+								<tpx-text-item :required="true" label="取件方式" :value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"></tpx-text-item>
 							</tpx-select>
 						</view>
 						
@@ -114,7 +114,7 @@
 								<tpx-select v-model:value="submitParam.customsEclaration" :list="dicData.emis_declare_mode"
 									mode="drop" 
 								>
-									<tpx-text-item label="报关方式" :value="submitParam.customsEclaration" :list="dicData.emis_declare_mode"></tpx-text-item>
+									<tpx-text-item :required="true" label="报关方式" :value="submitParam.customsEclaration" :list="dicData.emis_declare_mode"></tpx-text-item>
 								</tpx-select>
 							</view>
 							
@@ -122,7 +122,7 @@
 								<tpx-select v-model:value="submitParam.customsClear" :list="dicData.emis_customs_clear"
 									mode="drop" 
 								>
-									<tpx-text-item label="清关方式" :value="submitParam.customsClear" :list="dicData.emis_customs_clear"></tpx-text-item>
+									<tpx-text-item :required="true" label="清关方式" :value="submitParam.customsClear" :list="dicData.emis_customs_clear"></tpx-text-item>
 								</tpx-select>
 							</view>
 							
diff --git a/pages/post/query.vue b/pages/post/query.vue
index bf51874..f8b2433 100644
--- a/pages/post/query.vue
+++ b/pages/post/query.vue
@@ -14,10 +14,10 @@
 					<view style="position: relative;">
 						
 						<view class="mp-aside">
-							<bpd-send-reciever-tmp :value="modelInfo"></bpd-send-reciever-tmp>
+							<bpd-send-reciever-tmp :value="modelInfo" :showInfoBtn="false" :hideDetail="true"></bpd-send-reciever-tmp>
 						</view>
 						
-						<view class="mp-aside">
+						<!-- <view class="mp-aside">
 							<view class="">
 								<bpd-pic-preview-tmp :list="modelInfo.billPicGoodsRmk" label="货物图片"></bpd-pic-preview-tmp>
 							</view>
@@ -29,7 +29,7 @@
 							<view class="mt-30">
 								<bpd-pic-preview-tmp :list="modelInfo.billPicDispatchRmk" label="签收底单"></bpd-pic-preview-tmp>
 							</view>
-						</view>
+						</view> -->
 					</view>
 					
 					<view class="dt-block">
diff --git a/pages/tabBar/mine/mine.vue b/pages/tabBar/mine/mine.vue
index 816b187..e710be0 100644
--- a/pages/tabBar/mine/mine.vue
+++ b/pages/tabBar/mine/mine.vue
@@ -83,18 +83,18 @@
 					orderStat: {},
 				},
 				mainBtnlist: [
-					{  title: '186单', subTitle: "寄件", icon: getCdnUrl(`mine/jijian.png`), url: '' },
-					{  title: '186单', subTitle: "收件", icon: getCdnUrl(`mine/shjian.png`), url: '' }
+					{  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' },
-					{  title: '协议', subTitle: "", icon: getCdnUrl(`mine/xieyi.png`), url: '' },
-					{  title: '账单查询', subTitle: "", icon: getCdnUrl(`mine/zhdancha.png`), url: 'bill/list' },
+					// {  title: '进仓单', subTitle: "", icon: getCdnUrl(`mine/jcdan.png`), url: 'warehousing/list' },
+					// {  title: '协议', subTitle: "", icon: getCdnUrl(`mine/xieyi.png`), url: '' },
+					// {  title: '账单查询', subTitle: "", icon: getCdnUrl(`mine/zhdancha.png`), url: 'bill/list' },
 					{  title: '地址簿', subTitle: "", icon: getCdnUrl(`mine/dizhi.png`), url: 'address/list' },
 					{  title: '快件查询', subTitle: "", icon: getCdnUrl(`mine/kjcha.png`), url: 'post/query' },
-					{  title: '投诉建议', subTitle: "", icon: getCdnUrl(`mine/tousu.png`), url: 'complaint/complaint' },
-					{  title: '实名填写', subTitle: "", icon: getCdnUrl(`mine/shiming.png`), url: 'user/certification' }
+					// {  title: '投诉建议', subTitle: "", icon: getCdnUrl(`mine/tousu.png`), url: 'complaint/complaint' },
+					// {  title: '实名填写', subTitle: "", icon: getCdnUrl(`mine/shiming.png`), url: 'user/certification' }
 				]
 			}
 		},