From b5d3561a2e06106ed9cce2c6bcc9c2463951e998 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期五, 15 十一月 2024 11:06:26 +0800
Subject: [PATCH] 新增申请页面不显示发运通知单的问题修改

---
 pages/jihua/jihua.vue |  451 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 298 insertions(+), 153 deletions(-)

diff --git a/pages/jihua/jihua.vue b/pages/jihua/jihua.vue
index b4090af..5f6488b 100644
--- a/pages/jihua/jihua.vue
+++ b/pages/jihua/jihua.vue
@@ -11,33 +11,43 @@
 				</u-radio-group>
 			</view>
 			<view class="main-inside">
-				<view v-if="isTomJihua == '鍏ㄩ儴'">
+				<view v-if="isTomJihua == '鍏ㄩ儴'" class="totalListContainer">
 					<u-empty v-if="fyData.length == 0" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" class="empty-container"></u-empty>
-					<view id="u-dropdown" class="main-block-box" v-for="(item, index) in fyData" :key="item.id" ref="planViewRef">
+					<view id="u-dropdown" class="main-block-box" v-for="(item, index) in fyData" :key="item.orderId" ref="planViewRef">
 						<view class="jihua-main-line">
-							<!-- <view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName || ''}}</view> -->
-							<view class="name">鏀惰揣鍗曚綅锛歿{ item.customerAddressName || '' }}</view>
+							<view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName || ''}}</view>
 						</view>
+            <view class="jihua-main-line" v-if="item.order && item.order.customerAddressName != item.customerName">
+              <view class="name">鏀惰揣鍗曚綅锛歿{item.order && item.order.customerAddressName || ''}}</view>
+            </view>
 						<view class="jihua-main-line">
 							<view class="main-flex">
-								<view>鐓ょ锛歿{ item.coalName || '' }}</view>
-								<view>鍓╀綑閲忥細{{ item.executiveSurplus || '' }}</view>
+								<view>鐓ょ锛歿{ item.order.coalName || '' }}</view>
+								<view style="margin-right:10px">鍓╀綑閲忥細{{ item.order.executiveSurplus || '' }} 鍚�</view>
 							</view>
 						</view>
 						<view class="jihua-main-line">
 							<view class="main-flex">
 								<view class="carNum-box">
 									<view>璁″垝杞︽暟锛�</view>
-									<!-- <u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan" @change="inputChange" @focus="faYunPlanCarsFocus(item)"></u--input> -->
-									<view class="planCars" :style="{color:item.numPlan  ? '#111':'#ccc'}" @click="faYunPlanCarsFocus(item)">
-										<text v-model="item.numPlan">{{ item.numPlan || '鐐瑰嚮杈撳叆鏁伴噺' }}</text>
-										<view class="cursor" v-if="isCursor && fayunPlanFocusId == item.id"><image src="@/static/cursor.gif" mode=""><image></view>
-									</view>
+									 <u--input
+                       placeholder="璇疯緭鍏ュ彂杩愯溅鏁�"
+                       border="surround"
+                       v-model="item.numPlan"
+                       @change="inputChange(item)"
+                       @focus="faYunPlanCarsFocus(item)"
+                       type="number" pattern="[0-9]*"></u--input>
+
+                  <!--									<view class="planCars" :style="{color:item.numPlan  ? '#111':'#ccc'}" @click="faYunPlanCarsFocus(item)">
+                                      <text v-model="item.numPlan">{{ item.numPlan || '鐐瑰嚮杈撳叆鏁伴噺' }}</text>
+                  &lt;!&ndash;                    <text v-model="item.numPlan">{{ item.numPlan || '鐐瑰嚮杈撳叆鏁伴噺' }}</text>&ndash;&gt;
+                                      <view class="cursor" v-if="isCursor && fayunPlanFocusId == item.orderId"><image src="@/static/cursor.gif" mode=""><image></view>
+                                    </view>-->
 								</view>
