From dabc0af7b1f4583767d7ce30872a7a9652ec5c36 Mon Sep 17 00:00:00 2001
From: JasonChen <jason@192.168.3.101>
Date: Tue, 1 Aug 2023 17:49:22 +0800
Subject: [PATCH] merge

---
 src/api/user.js                                  | 16 ++++++++++++++++
 src/views/user/Index.vue                         | 12 ++++--------
 .../user/widgets/{AddRole.vue => AddUser.vue}    | 16 ++++++----------
 src/views/user/widgets/EditInvite.vue            | 13 ++++++-------
 4 files changed, 32 insertions(+), 25 deletions(-)
 rename src/views/user/widgets/{AddRole.vue => AddUser.vue} (84%)

diff --git a/src/api/user.js b/src/api/user.js
index 65b511c..6792b16 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -8,3 +8,19 @@ export function getMiddlesUser (parameter) {
     params: parameter
   })
 }
+//  添加用户
+export function addMiddlesUser (parameter) {
+  return request({
+    url: '/middles/user/add_user',
+    method: 'post',
+    params: parameter
+  })
+}
+//  更新推荐人
+export function editMiddlesUser (parameter) {
+  return request({
+    url: '/middles/user/change_parent/' + parameter.user_id,
+    method: 'post',
+    params: parameter
+  })
+}
diff --git a/src/views/user/Index.vue b/src/views/user/Index.vue
index 39f9d75..8c3dbca 100644
--- a/src/views/user/Index.vue
+++ b/src/views/user/Index.vue
@@ -38,7 +38,7 @@
         ref="table"
         :columns="columns"
         :data="loadData"
-        :rowKey="(row) => row.user_id"
+        :rowKey="(row) => row.user.user_id"
         showPagination="auto"
         bordered
         size="default"
@@ -70,7 +70,7 @@ import DeriveButton from '@/components/OrderDetailInfo/DeriveButton'
 import moment from 'moment'
 import { getMiddlesUser } from '@/api/user'
 import EditInvite from './widgets/EditInvite.vue'
-import AddRole from './widgets/AddRole.vue'
+import AddUser from './widgets/AddUser.vue'
 
 // 列表规格
 const columns = [
@@ -190,7 +190,6 @@ export default {
     },
     // 新增用户
     onAddRole () {
-      console.log('add....')
       const success = {
         title: '新增用户',
         width: 600,
@@ -200,11 +199,10 @@ export default {
         cancelText: '取消'
       }
       this.$dialog(
-        AddRole,
+        AddUser,
         {
           on: {
             ok: () => {
-              console.log('成功了。。')
               this.$refs.table.loadData()
             }
           }
@@ -212,9 +210,8 @@ export default {
         success
       )
     },
-    // 修改用户
+    // 更改推荐人
     onEdit (item) {
-      console.log(item)
       const success = {
         title: '更改推荐人',
         width: 600,
@@ -229,7 +226,6 @@ export default {
           item,
           on: {
             ok: () => {
-              console.log('成功了。。')
               this.$refs.table.loadData()
             }
           }
diff --git a/src/views/user/widgets/AddRole.vue b/src/views/user/widgets/AddUser.vue
similarity index 84%
rename from src/views/user/widgets/AddRole.vue
rename to src/views/user/widgets/AddUser.vue
index 1e8d7db..86232c5 100644
--- a/src/views/user/widgets/AddRole.vue
+++ b/src/views/user/widgets/AddUser.vue
@@ -9,7 +9,7 @@
     <a-form-item label="用户手机">
       <a-input
         v-decorator="[
-          'phone',
+          'mobile_no',
           {
             rules: [
               { required: true, message: `请添加用户手机!`, type: 'string' },
@@ -35,7 +35,7 @@
     <a-form-item label="推荐人信息">
       <a-input
         v-decorator="[
-          'invite',
+          'parent_mobile',
           {
             rules: [
               { required: true, message: `请添加推荐人手机号!`, type: 'string' },
@@ -49,9 +49,9 @@
 </template>
 
 <script>
-import { changeStatusTwo } from '@/api/organization'
+import { addMiddlesUser } from '@/api/user'
 export default {
-  name: 'AddRole',
+  name: 'AddUser',
   data: () => ({
     formItemLayout: {
       labelCol: { span: 6 },
@@ -68,14 +68,10 @@ export default {
         this.form.validateFields((errors, values) => {
           console.log(values)
           if (!errors) {
-            console.log(values)
-            const params = {
-              status: values.status
-            }
-            changeStatusTwo(this.item.order_item_id, params).then((res) => {
+            addMiddlesUser(values).then((res) => {
               this.$notification.success({
                 message: '成功',
-                description: '修改成功'
+                description: '新增成功'
               })
               resolve(true)
             }).catch((err) => {
diff --git a/src/views/user/widgets/EditInvite.vue b/src/views/user/widgets/EditInvite.vue
index d9d85cc..3cc4d86 100644
--- a/src/views/user/widgets/EditInvite.vue
+++ b/src/views/user/widgets/EditInvite.vue
@@ -9,7 +9,7 @@
     <a-form-item label="推荐人信息" style="padding-top:30px;">
       <a-input
         v-decorator="[
-          'name',
+          'parent_mobile',
           {
             rules: [
               { required: true, message: `请输入推荐人信息!`, type: 'string' },
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import { changeStatusTwo } from '@/api/organization'
+import { editMiddlesUser } from '@/api/user'
 export default {
   name: 'EditRole',
   props: {
@@ -48,16 +48,15 @@ export default {
     onOk () {
       return new Promise(resolve => {
         this.form.validateFields((errors, values) => {
-          console.log(values)
           if (!errors) {
-            console.log(values)
             const params = {
-              status: values.status
+              user_id: this.item.user.user_id,
+              parent_mobile: values.parent_mobile
             }
-            changeStatusTwo(this.item.order_item_id, params).then((res) => {
+            editMiddlesUser(params).then((res) => {
               this.$notification.success({
                 message: '成功',
-                description: '修改成功'
+                description: '修改推荐人成功'
               })
               resolve(true)
             }).catch((err) => {