From 661708990b04b4f939a02cc740e9fa33dd7566bb Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期三, 30 八月 2023 10:58:04 +0800
Subject: [PATCH] 小程序

---
 minipro_standard/pages.json                                        |   18 +
 minipro_standard/pages/plannedDistribution/plannedDistribution.vue |  609 ++++++++++++++++++++++++++++++++++++++++
 minipro_standard/pages/allocation/allocation.vue                   |  249 ++++++++++++++++
 minipro_standard/util/utils.js                                     |   15 +
 4 files changed, 891 insertions(+), 0 deletions(-)

diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index ebebaeb..7ee4eb5 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -72,6 +72,24 @@
             }
             
         }
+        ,{
+            "path" : "pages/plannedDistribution/plannedDistribution",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "璁″垝鍒嗛厤",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/allocation/allocation",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "閫夋嫨",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"subPackages": [
 		{
diff --git a/minipro_standard/pages/allocation/allocation.vue b/minipro_standard/pages/allocation/allocation.vue
new file mode 100644
index 0000000..94c45c0
--- /dev/null
+++ b/minipro_standard/pages/allocation/allocation.vue
@@ -0,0 +1,249 @@
+<template>
+	<view class="fp">
+		<view class="fp_list">
+			<view class="fp_list_item">
+				<view class="fp_list_item_left">
+					<text style="color: #f00;">*</text>
+					<text>璁″垝鐢熶骇鏁伴噺锛�</text>
+				</view>
+				<view class="fp_list_item_right">
+					<input type="number" v-model="form.num" placeholder="璇疯緭鍏�" />
+				</view>
+			</view>
+			<view class="fp_list_item" @click="openTime">
+				<view class="fp_list_item_left">
+					<text style="color: #f00;">*</text>
+					<text>璁″垝寮�宸ユ棩鏈燂細</text>
+				</view>
+				<view class="fp_list_item_right">
+					<text class="black" v-if="form.startTime">{{form.startTime}}</text>
+					<text v-else>骞� / 鏈� / 鏃�</text>
+					<u-icon name="arrow-right" color="#999999"></u-icon>
+				</view>
+			</view>
+			<view class="fp_list_item" @click="openSB">
+				<view class="fp_list_item_left">
+					<text>鐢熶骇璁惧</text>
+				</view>
+				<view class="fp_list_item_right">
+					<text v-if="form.equipmentName" class="black">{{form.equipmentName}}</text>
+					<text v-else>璇烽�夋嫨</text>
+					<u-icon name="arrow-right" color="#999999"></u-icon>
+				</view>
+			</view>
+			<view class="fp_list_item1" v-show="form.equipmentName">
+				<view class="fp_list_item_left">
+					<text>鐢熶骇浜哄憳</text>
+				</view>
+				<view class="fp_list_item_right">
+					<u-checkbox-group v-model="form.personnelId" direction="horizontal" v-show="personnelData.length > 0">
+						<u-checkbox :name="item.id" v-for="item in personnelData" checked-color="#4275FC">{{item.text}}</u-checkbox>
+					</u-checkbox-group>
+					<view class="wu" v-show="personnelData.length === 0">
+						<text>鏆傛棤鏁版嵁</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="fp_footer">
+			<view class="fp_footer_close" @click="go">鍙栨秷</view>
+			<button class="fp_footer_submit" @click="submit">纭</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { gsdate } from '@/util/utils.js'
+	export default {
+		data() {
+			return {
+				form: {
+					num: this.$route.query.num,        // 鐢熶骇鏁伴噺
+					startTime: gsdate(new Date()),      // 寮�濮嬫椂闂�
+					equipmentId: '',    // 璁惧id
+					equipmentName: '',    // 璁惧鍚嶇О 
+					personnelId: []    // 浜哄憳id
+				}
+			};
+		},
+		methods: {
+			go() {
+				uni.navigateBack({ delta: 1 });
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.fp {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    background: #F7F7F7;
+    .fp_list {
+        display: flex;
+        flex-direction: column;
+        .fp_list_item1 {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            padding: 20rpx 30rpx;
+            box-sizing: border-box;
+            background: #ffffff;
+            border-bottom: 1rpx solid #ececec;
+            .fp_list_item_left {
+                flex-shrink: 0;
+                margin-bottom: 20rpx;
+				display: flex;
+				align-items: center;
+                text {
+					color: #222222;
+					font-size: 30rpx;
+					font-weight: 400;
+                }
+            }
+            .fp_list_item_right v-deep {
+                display: flex;
+                align-items: center;
+                .wu {
+                    width: 100%;
+                    margin: 30rpx 0;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    text {
+                        font-size: 26rpx;
+                        color: black;
+                    }
+                }
+                .van-checkbox {
+                    margin-right: 5rpx !important;
+                    margin-top: 10rpx !important;
+                    &:nth-child(1) {
+                        margin-top: 0 !important;
+                    }
+                    &:nth-child(2) {
+                        margin-top: 0 !important;
+                    }
+                    &:nth-child(3) {
+                        margin-top: 0 !important;
+                    }
+                    .van-checkbox__label {
+                        color: black !important;
+                    }
+                }
+                .black {
+                    color: black !important;
+                }
+                input {
+                    width: 180rpx;
+                    height: 60rpx;
+                    border-radius: 8rpx;
+                    border: 1rpx solid #E5E5E5;
+                    padding: 0 30rpx;
+                    text-align: right;
+                    font-size: 25rpx;
+                }
+                text {
+                    font-size: 28rpx;
+                    font-weight: 400;
+                    color: #999999;
+                    margin-right: 20rpx;
+                }
+            }
+        }
+        .fp_list_item {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 0 30rpx;
+            height: 98rpx;
+            box-sizing: border-box;
+            background: #ffffff;
+            border-bottom: 1rpx solid #ececec;
+            .fp_list_item_left {
+                flex-shrink: 0;
+                b {
+                    color: $nav-stateColor4;
+                    font-size: 28rpx;
+                    margin-right: 5rpx;
+                }
+                text {
+                    color: #222222;
+                    font-size: 30rpx;
+                    font-weight: 400;
+                }
+            }
+            .fp_list_item_right {
+                display: flex;
+                align-items: center;
+                .wu {
+                    text-align: center;
+                    text {
+                        font-size: 26rpx;
+                        color: black;
+                    }
+                }
+                .black {
+                    color: black !important;
+                }
+                input {
+                    width: 180rpx;
+                    height: 60rpx;
+                    border-radius: 8rpx;
+                    border: 1rpx solid #E5E5E5;
+                    padding: 0 30rpx;
+                    text-align: right;
+                    font-size: 25rpx;
+                }
+                text {
+                    font-size: 28rpx;
+                    font-weight: 400;
+                    color: #999999;
+                    margin-right: 20rpx;
+                }
+            }
+        }
+    }
+    .fp_footer {
+        width: 100%;
+        padding-left: 30rpx;
+        padding-right: 30rpx;
+        padding-bottom: 68rpx;
+        box-sizing: border-box;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .fp_footer_close {
+            width: 334rpx;
+            height: 88rpx;
+            background: #FFFFFF;
+            box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
+            border-radius: 8rpx;
+            font-size: 30rpx;
+            font-weight: 500;
+            color: #666666;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+        .fp_footer_submit {
+            width: 334rpx;
+            height: 88rpx;
+            border: none;
+            background: $nav-color;
+            box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
+            border-radius: 8rpx;
+            font-size: 30rpx;
+            font-weight: 500;
+            color: #ffffff;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+    }
+}
+</style>
diff --git a/minipro_standard/pages/plannedDistribution/plannedDistribution.vue b/minipro_standard/pages/plannedDistribution/plannedDistribution.vue
new file mode 100644
index 0000000..de67bb9
--- /dev/null
+++ b/minipro_standard/pages/plannedDistribution/plannedDistribution.vue
@@ -0,0 +1,609 @@
+<template>
+	<view class="content">
+		<view class="content_search">
+			<Search @searchInput="searchInput" @submit="submit" @reset="reset" placeholder="鎼滅储鐗╂枡鍚嶇О/缂栫爜"></Search>
+			<view class="content_search_x"></view>
+			<LabelSelection :TagList="tagList" :isShow="true" @change="clickTag" />
+		</view>
+		<view class="content_total" :style="{top: top}">鍏眥{listData.total}}鏉℃暟鎹�</view>
+		<view class="content_list">
+			<scroll-view @scrolltolower="getLists" scroll-y :style="{height: height}">
+				<view class="fp_list_item" v-for="(item, i) in lists" :key="item.id" @click="clickItem(i)">
+					<view class="fp_list_item_header">
+						<u-checkbox :checked="item.isActive"></u-checkbox>
+						<text v-if="item.mmodel">{{item.mmodel.name}}</text>
+						<view class="tags" v-if="item.urgent">浼樺厛{{item.urgent}}</view>
+						<view class="warning" v-if="item.type === 2">杩斿伐</view>
+						<view class="warning success" v-else-if="item.type === 0">姝e父</view>
+						<view class="warning fail" v-else-if="item.type === 1">寮傚父</view>
+					</view>
+					<view class="fp_list_item_nr">
+						<view class="item" v-if="item.pmodel">
+							<view class="item_label">宸ュ簭鍚嶇О锛�</view>
+							<view class="item_nr">{{item.pmodel.name}}</view>
+						</view>
+						<view class="item">
+							<view class="item_label">璁″垝鏃ユ湡锛�</view>
+							<view class="item_nr">{{item.planDate}}</view>
+						</view>
+						<view class="item">
+							<view class="item_label">璁″垝鏁伴噺锛�</view>
+							<view class="item_nr">{{item.num}}</view>
+						</view>
+						<view class="item">
+							<view class="item_label">鐢熶骇鎵规锛�</view>
+							<view class="item_nr">{{item.batch}}</view>
+						</view>
+						<view class="item">
+							<view class="item_label">搴撳瓨锛�</view>
+							<view class="item_nr">{{item.isStock === 0 ? '涓嶆弧瓒�' : '婊¤冻'}}</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="fp_zw"></view>
+		<view class="fp_footer">
+			<view class="fp_footer_button" @click="submit">鍒嗛厤(1)</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Search from '@/components/Search.vue'
+	import LabelSelection from '@/components/LabelSelection.vue'
+	export default {
+		components: { Search, LabelSelection },
+		data() {
+			return {
+				height: '',
+				top: '',
+				listData: {
+					capacity: 10,
+					page: 0,
+					total: 0,
+					startDate: '',
+					endDate: '',
+					procedureIds: [],
+					departIds: '',
+					mixParam: '',
+					cateIds: []
+				},
+				tagList: [
+					{
+						id: '',
+						name: '娉ㄥ皠',
+						num: '0'
+					},
+					{
+						id: '0',
+						name: '鐑х粨',
+						num: '0'
+					},
+					{
+						id: '1,4',
+						name: '鐒婃帴',
+						num: '0'
+					}
+				],
+				data: [],	// 宸ュ簭鏁版嵁
+				factoryList: [],
+				finished: true,
+				loading: false,
+				refreshing: false,
+				timeShow: false,
+				lists: [
+					{
+						id: 1,
+						status: 0,
+						urgent: 1,
+						num: 100,
+						isActive: false,
+						batch: '11111',
+						planDate: '2023-08-29',
+						mmodel: {
+							name: '宸ュ簭璁″垝',
+							code: 'fbdseasafghb'
+						},
+						usermodel: {
+							realname: '璁″垝浜哄憳'
+						},
+						pmodel: {
+							name: '宸ュ簭璁″垝'
+						},
+						fmodel: {
+							name: '宸ュ巶'
+						}
+					},
+					{
+						id: 2,
+						status: 0,
+						urgent: 1,
+						num: 100,
+						isActive: false,
+						batch: '11111',
+						planDate: '2023-08-29',
+						mmodel: {
+							name: '宸ュ簭璁″垝',
+							code: 'fbdseasafghb'
+						},
+						usermodel: {
+							realname: '璁″垝浜哄憳'
+						},
+						pmodel: {
+							name: '宸ュ簭璁″垝'
+						},
+						fmodel: {
+							name: '宸ュ巶'
+						}
+					},
+					{
+						id: 3,
+						status: 0,
+						urgent: 1,
+						num: 100,
+						batch: '11111',
+						isActive: false,
+						planDate: '2023-08-29',
+						mmodel: {
+							name: '宸ュ簭璁″垝',
+							code: 'fbdseasafghb'
+						},
+						usermodel: {
+							realname: '璁″垝浜哄憳'
+						},
+						pmodel: {
+							name: '宸ュ簭璁″垝'
+						},
+						fmodel: {
+							name: '宸ュ巶'
+						}
+					},
+					{
+						id: 4,
+						status: 0,
+						urgent: 1,
+						num: 100,
+						isActive: false,
+						batch: '11111',
+						planDate: '2023-08-29',
+						mmodel: {
+							name: '宸ュ簭璁″垝',
+							code: 'fbdseasafghb'
+						},
+						usermodel: {
+							realname: '璁″垝浜哄憳'
+						},
+						pmodel: {
+							name: '宸ュ簭璁″垝'
+						},
+						fmodel: {
+							name: '宸ュ巶'
+						}
+					},
+					{
+						id: 5,
+						status: 0,
+						urgent: 1,
+						num: 100,
+						isActive: false,
+						batch: '11111',
+						planDate: '2023-08-29',
+						mmodel: {
+							name: '宸ュ簭璁″垝',
+							code: 'fbdseasafghb'
+						},
+						usermodel: {
+							realname: '璁″垝浜哄憳'
+						},
+						pmodel: {
+							name: '宸ュ簭璁″垝'
+						},
+						fmodel: {
+							name: '宸ュ巶'
+						}
+					}
+				]
+			};
+		},
+		onReady() {
+			var that = this
+			this.$nextTick(() => {
+				uni.createSelectorQuery().in(this).select('.content_search').boundingClientRect((rect) => {
+					that.height = `calc(100vh - ${rect.height + 80}px)`
+					that.top = `${rect.height}px`
+				}).exec()
+			})
+		},
+		methods: {
+			// 鐐瑰嚮褰撳墠椤�
+			clickItem(i) {
+				this.lists.forEach((item, index) => {
+					item.isActive = i === index;
+				})
+			},
+			// 璺宠浆
+			jump(item) {
+				uni.navigateTo({
+					url: `/pages/planDetails/planDetails?id=${item.id}`
+				})
+			},
+			// 鑾峰彇澶撮儴缁勪欢楂樺害
+			getHeight(height) {
+				this.height = height
+			},
+			// 閲嶇疆
+			reset() {
+				this.listData.page = 0
+				this.finished = false
+				this.lists = []
+				this.listData.mixParam = ''
+				this.listData.startDate = ''
+				this.listData.endDate = ''
+				this.listData.procedureIds = []
+				if (this.factoryList.length > 0) {
+					this.listData.departIds = this.factoryList[0].id
+				}
+				if (this.data.length > 0) {
+					this.data.forEach(item => { item.isActive = false })
+				}
+				// this.getLists()
+				// this.pageCounts()
+			},
+			// 鏃ユ湡纭畾
+			timeConfirm(val) {
+				this.listData.startDate = val[0]
+				this.listData.endDate = val[val.length - 1]
+				this.timeShow = false
+			},
+			// 鍒囨崲宸ュ巶
+			changeTags(i, id) {
+				this.listData.departIds = id
+				this.getWorkingProcedures(id)
+				this.factoryList.forEach((item, index) => {
+					if (index === i) {
+						item.isActive = true
+					} else {
+						item.isActive = false
+					}
+				})
+			},
+			// 鎵撳紑鏃ユ湡鎻掍欢
+			openDate() {
+				this.timeShow = true
+			},
+			// 鎼滅储
+			searchInput(val) {
+				this.listData.mixParam = val
+				this.listData.page = 0
+				this.finished = false
+				this.lists = []
+				this.getLists()
+			},
+			// 鐐瑰嚮鏍囩鎼滅储
+			clickTag(ids) {
+				this.listData.cateIds = ids
+				this.listData.page = 0
+				this.finished = false
+				this.lists = []
+				// this.getLists()
+			},
+			// 鑾峰彇鍒楄〃缁熻
+			pageCounts() {
+				pageCount({
+					factoryId: this.listData.departIds,
+					procedureIdList: this.listData.procedureIds ? this.listData.procedureIds : [],
+					startDate: this.listData.startDate,
+					endDate: this.listData.endDate,
+					statusList: this.listData.cateIds
+				}).then(res => {
+					if (res.code === 200 && res.data) {
+						this.tagList[0].num = res.data.allNum.toString()
+						this.tagList[1].num = res.data.startNum.toString()
+						this.tagList[2].num = res.data.ingNum.toString()
+						this.tagList[3].num = res.data.endNum.toString()
+					}
+				})
+			},
+			// 鑾峰彇宸ュ巶鏁版嵁
+			getOrganizations() {
+				getOrganization({
+					type: 1
+				}).then(res => {
+					if (res.code === 200 && res.data && res.data.length !== 0) {
+						res.data.forEach((item, i) => {
+							item.isActive = i === 0;
+						})
+						if (res.data.length > 0) {
+							this.factoryList = res.data
+							this.listData.departIds = this.factoryList[0].id
+							this.listData.procedureIds = ''
+							this.finished = false
+							this.getWorkingProcedures(this.factoryList[0].id)
+							this.getLists()
+							this.pageCounts()
+						}
+					}
+				})
+			},
+			// 鑾峰彇宸ュ簭鏁版嵁
+			getWorkingProcedures(orgId) {
+				this.data = []
+				getWorkingProcedure({ orgId })
+					.then(res => {
+						if (res.code === 200 && res.data && res.data.length !== 0) {
+							res.data.forEach((item, i) => {
+								item.isActive = false;
+							})
+							this.data = res.data
+						}
+					})
+			},
+			submit() {
+				let data;
+				this.lists.forEach(item => {
+					if (item.isActive) {
+						data = item
+					}
+				})
+				if (!data) {
+					uni.showToast({ title: '鑷冲皯閫夋嫨涓�椤硅鍒掞紒', duration: 2000 });
+					return
+				}
+				uni.navigateTo({
+					url: `/pages/allocation/allocation?gxid=${data.procedureId}&jhid=${data.id}&num=${data.workorderDistributNum ? data.num - data.workorderDistributNum : data.num}`
+				})
+			},
+			// 鑾峰彇璁″垝鍒楄〃鏁版嵁
+			getLists() {
+				console.log('getLists')
+				if (!this.finished) {
+					this.loading = true
+					this.listData.page = this.listData.page++
+					getList({
+						capacity: this.listData.capacity,
+						model: {
+							mixParam: this.listData.mixParam,
+							startDate: this.listData.startDate,
+							endDate: this.listData.endDate,
+							procedureIdList: this.listData.procedureIds ? this.listData.procedureIds : [],
+							factoryId: this.listData.departIds,
+							statusList: this.listData.cateIds
+						},
+						page: this.listData.page,
+						sorts: [
+							{
+								direction: 'ASC',
+								property: 'publishDate'
+							}
+						]
+					}).then(res => {
+						this.loading = false
+						this.listData.total = res.data.total
+						if (this.refreshing) {
+							this.lists = []
+							this.refreshing = false;
+						}
+						if (res.code === 200 && res.data.records.length !== 0) {
+							if (this.lists.length === 0) {
+								this.lists = res.data.records
+							} else {
+								this.lists.push(...res.data.records)
+							}
+						} else {
+							this.finished = true
+						}
+					}).catch(err => {
+						this.loading = false
+						this.finished = true
+						if (this.refreshing) {
+							this.lists = []
+							this.refreshing = false;
+						}
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		.content_search {
+			width: 100%;
+			padding: 30rpx;
+			background: white;
+			position: sticky;
+			top: 0;
+			z-index: 999;
+			box-sizing: border-box;
+			.Search_item {
+				margin-bottom: 40rpx;
+				.Search_item_label {
+					font-size: 30rpx;
+					font-weight: 500;
+					color: #222222;
+				}
+				.Search_item_content {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					margin-top: 30rpx;
+					.tag {
+						display: flex;
+						flex-wrap: wrap;
+						align-items: center;
+						.tag_active {
+							background: $nav-color !important;
+							color: #ffffff !important;
+						}
+						.tag_item {
+							padding: 22rpx 26rpx;
+							box-sizing: border-box;
+							background: #F2F2F2;
+							border-radius: 8rpx;
+							font-size: 26rpx;
+							font-weight: 400;
+							color: #333333;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							margin-right: 22rpx;
+							margin-bottom: 22rpx;
+						}
+					}
+					text {
+						font-size: 26rpx;
+						font-weight: 400;
+						color: #333333;
+						margin: 0 30rpx;
+					}
+					.Search_item_content_a {
+						padding: 20rpx 0;
+						flex: 1;
+						background: #F7F7F7;
+						border-radius: 8rpx;
+						border: 1rpx solid #EEEEEE;
+						font-size: 26rpx;
+						font-weight: 400;
+						color: #B2B2B2;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+					}
+				}
+			}
+			.content_search_x {
+				height: 24rpx;
+			}
+		}
+		.content_list {
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+			.fp_list_item {
+				background: white;
+				display: flex;
+				flex-direction: column;
+				padding: 30rpx;
+				border-bottom: 1rpx solid #ececec;
+				.fp_list_item_header {
+					display: flex;
+					align-items: center;
+					text {
+						max-width: 64%;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						-o-text-overflow: ellipsis;
+						font-size: 32rpx;
+						font-weight: 500;
+						color: #333333;
+						margin-left: 14rpx;
+					}
+					.tags {
+						flex-shrink: 0;
+						margin-left: 16rpx;
+						padding: 5rpx 10rpx;
+						background: $nav-stateColor4;
+						border-radius: 8rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 22rpx;
+						font-weight: 400;
+						color: #FFFFFF;
+					}
+					.fail {
+						background: $nav-stateColor4 !important;
+					}
+					.success {
+						background: $nav-stateColor2 !important;
+					}
+					.warning {
+						flex-shrink: 0;
+						margin-left: 16rpx;
+						padding: 5rpx 10rpx;
+						background: $nav-stateColor5;
+						border-radius: 8rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 22rpx;
+						font-weight: 400;
+						color: #FFFFFF;
+					}
+				}
+				.fp_list_item_nr {
+					padding: 24rpx 30rpx;
+					background: #F7F7F7;
+					border-radius: 16rpx;
+					margin-top: 32rpx;
+					display: flex;
+					align-items: flex-start;
+					flex-wrap: wrap;
+					.item {
+						display: flex;
+						align-items: flex-start;
+						width: 50%;
+						margin-top: 24rpx;
+						&:nth-child(1) {
+							margin-top: 0!important;
+						}
+						&:nth-child(2) {
+							margin-top: 0!important;
+						}
+						.item_label {
+							width: 130rpx;
+							flex-shrink: 0;
+							font-size: 24rpx;
+							font-weight: 400;
+							color: #666666;
+							text-align: right;
+						}
+						.item_nr {
+							font-size: 24rpx;
+							font-weight: 400;
+							color: #222222;
+						}
+					}
+				}
+			}
+		}
+		.content_total {
+			width: 100%;
+			height: 80rpx;
+			padding: 24rpx 30rpx;
+			background: #F7F7F7;
+			font-size: 24rpx;
+			font-weight: 400;
+			box-sizing: border-box;
+			color: #666666;
+			position: sticky;
+			z-index: 99;
+		}
+		.fp_zw {
+			height: 150px;
+		}
+		.fp_footer {
+			width: 100%;
+			padding-bottom: env(safe-area-inset-bottom);
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			background: #ffffff;
+			.fp_footer_button {
+				width: 272rpx;
+				height: 98rpx;
+				background: $nav-color;
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				float: right;
+			}
+		}
+	}
+</style>
diff --git a/minipro_standard/util/utils.js b/minipro_standard/util/utils.js
new file mode 100644
index 0000000..dd64b20
--- /dev/null
+++ b/minipro_standard/util/utils.js
@@ -0,0 +1,15 @@
+/***
+ *
+ * @param time 鏃ユ湡 骞存湀鏃�
+ */
+const gsdate = (time) => {
+    let date = new Date(time)
+    let y = date.getFullYear()
+    let m = date.getMonth() + 1
+    m = m < 10 ? ('0' + m) : m
+    let d = date.getDate()
+    d = d < 10 ? ('0' + d) : d
+    return y + '-' + m + '-' + d;
+}
+
+export { gsdate }

--
Gitblit v1.9.3