-								<view>瀹為檯鍙戣溅鏁帮細{{ item.numReal || '鏆傛棤' }}</view>
+								<view style="margin-right:10px">瀹為檯鍙戣溅鏁帮細{{ item.numReal || '鏆傛棤' }}</view>
 							</view>
 						</view>
-						<u-keyboard    
+						<u-keyboard
 							@change="valChange"
 							@backspace="backspace"
 							@confirm="keyBoardConfirm"
@@ -57,32 +67,38 @@
 				</view>
 				<view v-if="isTomJihua == '宸茶缃殑璁″垝'">
 					<u-empty v-if="fyData.length == 0" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" class="empty-container"></u-empty>
-					<view class="main-block-box" v-for="(item, index) in fyData" :key="item.id">
+					<view class="main-block-box" v-for="(item, index) in fyData" :key="item.orderId">
 						<view class="jihua-main-line">
 							<view class="name">瀹㈡埛鍚嶇О锛歿{ item.customerName || '' }}</view>
 						</view>
 						<view class="jihua-main-line">
 							<view class="main-flex">
 								<view>鐓ょ锛歿{ item.order.coalName || '' }}</view>
-								<view>鍓╀綑閲忥細{{ item.order.executiveSurplus || '' }}</view>       
+								<view style="margin-right:10px">鍓╀綑閲忥細{{ item.order.executiveSurplus || '' }} 鍚�</view>
 							</view>
 						</view>
 						<view class="jihua-main-line">
 							<view class="main-flex">
 								<view class="carNum-box">
 									<view>璁″垝杞︽暟锛�</view>
-									<!-- <u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan" @change="inputTotalChange(item)" @focus="faYunPlanCarsFocus(item)"></u--input> -->
-									<view class="planCars" :style="{color:item.numPlan  ? '#111':'#ccc'}" @click="faYunPlanCarsFocus(item)">
+									 <u--input
+                       placeholder="璇疯緭鍏ュ彂杩愯溅鏁�"
+                       border="surround"
+                       v-model="item.numPlan"
+                       @change="inputTotalChange(item)"
+                       @focus="faYunPlanCarsFocus(item)"
+                       type="number" pattern="[0-9]*"></u--input>
+<!--									<view class="planCars" :style="{color:item.numPlan  ? '#111':'#ccc'}" @click="faYunPlanCarsFocus(item)">
 										<text v-model="item.numPlan">{{ item.numPlan || '鐐瑰嚮杈撳叆鏁伴噺' }}</text>
-										<view class="cursor" v-if="isCursor && fayunPlanFocusId == item.id">
+										<view class="cursor" v-if="isCursor && fayunPlanFocusId == item.orderId">
 											<image src="@/static/cursor.gif" mode="" />
 										</view>
-									</view>
+									</view>-->
 								</view>
-								<view>瀹為檯鍙戣溅鏁帮細{{ item.order.numReal == null ? '鏆傛棤' : item.order.numReal }}</view>
+								<view style="margin-right:10px">瀹為檯鍙戣溅鏁帮細{{ item.numReal == null ? '鏆傛棤' : item.numReal }}</view>
 							</view>
 						</view>
-						<u-keyboard
+<!--						<u-keyboard
 							@change="valChange"
 							@backspace="backspace"
 							@confirm="keyBoardConfirm"
@@ -95,12 +111,20 @@
 							:closeOnClickOverlay="false"
 							:dotDisabled="true"
 							zIndex="100000"
-						></u-keyboard>
+						></u-keyboard>-->
 					</view>
-					<u-button class="xiugai-btn" type="primary" text="淇敼" @click="editPlan"></u-button>
 				</view>
 			</view>
 		</view>
