UI优化

pages/group-buy/group-baseinfo.nvue

@@ -18,15 +18,16 @@
 						<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
 					</view>
 				</view>
-				<view class="text-block" @click="selectBusiness">
+				<view class="text-block">
 					<text class="middle-date">商机选择</text>
 					<view class="middle-date-des uni-list picker-year">
-						<view class="uni-list-cell">
+						<view class="uni-list-cell" @click="selectBusiness">
 							<view class="uni-list-cell-db">
 								<text class="middle-date-des">{{selectedBusiness.NAME}}</text>
 							</view>
 						</view>
-						<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
+						<uni-icons v-if="selectedBusiness.NAME" class="clear-text" type="closeempty" size="14" color="#888" @click="clearName"></uni-icons>
+						<!-- <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image> -->
 					</view>
 				</view>
 				<view class="text-block" @click="selectAddress">
@@ -298,6 +299,12 @@
 			uni.$off('selectedPaintDesign')
 		},
 		methods: {
+			clearName(){
+				this.selectedBusiness = {}
+				this.HEADINFO.BUSOPPID = '' // 商机编码
+				this.HEADINFO.BUSINAME = '' // 商机名称
+				this.condition.BUSOPPID = ''
+			},
 			radioChange: function(evt) {
 				for (let i = 0; i < this.status.length; i++) {
 					if (this.status[i].key === evt.detail.key) {
@@ -505,7 +512,7 @@
 	.text-block {
 		overflow: hidden;
 		height: 96rpx;
-		margin-bottom: 14rpx;
+		// margin-bottom: 14rpx;
 		border-bottom: 1px solid #f4f5f6;
 	}
 
@@ -559,7 +566,7 @@
 	.icon-arrow {
 		position: absolute;
 		right: 0;
-		top: 16px;
+		top: 38rpx;
 		width: 12rpx;
 		height: 20rpx;
 		z-index: 10;
@@ -638,4 +645,8 @@
 	 	position: relative;
 	 	top: 30rpx;
 	}
+	.clear-text{
+		width: 60rpx;
+		text-align: right;
+	}
 </style>

pages/group-buy/quota-order.nvue

@@ -52,16 +52,16 @@
 							<view class="text-block title-first">
 								<text class="middle-date title-first__text">{{index+1}}</text>
 							</view>
-							<view class="text-block" style="height: auto;" @click="selectProduct(index,'inner')">
-								<view class="middle-date">
-									<text class="mustPosIcon">*</text>
-									<text class="middle-date">产品</text>
+							<view class="text-block" @click="selectProduct(index,'inner')">
+								<view class="middle-margin-date">
+									<text class="mustPosIcon-margin">*</text>
+									<text class="middle-margin-date">产品</text>
 								</view>
 								<!-- <text class="middle-date">产品</text> -->
-								<view class="middle-date-des uni-list picker-year">
+								<view class="middle-date-margin-des uni-list picker-year">
 									<view class="uni-list-cell">
 										<view class="uni-list-cell-db">
-											<text class="middle-date-des">{{item.DESCRIPTION}}</text>
+											<text class="middle-date-margin-des">{{item.DESCRIPTION}}</text>
 										</view>
 									</view>
 									<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit">
@@ -70,15 +70,15 @@
 							</view>
 							<view class="text-block" v-if="item.isBigSingleProduct === 'TRUE'"
 								@click="selectPlanOrder(item,index)">
-								<view class="middle-date">
-									<text class="mustPosIcon">*</text>
-									<text class="middle-date">计划编号</text>
+								<view class="middle-margin-date">
+									<text class="mustPosIcon-margin">*</text>
+									<text class="middle-margin-date">计划编号</text>
 								</view>
 								<!-- <text class="middle-date">计划编号</text> -->
-								<view class="middle-date-des uni-list picker-year">
+								<view class="middle-date-margin-des uni-list picker-year">
 									<view class="uni-list-cell">
 										<view class="uni-list-cell-db">
-											<text class="middle-date-des">{{item.ZZFLD00002Q_TEXT}}</text>
+											<text class="middle-date-margin-des">{{item.ZZFLD00002Q_TEXT}}</text>
 										</view>
 									</view>
 									<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit">
@@ -217,6 +217,8 @@
 						item.salesplan_info = {
 							...selectedSalePlan
 						}
+						item.SYS_FLAG = selectedSalePlan.SYS_FLAG
+						item.YEAR = selectedSalePlan.GJAHR
 						item.ZZFLD00002Q = selectedSalePlan.PLAN_TYPE
 						item.ZZFLD00002Q_TEXT = selectedSalePlan.PLAN_TYPE_DESC
 						selectedProductSalePlan = {
@@ -225,7 +227,6 @@
 					}
 					return item
 				})
-
 				// _this.updateQuotaData(fromIndex, 'inner', selectedProductSalePlan);
 			})
 		},
