diff --git a/pageConsumables/editsupplier.vue b/pageConsumables/editsupplier.vue
index 0b5c4f2..e7bae30 100644
--- a/pageConsumables/editsupplier.vue
+++ b/pageConsumables/editsupplier.vue
@@ -72,7 +72,8 @@
 
 			...datas.form
 		}).then(res => {
-			go.to('PAGES_SUPPLIER')
+			// go.to('PAGES_SUPPLIER')
+			go.back()
 		})
 	}
 </script>
diff --git a/pageConsumables/supplier.vue b/pageConsumables/supplier.vue
index 61884e1..54a6f11 100644
--- a/pageConsumables/supplier.vue
+++ b/pageConsumables/supplier.vue
@@ -58,7 +58,7 @@
 						@tap="toUrl('PAGES_PAYMENT_SETTLEMENT',{id:item.id})" :plain="true" text="结款记录"></up-button>
 				</view>
 			</view>
-			<view style="height: 200rpx;"> </view>
+			<view style="height: 200rpx;background-color: #f9f9f9;"> </view>
 		</template>
 		<view v-else style="text-align: center;background-color: #f9f9f9;">暂无数据</view>
 	</view>
diff --git a/pageUser/add-user/add-user.vue b/pageUser/add-user/add-user.vue
index 90bec2d..325fe8c 100644
--- a/pageUser/add-user/add-user.vue
+++ b/pageUser/add-user/add-user.vue
@@ -5,11 +5,11 @@
 				<uni-forms :model="userForm" :rules="rules" err-show-type="toast" validateTrigger="submit" ref="form"
 					:border="true" label-position="top" label-width="350">
 					<view class="block">
-						<uni-forms-item label="用户名" required name="nickName">
+						<uni-forms-item label="用户名" required  >
 							<uni-easyinput paddingNone :placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
 								v-model="userForm.nickName" placeholder="填写用户名" />
 						</uni-forms-item>
-						<uni-forms-item label="手机号" required name="phone">
+						<uni-forms-item label="手机号" required >
 							<uni-easyinput paddingNone :placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
 								v-model="userForm.phone" placeholder="填写号码" />
 						</uni-forms-item>
@@ -20,7 +20,7 @@
 						
 						</uni-forms-item> -->
 
-						<uni-forms-item label="生日" required name="birthDay">
+						<uni-forms-item label="生日" required >
 							<view style="display: none;">
 								<uni-easyinput paddingNone :inputBorder="inputBorder" v-model="userForm.birthDay"
 									placeholder="选择日期" />
@@ -34,7 +34,7 @@
 							</picker>
 						</uni-forms-item>
 
-						<uni-forms-item label="性别" required name="birthDay">
+						<uni-forms-item label="性别" required >
 							<radio-group class="u-flex u-flex-wrap" @change="sizeChange($event,'sex')">
 								<label class="radio u-m-r-60">
 									<radio value="1" :checked="userForm.sex == '1'" class="scale7" />
@@ -109,6 +109,9 @@
 	const inputBorder = ref(false)
 	const form = ref(null)
 	const bottom = ref(null)
+	const props = defineProps({
+		item:{type:''}
+	})
 	//表单验证
 	const rules = {
 		nickName: {
@@ -199,8 +202,8 @@
 
 
 	onLoad(params => {
-		if (params.item) {
-			let items = JSON.parse(params.item)
+		if (params.id) {
+			let items = params
 			uni.setNavigationBarTitle({
 				title: '编辑用户'
 			})
diff --git a/pageUser/index/components/user.vue b/pageUser/index/components/user.vue
index ee6e0e8..64fbe6f 100644
--- a/pageUser/index/components/user.vue
+++ b/pageUser/index/components/user.vue
@@ -10,7 +10,7 @@
 					<view class="color-000 font-bold">{{data.nickName}}</view>
 					<image style="width: 24rpx;height: 24rpx;" v-if="data.sex=='男'" src="./men.png" mode=""></image>
 					<image style="width: 24rpx;height: 24rpx;" v-if="data.sex=='女'" src="./women.png" mode=""></image>
-					<view class="color-999 u-m-l-40" @click="remark">备注</view>
+					<!-- <view class="color-999 u-m-l-40" @click="remark">备注</view> -->
 				</view>
 			<!-- 	<view class="u-m-t-6 u-flex u-row-between">
 					<view class="vip isvip" v-if="data.isVip">会员</view>
diff --git a/pageUser/index/index.vue b/pageUser/index/index.vue
index 719625d..f3c503b 100644
--- a/pageUser/index/index.vue
+++ b/pageUser/index/index.vue
@@ -229,7 +229,7 @@
 			</view>
 			<view class="zhezhaopopfour">
 				<view style="font-weight: 400;font-size: 28rpx;color: #333333;">
-					
+
 				</view>
 				<view class="">
 					<input type="number" v-model="datas.form.amount" placeholder="请输入金额" />
@@ -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>
@@ -275,7 +275,8 @@
 	let datas = reactive({
 		show: false,
 		form: {
-			operationType: 'in'
+			operationType: 'in',
+			type: 'inMoney'
 		},
 		activeUser: null
 	})
@@ -295,6 +296,7 @@
 			...datas.form
 		})
 		datas.show = false;
+		close()
 		getUser()
 	}
 	const remarModelData = reactive({
@@ -306,6 +308,13 @@
 
 	function sizeChange(e, name) {
 		datas.form[name] = e.detail.value
+		if (name == 'operationType') {
+			if (datas.form.operationType == 'in') {
+				datas.form.type = 'inMoney'
+			} else {
+				datas.form.type = 'consumeOut'
+			}
+		}
 	}
 	const goodsStockModel = ref(null)
 
@@ -333,9 +342,7 @@
 		} else if (i == 1) {
 			hasPermission('允许管理会员信息').then(ele => {
 				if (ele) {
-					go.to('PAGES_USER_ADD', {
-						item: JSON.stringify(datas.activeUser)
-					})
+					go.to('PAGES_USER_ADD', datas.activeUser)
 				}
 			})
 		}
@@ -719,6 +726,7 @@
 		.zhezhaopopfour {
 			margin-top: 32rpx;
 			margin-bottom: 48rpx;
+
 			>view:nth-child(2) {
 				margin-top: 24rpx;
 				display: flex;