+
+		<!-- 淇敼寮瑰嚭妗� -->
+		<u-popup :show="editPopupShow" @close="editPopupClose" @open="editPopupOpen" mode="top" round="10">
+			<view class="editPopup">
+				<view class="editPopup__title"><text>璁″垝杞︽暟</text></view>
+				<view class="editPopup__input"><u--input v-model="keyBoardValue" placeholder="璇疯緭鍏ュ唴瀹�" type="number" border="surround"></u--input></view>
+				<view class="editPopup__btn"><u-button text="纭畾" type="primary" @click="keyBoardConfirm"></u-button></view>
+			</view>
+		</u-popup>
 
 		<view class="back-top-container"><u-back-top :scroll-top="scrollTop" icon="arrow-up" mode="square"></u-back-top></view>
 		<!-- 鑿滃崟鏍� -->
@@ -111,15 +135,22 @@
 <script>
 import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
 import tool from '@/utils/tool.js';
+import { TrackOpTypes } from "vue";
+import row from "../../uni_modules/uview-ui/libs/config/props/row";
 export default {
 	components: {
 		popupMenu
 	},
+  computed: {
+    isShowCAN() {  //鏄惁鏄剧ず鏀惰揣鍗曚綅
+
+    }
+  },
 	data() {
 		return {
 			radioValue: '鍏ㄩ儴',
 			tabList: [
-				{  
+				{
 					name: '浠婃棩鍙戣繍璁″垝'
 				},
 				{
@@ -133,6 +164,7 @@
 				shippingDate: this.todayDate()
 			},
 			isTomJihua: '鍏ㄩ儴',
+			editPopupShow:false,// 淇敼寮瑰嚭妗�
 			editRow: '', //淇敼琛岀殑琛�
 			menuShow: false,
 			scrollTop: 0, // 杩斿洖椤堕儴鎸夐挳缁戝畾,
@@ -153,10 +185,10 @@
 	onPageScroll(e) {
 		// 浼犲叆scrollTop鍊煎苟瑙﹀彂鎵�鏈塭asy-loadimage缁勪欢涓嬬殑婊氬姩鐩戝惉浜嬩欢
 		this.scrollTop = e.scrollTop;
+		// console.log('灞忓箷婊氬姩鐩戝惉浜嬩欢',this.scrollTop);
 	},
 	// 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
 	onNavigationBarButtonTap(e) {
-		// console.log(e);
 		this.$refs.menuRef.menuClick();
 	},
 	mounted() {
@@ -176,32 +208,27 @@
 		},
 		keyBoardValue: {
 			handler: function(newV, oldV) {
-				console.log('閿洏杈撳叆鍊�', newV, oldV);
 				this.fyData.map(item => {
-					if (item.id == this.fayunPlanFocusId) {
+					if ( this.isTomJihua == '鍏ㄩ儴'&&item.orderId == this.fayunPlanFocusId) {
 						if (item.numPlan && item.numPlan != newV) {
 							item.numPlan = this.keyBoardValue;
-							if (this.isTomJihua == '宸茶缃殑璁″垝') {
-								this.editRow = item;
-							}
 						}
 					}
 				});
 			},
 			deep: true,
 			immediate: true
-		},
-		scrollTop: {
-			handler: function(newV, oldV) {
-				// console.log('椤甸潰婊戝姩', newV);
-				if (newV != oldV) {
-					this.keyBoardClose();
-					// this.keyBoardShow = false;
-				}
-			}
-		},
-		deep: true,
-		immediate: true
+		}
+		// scrollTop: {
+		// 	handler: function(newV, oldV) {
+		// 			if (newV != oldV) {
+		// 				this.keyBoardClose();
+		// 				// this.keyBoardShow = false;
+		// 			}
+		// 	},
+		// 	deep: true,
+		// 	immediate: true
+		// }
 	},
 	methods: {
 		init() {
@@ -210,76 +237,33 @@
 		menushow(e) {
 			this.menuShow = e;
 		},
-		//鎻愪氦
-		dataFormSubmit() {
-			console.log('鏃ュ彂杩愯鍒掓洿鏂版暟鎹彁浜�',this.fyData);
-				this.overlayShow = true;
-				this.fyData.forEach(e => {
-					e.shippingDate = this.info.shippingDate;
-					if (e.planId && !e.numPlan) {
-						e.numPlan = -1; // 鍒犻櫎璁剧疆涓虹┖鐨勮鍒�
-					}
-					let orderId = e.id;  // 璁㈠崟id
-					e.orderId = orderId;
-					// e.id = e.planId;
-				});
-				this.$reqPost('addObj', this.fyData).then(res => {
-					console.log('addObj鎺ュ彛杩斿洖',res);
-					this.$u.toast('娣诲姞鎴愬姛');
-					this.fyList();
-				});
-		},
-		// 鍏ㄩ儴鏃ヨ鍒掓彁浜ゆ寜閽槻鎶�
-		submit:tool.throttle(function(){
-				this.dataFormSubmit();
-		}),
-		// 淇敼鏃ヨ鍒掓寜閽�
-		getOrderCarNum() {
-			//淇敼
-			this.$reqPost('setCarNums', this.editRow).then(res => {
-				this.$u.toast('淇敼鎴愬姛');
-				this.xscarshippingdayplan();
-			});
-		},
-		// 淇敼鏃ヨ鍒掗槻鎶栨寜閽�
-		editPlan:tool.throttle(function(){
-			this.getOrderCarNum();
-		}),
-		// 鍒囨崲鍏ㄩ儴鍜屽凡璁剧疆
-		groupChange(n) {
-			console.log(n, 'n================');
-			this.isTomJihua = n;
-			if (n == '宸茶缃殑璁″垝') {
-				this.xscarshippingdayplan();
-			} else {
-				this.fyList();
-			}
-		},
+		// 鍏ㄩ儴璁″垝鍒楄〃
 		fyList() {
 			this.overlayShow = true;
 			//鍒楄〃鏌ヨ
-			uni.showLoading({   
+			uni.showLoading({
 				title: '姝e湪鍔犺浇...'
 			});
 			let compId = uni.getStorageSync('userInfo').compId;
 			let params = {
 				current: 1,
-				size: 100,
+				size: 900,
 				status: 2,
 				trainType: 1,
-				compId: compId
+				compId: compId,
+        type: '澶栭攢',
+				endDate: this.info.shippingDate,
 			};
 			this.$reqGet('fyList', params).then(res => {
 				if (res.code == 0) {
-					console.log('fylist--------',res.data);
-					this.xscarshippingdayplan(res.data);
+					this.fyData = res.data;
+					uni.hideLoading();
+					this.overlayShow = false;
 				}
 			});
 		},
-		xscarshippingdayplan(allList) {
-			uni.showLoading({
-				title: '姝e湪鍔犺浇...'
-			});
+		// 宸茶缃鍒掑垪琛�
+		xscarshippingdayplan() {
 			this.overlayShow = true;
 			//宸茬粡璁剧疆鐨�
 			let params = {
@@ -287,29 +271,13 @@
 				size: 50,
 				shippingDate: this.info.shippingDate
 			};
+			uni.showLoading({
+				title: '姝e湪鍔犺浇...'
+			});
 			this.$reqGet('xscarshippingdayplan', params)
 				.then(res => {
-					console.log('涓嶇煡閬撴槸浠�涔�---------------',res);
 					if (res.code == 0) {
-						if (allList) {
-							let selectFyData = res.data.records;
-							allList.forEach(e => {
-								selectFyData.forEach(ee => {
-									if (e.id == ee.orderId) {
-										e.numPlan = ee.numPlan;
-										e.numReal = ee.numReal;	
-										// e.planId = ee.id;
-										console.log('淇敼planid鎿嶄綔',`planId:${ee.id}`);
-										if (ee.carNums != null) {
-											e.carNums = ee.carNums;
-										}
-									}
-								});
-							});
-							this.fyData = allList;
-						} else {
-							this.fyData = res.data.records;
-						}
+						this.fyData = res.data.records;
 						uni.hideLoading();
 						this.overlayShow = false;
 					}
@@ -319,9 +287,89 @@
 					this.overlayShow = false;
 				});
 		},
+		//鎻愪氦
+		dataFormSubmit() {
+			this.overlayShow = true;
+			uni.showLoading({
+				title:'鍔犺浇涓�...'
+			})
+			this.fyData.forEach(e => {
+				if(!e.shippingDate && e.numPlan){
+					e.shippingDate = this.info.shippingDate
+				}
+			});
+			this.$reqPost('xscarshippingdayplanAddObj', this.fyData).then(res => {
+				uni.hideLoading();
+				if(res.code == 0){
+					this.fyList();
+          setTimeout(()=>{
+            uni.showToast({
+              title:'鏇存柊鎴愬姛锛�',
+              icon:'none',
+              duration:1000
+            })
+          },0)
+				}
+			});
+		},
+		// 鍏ㄩ儴鏃ヨ鍒掓彁浜ゆ寜閽槻鎶�
+		submit:tool.throttle(function(){
+				this.dataFormSubmit();
+		}),
+		// 淇敼鏃ヨ鍒掓寜閽�
+		getOrderCarNum() {
+			this.overlayShow = true;
+			uni.showLoading({
+				title:'鍔犺浇涓�...'
+			})
+			//淇敼
+			 this.$reqPost('setCarNums', this.editRow).then(res => {
+				uni.hideLoading();
+				if(res.code == 0){
+					// 璁剧疆setTimeout鏄伩鍏島ni.showToast琚玼ni.showLoading瑕嗙洊鎺�
+					setTimeout(()=>{
+						uni.showToast({
+							title:'淇敼鎴愬姛',
+							icon:'none',
+							duration:1000,
+							position:'bottom'
+						})
+					},0)
+				}else{
+					setTimeout(()=>{
+						uni.showToast({
+							title:'淇敼澶辫触',
+							icon:'none',
+							duration:1000
+						})
+					},0)
+				}
+				this.overlayShow = false;
+				this.xscarshippingdayplan();
+			});
+		},
+		// 淇敼寮瑰嚭妗�
+		editPopupClose(){
+			console.log('淇敼寮瑰嚭妗咰lose');
+			this.editPopupShow = false;
+			this.keyBoardShow = false;
+		},
+		editPopupOpen(){
+			console.log('淇敼寮瑰嚭妗哋pen');
+		},
+		// 鍒囨崲鍏ㄩ儴鍜屽凡璁剧疆
+		groupChange(n) {
+			this.initVariable();
+			this.isTomJihua = n;
+			if (n == '宸茶缃殑璁″垝') {
+				this.xscarshippingdayplan();
+			} else {
+				this.fyList();
+			}
+		},
 		//鍒囨崲浠婃棩鍜屾槑鏃�
 		tabClick(item) {
-			console.log(item, 'item==========');
+			this.initVariable();
 			if (item.index == 1) {
 				this.info.shippingDate = this.tomorrowDate();
 				if (this.isTomJihua == '宸茶缃殑璁″垝') {
@@ -338,34 +386,76 @@
 				}
 			}
 		},
-		inputChange(val) {
-			console.log('鍏ㄩ儴璁″垝', val);
+		// 鍒濆鍖栧彉閲�
+		initVariable(){
+			this.keyBoardShow = false;
+			this.keyBoardValue = null;
+			this.fayunPlanFocusId = null;
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 300
+			});
 		},
+		inputChange(item) {
+      if(item.numPlan) {
+        let total = Math.floor(item.order.executiveSurplus / Number(34));
+        let max = total + (item.numReal ? item.numReal : 0) + 1
+        if(item.numPlan > max) {
+          this.$nextTick(() => {
+            item.numPlan = max
+            this.$set(item,'numPlan',max)
+          })
+          uni.showToast({
+            title:`璇ヨ鍗曟渶澶ц缃溅鏁颁负锛�${max}`,
+            icon:'none',
+            duration:1000
+          })
+        }
+      }
+		},
+    changeIn(val) {
+      console.log(val,'val=====')
+    },
 		inputTotalChange(val) {
 			console.log(val, 'val2=======val2,宸茶缃鍒�');
 			this.editRow = val;
-		},   
+		},
 		// input鑾峰彇鐒︾偣
 		faYunPlanCarsFocus(item) {
-			// 鑾峰彇璇ョ劍鐐瑰湪椤甸潰鐨勪綅缃�
-			// let boxBottom = document.getElementById('#u-dropdown');
-			// console.log('鍏冪礌',boxBottom);
-			// let bottom = this.$refs.planViewRef.offsetHeight
-			
-			this.fayunPlanFocusId = item.id;
-			this.keyBoardShow = true;
-			this.isCursor = true;
+      console.log(item,'鍙戣繍杞︽暟璁″垝------------===========')
+			this.fayunPlanFocusId = item.orderId;
 			this.keyBoardValue = item.numPlan + '';
+			if(this.isTomJihua == '宸茶缃殑璁″垝'){
+				this.editPopupShow = true;
+			} else{
+				this.isCursor = true;
+			}
+
+			// 鏍规嵁鍒楄〃涓嬫爣锛屼娇灞忓箷婊氬姩鍒扮浉搴斿彲瑙嗕綅缃�
+			// for(let i = 0;i<this.fyData.length;i++){
+			// 	if(this.fyData[i].orderId == item.orderId){
+			// 		uni.pageScrollTo({
+			// 			scrollTop: i*144,
+			// 			duration: 300
+			// 		});
+			// 	}
+			// }
+
 		},
 		// 閿洏
 		valChange(val) {
+      console.log(val,'宸茶缃殑璁″垝====')
 			// this.keyBoardValue += val;
 			// 灏嗘瘡娆℃寜閿殑鍊兼嫾鎺ュ埌value鍙橀噺涓紝娉ㄦ剰+=鍐欐硶
 			this.fyData.map(item => {
-				if (item.id == this.fayunPlanFocusId) {
+				if (item.orderId == this.fayunPlanFocusId) {
 					if (item.numPlan) {
-						item.numPlan = this.keyBoardValue += val + '';
-						this.keyBoardValue = item.numPlan;
+						if(this.isTomJihua == '鍏ㄩ儴'){
+							item.numPlan = this.keyBoardValue += val + '';
+							this.keyBoardValue = item.numPlan;
+						}else{
+							this.keyBoardValue = this.keyBoardValue += val + '';
+						}
 					} else {
 						item.numPlan = val;
 						this.keyBoardValue = item.numPlan;
@@ -376,18 +466,28 @@
 		backspace() {
 			this.keyBoardValue = this.keyBoardValue.substr(0, this.keyBoardValue.length - 1);
 		},
-		keyBoardConfirm(val) {
-			console.log('閿洏鐐瑰嚮纭畾鐨勫��', val);
+		// 閿洏鐐瑰嚮纭畾
+		keyBoardConfirm() {
+			if(this.isTomJihua == '宸茶缃殑璁″垝'){
+				this.fyData.map(item => {
+					if (item.orderId == this.fayunPlanFocusId) {
+						item.numPlan = this.keyBoardValue;
+						this.editRow = item;
+					}
+				});
+				this.getOrderCarNum();
+			}
 			this.keyBoardClose();
 		},
 		keyBoardCancel() {
 			this.keyBoardClose();
 		},
+		// 閿洏鍏抽棴浜�
 		keyBoardClose() {
-			console.log('閿洏鍏抽棴浜�');
 			this.fayunPlanFocusId = null;
 			this.keyBoardShow = false;
 			this.isCursor = false;
+			this.editPopupShow = false;
 		},
 		todayDate() {
 			let yes = new Date().getTime();
@@ -398,7 +498,6 @@
 			let d = date.getDate();
 			d = d < 10 ? '0' + d : d;
 			const time = y + '-' + m + '-' + d;
-			console.log('todayDate---------', time);
 			return time;
 		},
 		tomorrowDate() {
@@ -410,14 +509,24 @@
 			let d = date.getDate();
 			d = d < 10 ? '0' + d : d;
 			const time = y + '-' + m + '-' + d;
-			console.log('tomorrowDate---------222', time);
 			return time;
 		}
 	}
 };
 </script>
-
+<style>
+input{-webkit-appearance: none;}
+</style>
 <style lang="scss" scoped>
+.ceshi-box{
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.editPopup__btn{
+  width: vww(100);
+  margin:20rpx auto 0;
+}
 ::v-deep {
 	.u-tabs__wrapper__nav {
 		padding-left: vww(75.5);
@@ -439,15 +548,7 @@
 		width: vww(100);
 		z-index: 1;
 	}
-	.u-button {
-		position: fixed !important;
-		left: 50%;
-		bottom: vww(20);
-		width: vww(200) !important;
-		transform: translateX(-50%);
-		border-radius: vww(20);
-		z-index: 9999;
-	}
+
 	.u-radio-group--row {
 		height: 100%;
 		width: 100%;
@@ -469,6 +570,19 @@
 	}
 }
 
+::v-deep.totalListContainer{
+	.u-button {
+		position: fixed !important;
+		left: 50%;
+		bottom: vww(20);
+		width: vww(200) !important;
+		transform: translateX(-50%);
+		border-radius: vww(20);
+		z-index: 9999;
+	}
+}
+
+
 .qiehuan-box {
 	position: fixed;
 	top: 0;
@@ -480,7 +594,7 @@
 	background-color: #fff;
 }
 
-.jihua-wrap {
+::v-deep.jihua-wrap {
 	width: 100%;
 	height: 100%;
 	// overflow-y: auto; // 浼氬紩璧烽敭鐩樺脊鍑洪〉闈㈠竷灞�
@@ -495,13 +609,14 @@
 	// 	transform: translateX(-50%);
 	// 	border-radius: vww(20);
 	// }
+
 }
 
 .jihua-main {
 	display: flex;
 	flex-direction: column;
 	width: 100%;
-	padding: vww(44) vww(10) vww(70) vww(10);
+	padding: vww(44) vww(10) vww(270) vww(10);
 	box-sizing: border-box;
 	.main-inside {
 		width: 100%;
@@ -521,7 +636,7 @@
 
 	.main-block-box {
 		box-shadow: 0px 0px 8px 0px rgba(216, 218, 238, 0.8);
-		height: vww(120);
+		//height: vww(120);
 		padding: vww(10);
 		box-sizing: border-box;
 		margin-top: vww(12);
@@ -538,7 +653,8 @@
 			}
 
 			.name {
-				font-weight: 600 !important;
+				font-weight: 550 !important;
+        line-height: 54rpx;
 			}
 
 			.main-flex {
@@ -559,8 +675,8 @@
 						border: 1px solid #dddddd;
 						border-radius: vww(4);
 						padding: vww(1) vww(10);
-						
-						
+
+
 						// 杈撳叆鐒︾偣鍥剧墖
 						.cursor {
 							// float: left;
@@ -584,4 +700,33 @@
 		}
 	}
 }
-</style>
\ No newline at end of file
+
+// 淇敼璁″垝杞﹁締寮瑰嚭妗�
+
+
+::v-deep.editPopup {
+		height: vww(110);
+
+		&__title {
+			margin-top: vww(10);
+			text-align: center;
+		}
+
+		&__input {
+			margin: vww(10) auto 0;
+			.u-input {
+				width:80%;
+				margin:0 auto!important;
+				border: 1px solid #dddddd;
+			}
+		}
+
+		// &__btn {
+		// 	margin: vww(80) auto;
+		// 	width: 50%;
+		// 	.u-button {
+		// 		height: vww(40);
+		// 	}
+		// }
+	}
+</style>

--
Gitblit v1.9.1