diff --git a/manifest.json b/manifest.json
index 41fb573..19e7f8b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -130,7 +130,7 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        "appid" : "wxcbff1cfb27c1066c",
+        "appid" : "wxcf0fe8cdba153fd6",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
diff --git a/pageConsumables/addConsumables.vue b/pageConsumables/addConsumables.vue
index a45814b..f15bd26 100644
--- a/pageConsumables/addConsumables.vue
+++ b/pageConsumables/addConsumables.vue
@@ -3,40 +3,40 @@
 		耗材信息
 	</view>
 	<view class="addConsumables">
-		<ul>
-			<li>
+		<view>
+			<view>
 				<view>
 					单位
 				</view>
 				<view>
 					<input type="text" placeholder="请输入单位" v-model="datas.form.conUnit" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					耗材名称
 				</view>
 				<view>
 					<input type="text" placeholder="请输入耗材名称" v-model="datas.form.conName" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					耗材价格
 				</view>
 				<view>
 					<input placeholder="请输入耗材价格" type="number" v-model="datas.form.price" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					预警值
 				</view>
 				<view>
 					<input type="text" placeholder="请输入预警值" v-model="datas.form.conWarning" name="" id="">
 				</view>
-			</li>
-			<li style="justify-content: space-between;">
+			</view>
+			<view style="justify-content: space-between;">
 				<view>
 					耗材类型
 				</view>
@@ -44,8 +44,8 @@
 					{{datas.typelist[datas.nowStatusIndex]}}
 				</view>
 				<uni-icons type="bottom" size="16"></uni-icons>
-			</li>
-		</ul>
+			</view>
+		</view>
 	</view>
 	<view :style="{height:datas.showStatus?statusHeight:0}" class="tranistion status  overflow-hide">
 		<view @tap="changeNowStatusIndex(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between"
@@ -126,8 +126,8 @@
 			})
 			return
 		}
