From 2b8797a1acb809ffb8b95736640777f53a79d844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Tue, 23 Apr 2024 11:48:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B9=E7=9B=AE=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                                | Bin 0 -> 8196 bytes
 App.vue                                  | 147 ++++++++++++---
 components/customTabBar/index.vue        |  80 ++++++--
 components/loadMore/index.vue            |  70 +++++++
 components/progressBar.vue               |  19 +-
 components/searchView/index.vue          |  40 ++++
 main.js                                  |  27 ++-
 manifest.json                            |  13 +-
 pages.json                               |  22 ++-
 pages/index/index.vue                    |  72 ++++----
 pages/index/materialYield.vue            |  80 ++++----
 pages/index/schedule.vue                 |  87 +++++----
 pages/login/login.vue                    |  30 +--
 pages/person/person.vue                  |  73 ++++++--
 pages/production/productionDetail.vue    |  47 +++--
 pages/production/productionOrder.vue     | 225 ++++++++++++++++-------
 static/.DS_Store                         | Bin 0 -> 8196 bytes
 static/css/app.css                       |  78 ++++++++
 static/iconfont/.DS_Store                | Bin 0 -> 6148 bytes
 static/iconfont/iconfont-weapp/.DS_Store | Bin 0 -> 6148 bytes
 static/iconfont/iconfont.css             |  46 ++++-
 static/sweep.png                         | Bin 0 -> 6928 bytes
 uni.scss                                 |  48 ++++-
 utils/api.js                             |  95 +++++-----
 utils/envConfig.js                       |   7 -
 utils/public.js                          |   8 +-
 26 files changed, 962 insertions(+), 352 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 components/loadMore/index.vue
 create mode 100644 components/searchView/index.vue
 create mode 100644 static/.DS_Store
 create mode 100644 static/css/app.css
 create mode 100644 static/iconfont/.DS_Store
 create mode 100644 static/iconfont/iconfont-weapp/.DS_Store
 create mode 100644 static/sweep.png

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..bf7edd8ae35815eeacfbe199b7585b9d20082403
GIT binary patch
literal 8196
zcmeHMO>Y}T7=9<8>$pjsG$|1ul7%lw4I!zN28jb(rw9dv5_Qw!C@E%bZ`^IxGiG<~
zv_z47h9AI<3qPP&uKWNva^=7u;KG3uJTtRycGt1Q2~l;%nt5kuo@Zv>$DVgQHW9IE
zueC|EN<<d2w51}7E0XM&c_d9FEz7VBe4-uNBZq3cfoP7PO@mRuC}0#Y3K#{90{;gE
zaAwP7jXC#quPKcJMuAsS0U004$kN)09cZgU2MTosfSp3KN~q%=pg85k+KC-#tEd=L
z-yT>(WyuwTX*&AL5)Nx8cA%}M6Vr5J$;>Rdp)fT&cx44AW@~FoqkvIhQ~`N+x2TTS
zXLL7xe{Te$fj+sN?jo=MtrBWPvuNq!wN8ENktc8aDfIIkdXAbTr~|wpP9AbhQI^Br
z%5i2Cu8$d>j9|abVdu!lm@P1#0{<AJcPPk>|5uJP3yiCHSIjWc&Y|ZOngf4=St87!
zSkj;DJW8qWQ%WtuYZv~XqHKfvE(Ku8=W!!Q_0l6;%Z)IGrxZ-{rWH@lnb%tCmqyNA
zBFC+YN&V8C8Kr^?C46dTHBjn}#Wv2OZt_|AvC$3uDBjrkl}$`eP0!3)vsTf1<UAH<
zPVC0LsOpAC^65Z`pfRkwjfcK>Rxd5@2p+pW_d-SRTOJ_CpZmNe&Z?rvTan^Ay2C11
zg?efA{CxBFTKV>!t&6qt`R2x*_t(l>+uIix1#6}9-Us*Vr$L8{Z{RBuOAZ>E*Uv9X
zsb9u_zu8ZGVm}Xk`mIzNdR3S!UYlRIURqqbvADdrvU2ma)s>~!-*~fLy3uf(r|nR#
zc1HvvtOh-=Ub-H^=iR2@`=Qr|ueI2F8aw{i=vvAV?t85-E}IUXb%9yFY*2%K9C{u<
zYKMMn@8l%%;##VHC}(SiA_(?H<j20?hsSF6*z4@_6M-4!3ii6PD|+aK5$p)3_9$>0
zUa-fjB92Ap&<#VEx4r7Knh!7J%GH!k*KPW|UHR}2EoGr%zoTm<stnbw*bj8ol7T6m
zSmA&R?p5r4-CD6fO}Z_*g^lOXF?~e?`i_2}=kyc(Lci0WY?95ho9u0Ni><LOw#{s|
z%RXU8?3lUiiRMoX-)I?xQi(-)$h^^gC**<PGCW9*h2STH!a6oX6FIlhunJ-esbEk{
z@O6X}fq>ORFc{gMGK6GU1;xsQk?e+(TR+2?219PlAipApk8TFJfB^0T>%j*Zq&Whd
zk3e-rP?RAc!%Zn=sxPMklX}^!Mc9wV|Nj4SI%igG6fg?>D+SopJ?CB((BVm#XUV&E
z8Tm_OnIvwYt)ie%*Kt^N9fy7Khau`^Kqbdc>_A(zApPe*1eo(*ekW1doAY1E@Jbf{
E09LF0<p2Nx

literal 0
HcmV?d00001

diff --git a/App.vue b/App.vue
index 9d01108..96333d0 100644
--- a/App.vue
+++ b/App.vue
@@ -21,43 +21,46 @@
 	/*每个页面公共css */
 	@import '@/uni_modules/uni-scss/index.scss';
 	/* #ifndef APP-NVUE */
-	@import '@/static/customicons.css';
+		@import '@/static/customicons.css';
+		@import 'uni.scss';
+	/* #endif */
+	
 	// 设置整个项目的背景色
 	page {
-		background-color: #060B26;
-		color: #fff;
+		background-color: $uni-bg-color-default !important;
+		color: $uni-text-color-inverse;
 	}
-	/* #endif */
 	.example-info {
 		font-size: 14px;
-		color: #333;
+		color: $uni-text-color;
 		padding: 10px;
 	}
 	.page_padding{padding: 14px;}
 	.page_content{padding: 0 12px 10px;}
 	//内容框
-	.contentboxsty{border-radius: 8px;background: #1C2755;}
+	.contentboxsty{border-radius: 8px;background: $uni-bg-color-primary;}
 	//没有底部边框
 	.noborbot{border-bottom:none !important}
 	
 	.t-icon{background-repeat: no-repeat;}
-	.icon22{width: 22px;height: 22px;}
+	.icon22{width: 22px;height: 22px;}
+	
 	//字体大小
-	.font12{font-size: $uni-font-size-sm;}
-	.font13{font-size:13px;}
-	.font14{font-size: $uni-font-size-base;}
-	.font15{font-size: 15px!important;}
+	.font12{font-size: 12px;}
+	.font13{font-size: 13px;}
+	.font14{font-size: 14px;}
+	.font15{font-size: 15px;}
 	.font20{font-size: 20px;}
 	.font22{font-size: 22px;}
 	.font24{font-size: 24px;}
 	.font35{font-size: 35px;}
-	.font_bold{font-weight: bold;}
+	.font_bold{font-weight: bold;}
+	
 	//文字颜色
-	.text_color_black{color: #000;}
-	.theme_color{color: #009688 }//主题绿
+	.text_color_black{color: $uni-text-color-default;}
+	.theme_color{color: $uni-text-color-primary } //主题绿
 	//按钮颜色
-	.but_color{background: #009688 !important;}
-	// .text_{color: #00B68D;}
+	.but_color{background: $uni-color-primary !important;}
 	
 	//布局
 	.flex_layout{display: flex;}
@@ -71,33 +74,121 @@
 	.padd_left12{padding-left:12px;}
 	//margin
 	.mar_top12{margin-top: 12px;}
-	.page_list{margin-bottom: 12px;padding:0 12px;}
+	.page_list{margin-bottom: 12px;padding:0 12px;}
+	
 	//有详情的列表
-	.detail_list{margin-bottom: 12px;
+	.detail_list{
+		margin-bottom: 12px;
 		.list_top{
 			display: flex;
 			padding:12px;
 			font-size: 14px;
 			border-radius: 8px 8px 0px 0px;
 			background: linear-gradient(90deg, rgba(61, 84, 176, 0.70) 5.83%, rgba(58, 77, 158, 0.00) 73.76%);
-			.top_left{flex: 1;}
+			.top_left{flex: 1;display: flex;align-items: center; font-weight: bold;}
+			.top_right{display: flex;align-items: center;font-weight: bold;}
+			.top_right .arrow{margin-left: 5px;font-weight: normal;}
 		}
-		.list_content{padding:12px;}
+		.list_content{padding:12px;position: relative;}
+		.list_content .card_right{position: absolute;top: 12px;right: 12px;}
+		
+		.card_right{
+			display: flex;
+			flex-direction: column;
+			.status{
+				padding: 3px 10px;
+				background: $uni-bg-color-success-dark;
+				color: $uni-text-color-success;
+				border-radius: 4px;
+				font-size: 12px;
+			}
+			.success{
+				background: $uni-bg-color-success-dark;
+				color: $uni-text-color-success;
+			}
+			.warning{
+				background: $uni-bg-color-warning-dark;
+				color: $uni-text-color-warning;
+			}
+			.error{
+				background: $uni-bg-color-error-dark;
+				color: $uni-text-color-danger;
+			}
+		}
+	}
+	.flexBox .detail_list:first-child{
+		margin-top: 2px;
+	}
+	// 检索固定
+	.headerViewFixed{
+		background: $uni-bg-color-default;
 	}
 	//页面固定按钮
 	.bottom_but{
-		    width: 100%;
-		    position: fixed;
-		    bottom: 0px;
-		    background-color: #060B26;
-		    border-top: 1px solid #2E3249;
-		    height: 80px;
+		width: 100%;
+		position: fixed;
+		bottom: 0px;
+		background-color: #060B26;
+		border-top: 1px solid #2E3249;
+		height: 80px;
 		// bottom: 40px;bottom: 40px;position: fixed;width: calc(100% - 28px);
 		view{width: 50%;text-align: center;margin: 0 20px;border-radius: 19px;background: #DDD;line-height: 38px;height: 38px;margin-top: 6px;}
 	}
 	//底部固定添加按钮
-	.page_bottom_button{width: 100%;position: fixed;bottom: 0px;background-color: #060B26;border-top: 1px solid #2E3249;height: 80px;
+	.page_bottom_button{
+		width: 100%;position: fixed;bottom: 0px;background-color: #060B26;border-top: 1px solid #2E3249;height: 80px;
 		.page_add{display: flex;justify-content: center;margin: 7px 20px;border-radius: 17.5px;background: #1C2755;line-height: 35px;}
 	}
-	.bot_padding{padding-bottom: 100px;}
+	.bot_padding{padding-bottom: 100px;}
+	
+	.placeholderStyle{
+		color: $uni-text-color-placeholder;
+		font-size: 14px;
+	}
+	
+	// 圆形进度条
+	.progressBg{
+		position: absolute;
+		left: 2px;
+		top: 2px;
+		z-index: 20;
+		background: $uni-bg-color-primary;
+		width: 98px;
+		height: 98px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		border-radius: 50%;
+	}
+	.progressBox{
+		background: $uni-bg-color-default-dark;
+		width: 90px;
+		height: 90px;
+		border-radius: 50%;
+		margin: 0 auto;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+	.circle-progress {
+	  width: 102px;
+	  height: 102px;
+	  position: relative;
+	  overflow: hidden;
+	  background: $uni-bg-color-primary;
+	}
+	
+	.circle-progress__bar {
+	  position: absolute;
+	  z-index: 10;
+	  top: 50%;
+	  left: 50%;
+	  transform: translate(-50%, -50%);
+	  width: 100%;
+	  height: 100%;
+	  border-radius: 50%;
+	  background-image: conic-gradient($uni-color-primary 0%, $uni-color-primary var(--progress), transparent 0);
+	}
 </style>
diff --git a/components/customTabBar/index.vue b/components/customTabBar/index.vue
index 0d3c209..0127595 100644
--- a/components/customTabBar/index.vue
+++ b/components/customTabBar/index.vue
@@ -4,7 +4,7 @@
       <!-- 针对中间的导航栏  通过true来判断控制类名和样式 -->
       <view class="tabbar-item" v-for="(item, index) in tabbarList" :class="[item.centerItem ? 'center-item' : '']" @click="changeItem(item)" :key="index">
         <view class="item-top">
-          <image :src="currentItem == item.id ? item.selectIcon:item.icon"></image>
+          <image class="img" :src="currentItem == item.id ? item.selectIcon:item.icon"></image>
         </view>
         <!-- 通过三元判断控制类名 达到控制选中和未选中的样式 -->
         <view class="item-bottom" :class="[currentItem == item.id ? 'item-active' : '']">
@@ -38,9 +38,9 @@ export default {
         },
         {
           id: 1,
-          path: '/pages/person/person',
-          // icon: '/static/logo.png',
-          // selectIcon: '/static/logo.png',
+          path: '',
+          icon: '/static/sweep.png',
+          selectIcon: '',
           text: '扫一扫',
           // 通过类名class控制样式大小
           centerItem: true
@@ -60,11 +60,34 @@ export default {
     this.currentItem = this.currentPage
   },
   methods: {
-    changeItem (item) {
-      uni.switchTab({
-        url: item.path
-      })
-    }
+	changeItem (item) {
+		if(item.centerItem){
+			this.scanQRCode();
+			return
+		}
+		uni.switchTab({
+			url: item.path
+		})
+	},
+	scanQRCode(){
+		uni.scanCode({
+			success: (res) => {
+			  console.log('扫码结果：' + res.result);
+			  uni.showModal({
+				title: '扫码结果',
+				content: res.result,
+				showCancel: false
+			  });
+			},
+			fail: (err) => {
+			  console.error('扫码失败：' + err);
+			  uni.showToast({
+				title: '扫码失败',
+				icon: 'none'
+			  });
+			}
+		});
+	}
   }
 };
 </script>
@@ -74,18 +97,32 @@ view {
   margin: 0;
   box-sizing: border-box;
 }
+.tabbar-container::before{
+	content: '';
+	position: absolute;
+	left: 10%;
+	top: 0;
+	z-index: 10;
+	height: 1px;
+	width: 80%;
+	background-image: linear-gradient(90deg, $uni-border-color-default, $uni-color-primary 50%, $uni-border-color-default);
+	background-size: 100% 1px;
+	background-repeat:no-repeat;
+	z-index: 1;
+}
 .tabbar-container {
   position: fixed;
   bottom: 0rpx;
   left: 0rpx;
   width: 100%;
   height: 110rpx;
-  box-shadow: 0 0 5px #999;
   display: flex;
   align-items: center;
   padding: 5rpx 0;
-  color: #999999;
-	background: #131E3B;
+  color: $uni-text-color-grey;
+  background: $uni-border-color-default;
+  box-shadow: 0 2px 4px $uni-border-shadow-color-default;
+  
   /* 针对tabbar的统一处理 */
   .tabbar-item {
     width: 33.33%;
@@ -111,7 +148,7 @@ view {
     }
     // 被选中的导航栏字体
     .item-active {
-      color: #fff;
+      color: $uni-text-color-inverse;
     }
   }
 
@@ -119,15 +156,26 @@ view {
   .center-item {
     display: block;
     position: relative;
+	z-index: 20;
     .item-top {
       flex-shrink: 0;
       width: 100rpx;
       height: 100rpx;
       position: absolute;
-      top: -50rpx;
+      top: -60rpx;
       left: calc(50% - 50rpx);
       border-radius: 50%;
-      box-shadow: 0 0 5px #999;
+      box-shadow: 0 2px 4px $uni-border-shadow-color-default;
+	  padding: 0;
+	  display: flex;
+	  align-items: center;
+	  justify-content: center;
+	  border: 2px solid $uni-text-color-inverse;
+	  .img{
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+	  }
     }
     .item-bottom {
       position: absolute;
@@ -136,7 +184,7 @@ view {
     .item-active {
       position: absolute;
       bottom: 5rpx;
-      color: #1fff;
+      color: $uni-text-color-inverse;
     }
   }
 }
diff --git a/components/loadMore/index.vue b/components/loadMore/index.vue
new file mode 100644
index 0000000..3a577ad
--- /dev/null
+++ b/components/loadMore/index.vue
@@ -0,0 +1,70 @@
+<template>
+	<view class="loadMore">
+		<!-- 无数据 -->
+		<view class="noData" v-if="noData">
+			<view class="imgView">
+				<image class="img" src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/noData.png" lazy-load="true"></image>
+			</view>
+			<view class="text font14">暂无数据...</view>
+		</view>
+		<view class="loadView" v-if="loading">
+			<view class="loadBox">
+				<text class="icon iconfont icon-loading"></text>
+				<text class="text font14">加载中...</text>
+			</view>
+		</view>
+		<view class="loadCompleted" v-if="loadEnd && !loading">
+			<view class="loadBox">
+				<text class="iconfont icon-meiyougengduo"></text> 
+				<text class="text font14">没有更多数据了！</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		props: {
+		    noData:{
+				type:[Boolean],
+				default(){
+					return false
+				}
+			},
+			loading:{
+				type:[Boolean],
+				default(){
+					return false
+				}
+			},
+			loadEnd:{
+				type:[Boolean],
+				default(){
+					return false
+				}
+			}
+		},
+		computed: {
+			
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.noData{
+		.text{
+			color: $uni-text-color-grey;
+		}
+	}
+	.loadBox{
+		color: $uni-color-primary;
+	}
+</style>
\ No newline at end of file
diff --git a/components/progressBar.vue b/components/progressBar.vue
index 0b71300..de9117b 100644
--- a/components/progressBar.vue
+++ b/components/progressBar.vue
@@ -1,19 +1,14 @@
 <template>
-	 <!-- style="height: 3.5rem; margin: 0 1em;" -->
 	<view>
 		<view class="line-total" :style="'width: ' + (val / total * 100) + '%'">
 			<text class="line-data">
 				{{val}}%
 			</text>
 		</view>
-		<view style="position: relative;bottom: 10px;">			
+		<view style="position: relative;bottom: 13px;">			
 			<view class="line-base"></view>
 			<view class="line-blue" :style="'width: ' + (val / total * 100) + '%'"></view>
 		</view>
-	<!-- 	<view class="line-val">
-			<text>{{title}}</text>
-			<text>{{total}}</text>
-		</view> -->
 	</view>
 </template>
 
@@ -48,7 +43,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .line-total {
 	color: #67C23A;
 	text-align: right;
@@ -61,12 +56,14 @@ export default {
 
 }
 .line-data{
-	color: #fff;
-	padding: 1px 3px;
+	color: $uni-text-color-inverse;
+	padding: 1px 5px;
 	border-radius: 9px;
-	border: 1px solid #FFF;
+	border: 1px solid $uni-text-color-inverse;
 	background: var(--color-warning, #67C23A);
-	width: 30px;
+	width: 30px;
+	display: inline-block;
+	text-align: center;
 	font-size: 11px;
 }
 .line-base {
diff --git a/components/searchView/index.vue b/components/searchView/index.vue
new file mode 100644
index 0000000..6ee6436
--- /dev/null
+++ b/components/searchView/index.vue
@@ -0,0 +1,40 @@
+<template>
+	<view class="searchBox">
+		<view class="searchView">
+			<view class="searchInput">
+				<input class="input font14" confirm-type="search" placeholder-class="placeholderStyle placeholderClass iconfont icon-a-Vector6-copy" :placeholder="placeholder" />
+				<view class="filter">
+					<text class="iconfont icon-a-shaixuan2 font22"></text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		props: {
+		    placeholder:{
+				type:[String],
+				default:' 请输入关键字'
+			}
+		},
+		computed: {
+			
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.searchBox .searchInput .input{
+		background: $uni-bg-color-primary;
+	}
+</style>
\ No newline at end of file
diff --git a/main.js b/main.js
index e0f84df..b0d1d26 100644
--- a/main.js
+++ b/main.js
@@ -1,11 +1,22 @@
 
-import "./static/iconfont/iconfont.css"
-import "./static/iconfont/iconfont-weapp/iconfont-weapp-icon.css"
+import "./static/iconfont/iconfont.css"
+import './static/css/app.css';
+import "./static/iconfont/iconfont-weapp/iconfont-weapp-icon.css"
+
+// 全局组件
+import searchView from './components/searchView/index'
+import loadMore from './components/loadMore/index'
+import progressBar from './components/progressBar'
 
 // #ifndef VUE3
 import Vue from 'vue'
-import App from './App'
-import svg from './static/iconfont/svg.js'
+import App from './App'
+import svg from './static/iconfont/svg.js'
+
+Vue.component('search-view',searchView);
+Vue.component('load-more',loadMore);
+Vue.component('progress-bar',progressBar);
+
 
 Vue.use(svg);
 
@@ -25,7 +36,13 @@ import request from "./utils/api.js"
 import publicMethods from "./utils/public.js"
 
 export function createApp() {
-  const app = createSSRApp(App)
+  const app = createSSRApp(App)
+  
+  // 全局注册组件
+  app.component('searchView', searchView);
+  app.component('loadMore', loadMore);
+  app.component('progressBar', progressBar);
+  
   app.config.globalProperties.$api = request;
   app.config.globalProperties.$wf = publicMethods;
   return {
diff --git a/manifest.json b/manifest.json
index a4b2d30..3dff693 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "mes-mobile01",
+    "name" : "mes-mobile",
     "appid" : "__UNI__41DB0F2",
     "description" : "",
     "versionName" : "1.0.0",
@@ -52,9 +52,14 @@
         /* 小程序特有相关 */
         "appid" : "wx38dc81b0eef130a3",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "postcss" : true,
+            "es6" : true,
+            "minified" : true
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+		"libVersion":"latest"
     },
-    "vueVersion" : "3"
+    "vueVersion" : "3",
+    "locale" : "zh-Hans"
 }
diff --git a/pages.json b/pages.json
index 41078b0..890e916 100644
--- a/pages.json
+++ b/pages.json
@@ -35,7 +35,6 @@
 		"path" : "pages/login/login",
 		"style" : 
 		{
-			// "navigationBarTitleText" : "登录",
 			"enablePullDownRefresh" : false,
 			"navigationStyle": "custom"
 		}
@@ -45,7 +44,10 @@
 		"style" : 
 		{
 			"navigationBarTitleText" : "生产工单管理",
-			"enablePullDownRefresh" : false
+			"enablePullDownRefresh" : true,
+			"pullToRefresh":{
+				"color":"red"
+			}
 		}
 	},
 	{
@@ -184,13 +186,21 @@
 			"enablePullDownRefresh" : false
 		}
 	}],
-	"globalStyle": {
+	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "德木自动化系统",
-		"navigationBarBackgroundColor": "#060B26",
+		"navigationBarBackgroundColor": "#060B26",
+		"backgroundColor":"#060B26",
+		"backgroundTextStyle":"light",
 		"app-plus": {
-			"background": "#efeff4"
-		}
+			"background": "#060B26"
+		},
+		"mp-weixin":{
+			"background":"#060B26",
+			"pullToRefresh":{
+				"color":"#060B26"
+			}
+		}
 	},
 	"condition" : { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6136833..baa8510 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -25,7 +25,7 @@
 							<view class="top">
 								▴2.89%
 							</view>
-							<view class="font22">
+							<view class="num font22">
 								1,567
 							</view>
 						</view>
@@ -43,7 +43,7 @@
 							<view class="top">
 								▴2.89%
 							</view>
-							<view class="font22">
+							<view class="num font22">
 								1,567
 							</view>
 						</view>
@@ -61,7 +61,7 @@
 							<view class="top">
 								▴2.89%
 							</view>
-							<view class="font22">
+							<view class="num font22">
 								1,567
 							</view>
 						</view>
@@ -79,7 +79,7 @@
 							<view class="top">
 								▴2.89%
 							</view>
-							<view class="font22">
+							<view class="num font22">
 								1,567
 							</view>
 						</view>
@@ -97,7 +97,7 @@
 							<view class="top">
 								▴2.89%
 							</view>
-							<view class="font22">
+							<view class="num font22">
 								1,567
 							</view>
 						</view>
@@ -115,7 +115,7 @@
 							<view class="top">
 								▴2.89%
 							</view>
-							<view class="font22">
+							<view class="num font22">
 								1,567
 							</view>
 						</view>
@@ -166,14 +166,6 @@
 						<view class="t-icon t-icon-shengchangongdan contenticon"></view>
 						<view class="contentname">生产工单</view>
 					</view>
-					<view class="content_module" @click="toSchedule()">
-						<view class="t-icon t-icon-gongdanjindu contenticon"></view>
-						<view class="contentname">工单进度</view>
-					</view>
-					<view class="content_module" @click="toMaterialYield()">
-						<view class="t-icon t-icon-gongdanchucaishuai contenticon"></view>
-						<view class="contentname">工单出材率</view>
-					</view>
 					<view class="content_module">
 						<view class="t-icon t-icon-shengchanbaobiao contenticon"></view>
 						<view class="contentname">生产报表</view>
@@ -187,11 +179,19 @@
 					<view class="content_module">
 						<view class="t-icon t-icon-paichengguanli contenticon"></view>
 						<view class="contentname">排程管理</view>
+					</view>
+					<view class="content_module" @click="toSchedule()">
+						<view class="t-icon t-icon-gongdanjindu contenticon"></view>
+						<view class="contentname">工单进度</view>
+					</view>
+					<view class="content_module" @click="toMaterialYield()">
+						<view class="t-icon t-icon-gongdanchucaishuai contenticon"></view>
+						<view class="contentname">工单出材率</view>
 					</view>
-					<view class="content_module">
+					<!-- <view class="content_module">
 						<view class="t-icon t-icon-paichengshichang contenticon"></view>
 						<view class="contentname">排程时长</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 			<view class="content_box">
@@ -205,8 +205,8 @@
 						<view class="t-icon t-icon-shebeizhuangtai contenticon"></view>
 						<view class="contentname">设备状态</view>
 					</view>
-					<view class="content_module">
-						<view class="t-icon t-icon-shebeibaoxiu contenticon" @click="toDeviceRepair()"></view>
+					<view class="content_module" @click="toDeviceRepair()">
+						<view class="t-icon t-icon-shebeibaoxiu contenticon"></view>
 						<view class="contentname">设备报修</view>
 					</view>
 				</view>
@@ -300,7 +300,7 @@
 			.name{flex:1;}
 			.accounticon{
 				margin-right: 5px;
-				color: #fff;
+				color: $uni-text-color-inverse;
 				font-size: 20px;
 			}
 			.notifyicon{font-size: 20px;padding-right: 20px;}
@@ -312,33 +312,43 @@
 		.content_title{line-height: 25px;font-size: 16px;padding: 15px 0;}
 		.device_data{display: flex;flex-wrap: wrap;
 			.device_module{
-				width: calc(50% - 12px); /* 计算每个块的宽度（根据需要调整）*/
+				width: calc(50% - 6px); /* 计算每个块的宽度（根据需要调整）*/
+				// background-color: #ccc; /* 设置背景色（根据需要调整）*/
+				background: $uni-bg-color-primary;
 				margin:6px;
-				background-color: #ccc; /* 设置背景色（根据需要调整）*/
-				padding: 10px; 
-				background: #1C2755;
+				padding: 10px 14px; 
 				border-radius: 8px;
 				display: flex;
 				.module_left{width: 60%;
-					.icon_background{width: 32px;height: 32px;background: #6576B7;border-radius: 8px;    display: flex;align-items: center;justify-content: center;margin-bottom: 4px;}
+					.icon_background{width: 32px;height: 32px;background: $uni-bg-color-info;border-radius: 8px;    display: flex;align-items: center;justify-content: center;margin-bottom: 4px;}
 				}
 				.module_right{width: 40%;
-					.top{float: right;font-size: 10px;padding: 2px 4px;background: rgba(103,194,58,0.3);border-radius: 4px;color: #67C23A;}
+					.top{
+						display: flex;flex-direction: column; font-size: 10px;padding: 2px 4px;background: rgba(103,194,58,0.3);border-radius: 4px;color: $uni-text-color-success;
+					}
+					.num{
+						margin-top: 6px;
+					}
 				}
+			}
+			.device_module:nth-child(even){
+				margin-right: 0;
+			}
+			.device_module:nth-child(odd){
+				margin-left: 0;
 			}
 		}
-		.energy_data{padding: 12px; height: 64px; display: flex;align-items: center;background: #1C2755;border-radius: 8px;
-			.energy_icon{color: #009688;font-size: 24px;margin-right: 8px;}
+		.energy_data{padding: 12px; height: 64px; display: flex;align-items: center;background: $uni-bg-color-primary;border-radius: 8px;
+			.energy_icon{color: $uni-text-color-primary;font-size: 24px;margin-right: 8px;}
 			.energy_image{flex: 1;text-align: center;
 				image{width: 86px;height: 32px;}
 			}
-			.energy_number{color: #FA3758;}
+			.energy_number{color: $uni-text-color-danger;}
 		}
 		.content_data{
-			// view{display: inline-block;width: 25%;}
-			padding: 10px 0;display: flex;position: relative;align-items: center;text-align: center;height: 98px;
+			padding: 10px 0;display: flex;position: relative;align-items: center;justify-content:flex-start;height: 98px;
 			.content_module{
-				width: 25%;margin: 10px 1%;height: 98px;display: flex;align-items: center;justify-content: center;flex-direction: column;background-color: #009688;border-radius: 8px;
+				width: calc(25% - 7px);margin: 10px 4px;height: 98px;display: flex;align-items: center;justify-content: center;flex-direction: column;background-color: $uni-color-primary;border-radius: 8px;
 				.contenticon{font-size: 24px;width: 32px;height: 32px;background-repeat: no-repeat;}
 				.contentname{padding-top: 2px;font-size: 12px;}
 			}
diff --git a/pages/index/materialYield.vue b/pages/index/materialYield.vue
index 1430158..6e2b30a 100644
--- a/pages/index/materialYield.vue
+++ b/pages/index/materialYield.vue
@@ -1,50 +1,49 @@
 <template>
 	<!-- 工单出材率 -->
 	<view class="page_padding font13">
-		<view v-for="(item,index) in list" :key="index" class="detail_list contentboxsty">
+		<view v-for="(item,index) in list" :key="index" class="detail_list contentboxsty" @click="toDetail(498)">
 			<view class="list_top">
 				<view class="top_left">
-					工单号:{{item.name}}
+					工单号：{{item.name}}
 				</view>
 				<view class="top_right">
-					工单详情 <text class="iconfont icon-gengduo"></text>
+					工单详情 <text class="arrow iconfont icon-gengduo"></text>
 				</view>
 			</view>
 			<view class="list_content font13">
 				<view class="list_centre">
 					<view class="list_row">						
 						<view class="centre_left">
-							<text>加工规格</text> 
-							<text>{{item.specs}}</text>
-						</view>
-						<view class="centre_right">
-							生产中
+							<text class="name">加工规格</text>
+							<text class="text">{{item.specs}}</text>
 						</view>
 					</view>
 					<view class="list_row">
 						<view class="centre_left">
-							<text>算法出材率</text>
-							<text>{{item.algorithm}}%</text>
+							<text class="name">算法出材率</text>
+							<text class="text">{{item.algorithm}}%</text>
 						</view>
 					</view>
 				</view>
 				<view class="list_below">
-					<view class="below_left">
-						<view class="">
-							出材率
-						</view>
-						<view class="percentage font24">
-							{{item.algorithm}}%
-						</view>
+					<view class="below_left">
+						<view class="circle-progress">
+							<view class="progressBg">
+								<view class="progressBox">
+									<view class="percentage font22">
+										{{item.algorithm}}%
+									</view>
+									<view class="title font12">
+										出材率
+									</view>
+								</view>
+							</view>
+							<view class="circle-progress__bar" :style="'--progress:'+item.algorithm+'%'"></view>
+						</view>
 					</view>
-					<!-- <view class="below_left">
-						<view class="">
-							算法出材率
-						</view>
-						<view class="percentage font24">
-							{{item.reality}}%
-						</view>
-					</view> -->
+				</view>
+				<view class="card_right">
+					<view class="status">生产中</view>
 				</view>
 			</view>
 		</view>
@@ -57,7 +56,7 @@
 			return {
 				list:[{
 					name:'SO202401111004',
-					algorithm:'81.5',
+					algorithm:'51.5',
 					reality:'81.4',
 					state:'生产中',
 					specs:'4*9*3.66',
@@ -75,7 +74,7 @@
 					number:'12.66m³'
 				},{
 					name:'SO202401111004',
-					algorithm:'81.5',
+					algorithm:'61.5',
 					reality:'81.4',
 					state:'生产中',
 					specs:'4*9*3.66',
@@ -95,27 +94,28 @@
 			}
 		},
 		methods: {
-			
+			toDetail(id){
+				uni.navigateTo({
+					url:'/pages/production/productionDetail?id='+id
+				})
+			},
 		}
 	}
 </script>
 
-<style lang="scss">
+<style scoped lang="scss">
 .detail_list{
-	// .list_top{display: flex;padding: 12px 0;border-bottom: 1px solid #2D3A6F;margin-bottom: 8px;
-	// 	.top_left{flex: 1;}
-	// }
 	.list_centre{
 		.list_row{display: flex;padding-bottom: 12px;
-			.centre_left{flex: 1;display: flex;
-				text:first-child{width:80px;}
+			.centre_left{
+				flex: 1;
+				.name{width:80px;display: inline-block;font-weight: bold;}
 			}
-			.centre_right{background: rgba(230,162,60,0.2);border-radius: 4px 4px 4px 4px;height: 20px;padding: 0 6px;color: #E6A23C;}
 		}
 	}
-	.list_below{display: flex;text-align: center;padding: 20px 0;
-		view{flex: 1;}
-		.percentage{color: #00B68D;}
+	.list_below{display: flex;text-align: center;padding: 20px 0;
+		.below_left{flex: 1;display: flex;align-items: center;justify-content: center;}
+		.percentage{color: $uni-text-color-inverse;}
 	}
-}	
-</style>
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/schedule.vue b/pages/index/schedule.vue
index a95c919..2ba2078 100644
--- a/pages/index/schedule.vue
+++ b/pages/index/schedule.vue
@@ -1,62 +1,77 @@
 <template>
 	<!-- 工单进度管理 -->
-	<view class="page_padding">
-		<view class="detail_list contentboxsty font13">
-			<view class="list_top">
-				<view class="top_left">
-					工单号:
-				</view>
-				<view class="top_right">
-					工单详情
-				</view>
-			</view>
-			<view class="list_content">
-				<view class="list_row">
-					<view class="row_left">
-						<view class="">开始时间：</view>
-						<view class="">24-01-12 08:00</view>
+	<view class="page_padding columnFlex">
+		<view class="headerView" :class="headerFixed?'headerViewFixed':''">
+			<searchView placeholder=" 搜索工单" />
+		</view>
+		<view class="flexBox">
+			<view class="detail_list contentboxsty font13" v-for="(item,index) in list" :key="index">
+				<view @click="toDetail(497)">
+					<view class="list_top">
+						<view class="top_left">
+							工单号：{{item.sn}}
+						</view>
+						<view class="top_right">
+							工单详情<text class="arrow iconfont icon-gengduo"></text>
+						</view>
 					</view>
-					<view class="row_right">
-						生产中
+					<view class="list_content">
+						<view class="list_row">
+							<text class="name">开始时间</text>
+							<text class="text">24-01-12 08:00</text>
+						</view>
+						<view class="list_row padd_top12">
+							<text class="name">计划完成</text>
+							<text class="text">24-01-12 08:00</text>
+						</view>
+						<view class="padd_top12">
+							<progressBar :total="100" :val="item.num" title="" />
+						</view>
+						<view class="card_right">
+							<view class="status">生产中</view>
+						</view>
 					</view>
 				</view>
-				<view class="list_row padd_top12">
-					<view class="">计划完成：</view>
-					<view class="">24-01-12 08:00</view>
-				</view>
-				<view class="padd_top12">
-					<progressBar :total="100" :val="20" title="" />
-				</view>
-			</view>
-			<!-- <annularProgressBar :progress_txt="20" :width="84"  :height="69" title="出材率"/> -->
+			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import progressBar from '/components/progressBar.vue'
-	import annularProgressBar from '/components/chocolate-progress-bar/chocolate-progress-bar.vue'
 	export default {
 	  components: {
-		"progressBar":progressBar,
-		"annularProgressBar":annularProgressBar,
+		
 	  },
 		data() {
 			return {
-				list:[{name:''}]
+				list:[
+					{name:'',sn:"SO20240422000002",num:20},{name:'',sn:"SO20240422000002",num:70},{name:'',sn:"SO20240422000002",num:90},
+					{name:'',sn:"SO20240422000002",num:20},{name:'',sn:"SO20240422000002",num:70},{name:'',sn:"SO20240422000002",num:90}
+				]
 			}
 		},
 		methods: {
-			
+			toDetail(id){
+				uni.navigateTo({
+					url:'/pages/production/productionDetail?id='+id
+				})
+			},
 		}
 	}
 </script>
 
-<style lang="scss">
+<style scoped lang="scss">
+.page_padding{
+	padding-top: 0;
+}
 .detail_list{
-	.list_content{
-		.list_row{display: flex;
-			.row_left{display: flex;}
+	.list_content{
+		.list_row{
+			.name{
+				width: 65px;
+				display: inline-block;
+				font-weight: bold;
+			}
 		}
 	}
 }
diff --git a/pages/login/login.vue b/pages/login/login.vue
index f9dd257..058de8a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -3,10 +3,9 @@
 		<view class="iconfont icon-shouye" @click="toIndex()" style="height: 25px;position: absolute;top: 60px;width: 30px;"></view>
 		<view class="login_top">
 			<view class="login_logo">
-				<image src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/meslogo.png" class="logopng"></image>
-				<image src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/demu.png" class="demupng"></image>
+				<image src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/loginLogo.png" class="demupng"></image>
 			</view>
-			<view class="">
+			<view class="name">
 				自动化MES管理系统
 			</view>
 		</view>
@@ -36,7 +35,7 @@
 					<view  class="getCaptcha">{{codename}}</view>
 				</view>
 			</view>
-			<view class="" v-if="tab==1" style="color: #C4C4C4;font-size: 11px;    padding-top: 14px;">
+			<view class="" v-if="tab==1" style="color: #C4C4C4;font-size: 12px;padding-top: 14px;">
 				记住密码
 			</view>
 			<view class="loginbut" @click="login()">
@@ -80,13 +79,12 @@
 				this.$set(this,"tab",tab);
 			},
 			toIndex(){
-				uni.navigateBack({
-					delta: 2
+				uni.reLaunch({
+					url:'/pages/index/index'
 				});
 			},
 			login(){
 				this.$api.postFuncLoading('/user.login',{login_name:this.accountValue,password:this.passValue}).then(res=>{
-					console.log(res)
 					let obj = new Object();
 					obj.mes_user_name=res.data.user.name;
 					obj.mes_token=res.data.token;
@@ -105,19 +103,21 @@
 	.login_page{
 		padding: 0 32px;
 		background: url('https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/background.png') no-repeat;
-		background-position: center center;
+		background-position: center;
 		background-size: cover;
 		height: 100vh;
 	}
-	.login_top{padding-top: 160px;padding-bottom: 32px;}
+	.login_top{padding-top: 160px;padding-bottom: 32px;}
+	.login_top .name{letter-spacing: 1.2px;background: linear-gradient(to right, #fff, rgba(255,255,255,0.1));
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+	}
 	.login_logo{display: flex;align-items: center;margin-bottom: 17px;}
-	.logopng{width: 53px;height: 44px;}
-	.demupng{width: 60px;height: 36px;}
+	.demupng{width: 117px;height: 43px;}
 	.login_centre{border-radius: 16px;background: #FFF;padding: 20px 24px 40px;}
 	.login_switch{display: flex;}
 	.login_name{flex: 1;text-align: center;
 		padding-bottom: 5px;
-		/* border-bottom: 1px solid #000; */
 		margin-bottom: 10px;
 	}
 	.login_name:focus {
@@ -134,13 +134,13 @@
 		bottom: -4px;
 		z-index: 10;
 		width: 30px;
-		border-bottom: 3px solid #009688 ;
+		border-bottom: 3px solid #009688;
 	}
-	.login_input{border-radius: 21.5px;background: #F3F5F9;margin-top: 12px;padding: 5px 15px;}
+	.login_input{border-radius: 21.5px;background: #F3F5F9;margin-top: 12px;padding: 9px 15px;font-size: 14px;}
 	.getCaptcha{border-radius: 21.5px;background: #009688;height: auto;color: white;display: flex;align-items: center;width: 40%;justify-content: center;}
 	.flex_layout{display: flex;margin-top: 12px;}
 	.login_code{margin-top: unset;width:60%;margin-right: 12px;}
-	.loginbut{background: #009688;text-align: center;margin-top: 60px;margin-bottom: 18px;padding: 9px;border-radius: 66rpx;}
+	.loginbut{background: #009688;text-align: center;margin-top: 40px;margin-bottom: 18px;padding: 9px;border-radius: 66rpx;}
 	.persontc{
 		border: none;
 		margin: 0;
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 43f0ed5..4c662e4 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -2,11 +2,11 @@
 	<view class="person_page ">
 		<view class="person_top">
 			<view class="person_data">
-				<!-- <view class="person_logo"> -->
+				<view class="person_logo">
 					<!-- <button class="avatar-wrapper" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar"> -->
-					  <image class="person_logo" :src="avatarUrl"></image>
-					<!-- </button> -->
-				<!-- </view> -->
+					  <image class="img" :src="avatarUrl"></image>
+					<!-- </button> -->
+				</view>
 				<view class="person_name">
 					<view class="name">
 						<text class="font15">肖银奎</text>
@@ -75,6 +75,9 @@
 			<view class="con_set">
 				<view class="t-icon t-icon-xitongshezhi-gerenzhongxin personicon"></view>
 				<view class="font13">系统设置</view>
+			</view>
+			<view class="login_out">
+				<view class="font13">退出登录</view>
 			</view>
 		</view>
 		<tab-bar :current-page="2"></tab-bar>
@@ -83,7 +86,7 @@
 
 <script>
 	import tabBar from "@/components/customTabBar/index";
-	const defaultAvatarUrl = 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0';
+	const defaultAvatarUrl = 'https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/avatar.png';
 	export default {
 		components:{
 			tabBar
@@ -137,7 +140,18 @@
 .person_page{ padding: 14px;
 	.person_top{margin-bottom:33px ;
 		.person_data{display: flex;align-items: center;
-			.person_logo{border-radius: 50%;width: 54px;height: 54px;margin:0 6px 0 4px;}	
+			.person_logo{
+				border-radius: 50%;width: 54px;height: 54px;margin:0 6px 0 4px;position: relative;
+				.img{
+					height: 100%;width: 100%;
+				}
+			}
+			.person_logo::before{
+				content: '';position: absolute;right: 2px;bottom: 1px;z-index: 10;border: 1px solid $uni-bg-color-default; background: $uni-bg-color-whith;width: 10px;height: 10px;border-radius: 50%;
+			}
+			.person_logo::after{
+				content: '';position: absolute;right: 4px;bottom: 3px;z-index: 20;background: $uni-bg-color-success;width: 8px;height: 8px;border-radius: 50%;
+			}
 		
 			.person_name{
 				.name{display: flex;align-items: center;margin-bottom: 2px;
@@ -147,20 +161,26 @@
 			}
 		}
 	}
-	.person_content{
-		.con_backlog{padding: 14px 10px 14px 15px;background: #1C2755;border-radius: 8px;margin-bottom: 12px;
-			.backlog_data{display: flex;    flex-wrap: wrap;margin-top: 7px;
-				.backlog_module{width: 93px;height: 76px;display: flex;justify-content: center;flex-direction: column;align-items: center;border-radius: 8px;
-				background: #6576B7;margin: 5px 6px;}
+	.person_content{
+		padding-bottom: 100px;
+		.con_backlog{padding: 14px 10px;background: $uni-bg-color-primary;border-radius: 8px;margin-bottom: 12px;
+			.backlog_data{
+				display: flex;flex-wrap:wrap;margin-top:7px;
+				.backlog_module{
+					width: calc(33.33% - 12px);height: 76px;display: flex;justify-content: center;flex-direction: column;align-items: center;border-radius: 8px;
+					background: $uni-color-info;margin: 5px 6px;
+					box-sizing: border-box;
+				}
 				.backlogicon{width: 32px;height: 32px;}
 				.backlogname{
 					font-size: $uni-font-size-sm;
-					padding-top: 5px;}
+					padding-top: 5px;
+				}
 			}
 		}
 		.con_account{
 			border-radius: 8px;
-			background: #1C2755;
+			background: $uni-bg-color-primary;
 			display: flex;
 			height: 52px;
 			align-items: center;
@@ -169,19 +189,32 @@
 			
 		}
 		.personicon{width: 24px;height: 24px;margin-right: 15px;}
-		.con_data{border-radius: 8px;
-			background: #1C2755;
+		.con_data{
+			border-radius: 8px;
+			background: $uni-bg-color-primary;
 			padding: 0 14px;
 			margin-bottom: 12px;
-			.con_module{display: flex;height: 49px;align-items: center;border-bottom: 1px solid #2D3A6F;}
+			.con_module{display: flex;height: 49px;align-items: center;border-bottom: 1px solid $uni-border-color-primary;}
 		}
-		.con_set{border-radius: 8px;
-			background: #1C2755;
+		.con_set{
+			border-radius: 8px;
+			background: $uni-bg-color-primary;
 			display: flex;
 			height: 48px;
 			align-items: center;
-			padding: 0 14px;
-			}
+			padding: 0 14px;
+			margin-bottom: 12px;
+		}
+		.login_out{
+			border-radius: 8px;
+			background: $uni-bg-color-primary;
+			display: flex;
+			height: 48px;
+			align-items: center;
+			justify-content: center;
+			padding: 0 14px;
+			color: $uni-text-color-danger;
+		}
 	}
 }
 </style>
\ No newline at end of file
diff --git a/pages/production/productionDetail.vue b/pages/production/productionDetail.vue
index 1c03872..406c8d7 100644
--- a/pages/production/productionDetail.vue
+++ b/pages/production/productionDetail.vue
@@ -5,8 +5,8 @@
 				<view class="top_left">
 					工单号 <text class="padd_left12">{{form.order_sn}}</text>
 				</view>
-				<view class="top_right font13">
-					{{form.review_status_label}}
+				<view class="top_right font12">
+					{{form.active_status_label}}
 				</view>
 			</view>
 			<view class="list_content">
@@ -21,7 +21,7 @@
 					</view>
 					<view class="content_row">
 						<text class="name">工单耗时</text>
-						<text class="data">10h</text>
+						<text class="data">{{form.processing_time}}</text>
 					</view>
 					<view class="content_row">
 						<text class="name">加工规格</text>
@@ -29,11 +29,11 @@
 					</view>
 					<view class="content_row">
 						<text class="name">规格料</text>
-						<text class="data">13.01m³</text>
+						<text class="data">{{form.cube}}m³</text>
 					</view>
 					<view class="content_row">
 						<text class="name">生产负责</text>
-						<text class="data">张三</text>
+						<text class="data">{{form.creator_name}}</text>
 					</view>
 					<view class="content_row">
 						<text class="name">加工等级</text>
@@ -49,7 +49,22 @@
 					</view>
 				</view>
 				<view class="content_right">
-					
+					<progressBar :total="100" :val="form.progress_rate" title="" />
+				</view>
+				<view class="progressView">
+					<view class="circle-progress">
+						<view class="progressBg">
+							<view class="progressBox">
+								<view class="percentage font22">
+									{{form.yield_rate}}%
+								</view>
+								<view class="title font12">
+									出材率
+								</view>
+							</view>
+						</view>
+						<view class="circle-progress__bar" :style="'--progress:'+form.yield_rate+'%'"></view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -64,16 +79,17 @@
 			}
 		},
 		onLoad(option){
-			console.log(option)
 			this.detailData(option.id)
 		},
 		onShow(){
-			// this.detailData()
+			
+		},
+		onReady() {
+			
 		},
 		methods: {
 			detailData(id){
 				this.$api.postFuncLoading('/order.info',{id:id}).then(res=>{
-					console.log(res.data)
 					this.form = res.data
 				})
 			},
@@ -83,11 +99,18 @@
 
 <style lang="scss">
 	.list_top{
-		.top_right{background: #243168;border-radius: 4px 4px 4px 4px;width: 46px;height: 20px;text-align: center;}
+		.top_right{background: #243168;border-radius: 4px;padding: 3px 10px; text-align: center;display: inline-block;}
 	}
-	.list_content{		
+	.list_content{
 		.content_row{display: flex;padding:6px 0;
-			.name{width: 90px;}
+			.name{width: 90px;font-weight: bold;}
+		}
+		.content_right{padding: 6px 0;}
+		.progressView{
+			position: absolute;
+			top: 12px;
+			right:12px;
+			z-index: 20;
 		}
 	}
 </style>
diff --git a/pages/production/productionOrder.vue b/pages/production/productionOrder.vue
index ea14912..3a44f0b 100644
--- a/pages/production/productionOrder.vue
+++ b/pages/production/productionOrder.vue
@@ -1,87 +1,162 @@
 <template>
 	<!-- 生产工单 -->
-	<view class="page_padding">
-		<view v-for="(item,index) in list" :key="index" class="detail_list contentboxsty font13">
-			<view @click="toDetail(item.id)">
-				<view class="list_top">
-					<view class="top_left">
-						工单号:{{item.order_sn}}
+	<view class="page_padding columnFlex">
+		<view class="headerView" :class="headerFixed?'headerViewFixed':''">
+			<searchView placeholder=" 搜索工单" />
+		</view>
+		<view class="flexBox">
+			<!-- <scroll-view scroll-y="true" class="scrollView"> -->
+			<view v-for="(item,index) in list" :key="index" class="detail_list contentboxsty font13">
+				<view @click="toDetail(item.id)">
+					<view class="list_top">
+						<view class="top_left">
+							工单号：{{item.order_sn}}
+						</view>
+						<view class="top_right">
+							工单详情 <text class="arrow iconfont icon-gengduo"></text>
+						</view>
 					</view>
-					<view class="top_right">
-						工单详情 <text class="iconfont icon-gengduo"></text>
-					</view>
-				</view>
-				<view class="list_content font13">
-					<view class="list_centre">
-						<view class="centre_left">
-							<view class="">
-								算法出材率
+					<view class="list_content font13">
+						<view class="list_centre">
+							<view class="centre_left">
+								<view class="name font_bold">
+									算法出材率
+								</view>
+								<view class="percentage font24">
+									{{item.algorithm && item.algorithm!=''?item.algorithm+'':'0'}}%
+								</view>
 							</view>
-							<view class="percentage font24">
-								{{item.algorithm}}%
+							<view class="centre_left">
+								<view class="name font_bold">
+									实际出材率
+								</view>
+								<view class="percentage font24">
+									{{item.reality && item.reality!=''?item.reality:'0'}}%
+								</view>
 							</view>
 						</view>
-						<view class="centre_left">
-							<view class="">
-								实际出材率
+						<view class="list_below">
+							<view class="row">
+								<view class="row_left">
+									<text class="name">状态</text>
+									<text class="text status">{{item.active_status_label}}</text>
+								</view>
+								<view class="row_right">
+									<text class="name">加工规格</text>
+									<text class="text">{{item.order_spec}}</text>
+								</view>
 							</view>
-							<view class="percentage font24">
-								{{item.reality}}%
+							<view class="row">
+								<view class="row_left">
+									<text class="name">生产开始</text>
+									<text class="text">{{item.plan_date}}</text>
+								</view>
+								<view class="row_right">
+									<text class="name">工单耗时</text>
+									<text class="text">{{item.progress_rate}}</text>
+								</view>
+							</view>
+							<view class="row">
+								<view class="row_left">
+									<text class="name">工单数量</text>
+									<text class="text">{{item.order_number}}</text>
+								</view>
 							</view>
 						</view>
 					</view>
-					<view class="list_below">
-						<view class="row">
-							<view class="row_left">
-								<text>状态：</text>
-								<text>{{item.review_status_label}}</text>
-							</view>
-							<view class="row_right">
-								<text>加工规格：</text>
-								<text>{{item.order_spec}}</text>
-							</view>
-						</view>
-						<view class="row">
-							<view class="row_left">
-								<text>生产开始：</text>
-								<text>{{item.plan_date}}</text>
-							</view>
-							<view class="row_right">
-								<text>工单耗时：</text>
-								<text>{{item.timeConsuming}}</text>
-							</view>
-						</view>
-						<view class="row">
-							<view class="row_left">
-								<text>工单数量：</text>
-								<text>{{item.order_number}}</text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
+				</view>
+			</view>
+			<loadMore :noData="loadParams.noData" :loading="loadParams.loading" :loadEnd="loadParams.loadEnd" />
+			<!-- </scroll-view> -->
 		</view>
 	</view>
 </template>
 
-<script>
-	export default {
+<script>
+	export default {
+		components:{
+			
+		},
 		data() {
-			return {
-				list:[]
+			return {
+				headerFixed:false,
+				list:[],
+				params:{
+					page:1,
+					pageSize:10,
+				},
+				loadParams:{
+					noData:false,
+					loading:false,
+					loadEnd:false
+				}
 			}
 		},
 		onShow(){
-			this.listData();
+			
+		},
+		onReady() {
+			this.listData();
+		},
+		onPageScroll(e){
+			if(e.scrollTop>30){
+				this.headerFixed = true;
+			}else{
+				this.headerFixed = false;
+			}
+		},
+		// 上拉刷新
+		onPullDownRefresh(){
+			this.params.page = 1;
+			this.listData(2);
+		},
+		// 加载下一页
+		onReachBottom(){
+			if(!(this.loadParams.loadEnd || this.loadParams.noData)){
+				this.loadParams.loading = true;
+				this.params.page ++;
+				this.listData();
+			}
 		},
 		methods: {
-			listData(){
-				this.$api.postFuncLoading('/order.list',{page: 1,pageSize: 15}).then(res=>{
-					this.list = res.data.rows
+			listData(type=1){
+				if(this.params.page == 1){
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+				}
+				this.$api.request('/order.list',this.params).then(res=>{
+					console.log(res,566)
+					if(type ==2){
+						uni.stopPullDownRefresh();
+					}
+					setTimeout(function () {
+					 	uni.hideLoading();
+					}, 200);
+					
+					this.loadParams.loading = false;
+					if(res.data.rows.length ==0 && this.params.page == 1){
+						this.loadParams.noData = true;
+					}
+					if(res.data.rows.length>0 && res.data.rows.length < this.params.pageSize){
+						this.loadParams.loadEnd = true;
+					}
+					if(this.params.page == 1){
+						this.list = res.data.rows;
+					}else{
+						this.list = this.list.concat(res.data.rows);
+					}
+					
+				}).catch(err=>{
+					console.log('err',err)
+					setTimeout(function () {
+					 	uni.hideLoading();
+					}, 200);
+				})
 			},
 			//跳转工单详情
 			toDetail(id){
-				console.log(id)
 				uni.navigateTo({
 					url:'/pages/production/productionDetail?id='+id
 				})
@@ -90,16 +165,34 @@
 	}
 </script>
 
-<style lang="scss">
-.detail_list{
+<style scoped lang="scss">
+.page_padding{
+	padding-top: 0;
+}
+.detail_list{
 	.list_centre{display: flex;text-align: center;padding-bottom: 10px;
 		view{flex: 1;}
-		.percentage{color: #00B68D;}
+		.percentage{color: $uni-text-color-primary;margin: 10px 0 0 0;}
 	}
 	.list_below{padding-bottom: 12px;
 		.row{display: flex;padding-top: 10px;
-			.row_left{    white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
-			view{flex: 1;}
+			.row_left{
+				white-space: nowrap;overflow: hidden;text-overflow: ellipsis;
+				padding-right: 4px;
+			}
+			.row_right{
+				white-space: nowrap;overflow: hidden;text-overflow: ellipsis;
+				padding-left: 4px;
+			}
+			view{flex: 1;}
+			.row_left .name,.row_right .name{
+				display: inline-block;
+				width: 65px;
+				font-weight: bold;
+			}
+			.status{
+				color: $uni-text-color-warning;
+			}
 		}
 	}
 	
diff --git a/static/.DS_Store b/static/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ba29a1fcdaa416774025af17861c0d1454894a06
GIT binary patch
literal 8196
zcmeI1Pmj_-7{=e(#icA!IcVf!(!}d#Wno=+;{|a&com}uHAtb0jol8RMN9~WvwjD^
zf>%F@-^G(Y?@X5zm=aIMgqdXKowm=zOn)=|GlhsmYurB~suGcd%&}5NVMu(O^IF<T
z_uN4g@DoKecoxc@7fNqUZFg7#mVhN-30MM_!2du1&umUk&U0TMwWTFs32Y?+zCXCg
z9GhvJ>!@xWDAW=Fv4Gtwp^kNc^0;Yirg5&Lvf?-O>OrJdkuEWWw&S?Va>QmD=Q?UT
z32i5lwk*;Wicqb?=PEggrjE9>1T2Ad0=#zLqaGd6Aq`j7?|dmeMn3$lk}|Wlo}>M4
z&^F9kao3<d&e47~XdmQge;KqVX6??vpnYi8Dh}UPIGpBanZv5~%&b)$vf7*AJEoWt
zl5|M{wj@R+hP#I{&U{_L=m;kBckTqgc(LMUR#|tM`e-qxE_oD^Z|<?8mUZnz8Ey73
zJ#iyL&sm(=g*v}vxn~4|oAur#9;RQJet5$$h?83Fr`XvoT-z%;MW^h%ZNHb3cG6A8
zajQFe&08;|485y**LxZGlTPK<6B#AlAo54b5cGXW-n<H;zMQn=IO@mB+tvr1l2htb
zs?%xXw07V&YW3NHJ3XtTe%v^j%}UPgd-oqb?|cX^Bl!h%kwp5yqU(BlQS#WWaroFC
zMWKv%X0mS|oFa^hPoKchc!lx|T4I&;v~oOXd&%Qqyd@2g&23<&Ea}U*SNJr-T;bW7
z(=(na8(cYkQ*-5WX0DXb$^@<XXw%#~CXjU$aRo&nXH=`Xl~peW#8xbUts=0i&$e1d
ze479Lf2)|-leGl4jesbex6fNR>#J9lRRFx!c9Gv9b7I|GM`b~wmg9(OIgYsa!w_{B
cQuZ{{IM)$-kpB6H0DiZ$&ws_<7TZhU52TW7VgLXD

literal 0
HcmV?d00001

diff --git a/static/css/app.css b/static/css/app.css
new file mode 100644
index 0000000..653429a
--- /dev/null
+++ b/static/css/app.css
@@ -0,0 +1,78 @@
+/* 检索部分 */
+.columnFlex{
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	box-sizing: border-box;
+}
+.headerView{
+	padding: 10px 0;
+	flex-basis: 40px;
+}
+.searchBox .searchView{
+	position: relative;
+}
+.searchBox .searchInput{
+	display: flex;
+	flex-direction: row;
+}
+.searchBox .searchInput .input{
+	border-radius: 20px;
+	padding: 7px 13px 7px 13px;
+	flex: 1;
+}
+.searchBox .searchInput .filter{
+	flex-basis: 32px;
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+}
+.headerViewFixed{
+	position: fixed;
+	left: 14px;
+	top: 0;
+	z-index: 100;
+	width: calc(100% - 28px);
+}
+.flexBox{
+	flex: 1;
+}
+.scrollView{
+	height: 100%;
+}
+
+
+
+/* 加载更多部分 */
+.noData{
+	margin: 50% auto;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+.noData .imgView .img{
+	width: 180px;
+	height: 138px;
+}
+.noData .text{
+	margin-top: 10px;
+}
+.loadBox{
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 20px;
+}
+.loadBox .text{
+	margin-left: 8px;
+}
+.loadBox .icon{
+	animation: spin 0.6s linear infinite;
+}
+@keyframes spin {
+	to {
+		transform: rotate(360deg);
+	}
+}
diff --git a/static/iconfont/.DS_Store b/static/iconfont/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c52ba54acc1b0bbe6d66e1774f3acb46fe3caec4
GIT binary patch
literal 6148
zcmeHKO;6iE5S<NyIHIj`C=wSWOI&H1lB#OO#iVfP6<2U*tJEebb?bVg*ujS=lF#(V
zaOIcqcj%klrGlg%2c)V(Gt%svot?MVK3lt9B2vA{;2BYih&(uBt%>Fr#^dY@R&$wU
zpfYoOB25_;^n}WVYDxT$3h=voL<t?6H+S>>4Jo1#jozgCI8JqpI{rv@;q5D9i2lNj
z%Y5Xx7x5@f@}kqZRJEo0@=C*Nc&pxr@Ut$%A}S_%FB-q&-dnBH_&Sc_!(>?YTaRDs
ztca3qI5vc2Fht4wqa+*XvZp86AUE954tPzk*>9~+r`?yGEx+5@o^AQlSKEl6cVEnA
zO>b@U>CQp_Yx*tIXJ!?o@ckNl=<pi8Blx2}r{OqDb#{U}p5wuSmThR8Q$DBTIcjg}
zxPqEfI-xdwnXgqFbG7J-i2|a4C~zkQ+@9yH-f0#givps+eN=$=2OrKDIIJw1tpkm@
z0s!ks8$-;$iOlgG1`aEW7=bBE1zM_dR}5w8$osA?a9CNibW-l}q1=;|yP+uabj<IY
za#DdsX+;51;I;xww%g+KfB*OQ|Jx+#i2|a)y;4Bc_rkp%mgLUXg~jn%>%%|7*|@H<
l_>+Rb9L1>Rqj()|40)deVBoN_hzv}A1dI&QhywpqfgjuQdeZ;^

literal 0
HcmV?d00001

diff --git a/static/iconfont/iconfont-weapp/.DS_Store b/static/iconfont/iconfont-weapp/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..4eb2702fec0c43e3057e36c1b543e4ffc432780f
GIT binary patch
literal 6148
zcmeHK!EVz)5S>j^>Zn4>0YolHmbkVhZ4d%+F`+$htr0yG6znD~7RDRJ4n~S1`P_aC
zSH7gbL*MLfESi9NsDw~86V1Na*_pBSZRGV3k?K!}yF_gw@}P{37KT3vud}X5!+F+$
zifg=0^+}xS7;`Qt^8YiyXV;{JPDoR>bbha~w)4w~*+?B1m-*P8^UrvkCVA2AUaH1g
zbN$|ix8ZGiAH&bO42!6k=KW}L%(Hh|r}4s$;`hm@9JC+2(OD5C*=S-ClHmv;AC8i2
zsLQ^dX2aa%hIYYgd96XaGn@5ZbhrFocW=Js&tC4qe%5<FpSQe+PoBOy9DGT?X8PPx
zukgP#a^K+sE@0IA`4&#HRA*=Kar~nNA9TvBP(j;N(ug7&<F{R}?trzN@+H=Opu+F0
zb?W$=s+IJ8wVrysR1Z@TVL%uV25!lKdpCNUx2z-S!hkSv_ZZ;!gAZj4999<1s{?~+
z0f0@ojleda{y?7{z`$W;5gv%LsX&{mT#KPx=b&sl)&mz`S+wb-%#%^aJz2R9MY+a9
z`6irHU{OY4Kp42rz?z-5`Tjrnd;fnuNoK-;FmR_BP|f{tzmF}syLDxAeAoKWPf!+)
nt1Q+jFw9kqSiXuoP$TgBYybm?l|^_U@*!YokU<#urwm*H?UZ`*

literal 0
HcmV?d00001

diff --git a/static/iconfont/iconfont.css b/static/iconfont/iconfont.css
index e25e1ae..01474ec 100644
--- a/static/iconfont/iconfont.css
+++ b/static/iconfont/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4403683 */
-  src: url('//at.alicdn.com/t/c/font_4403683_5b5i159cydc.woff2?t=1709604278213') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4403683_5b5i159cydc.woff?t=1709604278213') format('woff'),
-       url('//at.alicdn.com/t/c/font_4403683_5b5i159cydc.ttf?t=1709604278213') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_4403683_4mp9v07pqat.woff2?t=1713756401049') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4403683_4mp9v07pqat.woff?t=1713756401049') format('woff'),
+       url('//at.alicdn.com/t/c/font_4403683_4mp9v07pqat.ttf?t=1713756401049') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,46 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-meiyougengduo:before {
+  content: "\e638";
+}
+
+.icon-loading:before {
+  content: "\e891";
+}
+
+.icon-bianji1:before {
+  content: "\e601";
+}
+
+.icon-bangding1:before {
+  content: "\e602";
+}
+
+.icon-a-shaixuan2:before {
+  content: "\e636";
+}
+
+.icon-a-Vector6:before {
+  content: "\e637";
+}
+
+.icon-a-Vector6-copy:before {
+  content: "\e655";
+}
+
+.icon-saoyisao:before {
+  content: "\e600";
+}
+
+.icon-a-shengchanshijian1:before {
+  content: "\e63b";
+}
+
+.icon-weixuanzhong:before {
+  content: "\e635";
+}
+
 .icon-paizhao:before {
   content: "\e633";
 }
diff --git a/static/sweep.png b/static/sweep.png
new file mode 100644
index 0000000000000000000000000000000000000000..1158a3275b3001f23c15265bf683ac45b4db6955
GIT binary patch
literal 6928
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

literal 0
HcmV?d00001

diff --git a/uni.scss b/uni.scss
index e7ff70d..54e09bf 100644
--- a/uni.scss
+++ b/uni.scss
@@ -1,10 +1,56 @@
 @import '@/uni_modules/uni-scss/variables.scss';
+
+/* 行为基本色 */
+$uni-color-primary: #009688;
+$uni-color-success: #67C23A;
+$uni-color-warning: #F5AC3F;
+$uni-color-error: #F84545;
+$uni-color-info: #6576B7;
+
+/* 文字基本色 */
+$uni-text-color-primary: #009688;
+$uni-text-color-success: #67C23A;
+$uni-text-color-info: #909398;
+$uni-text-color-warning: #F5AC3F;
+$uni-text-color-danger: #FA3758;
+$uni-text-color: #333;
+$uni-text-color-tip: #6E6E6E;
+$uni-text-color-inverse: #fff;
+$uni-text-color-grey: #999999;
+$uni-text-color-placeholder: rgba(255,255,255,0.7);
+$uni-text-color-default: #000000;
 
 /* 文字尺寸 */
 $uni-font-size-sm:24rpx;
 $uni-font-size-base:28rpx;
 $uni-font-size-lg:32rpx;
+
+/* 背景色 */
+$uni-bg-color-default:#060B26;
+$uni-bg-color-primary:#1C2755;
+$uni-bg-color-success:#67C23A;
+$uni-bg-color-warning:#F5AC3F;
+$uni-bg-color-error:#F84545;
+$uni-bg-color-info:#6576B7;
+$uni-bg-color-grey:#CCCCCC;
+$uni-bg-color-whith:#FFFFFF;
+$uni-bg-color-default-dark:rgba(0, 150, 136, 0.5);
+$uni-bg-color-success-dark:rgba(103, 194, 58, 0.25);
+$uni-bg-color-warning-dark:rgba(230, 162, 60, 0.25);
+$uni-bg-color-error-dark:rgba(248, 69, 69, 0.25);
+
+
+/* 边框的颜色 */
+$uni-border-color-primary:#2D3A6F;
+$uni-border-color-default:#131E3B;
+
+
+/* 边框阴影 */
+ $uni-border-shadow-color-default:#999999;
+ $uni-border-shadow-color-white:#ffffff;
+ $uni-border-shadow-color-black:#000000;
 
 /* 透明度 */
-$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+
 
diff --git a/utils/api.js b/utils/api.js
index bb328dd..c273385 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -1,52 +1,54 @@
 import config from './envConfig.js';
 import wf from './public.js'
  
-const request = (url = '', data = {}, header = {   //这里这样封装是为了后续具体组件中使用时可以直接传参,需按此顺序传参；而不需要写url：xxx等键值对传参
-	//具体的header和后端商同后再编写，这里以常见的token为例
+const request = (url = '', data = {}, header = {
 	'Authorization': 'Bearer '+uni.getStorageSync('mes_token') ? 'Bearer '+uni.getStorageSync('mes_token') : '',
 }) => {
 	return new Promise((resolve, reject) => {
-		// console.log(config,800)
 		uni.request({
-			url: config.dev.VITE_BASE_API + url, //接口地址：前缀+方法中传入的地址
-			method: "POST", //请求方法
+			url: config.dev.VITE_BASE_API + url,
+			method: "POST",
 			dataType: "json",
-			data: data, //传递参数
-			header: header, //自定义头部，和后端商同后编写
+			data: data,
+			header: header,
 			success: (res) => {
-				// console.log('request.js文件的通用接口请求封装返回的结果数据',res);
-				//注：因为这里对请求成功的没有统一设置抛错提示，所以后续具体组件中使用接口请求的res除200（实际以后端同事定好的为准）成功外的其他code需要额外写抛错提示
-				if (res.data.code == 'xxx') { //自定请求失败的情况，这里以常见的token失效或过期为例
-					uni.removeStorageSync('token');
+				if (res.data.code == 401){
+					setTimeout( ()=> {
+					 	uni.hideLoading();
+					}, 200);
+					
+				console.log(res.data.code,455)
 					uni.showModal({
 						showCancel: false,
 						title: '温馨提示',
-						content: res.data.msg,
-						// header: {
-						// 	"Token": 'Bearer ' + uni.getStorageSync("mes_token")
-						// },
-						success: function(result) {
+						confirmColor:'#009688',
+						content: res.data.message,
+						success: (result)=> {
 							if (result.confirm) {
-								// uni.reLaunch({
-								// 	url: '/pages/login/index'    //这里需用绝对路径才可
-								// });
+								uni.reLaunch({
+									url: '/pages/login/login'
+								});
+								wf.removeLoginData();
 							}
 						}
 					});
+					console.log(res.data.code,888)
+					
 				}
 				if(res.header.Authorization){
 					uni.removeStorageSync('mes_token');
 					let obj = new Object();
-					let str =String(res.header.Authorization)
+					let str = String(res.header.Authorization)
 					let newStr = str.slice(0, 0) + str.slice(7)
-					obj.mes_token=newStr;
+					obj.mes_token = newStr;
 					uni.setStorageSync("mes_token",obj.mes_token);
 				}
 				
-				resolve(res.data) //成功
+				// 成功的回调
+				if(res.data.code == 200){
+					resolve(res.data)
+				}
 			},
-			// 这里的接口请求，如果出现问题就输出接口请求失败的msg；
-			//注：因为这里对于请求失败的设置统一抛错提示了，所以后续具体组件中使用接口请求的catch中不需要再写抛错提示
 			fail: (err) => {
 				uni.showToast({
 					title: "" + err.msg,
@@ -57,8 +59,7 @@ const request = (url = '', data = {}, header = {   //这里这样封装是为了
 		})
 	})
 }
- const postFuncLoading = (url = '', data = {}, header = {   //这里这样封装是为了后续具体组件中使用时可以直接传参,需按此顺序传参；而不需要写url：xxx等键值对传参
- 	//具体的header和后端商同后再编写，这里以常见的token为例
+ const postFuncLoading = (url = '', data = {}, header = {
  	'Authorization': 'Bearer '+uni.getStorageSync('mes_token') ? 'Bearer '+uni.getStorageSync('mes_token') : '',
  }) => {
 	 uni.showLoading({
@@ -66,7 +67,6 @@ const request = (url = '', data = {}, header = {   //这里这样封装是为了
 	 	mask: true
 	 })
  	return new Promise((resolve, reject) => {
- 		// console.log(config,800)
  		uni.request({
  			url: config.dev.VITE_BASE_API + url, //接口地址：前缀+方法中传入的地址
  			method: "POST", //请求方法
@@ -74,25 +74,21 @@ const request = (url = '', data = {}, header = {   //这里这样封装是为了
  			data: data, //传递参数
  			header: header, //自定义头部，和后端商同后编写
  			success: (res) => {
-				setTimeout(function () {
+				setTimeout( ()=> {
 				 	uni.hideLoading();
-				}, 200);
- 				// console.log('request.js文件的通用接口请求封装返回的结果数据',res);
- 				//注：因为这里对请求成功的没有统一设置抛错提示，所以后续具体组件中使用接口请求的res除200（实际以后端同事定好的为准）成功外的其他code需要额外写抛错提示
- 				if (res.data.code == 'xxx') { //自定请求失败的情况，这里以常见的token失效或过期为例
- 					uni.removeStorageSync('token');
+				}, 200);
+ 				if (res.data.code == 401){
+ 					wf.removeLoginData();
  					uni.showModal({
  						showCancel: false,
- 						title: '温馨提示',
- 						content: res.data.msg,
- 						// header: {
- 						// 	"Token": 'Bearer ' + uni.getStorageSync("mes_token")
- 						// },
- 						success: function(result) {
+ 						title: '温馨提示',
+						confirmColor:'#009688',
+ 						content: res.data.message,
+ 						success: (result)=> {
  							if (result.confirm) {
- 								// uni.reLaunch({
- 								// 	url: '/pages/login/index'    //这里需用绝对路径才可
- 								// });
+ 								uni.reLaunch({
+ 									url: '/pages/login/login'
+ 								});
  							}
  						}
  					});
@@ -100,16 +96,16 @@ const request = (url = '', data = {}, header = {   //这里这样封装是为了
  				if(res.header.Authorization){
  					uni.removeStorageSync('mes_token');
  					let obj = new Object();
- 					let str =String(res.header.Authorization)
+ 					let str = String(res.header.Authorization)
  					let newStr = str.slice(0, 0) + str.slice(7)
- 					obj.mes_token=newStr;
+ 					obj.mes_token = newStr;
  					uni.setStorageSync("mes_token",obj.mes_token);
- 				}
- 				
- 				resolve(res.data) //成功
+ 				}
+				// 成功的回调
+ 				if(res.data.code == 200){
+					resolve(res.data)
+				}
  			},
- 			// 这里的接口请求，如果出现问题就输出接口请求失败的msg；
- 			//注：因为这里对于请求失败的设置统一抛错提示了，所以后续具体组件中使用接口请求的catch中不需要再写抛错提示
  			fail: (err) => {
  				uni.showToast({
  					title: "" + err.msg,
@@ -123,6 +119,5 @@ const request = (url = '', data = {}, header = {   //这里这样封装是为了
 export default {
 	request,
 	postFuncLoading
-	
 };
 
diff --git a/utils/envConfig.js b/utils/envConfig.js
index c4cdf8d..e5af1e9 100644
--- a/utils/envConfig.js
+++ b/utils/envConfig.js
@@ -1,4 +1,3 @@
-// 导出的环境请求地址
 //本地环境
 const dev = {
   ENV: "dev",
@@ -9,13 +8,7 @@ const pro = {
   ENV: "pro",
   VITE_BASE_API: "https://api.dev.dwoodauto.com",
 };
-// //测试环境
-// const test = {
-//   ENV: "test",
-//   VITE_BASE_API: "https://api.dev.dwoodauto.com",
-// };
 export default {
   dev,
-  // test,
   pro,
 };
\ No newline at end of file
diff --git a/utils/public.js b/utils/public.js
index 7d44200..9b8d89e 100644
--- a/utils/public.js
+++ b/utils/public.js
@@ -2,8 +2,14 @@
 const setLoginData=function(obj){
 	uni.setStorageSync("demu_mes_user_name",obj.mes_user_name); 
 	uni.setStorageSync("mes_token",obj.mes_token);
+}
+
+const removeLoginData=function(){
+	uni.removeStorageSync("demu_mes_user_name"); 
+	uni.removeStorageSync("mes_token");
 }
 
 export default {
-	setLoginData
+	setLoginData,
+	removeLoginData
 };
\ No newline at end of file