From 0fba0d9a6a81b2e4555128a77985eb89e2cf7125 Mon Sep 17 00:00:00 2001
From: youkehai <youkehai@darryring.com>
Date: Mon, 25 Sep 2023 11:31:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=AF=B9=E9=BD=90=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF-=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=A7=94=E6=B4=BE?=
 =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpm/processInstance/detail/TaskDelegateForm.vue    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/bpm/processInstance/detail/TaskDelegateForm.vue b/src/views/bpm/processInstance/detail/TaskDelegateForm.vue
index 99c6cc7e..dc757a0c 100644
--- a/src/views/bpm/processInstance/detail/TaskDelegateForm.vue
+++ b/src/views/bpm/processInstance/detail/TaskDelegateForm.vue
@@ -7,8 +7,8 @@
       :rules="formRules"
       label-width="110px"
     >
-      <el-form-item label="接收人" prop="receiveId">
-        <el-select v-model="formData.receiveId" clearable style="width: 100%">
+      <el-form-item label="接收人" prop="delegateUserId">
+        <el-select v-model="formData.delegateUserId" clearable style="width: 100%">
           <el-option
             v-for="item in userList"
             :key="item.id"
@@ -37,10 +37,10 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中
 const formData = ref({
   id: '',
-  receiveId: undefined
+  delegateUserId: undefined
 })
 const formRules = ref({
-  receiveId: [{ required: true, message: '接收人不能为空', trigger: 'change' }]
+  delegateUserId: [{ required: true, message: '接收人不能为空', trigger: 'change' }]
 })
 
 const formRef = ref() // 表单 Ref
@@ -79,7 +79,7 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: '',
-    receiveId: undefined
+    delegateUserId: undefined
   }
   formRef.value?.resetFields()
 }

From c6031ba2b21d14c4a15c106dc6f0bb66fbbbc967 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 27 Sep 2023 23:30:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20user=20detail=20?=
 =?UTF-8?q?=E7=9A=84=20todo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/member/user/detail/UserAccountInfo.vue | 2 +-
 src/views/member/user/detail/index.vue           | 3 +++
 src/views/member/user/index.vue                  | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/member/user/detail/UserAccountInfo.vue b/src/views/member/user/detail/UserAccountInfo.vue
index fff4b6b0..3a609fe0 100644
--- a/src/views/member/user/detail/UserAccountInfo.vue
+++ b/src/views/member/user/detail/UserAccountInfo.vue
@@ -24,7 +24,7 @@
       </template>
       {{ user.totalPoint || 0 }}
     </el-descriptions-item>
-    <!-- TODO 芋艿：后续接入余额、支付金额 -->
+    <!-- TODO @疯狂：从 wallet 读取下对应字段 -->
     <el-descriptions-item>
       <template #label>
         <descriptions-item-label label=" 当前余额 " icon="svg-icon:member_balance" />
diff --git a/src/views/member/user/detail/index.vue b/src/views/member/user/detail/index.vue
index d9fa844e..432b002d 100644
--- a/src/views/member/user/detail/index.vue
+++ b/src/views/member/user/detail/index.vue
@@ -39,6 +39,7 @@
           <el-tab-pane label="成长值" name="experience" lazy>
             <UserExperienceRecordList :user-id="id"
           /></el-tab-pane>
+          <!-- TODO @jason：增加一个余额变化； -->
           <el-tab-pane label="余额" name="fourth">余额(WIP)</el-tab-pane>
           <el-tab-pane label="收货地址" name="address" lazy>
             <UserAddressList :user-id="id" />
@@ -48,7 +49,9 @@
           </el-tab-pane>
           <el-tab-pane label="售后管理" name="fourth">售后管理(WIP)</el-tab-pane>
           <el-tab-pane label="收藏记录" name="fourth">收藏记录(WIP)</el-tab-pane>
+          <!-- TODO @疯狂：优惠劵的读取 -->
           <el-tab-pane label="优惠劵" name="fourth">优惠劵(WIP)</el-tab-pane>
+          <!-- TODO @疯狂：增加获得分校用户；直接查询出所有；需要体现出是一级还是二级；用户编号、昵称、级别、绑定时间 -->
         </el-tabs>
       </el-card>
     </el-row>
diff --git a/src/views/member/user/index.vue b/src/views/member/user/index.vue
index 8350f743..10ff8863 100644
--- a/src/views/member/user/index.vue
+++ b/src/views/member/user/index.vue
@@ -128,6 +128,8 @@
           >
             编辑
           </el-button>
+          <!-- todo @jason：增加一个【修改余额】 -->
+          <!-- todo @疯狂：增加一个【修改积分】，表单是：radio 增加/减少；input 具体的变化积分 -->
           <!-- todo 放到更多菜单中 -->
           <el-button
             link