-		console.log(datas.list,'tiaoshi1')
-		console.log(datas.list[datas.nowStatusIndex],'tiaoshi1')
+		console.log(datas.list, 'tiaoshi1')
+		console.log(datas.list[datas.nowStatusIndex], 'tiaoshi1')
 		tbConsInfoAddlist([{
 			...datas.form,
 			shopId: uni.getStorageSync("shopId"),
@@ -146,18 +146,15 @@
 		datas.showStatus = false
 	}
 </script>
-
-<style scoped lang="less">
+<style>
 	page {
 		background-color: #f9f9f9;
 	}
-
-	ul,
-	li {
-		list-style: none;
-		padding: 0;
-	}
-
+	
+</style>
+<style scoped lang="less">
+	
+	 
 	.topTitle {
 		font-weight: 400;
 		font-size: 32rpx;
@@ -174,8 +171,8 @@
 		padding: 1rpx 24rpx;
 		box-sizing: border-box;
 
-		>ul {
-			>li {
+		>view {
+			>view {
 				width: 646rpx;
 				height: 84rpx;
 				background: #fcfcfc;
@@ -203,7 +200,7 @@
 
 	.bottombutton {
 		margin-top: 84rpx;
-
+		padding: 0 24rpx;
 		>button {
 			width: 530rpx;
 			height: 80rpx;
diff --git a/pageConsumables/addType.vue b/pageConsumables/addType.vue
index 2dcc2a8..98460e7 100644
--- a/pageConsumables/addType.vue
+++ b/pageConsumables/addType.vue
@@ -1,19 +1,19 @@
 <template>
-	<ul class="addType">
-		<li v-for="item in datas.list">
+	<view class="addType">
+		<view v-for="item in datas.list">
 			<view class="">
 				{{item.conTypeName}}<up-icon color="#64A7FE" name="edit-pen" @tap="showoneEvent(item)"></up-icon>
 			</view>
 			<view class="">
-				是否启用
-				<up-switch checked="true" :activeValue="1" :inactiveValue="0" @change="switchChangeEvent($event,item)"
-					:modelValue="item.status" style="transform:scale(0.7)" />
+				是否启用 &nbsp;&nbsp;
+				<up-switch checked="true" activeValue="1" size="20" inactiveValue="0"
+					@change="switchChangeEvent($event,item)" :modelValue="item.status" style="transform:scale(0.7)" />
 			</view>
-		</li>
-	</ul>
-	<view class="bottombutton">
-		<up-button type="primary" style="background-color:  #318AFE;color: #fff;margin-top: 100rpx;"
-			@tap="datas.showtwo=true" :plain="true" text="添加"></up-button>
+		</view>
+	</view>
+	<view style="margin-top: 100rpx; padding: 0 28rpx;">
+		<up-button type="primary" style="background-color:  #318AFE;color: #fff;" @tap="datas.showtwo=true"
+			:plain="true" text="添加"></up-button>
 	</view>
 	<!-- 新增类别 -->
 	<up-popup :show="datas.showtwo" :round="18" mode="center" @close="close">
@@ -23,7 +23,7 @@
 				<span>新增类别</span>
 				<up-icon @tap="datas.showtwo=false" name="close-circle-fill"></up-icon>
 			</view>
-			<view class="">
+			<view style="margin-bottom: 28rpx;">
 				耗材类型名称<input type="text" v-model="datas.conTypeName" />
 			</view>
 			<view class="">
@@ -36,13 +36,13 @@
 	</up-popup>
 	<!-- 编辑 -->
 	<up-popup :show="datas.showone" :round="18" mode="center" @close="close">
-		<view class="zhezhaopops" style="height: 466rpx;">
+		<view class="zhezhaopops">
 			<view class="">
 				<span></span>
 				<span>编辑类别</span>
 				<up-icon @tap="datas.showone=false" name="close-circle-fill"></up-icon>
 			</view>
-			<view class="">
+			<view style="margin-bottom: 28rpx;">
 				耗材类型名称<input type="text" v-model="datas.conTypeName" />
 			</view>
 			<up-button text="确认" @tap="confirmone" type="primary" class="buttomStyle" shape="circle"></up-button>
@@ -105,7 +105,7 @@
 	let confirmone = () => {
 		edittbConsTypeput({
 			...datas.activeData,
-			conTypeName:datas.conTypeName
+			conTypeName: datas.conTypeName
 		}).then(res => {
 			gettbConsTypeList()
 			datas.showone = false
@@ -129,7 +129,6 @@
 <style>
 	page {
 		background-color: #f9f9f9;
-		padding: 0 28rpx;
 	}
 </style>
 <style scoped lang="less">
@@ -140,7 +139,9 @@
 	}
 
 	.addType {
-		>li {
+		padding: 0 28rpx;
+
+		>view {
 			height: 104rpx;
 			background: #FFFFFF;
 			border-radius: 10rpx 10rpx 10rpx 10rpx;
@@ -161,7 +162,7 @@
 	.zhezhaopops {
 		padding: 34rpx 32rpx;
 		width: 594rpx;
-		height: 566rpx;
+		// height: 566rpx;
 		background: #FFFFFF;
 		border-radius: 18rpx 18rpx 18rpx 18rpx;
 
diff --git a/pageConsumables/addsupplier.vue b/pageConsumables/addsupplier.vue
index a9f7f0a..3c62c54 100644
--- a/pageConsumables/addsupplier.vue
+++ b/pageConsumables/addsupplier.vue
@@ -1,39 +1,39 @@
 <template>
 	<view class="warehouseEntry">
-		<ul>
-			<li>
+		<view>
+			<view>
 				<view>
 					供应商
 				</view>
 				<view>
 					<input type="text" placeholder="请输入供应商名称" v-model="datas.form.purveyorName" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					联系电话
 				</view>
 				<view>
 					<input type="text" placeholder="请输入联系电话" v-model="datas.form.purveyorTelephone" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					地址
 				</view>
 				<view>
 					<input type="text" placeholder="请输入地址" v-model="datas.form.address" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					备注
 				</view>
 				<view>
 					<input type="text" placeholder="请输入备注" v-model="datas.form.remark" name="" id="">
 				</view>
-			</li>
-		</ul>
+			</view>
+		</view>
 	</view>
 	<view class="bottombutton">
 		<up-button type="primary" style="background-color:  #318AFE;color: #fff;" @tap="sumbit" :plain="true"
@@ -101,8 +101,8 @@
 		padding: 1rpx 24rpx;
 		box-sizing: border-box;
 
-		>ul {
-			>li {
+		>view {
+			>view {
 				height: 84rpx;
 				background: #fcfcfc;
 				border: 2rpx solid #F9F9F9;
@@ -129,7 +129,7 @@
 
 	.bottombutton {
 		margin-top: 84rpx;
-
+		padding: 0 24rpx;
 		>button {
 			width: 530rpx;
 			height: 80rpx;
diff --git a/pageConsumables/editConsumables.vue b/pageConsumables/editConsumables.vue
index 0ac9360..bca1e8a 100644
--- a/pageConsumables/editConsumables.vue
+++ b/pageConsumables/editConsumables.vue
@@ -3,39 +3,39 @@
 		耗材信息
 	</view>
 	<view class="addConsumables">
-		<ul>
-			<li>
+		<view>
+			<view>
 				<view>
 					单位
 				</view>
 				<view>
 					<input type="text" placeholder="请输入单位" v-model="datas.form.conUnit" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					耗材名称
 				</view>
 				<view>
 					<input type="text" placeholder="请输入耗材名称" v-model="datas.form.conName" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					耗材价格
 				</view>
 				<view>
 					<input type="text" placeholder="请输入耗材价格" v-model="datas.form.price" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					预警值
 				</view>
 				<view>
 					<input type="text" placeholder="请输入预警值" v-model="datas.form.conWarning" name="" id="">
 				</view>
-			</li>
+			</view>
 			<!-- <li style="justify-content: space-between;">
 				<view>
 					耗材类型
@@ -45,7 +45,7 @@
 				</view>
 				<uni-icons type="bottom" size="16"></uni-icons>
 			</li> -->
-		</ul>
+		</view>
 	</view>
 	<!-- 	<view :style="{height:datas.showStatus?statusHeight:0}" class="tranistion status  overflow-hide">
 		<view @tap="changeNowStatusIndex(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between"
@@ -156,8 +156,8 @@
 		padding: 1rpx 24rpx;
 		box-sizing: border-box;
 
-		>ul {
-			>li {
+		>view {
+			>view {
 				width: 646rpx;
 				height: 84rpx;
 				background: #fcfcfc;
@@ -185,7 +185,7 @@
 
 	.bottombutton {
 		margin-top: 84rpx;
-
+		padding: 0 24rpx;
 		>button {
 			width: 530rpx;
 			height: 80rpx;
diff --git a/pageConsumables/editsupplier.vue b/pageConsumables/editsupplier.vue
index d60c413..0b5c4f2 100644
--- a/pageConsumables/editsupplier.vue
+++ b/pageConsumables/editsupplier.vue
@@ -1,39 +1,39 @@
 <template>
 	<view class="warehouseEntry">
-		<ul>
-			<li>
+		<view>
+			<view>
 				<view>
 					供应商
 				</view>
 				<view>
 					<input type="text" placeholder="请输入供应商名称" v-model="datas.form.purveyorName" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					联系电话
 				</view>
 				<view>
 					<input type="text" placeholder="请输入联系电话" v-model="datas.form.purveyorTelephone" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					地址
 				</view>
 				<view>
 					<input type="text" placeholder="请输入地址" v-model="datas.form.address" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					备注
 				</view>
 				<view>
 					<input type="text" placeholder="请输入备注" v-model="datas.form.remark" name="" id="">
 				</view>
-			</li>
-		</ul>
+			</view>
+		</view>
 	</view>
 	<view class="bottombutton">
 		<up-button type="primary" style="background-color:  #318AFE;color: #fff;" @tap="sumbit" :plain="true"
@@ -76,22 +76,20 @@
 		})
 	}
 </script>
-
-<style scoped lang="less">
+<style>
 	page {
 		background-color: #f9f9f9;
 	}
+</style>
+<style scoped lang="less">
+
 
 	.df() {
 		display: flex;
 		align-items: center;
 	}
 
-	ul,
-	li {
-		list-style: none;
-		padding: 0;
-	}
+	 
 
 	.status {
 		margin: 0 32rpx;
@@ -111,8 +109,8 @@
 		padding: 1rpx 24rpx;
 		box-sizing: border-box;
 
-		>ul {
-			>li {
+		>view {
+			>view {
 				height: 84rpx;
 				background: #fcfcfc;
 				border: 2rpx solid #F9F9F9;
@@ -139,7 +137,7 @@
 
 	.bottombutton {
 		margin-top: 84rpx;
-
+		padding: 0 24rpx;
 		>button {
 			width: 530rpx;
 			height: 80rpx;
diff --git a/pageConsumables/index.vue b/pageConsumables/index.vue
index da60782..226e90c 100644
--- a/pageConsumables/index.vue
+++ b/pageConsumables/index.vue
@@ -20,8 +20,8 @@
 		<view :style="{height: '14px'}"></view>
 	</view>
 
-	<ul class="ConsumablesConent" v-if="datas.list.length">
-		<li v-for="(item,index) in datas.list" :key="index">
+	<view class="ConsumablesConent" v-if="datas.list.length">
+		<view v-for="(item,index) in datas.list" :key="index">
 			<view>
 				{{item.conName}}
 				<view> {{item.conTypeName}} </view>
@@ -49,14 +49,14 @@
 					所属商品: {{ filtersSproductId(item.productId)}}
 				</view>
 				<view class="">
-					<up-button type="primary" color="#999" @tap="toUrl('PAGES_VIEWRECORDS',{item:JSON.stringify(item)})"
-						:plain="true" text="查看记录"></up-button>
-					<up-button type="primary" @click="toggle(item)" :plain="true" text="更多操作"></up-button>
+					<up-button shape="circle" type="primary" size="mini"   color="#999" @tap="toUrl('PAGES_VIEWRECORDS',{item:JSON.stringify(item)})"
+						:plain="true" text="查看记录"></up-button>&nbsp;&nbsp;
+					<up-button type="primary"    shape="circle" size="mini"  @click="toggle(item)" :plain="true" text="更多操作"></up-button>
 				</view>
 			</view>
-		</li>
-		<li style="background-color: rgba(0,0,0,0); height: 200rpx;"></li>
-	</ul>
+		</view>
+		<view style="background-color: rgba(0,0,0,0); height: 200rpx;"></view>
+	</view>
 	<view v-else style="text-align: center;">
 		<image src="./bg.png" style="width: 325rpx;height: 335rpx;" mode=""></image>
 		<view style="font-size: 28rpx;color: #999;">暂无数据</view>
@@ -254,12 +254,14 @@
 		go.to(url, d)
 	}
 </script>
-
-<style scoped lang="less">
+<style>
 	page {
 		background-color: #f9f9f9;
 	}
-
+	
+</style>
+<style scoped lang="less">
+	
 	ul,
 	li {
 		list-style: none;
@@ -308,7 +310,7 @@
 		background-color: #f9f9f9;
 		padding-top: 1rpx;
 
-		>li {
+		>view {
 			width: 694rpx;
 			height: 332rpx;
 			background: #FFFFFF;
@@ -369,7 +371,7 @@
 						width: 128rpx;
 						height: 48rpx;
 						background: #FFFFFF;
-						border-radius: 28rpx 28rpx 28rpx 28rpx;
+						// border-radius: 28rpx 28rpx 28rpx 28rpx;
 					}
 
 					>button:last-child {
@@ -426,7 +428,7 @@
 		}
 
 		.operate {
-			>li {
+			>view {
 				height: 88rpx;
 				line-height: 88rpx;
 				text-align: center;
diff --git a/pageConsumables/inventoryCheck.vue b/pageConsumables/inventoryCheck.vue
index 421df5a..25009e8 100644
--- a/pageConsumables/inventoryCheck.vue
+++ b/pageConsumables/inventoryCheck.vue
@@ -1,47 +1,47 @@
 <template>
 	<view class="warehouseEntry">
-		<ul>
-			<li>
+		<view>
+			<view>
 				<view>
 					账存数量
 				</view>
 				<view>
 					{{datas.item.balance}}
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					实际数量
 				</view>
 				<view>
 					<input type="text" v-model="datas.form.balance" placeholder="输入数量" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					单价
 				</view>
 				<view>
 					{{datas.item.price}}
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					盈亏数量
 				</view>
 				<view>
 					{{profitNumber}}
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					总盈亏
 				</view>
 				<view>
 					{{profitPrice}}
 				</view>
-			</li>
-		</ul>
+			</view>
+		</view>
 	</view>
 	<view class="bottombutton">
 		<up-button type="primary" style="background-color:  #318AFE;color: #fff;" @tap="toggle" :plain="true"
@@ -96,7 +96,7 @@
 
 	function toggle() {
 		tbConsInfotbConCheck({
-			stockNumber: datas.item.balance,
+			stockNumber: datas.form.balance,
 			conInfoId: datas.form.id,
 			lpNum: profitNumber._value
 		}).then(res => {
@@ -168,8 +168,8 @@
 		padding: 1rpx 24rpx;
 		box-sizing: border-box;
 
-		>ul {
-			>li {
+		>view {
+			>view {
 				width: 646rpx;
 				height: 84rpx;
 				background: #fcfcfc;
@@ -197,7 +197,7 @@
 
 	.bottombutton {
 		margin-top: 84rpx;
-
+		padding: 0 24rpx;
 		>button {
 			width: 530rpx;
 			height: 80rpx;
diff --git a/pageConsumables/outbound.vue b/pageConsumables/outbound.vue
index 0ba2120..0a4a77e 100644
--- a/pageConsumables/outbound.vue
+++ b/pageConsumables/outbound.vue
@@ -1,54 +1,54 @@
 <template>
 	<view class="warehouseEntry">
-		<ul>
-			<li>
+		<view>
+			<view>
 				<view>
 					耗材名称
 				</view>
 				<view>
 					{{datas.item.conName}}
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					现有库存
 				</view>
 				<view>
 					{{datas.item.stockNumber-datas.item.stockConsume}}
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					<text style="color: red;">*</text>出库数量
 				</view>
 				<view>
 					<input type="text" placeholder="请输入数量" v-model="datas.form.list.stockNumber" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					<text style="color: red;">*</text>单价
 				</view>
 				<view>
 					<input type="text" placeholder="请输入单价(元)" v-model="datas.form.list.price" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					应付金额
 				</view>
 				<view>
 					{{datas.form.list.stockNumber*datas.form.list.price|0}}
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					实付金额
 				</view>
 				<view>
 					<input placeholder="请输入现有库存" type="text" v-model="datas.form.actualPayment" />
 				</view>
-			</li>
+			</view>
 			<!-- <li>
 				<view>
 					总价值
@@ -57,7 +57,7 @@
 					<input type="text" placeholder="请输入总价值(元)" name="" id="">
 				</view>
 			</li> -->
-			<li style="justify-content: space-between;">
+			<view style="justify-content: space-between;">
 				<view>
 					供应商
 				</view>
@@ -65,10 +65,11 @@
 					{{datas.status[nowStatusIndex]}}
 				</view>
 				<uni-icons type="bottom" size="16"></uni-icons>
-				<up-button type="text" style="color: #318AFE;width: 64rpx;" @tap="toggle" :plain="true"
-					text="新增"></up-button>
-			</li>
-		</ul>
+				<view style="color: #318AFE;width: 80rpx;text-align: center;" @tap="toggle">
+					新增
+				</view>
+			</view>
+		</view>
 		<view :style="{height:showStatus?statusHeight:0}" class="tranistion status  overflow-hide">
 			<view @tap="changeNowStatusIndex(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between"
 				v-for="(item,index) in datas.status" :key="index">
@@ -160,7 +161,7 @@
 	}
 
 	function sumbit() {
-	
+
 		if (!datas.form.list.stockNumber) {
 			refs.ctx.$refs.uToastRef.show({
 				type: 'default',
@@ -168,7 +169,7 @@
 			})
 			return
 		}
-		if(!datas.form.list.price){
+		if (!datas.form.list.price) {
 			refs.ctx.$refs.uToastRef.show({
 				type: 'default',
 				message: "请输入必填项",
@@ -177,8 +178,8 @@
 		}
 		datas.form.list.conInfoId = props.consId
 		datas.form.list = [datas.form.list]
-		
-		
+
+
 		tbConsInfostockInOut({
 			...datas.form,
 			// 供应商id
@@ -199,18 +200,12 @@
 	}
 </style>
 <style scoped lang="less">
- 
-
 	.df() {
 		display: flex;
 		align-items: center;
 	}
 
-	ul,
-	li {
-		list-style: none;
-		padding: 0;
-	}
+
 
 	.status {
 		margin: 0 32rpx;
@@ -231,8 +226,8 @@
 		padding: 20rpx 24rpx;
 		box-sizing: border-box;
 
-		>ul {
-			>li {
+		>view {
+			>view {
 				width: 646rpx;
 				height: 84rpx;
 				background: #fcfcfc;
@@ -260,6 +255,7 @@
 
 	.bottombutton {
 		margin-top: 84rpx;
+		padding: 0 24rpx;
 
 		>button {
 			width: 530rpx;
diff --git a/pageConsumables/paymentSettlement.vue b/pageConsumables/paymentSettlement.vue
index ac907f2..8885e16 100644
--- a/pageConsumables/paymentSettlement.vue
+++ b/pageConsumables/paymentSettlement.vue
@@ -7,15 +7,15 @@
 			<view class="xian" v-if="v.value==selected "> </view>
 		</view>
 	</view>
-	<ul class="paymentSettlement">
-		<li :style="{color:datas.activeType==0?'#318AFE':''}" @tap="switchType(0)">全部</li>
-		<li :style="{color:datas.activeType==1?'#318AFE':''}" @tap="switchType(1)">进货</li>
-		<li :style="{color:datas.activeType==2?'#318AFE':''}" @tap="switchType(2)">退货</li>
-		<li :style="{color:datas.activeType==3?'#318AFE':''}" @tap="switchType(3)">未支付</li>
-		<li :style="{color:datas.activeType==4?'#318AFE':''}" @tap="switchType(4)">已付款</li>
-	</ul>
-	<ul class="supplier">
-		<li v-for="item in datas.list" :key="item.id">
+	<view class="paymentSettlement">
+		<view :style="{color:datas.activeType==0?'#318AFE':''}" @tap="switchType(0)">全部</view>
+		<view :style="{color:datas.activeType==1?'#318AFE':''}" @tap="switchType(1)">进货</view>
+		<view :style="{color:datas.activeType==2?'#318AFE':''}" @tap="switchType(2)">退货</view>
+		<view :style="{color:datas.activeType==3?'#318AFE':''}" @tap="switchType(3)">未支付</view>
+		<view :style="{color:datas.activeType==4?'#318AFE':''}" @tap="switchType(4)">已付款</view>
+	</view>
+	<view class="supplier">
+		<view v-for="item in datas.list" :key="item.id">
 			<view style="position: relative;">
 
 				<view>
@@ -60,13 +60,20 @@
 				<span>{{dayjs(item.updatedAt).format('YYYY-MM-DD HH:mm:ss')}}</span>
 			</view>
 			<view>
-				<up-button type="primary" style="background-color:  #318AFE;color: #fff;" @tap="datas.PopUp=true;datas.form.id=item.id"
-					:plain="true" text="付款"></up-button>
-				<up-button type="primary" style="width: 200rpx;" @tap="toUrl(item.id)" :plain="true" text="账单付款记录">
+				
+			<!-- 	<up-button shape="circle" type="primary" size="mini"   color="#999" @tap="toUrl('PAGES_VIEWRECORDS',{item:JSON.stringify(item)})"
+						:plain="true" text="查看记录"></up-button>&nbsp;&nbsp;
+					<up-button type="primary"    shape="circle" size="mini"  @click="toggle(item)" :plain="true" text="更多操作"></up-button>
+				
+				 -->
+				
+				<up-button type="primary" size="mini"  shape="circle" style="background-color:  #318AFE;color: #fff;" @tap="datas.PopUp=true;datas.form.id=item.id"
+					:plain="true" text="付款"></up-button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				<up-button type="primary" size="mini"  shape="circle"  style="width: 200rpx;" @tap="toUrl(item.id)" :plain="true" text="账单付款记录">
 				</up-button>
 			</view>
-		</li>
-	</ul>
+		</view>
+	</view>
 	<!-- 取号遮罩层 -->
 	<up-popup :show="datas.PopUp" :round="18" mode="center" @close="close">
 		<view class="zhezhaopops">
@@ -263,18 +270,12 @@
 		}
 	}
 </script>
-
-<style scoped lang="less">
+<style>
 	page {
 		background-color: #f9f9f9;
-	}
-
-	ul,
-	li {
-		list-style: none;
-		padding: 0;
-	}
-
+	} 
+</style>
+<style scoped lang="less">
 	.time-wrapper {
 		display: flex;
 		justify-content: space-around;
@@ -306,7 +307,7 @@
 	}
 
 	.supplier {
-		>li {
+		>view {
 			width: 694rpx;
 			height: 550rpx;
 			background: #FFFFFF;
diff --git a/pageConsumables/supplier.vue b/pageConsumables/supplier.vue
index 999c118..45aee2e 100644
--- a/pageConsumables/supplier.vue
+++ b/pageConsumables/supplier.vue
@@ -1,12 +1,12 @@
 <template>
-	<ul class="supplier">
-		<li v-for="item in  datas.list" :key="item.id">
+	<view class="supplier">
+		<view v-for="item in  datas.list" :key="item.id">
 			<view class="">
 				<view style="display: flex;align-items: center;">
 					<image src="./profile.png" style="width: 64rpx;height: 64rpx;" mode=""></image>
 					<view style="margin-left: 16rpx;">
 						<view style="font-weight: 400;font-size: 28rpx;color: #333333;">
-							{{item.purveyorName}} 
+							{{item.purveyorName}}
 						</view>
 						<text style="color: #999;">{{item.purveyorTelephone}}</text>
 					</view>
@@ -48,14 +48,16 @@
 				<span>{{item.remark}}</span>
 			</view>
 			<view class="">
-				<up-button type="primary" @tap="toUrl('PAGES_EDIT_SUPPLIER',{item:JSON.stringify(item)})" :plain="true"
-					text="编辑">
-				</up-button><up-button type="primary" @tap="deleteEvent(item.id)" :plain="true" text="删除">
-				</up-button><up-button type="primary" style="background-color:  #318AFE;color: #fff;"
+				<up-button type="primary" shape="circle" size="mini"
+					@tap="toUrl('PAGES_EDIT_SUPPLIER',{item:JSON.stringify(item)})" :plain="true" text="编辑">
+				</up-button>&nbsp;&nbsp;&nbsp;&nbsp;<up-button size="mini" shape="circle" type="primary" @tap="deleteEvent(item.id)"
+					:plain="true" text="删除">
+				</up-button>&nbsp;&nbsp;&nbsp;&nbsp;<up-button size="mini" shape="circle" type="primary"
+					style="background-color:  #318AFE;color: #fff;"
 					@tap="toUrl('PAGES_PAYMENT_SETTLEMENT',{id:item.id})" :plain="true" text="结款记录"></up-button>
 			</view>
-		</li>
-	</ul>
+		</view>
+	</view>
 	<view class="bottombutton">
 		<up-button type="primary" style="background-color:  #318AFE;color: #fff;" @tap="toUrl('PAGES_ADD_SUPPLIER')"
 			:plain="true" text="添加供应商"></up-button>
@@ -98,18 +100,17 @@
 		})
 	}
 </script>
-
-<style scoped lang="less">
+<style>
 	page {
 		background-color: #f9f9f9;
-		padding: 28rpx;
-	}
-
-	ul,
-	li {
-		list-style: none;
-		padding: 0;
 	}
+</style>
+<style scoped lang="less">
+	// ul,
+	// li {
+	// 	list-style: none;
+	// 	padding: 0;
+	// }
 
 	.bottombutton {
 		// margin-top: 84rpx;
@@ -117,16 +118,19 @@
 		bottom: 20rpx;
 		left: 50%;
 		transform: translateX(-50%);
+		width: 90%;
 
 		>button {
-			width: 530rpx;
+			// width: 530rpx;
 			height: 80rpx;
 			border-radius: 56rpx 56rpx 56rpx 56rpx;
 		}
 	}
 
 	.supplier {
-		>li {
+		padding: 28rpx;
+
+		>view {
 			width: 694rpx;
 			// height: 604rpx;
 			background: #FFFFFF;
diff --git a/pageConsumables/viewrecords.vue b/pageConsumables/viewrecords.vue
index d333c12..0fb8a60 100644
--- a/pageConsumables/viewrecords.vue
+++ b/pageConsumables/viewrecords.vue
@@ -74,8 +74,8 @@
 			</view>
 		</view>
 	</view>
-	<ul class="viewrecords">
-		<li v-for="item in datas.list" :key="item.id">
+	<view class="viewrecords">
+		<view v-for="item in datas.list" :key="item.id">
 			<view class="">
 				<view class="">
 					{{item.createTime}}
@@ -103,8 +103,8 @@
 					</view>
 				</view>
 			</view>
-		</li>
-	</ul>
+		</view>
+	</view>
 	<datePickerview @confirm="datePickerConfirm" ref="datePicker"></datePickerview>
 </template>
 
@@ -215,11 +215,6 @@
 	}
 </style>
 <style scoped lang="less">
-	ul,
-	li {
-		list-style: none;
-		padding: 0;
-	}
 
 	.viewrecordsType {
 		height: 100rpx;
@@ -255,7 +250,7 @@
 	.viewrecords {
 		padding: 0 28rpx;
 
-		>li {
+		>view {
 			margin-top: 32rpx;
 			width: 694rpx;
 			height: 284rpx;
diff --git a/pageConsumables/warehouseEntry.vue b/pageConsumables/warehouseEntry.vue
index 75d270d..08f5d9b 100644
--- a/pageConsumables/warehouseEntry.vue
+++ b/pageConsumables/warehouseEntry.vue
@@ -1,74 +1,86 @@
 <template>
 	<view class="warehouseEntry">
-		<ul>
-			<li>
+		<view>
+			<view>
 				<view>
 					耗材名称
 				</view>
 				<view>
 					{{datas.item.conName}}
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					现有库存
 				</view>
 				<view>
 					{{datas.item.stockNumber-datas.item.stockConsume}}
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					<text style="color: red;">*</text> 入库数量
 				</view>
 				<view>
 					<input type="number" placeholder="请输入数量" v-model="datas.form.list.stockNumber" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view style="justify-content: space-between;">
+				<view>
+					单位
+				</view>
+				<view style="width: 54%;" @tap="showStatusToggle">
+					{{datas.status[nowStatusIndex]}}
+				</view>
+				<uni-icons type="bottom" size="16"></uni-icons>
+			</view>
+			<view>
 				<view>
 					<text style="color: red;">*</text>单价
 				</view>
 				<view>
 					<input type="number" placeholder="请输入单价(元)" v-model="datas.form.list.price" name="" id="">
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					应付金额
 				</view>
 				<view>
 					{{datas.form.list.stockNumber*datas.form.list.price|0}}
 				</view>
-			</li>
-			<li>
+			</view>
+			<view>
 				<view>
 					实付金额
 				</view>
 				<view>
 					<input placeholder="请输入现有库存" type="text" v-model="datas.form.actualPayment" />
 				</view>
-			</li>
-			<!-- <li>
+			</view>
+			<!-- <view>
 				<view>
 					总价值
 				</view>
 				<view>
 					<input type="text" placeholder="请输入总价值(元)" name="" id="">
 				</view>
-			</li> -->
-			<li style="justify-content: space-between;">
+			</view> -->
+			<view style="justify-content: space-between;">
 				<view>
 					供应商
 				</view>
-				<view style="width: 54%;" @tap="showStatusToggle">
+				<view style="width: 375rpx;" @tap="showStatusToggle">
 					{{datas.status[nowStatusIndex]}}
 				</view>
 				<uni-icons type="bottom" size="16"></uni-icons>
-				<up-button type="text" style="color: #318AFE;width: 64rpx;" @tap="toggle" :plain="true"
-					text="新增"></up-button>
-			</li>
-		</ul>
+				<view style="color: #318AFE;width: 80rpx;text-align: center;"  @tap="toggle">
+					新增
+				</view>
+			<!-- 	<up-button type="text" style="color: #318AFE;"   @tap="toggle" :plain="true"
+					text="新增"></up-button> -->
+			</view>
+		</view>
 		<view :style="{height:showStatus?statusHeight:0}" class="tranistion status  overflow-hide">
 			<view @tap="changeNowStatusIndex(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between"
 				v-for="(item,index) in datas.status" :key="index">
@@ -79,7 +91,7 @@
 		</view>
 	</view>
 	<view class="bottombutton">
-		<up-button type="primary" style="background-color:  #318AFE;color: #fff;" @tap="sumbit" :plain="true"
+		<up-button type="primary" style="background-color:  #318AFE;color: #fff;width: 100%!important;" @tap="sumbit" :plain="true"
 			text="保存"></up-button>
 		<!-- 	<up-button type="text" style="background-color:  #f9f9f9;color: #999;" @tap="toggle" :plain="true"
 			text="取消"></up-button> -->
@@ -202,6 +214,10 @@
 	page {
 		background-color: #f9f9f9;
 	}
+
+	/* .u-button {
+		width: 64rpx!important;
+	} */
 </style>
 <style scoped lang="less">
 	.df() {
@@ -235,8 +251,8 @@
 		padding: 20rpx 24rpx;
 		box-sizing: border-box;
 
-		>ul {
-			>li {
+		>view {
+			>view {
 				width: 646rpx;
 				height: 84rpx;
 				background: #fcfcfc;
@@ -264,6 +280,7 @@
 
 	.bottombutton {
 		margin-top: 84rpx;
+		padding: 0 24rpx;
 
 		>button {
 			width: 530rpx;
diff --git a/pageLineUp/callRecord.vue b/pageLineUp/callRecord.vue
index 9fb0a14..721f89c 100644
--- a/pageLineUp/callRecord.vue
+++ b/pageLineUp/callRecord.vue
@@ -1,6 +1,6 @@
 <template>
-	<ul class="callRecord">
-		<li v-for="item in datas.list" :key="item.id">
+	<view class="callRecord">
+		<view v-for="item in datas.list" :key="item.id">
 			<view>
 				<view>
 					{{item.callNum}}
@@ -30,8 +30,8 @@
 					</view>
 				</view>
 			</view>
-		</li>
-	</ul>
+		</view>
+	</view>
 </template>
 
 <script setup>
@@ -74,7 +74,11 @@
 		})
 	}
 </script>
-
+<style>
+	page {
+		background: #f9f9f9;
+	}
+</style>
 <style scoped lang="less">
 	// * {
 	// 	padding: 0;
@@ -82,9 +86,7 @@
 	// 	text-decoration: none;
 	// 	outline: none;
 	// }
-	page {
-		background: #f9f9f9;
-	}
+
 
 	ul,
 	li {
@@ -96,7 +98,7 @@
 
 	.callRecord {
 
-		>li {
+		>view {
 			width: 694rpx;
 			height: 166rpx;
 			margin: 32rpx 0;
diff --git a/pageLineUp/index.vue b/pageLineUp/index.vue
index d8921eb..f76e29e 100644
--- a/pageLineUp/index.vue
+++ b/pageLineUp/index.vue
@@ -83,7 +83,7 @@
 			<view class="">
 				手机号码
 			</view>
-			<view class="">
+			<view style="margin-bottom: 48rpx;">
 				<input v-model="datas.phone" type="text" placeholder="填写号码" />
 			</view>
 			<up-button text="确认取号" @tap="callTabletakeNumberEvent" type="primary" class="buttomStyle"
@@ -101,7 +101,7 @@
 			<view class="">
 				{{datas.showtowData.callNum}}
 			</view>
-			<view class="">
+			<view style="margin-bottom: 48rpx;">
 				{{datas.showtowData.tableName}} ({{datas.showtowData.tableNote}})
 			</view>
 			<up-button text="确认" @tap="confirmtow" type="primary" class="buttomStyle" shape="circle"></up-button>
@@ -377,7 +377,7 @@
 	.zhezhaopop {
 		padding: 34rpx 32rpx;
 		width: 594rpx;
-		height: 668rpx;
+		// height: 668rpx;
 		background: #FFFFFF;
 		// border-radius: 18rpx 18rpx 18rpx 18rpx;
 
@@ -433,13 +433,12 @@
 	.zhezhaopops {
 		padding: 34rpx 32rpx;
 		width: 594rpx;
-		height: 508rpx;
 		background: #FFFFFF;
 		// border-radius: 18rpx 18rpx 18rpx 18rpx;
 		border-radius: 18rpx 18rpx 18rpx 18rpx;
 
 		>view:first-child {
-
+			border-radius: 18rpx 18rpx 18rpx 18rpx;
 			.df;
 			justify-content: space-between;
 
diff --git a/pageSalesSummary/index.vue b/pageSalesSummary/index.vue
index 51455e3..fa93420 100644
--- a/pageSalesSummary/index.vue
+++ b/pageSalesSummary/index.vue
@@ -59,15 +59,15 @@
 		</view>
 	</view>
 	<view class="table-scroll">
-		<table cellspacing="0">
-			<thead>
+		<!-- 		<table class="table" cellspacing="0">
+			<thead class="thead">
 				<tr style="background-color: #aebad2;color: #fff;" height='41'>
 					<th style="width: 540rpx;">商品名称</th>
 					<th style="width: 215rpx;">总数量</th>
 					<th>金额</th>
 				</tr>
 			</thead>
-			<tbody>
+			<tbody class="tbody">
 				<tr v-for="(item,index) in tableList" :key="item.productId">
 					<td style="width: 500rpx;padding-left: 16rpx;">
 						<image v-if="index==0" src="../pageTable/index/images/1.png" style="width: 22rpx;height: 30rpx;"
@@ -84,6 +84,39 @@
 				</tr>
 			</tbody>
 		</table>
+	 -->
+
+
+		<template>
+			<view class="color-333 u-font-28   bg-gray default-box-padding" style="padding-top:80px;">
+				<scroll-view :scroll-x="true" class="bg-fff table u-text-center">
+					<view class="bg-fff border-r-12  u-flex no-wrap u-col-top">
+						<view class="constantbox">
+							<view class="constantboxitem">
+								<view class="head">商品名称</view>
+								<view class="head">总数量</view>
+								<view class="head">金额</view>
+							</view>
+							<view class="constantboxitem" v-for="(item,index) in tableList" :key="index"
+								@click="toDetail(item)">
+								<view class="head" style="padding-left: 16rpx;">
+									<image v-if="index==0" src="../pageTable/index/images/1.png"
+										style="width: 22rpx;height: 30rpx;" mode=""></image>
+									<image v-else-if="index==1" src="../pageTable/index/images/2.png"
+										style="width: 22rpx;height: 30rpx;" mode=""></image>
+									<image v-else-if="index==2" src="../pageTable/index/images/3.png"
+										style="width: 22rpx;height: 30rpx;" mode=""></image>
+									&nbsp;&nbsp;{{item.productName}}
+								</view>
+								<view class="head">{{item.num}}</view>
+								<view class="head">{{item.salesAmount || '无'}}</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+				<!-- <view style="height: 100px;"></view> -->
+			</view>
+		</template>
 	</view>
 	<view class="bottombtn" @tap="toUrl">
 		更多 <uni-icons type="right" size="16"></uni-icons>
@@ -182,7 +215,7 @@
 	}
 
 	function changeTime(e) {
-	
+
 		selected.value = e
 		if (e == 'custom') {
 			currentInstance.ctx.$refs.datePicker.toggle()
@@ -243,6 +276,71 @@
 		background: #f6f6f6;
 	}
 </style>
+<style lang="scss" scoped>
+
+	.fixed-top {
+		padding: 32rpx 28rpx;
+		z-index: 100;
+	}
+
+	.bottom {
+		background-color: transparent;
+		bottom: 84rpx;
+		left: 28rpx;
+		right: 28rpx;
+	}
+
+	.table {
+		border-radius: 12rpx 12rpx 0rpx 0rpx;
+		overflow: hidden;
+		font-size: 24rpx;
+
+		.constantbox {
+			.constantboxitem {
+				display: flex;
+
+				.head {
+					width: 220rpx;
+					padding: 32rpx 24rpx;
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #333333;
+					overflow: hidden; //超出的文本隐藏
+					text-overflow: ellipsis; //溢出用省略号显示
+					white-space: nowrap; //溢出不换行
+				}
+
+				.head:nth-child(4) {
+					width: 300rpx;
+				}
+
+				.head:nth-child(5) {
+					width: 300rpx;
+				}
+			}
+
+			.constantboxitem:nth-child(even) {
+				background: #fff;
+			}
+
+			.constantboxitem:nth-child(odd) {
+				background: #F7F6FB;
+			}
+
+			.constantboxitem:nth-child(1) {
+				background: #AEBAD2;
+				color: #fff;
+				font-size: 24rpx;
+			}
+		}
+
+		.item:nth-of-type(2n+1) {
+			background-color: rgb(249, 249, 249);
+		}
+	}
+</style>
+
 <style scoped lang="less">
 	.time-wrapper {
 		display: flex;
@@ -309,18 +407,18 @@
 
 	}
 
-	.table-scroll table {
+	.table-scroll .table {
 		table-layout: fixed;
 		// width: calc(100% - 10rpx);
 	}
 
-	.table-scroll thead {
+	.table-scroll .thead {
 		display: table-row;
 		background-color: bisque;
 		font-size: 24rpx;
 	}
 
-	.table-scroll tbody {
+	.table-scroll .tbody {
 		overflow-y: scroll;
 		overflow-x: hidden;
 		display: block;
@@ -329,15 +427,15 @@
 		// width: calc(100% );
 	}
 
-	.table-scroll th,
-	td {
-		height: 82rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		width: 250rpx;
-		// border: 0.7rpx solid red;
-		border: 0.7rpx solid rgba(126, 155, 212, 0.27);
-	}
+	// .table-scroll th,
+	// td {
+	// 	height: 82rpx;
+	// 	overflow: hidden;
+	// 	text-overflow: ellipsis;
+	// 	width: 250rpx;
+	// 	// border: 0.7rpx solid red;
+	// 	border: 0.7rpx solid rgba(126, 155, 212, 0.27);
+	// }
 
 	.bottombtn {
 		width: 694rpx;
@@ -354,4 +452,9 @@
 		display: flex;
 		align-items: center;
 	}
+</style>
+<style>
+	.min-page{
+		height: 20vh;
+	}
 </style>
\ No newline at end of file
diff --git a/pageSalesSummary/productSalesRanking.vue b/pageSalesSummary/productSalesRanking.vue
index 229ccec..a4b1fc9 100644
--- a/pageSalesSummary/productSalesRanking.vue
+++ b/pageSalesSummary/productSalesRanking.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="table-scroll">
+	<!-- <view class="table-scroll">
 		<table cellspacing="0">
 			<thead>
 				<tr style="background-color: #aebad2;color: #fff;" height='41'>
@@ -16,7 +16,29 @@
 				</tr>
 			</tbody>
 		</table>
-	</view>
+	</view> -->
+	<template>
+		<view class="color-333 u-font-28   bg-gray default-box-padding"  >
+			<scroll-view :scroll-x="true" class="bg-fff table u-text-center">
+				<view class="bg-fff border-r-12  u-flex no-wrap u-col-top">
+					<view class="constantbox">
+						<view class="constantboxitem">
+							<view class="head">商品名称</view>
+							<view class="head">总数量</view>
+							<view class="head">金额</view>
+						</view>
+						<view class="constantboxitem" v-for="(item,index) in tableList" :key="index"
+							@click="toDetail(item)">
+							<view class="head">{{item.productName}}</view>
+							<view class="head">{{item.num}}</view>
+							<view class="head">{{item.salesAmount || '无'}}</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+			<!-- <view style="height: 100px;"></view> -->
+		</view>
+	</template>
 </template>
 
 <script setup>
@@ -86,4 +108,68 @@
 		width: 250rpx;
 		border: 0.7rpx solid rgba(126, 155, 212, 0.27);
 	}
-</style>
\ No newline at end of file
+</style>
+<style lang="scss" scoped>
+
+	.fixed-top {
+		padding: 32rpx 28rpx;
+		z-index: 100;
+	}
+
+	.bottom {
+		background-color: transparent;
+		bottom: 84rpx;
+		left: 28rpx;
+		right: 28rpx;
+	}
+
+	.table {
+		border-radius: 12rpx 12rpx 0rpx 0rpx;
+		overflow: hidden;
+		font-size: 24rpx;
+
+		.constantbox {
+			.constantboxitem {
+				display: flex;
+
+				.head {
+					width: 220rpx;
+					padding: 32rpx 24rpx;
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #333333;
+					overflow: hidden; //超出的文本隐藏
+					text-overflow: ellipsis; //溢出用省略号显示
+					white-space: nowrap; //溢出不换行
+				}
+
+				.head:nth-child(4) {
+					width: 300rpx;
+				}
+
+				.head:nth-child(5) {
+					width: 300rpx;
+				}
+			}
+
+			.constantboxitem:nth-child(even) {
+				background: #fff;
+			}
+
+			.constantboxitem:nth-child(odd) {
+				background: #F7F6FB;
+			}
+
+			.constantboxitem:nth-child(1) {
+				background: #AEBAD2;
+				color: #fff;
+				font-size: 24rpx;
+			}
+		}
+
+		.item:nth-of-type(2n+1) {
+			background-color: rgb(249, 249, 249);
+		}
+	}
+</style>
diff --git a/pageUser/index/index.vue b/pageUser/index/index.vue
index 0b821c0..784ca4c 100644
--- a/pageUser/index/index.vue
+++ b/pageUser/index/index.vue
@@ -163,16 +163,16 @@
 				<up-icon @tap="confirm" name="close-circle-fill"></up-icon>
 			</view>
 			<view style="display: flex;align-items: center;padding: 24rpx;">
-				<image v-if="datas.activeUser.headImg" :src="datas.activeUser.headImg"
+				<image v-if="datas.activeUser?datas.activeUser.headImg:''" :src="datas.activeUser.headImg"
 					style="width: 52rpx;height: 52rpx;;background-color: #eee;"></image>
 				<view style="width: 52rpx;height: 52rpx;;background-color: #eee;" v-else>
 				</view>
 				<view style="margin-left: 12rpx;">
 					<view style="font-weight: 400;font-size: 28rpx;color: #333333;">
-						{{datas.activeUser.nickName}}
+						{{datas.activeUser?datas.activeUser.nickName:''}}
 					</view>
 					<view style="font-weight: 400;font-size: 24rpx;color: #999999;">
-						当前余额:{{datas.activeUser.amount}}
+						当前余额:{{datas.activeUser?datas.activeUser.amount:''}}
 					</view>
 				</view>
 			</view>
@@ -238,7 +238,7 @@
 					</view>
 				</view>
 			</view>
-			<up-button text="确认" @tap="callTabletakeNumberEvent" type="primary" class="buttomStyle"
+			<up-button text="确认" @tap="callTabletakeNumberEvent"  type="primary" class="buttomStyle"
 				shape="circle"></up-button>
 		</view>
 	</up-popup>
@@ -718,7 +718,7 @@
 
 		.zhezhaopopfour {
 			margin-top: 32rpx;
-
+			margin-bottom: 48rpx;
 			>view:nth-child(2) {
 				margin-top: 24rpx;
 				display: flex;
@@ -750,6 +750,9 @@
 			margin-top: 48rpx;
 			width: 506rpx;
 			height: 80rpx;
+			/*#ifdef MP*/
+			padding-top: 48rpx;
+			/*#endif*/
 		}
 	}
 
diff --git a/pages/index/components/statistics.vue b/pages/index/components/statistics.vue
index 89414d2..d853223 100644
--- a/pages/index/components/statistics.vue
+++ b/pages/index/components/statistics.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="statistics">
 		<view class="statisticsBox">
-
 			<view class="time-wrapper">
 				<view v-for="(v, i) in timeList" :key="i" class="timelistbox">
 					<view class="time-item" @tap="changeTime(v.value)" :class="{ 'time-selected':v.value==selected }">
@@ -13,10 +12,10 @@
 
 			<ul class="payList">
 				<li v-for="item in list" :key="item.id">
-					<view class="">
+					<view style="text-align: center;">
 						{{item.payType}}
 					</view>
-					<view class="">
+					<view style="text-align: center;">
 						{{item.payAmount}}
 					</view>
 				</li>
@@ -37,7 +36,7 @@
 	} from 'vue';
 	import datePickerview from './my-date-pickerview.vue'
 	import {
-		onLoad
+		onShow
 	} from '@dcloudio/uni-app';
 	let selected = ref('today')
 	let list = ref()
@@ -63,7 +62,7 @@
 		}
 	]
 	const currentInstance = getCurrentInstance()
-	onLoad((options) => {
+	onShow((options) => {
 		getlist()
 	});
 
@@ -99,7 +98,7 @@
 			endTime,
 		}).then((res) => {
 			list.value = res.sale.payCount.slice(0, 4)
-			emit('totalRevenue',res.sale.incomeAmountAll)
+			emit('totalRevenue', res.sale.incomeAmountAll)
 		})
 	}
 
@@ -192,7 +191,7 @@
 
 			.payList {
 				display: flex;
-				// justify-content: space-around;
+				justify-content: space-around;
 				align-items: center;
 				flex-wrap: wrap;
 				margin-top: 32rpx;