@@ -277,11 +278,8 @@
 
 				let productAfterInit = this.updateProductByInit(productIndex, mode, product)
 
-				console.log('productAfterInit', productAfterInit)
-
 				// 产品编号和件数 都有才请求
-				if (!(productAfterInit?.product_info?.PRODUCT_ID &&
-						productAfterInit?.ZZFLD000009)) {
+				if (!(productAfterInit?.product_info?.PRODUCT_ID)) {
 					return
 				}
 
@@ -427,7 +425,7 @@
 				this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
 				this.Marketing = this.selectedSalesCenter.VALUE
 			},
-			nextStep() {
+			async nextStep() {
 				if (this.salesCenterIndex === -1) {
 					uni.showToast({
 						title: '请先选择营销中心',
@@ -474,6 +472,10 @@
 					});
 					return
 				}
+				const flag = await this.updateGroupData();
+				if(!flag){
+					return
+				}
 				let groupOrder = {
 					"baseinfo": this.groupOrder.baseinfo,
 					'ITEM': this.planinnerLists,
@@ -488,6 +490,14 @@
 
 				this.$emit('click', 'orderUpload')
 			},
+			async updateGroupData() {
+				const params = {
+					"INFO": this.HEADINFO,
+					"ITEM": this.planinnerLists,
+				}
+				const res = await apiUpdateGroupData(params)
+				return res.MSGTYPE === "S"
+			},
 			preStep() {
 				let groupOrder = {
 					"baseinfo": this.groupOrder.baseinfo,
@@ -541,7 +551,7 @@
 	}
 
 	.middle-date {
-		flex: 3;
+		flex: 2;
 		font-size: 28rpx;
 		line-height: 96rpx;
 		color: #333;
@@ -551,7 +561,7 @@
 	.middle-date-des {
 		flex: 3;
 		font-size: 28rpx;
-		// line-height: 96rpx;
+		line-height: 96rpx;
 		height: 96rpx;
 		color: #888;
 		margin-top: 10rpx;
@@ -575,9 +585,10 @@
 	}
 
 	.title-first__text {
-		font-size: 28rpx;
+		font-size: 50rpx;
 		color: #333333;
 		font-weight: 600;
+		font-family: AvenirNext, AvenirNext-BoldItalic;
 	}
 
 
@@ -803,4 +814,27 @@
 		position: relative;
 		top: 30rpx;
 	}
+	.mustPosIcon-margin{
+		color: #FF1D32;
+		position: relative;
+		top: 20rpx;
+	}
+	.middle-date-margin-des{
+		flex: 3;
+		font-size: 28rpx;
+		color: #888;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+		width: 200%;
+		text-align: left;
+		justify-content: end;
+	}
+	.middle-margin-date{
+		flex: 2;
+		font-size: 28rpx;
+		color: #333;
+		margin-left: 4rpx;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+	}
 </style>

pages/my-purchase/order-item.nvue

@@ -13,20 +13,20 @@
 				</image>
 			</view>
 			<view class="text-block">
-				<text class="middle-date">{{newsItem.customerName}}</text>
 				<text class="middle-date-des">客户名称</text>
+				<text class="middle-date">{{newsItem.customerName}}</text>
 			</view>
 			<view class="text-block-box">
 				<view class="text-block text-block-last">
-					<text class="middle-date">{{newsItem.createdDate}}</text>
 					<text class="middle-date-des">申请时间</text>
+					<text class="middle-date">{{newsItem.createdDate}}</text>
 				</view>
 				<view class="text-block text-block-last" v-if="newsItem.significanceTextView">
+					<text class="middle-date-des middle-date-right">重要程度</text>
 					<view class="middle-date-right">
 						<text class="dot"></text>
 						<text class="middle-date">{{newsItem.significanceTextView}}</text>
 					</view>
-					<text class="middle-date-des middle-date-right">重要程度</text>
 				</view>
 			</view>
 		</view>
@@ -293,7 +293,7 @@
 	.middle-date {
 		font-size: 28rpx;
 		color: $text-base-color;
-		margin-bottom: 8rpx;
+		margin-top: 8rpx;
 	}
 
 	.middle-date-des {

pages/no-quota/quota-order.nvue

@@ -51,15 +51,15 @@
 								<text class="middle-date title-first__text">{{index+1}}</text>
 							</view>
 							<view class="text-block" @click="selectProduct(index,'inner')">
-								<view class="middle-date">
-									<text class="mustPosIcon">*</text>
-									<text class="middle-date">产品</text>
+								<view class="middle-margin-date">
+									<text class="mustPosIcon-margin">*</text>
+									<text class="middle-margin-date">产品</text>
 								</view>
 								<!-- <text class="middle-date">产品</text> -->
-								<view class="middle-date-pro uni-list picker-year">
+								<view class="middle-date-margin-des uni-list picker-year">
 									<view class="uni-list-cell">
 										<view class="uni-list-cell-db">
-											<text class="middle-date-pro">{{item.DESCRIPTION}}</text>
+											<text class="middle-date-margin-des">{{item.DESCRIPTION}}</text>
 										</view>
 									</view>
 									<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit">
@@ -369,7 +369,15 @@
 				this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
 				this.Marketing = this.selectedSalesCenter.VALUE
 			},
-			nextStep() {
+			async updateGroupData() {
+				const params = {
+					"INFO": this.HEADINFO,
+					"ITEM": this.planinnerLists,
+				}
+				const res = await apiUpdateNoQuotaData(params)
+				return res.MSGTYPE === "S"
+			},
+			async nextStep() {
 				if (this.salesCenterIndex === -1) {
 					uni.showToast({
 						title: '请先选择营销单元',
@@ -400,7 +408,10 @@
 					});
 					return
 				}
-
+				const flag = await this.updateGroupData()
+				if(!flag){
+					return
+				}
 				let noQuotaOrder = {
 					'ITEM': this.planinnerLists,
 					'item_d': [],
@@ -459,7 +470,7 @@
 	}
 
 	.middle-date {
-		flex: 3;
+		flex: 2;
 		font-size: 28rpx;
 		line-height: 96rpx;
 		color: #333;
@@ -492,9 +503,10 @@
 	}
 
 	.title-first__text {
-		font-size: 28rpx;
+		font-size: 50rpx;
 		color: #333333;
 		font-weight: 600;
+		font-family: AvenirNext, AvenirNext-BoldItalic;
 	}
 
 
@@ -717,4 +729,27 @@
 		position: relative;
 		top: 30rpx;
 	}
+	.mustPosIcon-margin{
+		color: #FF1D32;
+		position: relative;
+		top: 20rpx;
+	}
+	.middle-date-margin-des{
+		flex: 3;
+		font-size: 28rpx;
+		color: #888;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+		width: 200%;
+		text-align: left;
+		justify-content: end;
+	}
+	.middle-margin-date{
+		flex: 2;
+		font-size: 28rpx;
+		color: #333;
+		margin-left: 4rpx;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+	}
 </style>

pages/order-detail-group/order-detail-group.nvue

@@ -25,38 +25,39 @@
 								</view>
 								<view class="text-block-box">
 									<view class="text-block text-block-last">
-										<text class="middle-date">{{INFO.POSTING_DATE}}</text>
 										<text class="middle-date-des">下单日期</text>
+										<text class="middle-date">{{INFO.POSTING_DATE}}</text>
 									</view>
 									<view class="text-block text-block-last">
+										<text class="middle-date-des middle-date-right">金额</text>
 										<view class="middle-date-right">
 											<text class="middle-date">{{INFO.TOTAL_AMOUNT}}</text>
 										</view>
-										<text class="middle-date-des middle-date-right">金额</text>
 									</view>
 								</view>
 								<view class="text-block-box">
 									<view class="text-block text-block-last">
-										<text class="middle-date">{{INFO.GRPNAME}}</text>
 										<text class="middle-date-des">团购单位</text>
+										<text class="middle-date">{{INFO.GRPNAME}}</text>
 									</view>
 								</view>
 								<view class="text-block-box text-block-box-last">
 									<view class="text-block text-block-last">
-										<view class="middle-date">{{DIYC==='X'?'是':'否'}}
+										<text class="middle-date-des">是否盒外刻字</text>
+										<view class="middle-date">
+											{{INFO.ZZFLD000099==='X'?'是':'否'}}
 											<button class="diy-entry" type="default" @click="goDiyPage" v-if="DIYC==='X'">
 												<image class="diy-icon" src="../../static/image/address@3x.png" mode="">
 												</image>
 												<text class="diy-entry-text">定制酒</text>
 											</button>
 										</view>
-										<text class="middle-date-des">是否盒外刻字</text>
 									</view>
 									<view class="text-block text-block-last">
+										<text class="middle-date-des middle-date-right">外箱喷码内容</text>
 										<view class="middle-date-right">
 											<text class="middle-date">{{INFO.ZZFLD000098}}</text>
 										</view>
-										<text class="middle-date-des middle-date-right">外箱喷码内容</text>
 									</view>
 								</view>
 							</view>
@@ -215,7 +216,8 @@
 			async getOrderDetail() {
 				try{
 					const params = {
-						OBJECT_ID: this.orderItem.object_id
+						OBJECT_ID: this.orderItem.object_id,
+						role: "WLY001"
 					}
 					const res = await apiGetSalesOrderDetail(params)
 					this.orderDetail = res.DATA
@@ -374,7 +376,7 @@
 	.middle-date {
 		font-size: 28rpx;
 		color: $text-base-color;
-		margin-bottom: 16rpx;
+		margin-top: 16rpx;
 	}
 
 	.middle-date-des {

pages/order-detail-noquota/order-detail-noquota.nvue

@@ -26,14 +26,14 @@
 								</view>
 								<view class="text-block-box">
 									<view class="text-block text-block-last">
-										<text class="middle-date">{{INFO.POSTING_DATE}}</text>
 										<text class="middle-date-des">下单日期</text>
+										<text class="middle-date">{{INFO.POSTING_DATE}}</text>
 									</view>
 									<view class="text-block text-block-last">
+										<text class="middle-date-des middle-date-right">金额</text>
 										<view class="middle-date-right">
 											<text class="middle-date">{{INFO.TOTAL_AMOUNT}}</text>
 										</view>
-										<text class="middle-date-des middle-date-right">金额</text>
 									</view>
 								</view>
 							</view>
@@ -173,7 +173,8 @@
 		methods: {
 			async getOrderDetail() {
 				const params = {
-					OBJECT_ID: this.orderItem.object_id
+					OBJECT_ID: this.orderItem.object_id,
+					role: "WLY001"
 				}
 				const res = await apiGetSalesOrderDetail(params)
 				this.orderDetail = res.DATA
@@ -326,7 +327,7 @@
 	.middle-date {
 		font-size: 28rpx;
 		color: $text-base-color;
-		margin-bottom: 16rpx;
+		margin-top: 16rpx;
 	}
 
 	.middle-date-des {

pages/order-detail-quota/order-detail-quota.nvue

@@ -26,14 +26,14 @@
 								</view>
 								<view class="text-block-box">
 									<view class="text-block text-block-last">
-										<text class="middle-date">{{INFO.POSTING_DATE}}</text>
 										<text class="middle-date-des">下单日期</text>
+										<text class="middle-date">{{INFO.POSTING_DATE}}</text>
 									</view>
 									<view class="text-block text-block-last">
+										<text class="middle-date-des middle-date-right">金额</text>
 										<view class="middle-date-right">
 											<text class="middle-date">{{INFO.TOTAL_AMOUNT}}</text>
 										</view>
-										<text class="middle-date-des middle-date-right">金额</text>
 									</view>
 								</view>
 							</view>
@@ -215,7 +215,8 @@
 		methods: {
 			async getOrderDetail() {
 				const params = {
-					OBJECT_ID: this.orderItem.object_id
+					OBJECT_ID: this.orderItem.object_id,
+					role: "WLY001"
 				}
 				const res = await apiGetSalesOrderDetail(params)
 				this.orderDetail = res.DATA
@@ -356,7 +357,7 @@
 	.middle-date {
 		font-size: 28rpx;
 		color: $text-base-color;
-		margin-bottom: 16rpx;
+		margin-top: 16rpx;
 	}
 
 	.middle-date-des {

pages/order-other-detail/order-other-detail.nvue

@@ -25,14 +25,14 @@
 								</view>
 								<view class="text-block-box">
 									<view class="text-block text-block-last">
-										<text class="middle-date">{{INFO.POSTING_DATE}}</text>
 										<text class="middle-date-des">下单日期</text>
+										<text class="middle-date">{{INFO.POSTING_DATE}}</text>
 									</view>
 									<view class="text-block text-block-last">
+										<text class="middle-date-des middle-date-right">金额</text>
 										<view class="middle-date-right">
 											<text class="middle-date">{{INFO.TOTAL_AMOUNT}}</text>
 										</view>
-										<text class="middle-date-des middle-date-right">金额</text>
 									</view>
 								</view>
 								<!-- <view class="text-block-box">
@@ -215,7 +215,8 @@
 			async getOrderDetail() {
 				try{
 					const params = {
-						OBJECT_ID: this.orderItem.object_id
+						OBJECT_ID: this.orderItem.object_id,
+						role: "WLY001"
 					}
 					const res = await apiGetSalesOrderDetail(params)
 					this.orderDetail = res.DATA
@@ -375,7 +376,7 @@
 	.middle-date {
 		font-size: 28rpx;
 		color: $text-base-color;
-		margin-bottom: 16rpx;
+		margin-top: 16rpx;
 	}
 
 	.middle-date-des {

pages/order-trends/order-trends.nvue

@@ -53,7 +53,7 @@
 					</view>
 				</view>
 				<view class="text-block text-block-last">
-					<text class="middle-date">产品编码</text>
+					<text class="middle-date">订单编号</text>
 					<input class="middle-date-des" type="text" v-model="condition.OBJECT_ID" placeholder="请输入" />
 				</view>
 			</view>

pages/produce-material/order-list.nvue

@@ -12,10 +12,10 @@
 						<text class="item-block-label item-block__label">{{itemHead.packtype}}</text>
 					</view>
 					<view class="item-block">
-						<text class="item-block-label-des">{{itemHead.datum}}</text>
+						<text class="detal-item-label">下单日期</text>
 					</view>
 					<view class="item-block item-block-date">
-						<text class="detal-item-label">下单日期</text>
+						<text class="item-block-label-des">{{itemHead.datum}}</text>
 					</view>
 
 					<view class="block-detal" :class="{'block-detal-last':index === itemLists.length-1}"

pages/produce-order/order-list.nvue

@@ -12,10 +12,10 @@
 						<text class="item-block-label item-block__label">{{itemHead.prodpltype}}</text>
 					</view>
 					<view class="item-block">
-						<text class="item-block-label-des">{{itemHead.datum}}</text>
+						<text class="detal-item-label">下单日期</text>
 					</view>
 					<view class="item-block item-block-date">
-						<text class="detal-item-label">下单日期</text>
+						<text class="item-block-label-des">{{itemHead.datum}}</text>
 					</view>
 					<view class="block-detal" :class="{'block-detal-last':index === itemLists.length-1}"
 						v-for="(item,index) in itemLists" :key="index">

pages/purchase-main/purchase-main.nvue

@@ -71,7 +71,7 @@
 						<text class="middle-date">未发货件数</text>
 						<text class="middle-date-des">{{ele.undeliveredQuantity}}</text>
 					</view>
-					<view class="text-block">
+					<!-- <view class="text-block">
 						<text class="middle-date">传统当月计划量</text>
 						<text class="middle-date-des">{{ele.planQuantity}}</text>
 					</view>
@@ -82,7 +82,7 @@
 					<view class="text-block">
 						<text class="middle-date">传统当年剩余量</text>
 						<text class="middle-date-des">{{ele.annualLeftQty}}</text>
-					</view>
+					</view> -->
 					<view class="text-block text-block-last">
 						<text class="middle-date">本次要货件数</text>
 						<input class="middle-date-address" type="text" v-model="ele.wantQuantity" placeholder="请输入" />

pages/purchase-receive/purchase-receive.nvue

@@ -85,7 +85,8 @@
 					</view>
 					<view class="text-block text-block-last">
 						<text class="middle-date">收货联系人</text>
-						<text class="middle-date-des">{{orderItem.contacPerson}}</text>
+						<input class="middle-date-des" type="text" v-model="orderItem.contacPerson" placeholder="请输入" />
+						<!-- <text class="middle-date-des">{{orderItem.contacPerson}}</text> -->
 					</view>
 				</view>
 				<view class="middle view">

pages/quota/quota-order.nvue

@@ -50,20 +50,18 @@
 				<uni-swipe-action class="planout-block-lists">
 					<uni-swipe-action-item v-for="(item,index) in planinnerLists" :key='index'>
 						<view class="middle view planout-block-item">
-							<view class="text-block title-first">
-								<text class="middle-date title-first__text">{{index+1}}</text>
-							</view>
+							<text class="middle-date title-first__text">{{index+1}}</text>
 							<view class="text-block" @click="selectProduct(index,'inner')">
-								<view class="middle-date">
-									<text class="mustPosIcon">*</text>
-									<text class="middle-date">产品</text>
+								<view class="middle-margin-date">
+									<text class="mustPosIcon-margin">*</text>
+									<text class="middle-margin-date">产品</text>
 								</view>
 								<!-- <text class="mustPosIcon">*</text> -->
 								<!-- <text class="middle-date">产品</text> -->
-								<view class="middle-date-pro uni-list picker-year">
+								<view class="middle-date-margin-des uni-list picker-year">
 									<view class="uni-list-cell">
 										<view class="uni-list-cell-db">
-											<text class="middle-date-pro">{{item.DESCRIPTION}}</text>
+											<text class="middle-date-margin-des">{{item.DESCRIPTION}}</text>
 										</view>
 									</view>
 									<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit">
@@ -128,9 +126,7 @@
 				<uni-swipe-action class="planout-block-lists">
 					<uni-swipe-action-item v-for="(item,index) in planoutLists" :key='index'>
 						<view class="middle view planout-block-item">
-							<view class="text-block title-first">
-								<text class="middle-date title-first__text">{{index+1}}</text>
-							</view>
+							<text class="middle-date title-first__text">{{index+1}}</text>
 							<view class="text-block">
 								<text class="middle-date">产品</text>
 								<view class="middle-date-pro uni-list picker-year">
@@ -599,7 +595,17 @@
 				this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
 				this.Marketing = this.selectedSalesCenter.VALUE
 			},
-			nextStep() {
+			async updateGroupData() {
+				const params = {
+					"item_type": 'ITEM_INNER',
+					"info": this.HEADINFO,
+					"item_inner": this.planinnerLists,
+					"item_outer": this.planoutLists
+				}
+				const res = await apiUpdateQuotaData(params)
+				return res.MSGTYPE === "S"
+			},
+			async nextStep() {
 				if (this.salesCenterIndex === -1) {
 					uni.showToast({
 						title: '请先选择营销单元',
@@ -641,6 +647,11 @@
 					});
 					return
 				}
+				
+				const flag = await this.updateGroupData()
+				if(!flag){
+					return
+				}
 							
 				let quotaOrder = {
 					'ITEM_INNER': this.planinnerLists,
@@ -702,7 +713,7 @@
 	}
 
 	.middle-date {
-		flex: 3;
+		flex: 2;
 		font-size: 28rpx;
 		line-height: 96rpx;
 		color: #333;
@@ -736,7 +747,7 @@
 	}
 
 	.title-first__text {
-		font-size: 28px;
+		font-size: 50rpx;
 		color: #333333;
 		font-weight: 600;
 		font-family: AvenirNext, AvenirNext-BoldItalic;
@@ -963,4 +974,27 @@
 		border-top-left-radius: 10px;
 		border-top-right-radius: 10px;
 	}
+	.mustPosIcon-margin{
+		color: #FF1D32;
+		position: relative;
+		top: 20rpx;
+	}
+	.middle-date-margin-des{
+		flex: 3;
+		font-size: 28rpx;
+		color: #888;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+		width: 200%;
+		text-align: left;
+		justify-content: end;
+	}
+	.middle-margin-date{
+		flex: 2;
+		font-size: 28rpx;
+		color: #333;
+		margin-left: 4rpx;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+	}
 </style>

pages/ticket-order/order-item.nvue

@@ -10,8 +10,8 @@
 		<view class="middle view">
 			<text class="middle-title">{{itemHead.inftype}}</text>
 			<view class="text-block">
-				<text class="middle-date">{{itemHead.mak_date}}</text>
 				<text class="middle-date-des">下单日期</text>
+				<text class="middle-date">{{itemHead.mak_date}}</text>
 			</view>
 		</view>
 		<view class="bottom view">
@@ -24,45 +24,45 @@
 			</view>
 			<view v-if="ishowDetail" class="bottom-content" v-for="(item,index) in itemLists" :key="index">
 				<view class="text-block">
-					<text class="middle-date">{{item.description}}</text>
 					<text class="middle-date-des">产品描述</text>
+					<text class="middle-date">{{item.description}}</text>
 				</view>
 				<view class="text-block">
-					<text class="middle-date middle-billno">{{item.invo_id}}</text>
 					<text class="middle-date-des">发票号</text>
+					<text class="middle-date middle-billno">{{item.invo_id}}</text>
 				</view>
 				<view class="text-block">
-					<text class="middle-date">{{item.zzfld00002s}}</text>
 					<text class="middle-date-des">规格</text>
+					<text class="middle-date">{{item.zzfld00002s}}</text>
 				</view>
 				<view class="text-block-2">
 					<view class="text-block text-block-1">
-						<text class="middle-date">{{item.use_zzfld9}}</text>
 						<text class="middle-date-des">开票件数({{item.zzfld00002t}})</text>
+						<text class="middle-date">{{item.use_zzfld9}}</text>
 					</view>
 					<view class="text-block">
-						<text class="middle-date">{{item.use_quantity}}</text>
 						<text class="middle-date-des">数量(瓶)</text>
+						<text class="middle-date">{{item.use_quantity}}</text>
 					</view>
 				</view>
 				<view class="text-block-2">
 					<view class="text-block text-block-1">
-						<text class="middle-date">{{item.net_price}}</text>
 						<text class="middle-date-des">单价</text>
+						<text class="middle-date">{{item.net_price}}</text>
 					</view>
 					<view class="text-block">
-						<text class="middle-date">{{item.net_value}}</text>
 						<text class="middle-date-des">价税合计</text>
+						<text class="middle-date">{{item.net_value}}</text>
 					</view>
 				</view>
 				<view class="text-block-2">
 					<view class="text-block text-block-1">
-						<text class="middle-date">{{item.zzfld00002e}}</text>
 						<text class="middle-date-des">税率</text>
+						<text class="middle-date">{{item.zzfld00002e}}</text>
 					</view>
 					<view class="text-block">
-						<text class="middle-date">{{item.remain_zzfld9}}</text>
 						<text class="middle-date-des">剩余开票件数</text>
+						<text class="middle-date">{{item.remain_zzfld9}}</text>
 					</view>
 				</view>
 				<!-- <view class="text-block-2"> -->
@@ -196,7 +196,7 @@
 	.middle-date {
 		font-size: 28rpx;
 		color: $text-base-color;
-		margin-bottom: 8rpx;
+		margin-top: 8rpx;
 	}
 
 	.middle-date-des {