From 1a7886450d2f469f76be646c223c290e620b8e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9A=E5=95=A6C=E6=A2=A6?= <15709267061@163.com>
Date: Wed, 30 Apr 2025 16:43:52 +0800
Subject: [PATCH] update

---
 src/api/merchant.js                           |  49 ++++-
 src/assets/images/avatar.png                  | Bin 0 -> 3540 bytes
 src/components/LayoutHeader/index.vue         |   6 +-
 src/components/VerificationCode/index.vue     |   8 +-
 src/components/upload/UploadSlot.vue          |  31 +++
 src/pages/login/Forgot.vue                    |   6 +-
 src/pages/login/Login.vue                     |   1 +
 src/pages/login/Register.vue                  |   1 +
 .../AddWithdrawalInformationModal.vue         |   1 +
 .../personal-center/account-settings.vue      | 180 +++++++++++++++---
 .../pages/personal-center/credit-score.vue    |   4 +-
 .../pages/task-center/look-min-task.vue       |  23 ++-
 .../pages/task-center/reward-mission.vue      |   7 +-
 src/utils/index.js                            |  12 +-
 14 files changed, 276 insertions(+), 53 deletions(-)
 create mode 100644 src/assets/images/avatar.png
 create mode 100644 src/components/upload/UploadSlot.vue

diff --git a/src/api/merchant.js b/src/api/merchant.js
index 9da3b66..76976cc 100644
--- a/src/api/merchant.js
+++ b/src/api/merchant.js
@@ -2,11 +2,14 @@ import request from "../utils/request.js";
 import Method from "./Method.js";
 
 const merchant = {
-    sendSms: async (mobile) => {
+    sendSms: async (mobile, type) => {
         return request({
             url: '/index/login/sendSms',
             method: Method.POST,
-            data: {mobile},
+            data: {
+                mobile,
+                type
+            },
         });
     },
     register: async (data) => {
@@ -166,6 +169,48 @@ const merchant = {
             data: data
         });
     },
+    saveNickname: async (data) => {
+        return request({
+            url: '/index/business/saveNickname',
+            method: Method.POST,
+            data: data
+        });
+    },
+    saveMobile: async (data) => {
+        return request({
+            url: '/index/business/saveMobile',
+            method: Method.POST,
+            data: data
+        });
+    },
+    saveWechat: async (data) => {
+        return request({
+            url: '/index/business/saveWechat',
+            method: Method.POST,
+            data: data
+        });
+    },
+    savePassword: async (data) => {
+        return request({
+            url: '/index/business/savePassword',
+            method: Method.POST,
+            data: data
+        });
+    },
+    saveAvatar: async (data) => {
+        return request({
+            url: '/index/business/saveAvatar',
+            method: Method.POST,
+            data: data
+        });
+    },
+    getTaskChildrenList: async (data) => {
+        return request({
+            url: '/index/task/getTaskChildrenList',
+            method: Method.POST,
+            data: data
+        });
+    },
 }
 
 export default merchant;
diff --git a/src/assets/images/avatar.png b/src/assets/images/avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..083f50b82faecf436306e4327733debac9e22b84
GIT binary patch
literal 3540
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
O0000<MNUMnLSTYYE&c%j

literal 0
HcmV?d00001

diff --git a/src/components/LayoutHeader/index.vue b/src/components/LayoutHeader/index.vue
index 392c5a8..0298da6 100644
--- a/src/components/LayoutHeader/index.vue
+++ b/src/components/LayoutHeader/index.vue
@@ -3,7 +3,7 @@ import {useSystemStore} from "../../pinia/SystemStore/index.js";
 import {useUserStore} from "../../pinia/UserStore/index.js";
 
 const SystemStore = useSystemStore();
-const {logout} = useUserStore();
+const UserStore = useUserStore();
 </script>
 
 <template>
@@ -16,11 +16,11 @@ const {logout} = useUserStore();
             <a-dropdown>
                 <a-link
                     :hoverable="false">
-                    15709267061
+                    {{ UserStore.userInfo.nickname || UserStore.userInfo.mobile }}
                     <icon-down/>
                 </a-link>
                 <template #content>
-                    <a-doption @click="logout">退出登陆</a-doption>
+                    <a-doption @click="UserStore.logout">退出登陆</a-doption>
                 </template>
             </a-dropdown>
         </div>
diff --git a/src/components/VerificationCode/index.vue b/src/components/VerificationCode/index.vue
index 1ccaca4..2d042e0 100644
--- a/src/components/VerificationCode/index.vue
+++ b/src/components/VerificationCode/index.vue
@@ -4,11 +4,15 @@ import {Message, Notification} from "@arco-design/web-vue";
 import Api from "../../api/index.js";
 
 const verificationCode = defineModel('verificationCode', {type: String});
-const {mobile, api} = defineProps({
+const {mobile, api, type} = defineProps({
     mobile: {
         type: String,
         default: null,
     },
+    type: {
+        type: Number,
+        default: null,
+    },
     api: {
         type: Function,
         default: Api.admin.sendSms
@@ -21,7 +25,7 @@ let timer = null;
 const verifyPhone = async () => {
     if (/^1[3-9]\d{9}$/.test(mobile)) {
         if (timer === null) {
-            const {msg, code} = await api(mobile);
+            const {msg, code} = await api(mobile, type);
             if (code === 1) Message.success(msg);
             time.value = 10;
             timer = setInterval(() => {
diff --git a/src/components/upload/UploadSlot.vue b/src/components/upload/UploadSlot.vue
new file mode 100644
index 0000000..288512e
--- /dev/null
+++ b/src/components/upload/UploadSlot.vue
@@ -0,0 +1,31 @@
+<script setup>
+import Api from "../../api/index.js";
+
+const emits = defineEmits(['success']);
+
+const upload = (e) => {
+    const file = e.target.files[0];
+    Api.system.uploadFile2(file).then(({data}) => {
+        emits('success', data);
+    });
+}
+
+const createInput = () => {
+    const input = document.createElement('input');
+    input.type = 'file';
+    input.onchange = upload;
+    input.style.display = 'none';
+    document.body.append(input);
+    input.click();
+}
+</script>
+
+<template>
+    <div @click="createInput">
+        <slot></slot>
+    </div>
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/pages/login/Forgot.vue b/src/pages/login/Forgot.vue
index c2a7b31..fa49a4c 100644
--- a/src/pages/login/Forgot.vue
+++ b/src/pages/login/Forgot.vue
@@ -1,6 +1,7 @@
 <script setup>
-import {ref, reactive} from 'vue';
+import {reactive} from 'vue';
 import VerificationCode from "../../components/VerificationCode/index.vue";
+import Api from "../../api/index.js";
 
 const from = reactive({
     phone: null,
@@ -19,6 +20,8 @@ const from = reactive({
                 </a-form-item>
                 <a-form-item>
                     <VerificationCode
+                        :type="3"
+                        :api="Api.merchant.sendSms"
                         :phone="from.phone"
                         v-model:verification-code="from.verificationCode">
                     </VerificationCode>
@@ -37,6 +40,7 @@ const from = reactive({
 <style scoped>
 .card {
     box-shadow: 0 8px 20px 0 rgba(0, 0, 0, 0.1);
+
     :deep(.arco-form-item-label-col) {
         line-height: 20px;
     }
diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue
index baea0f2..fe5a190 100644
--- a/src/pages/login/Login.vue
+++ b/src/pages/login/Login.vue
@@ -31,6 +31,7 @@ const mode = ref(MODE.PHONE);
         <div class="mt-[38px] flex flex-col gap-[20px]">
             <a-input v-model:model-value="from.mobile" placeholder="手机号"></a-input>
             <VerificationCode
+                :type="2"
                 v-if="mode === MODE.PHONE"
                 :mobile="from.mobile"
                 v-model:verification-code="from.code">
diff --git a/src/pages/login/Register.vue b/src/pages/login/Register.vue
index c757977..cfc128e 100644
--- a/src/pages/login/Register.vue
+++ b/src/pages/login/Register.vue
@@ -31,6 +31,7 @@ const register = async () => {
                 </a-form-item>
                 <a-form-item label="验证码">
                     <VerificationCode
+                        :type="1"
                         :api="Api.merchant.sendSms"
                         :mobile="from.mobile"
                         v-model:verification-code="from.captcha">
diff --git a/src/pages/merchant/components/AddWithdrawalInformationModal.vue b/src/pages/merchant/components/AddWithdrawalInformationModal.vue
index eb0d420..4379302 100644
--- a/src/pages/merchant/components/AddWithdrawalInformationModal.vue
+++ b/src/pages/merchant/components/AddWithdrawalInformationModal.vue
@@ -63,6 +63,7 @@ const success = async () => {
                     </a-form-item>
                     <a-form-item label="验证码">
                         <VerificationCode
+                            :type="6"
                             :api="Api.merchant.sendSms"
                             :mobile="form.mobile"
                             v-model:verification-code="form.captcha">
diff --git a/src/pages/merchant/pages/personal-center/account-settings.vue b/src/pages/merchant/pages/personal-center/account-settings.vue
index d5dfd94..05cbac5 100644
--- a/src/pages/merchant/pages/personal-center/account-settings.vue
+++ b/src/pages/merchant/pages/personal-center/account-settings.vue
@@ -1,10 +1,104 @@
 <script setup>
-import {reactive, ref} from "vue";
+import ICON from "../../../../assets/images/avatar.png";
+import {onMounted, reactive, ref} from "vue";
+import Api from "../../../../api/index.js";
+import {baseImage} from "../../../../utils/index.js";
+import {Message} from "@arco-design/web-vue";
+import {useUserStore} from "../../../../pinia/UserStore/index.js";
+import VerificationCode from "../../../../components/VerificationCode/index.vue";
+import UploadSlot from "../../../../components/upload/UploadSlot.vue";
 
+const UserStore = useUserStore();
 const activeKey = ref('1');
-const form = reactive({
-    name: null
+const vo = reactive({
+    avatar: null,
+    nickname: null,
+    wechat: null,
+    mobile: null,
+    uid: null,
+    invite: null,
+    password: null,
 });
+const form = reactive({
+    avatar: null,
+    nickname: null,
+    wechat: null,
+    mobile: null,
+    uid: null,
+    invite: null,
+    captcha: null,
+    password: null,
+    old_mobile: null,
+    new_mobile: null,
+    old_captcha: null,
+    new_captcha: null,
+});
+
+const getData = async () => {
+    const {data} = await Api.merchant.getBusinessInfo();
+    Object.assign(vo, data);
+    Object.assign(UserStore.userInfo, vo);
+    form.old_mobile = vo.mobile;
+    vo.password = '********';
+}
+
+const saveNickname = async () => {
+    const {msg} = await Api.merchant.saveNickname({
+        nickname: form.nickname,
+    });
+    form.nickname = null;
+    Message.success(msg);
+    await getData();
+}
+
+const saveMobile = async () => {
+    const {msg} = await Api.merchant.saveMobile({
+        old_mobile: form.old_mobile,
+        new_mobile: form.new_mobile,
+        old_captcha: form.old_captcha,
+        new_captcha: form.new_captcha,
+    });
+    form.old_mobile = null;
+    form.new_mobile = null;
+    form.old_captcha = null;
+    form.new_captcha = null;
+    Message.success(msg);
+    await getData();
+}
+
+const savePassword = async () => {
+    const {msg} = await Api.merchant.savePassword({
+        mobile: form.mobile,
+        captcha: form.captcha,
+        password: form.password,
+    });
+    form.mobile = null;
+    form.captcha = null;
+    form.password = null;
+    Message.success(msg);
+    await getData();
+}
+
+const saveWechat = async () => {
+    const {msg} = await Api.merchant.saveWechat({
+        wechat: form.wechat
+    });
+    form.wechat = null;
+    Message.success(msg);
+    await getData();
+}
+
+const updateAvatar = async (url) => {
+    const {msg} = await Api.merchant.saveAvatar({
+        avatar: url,
+    });
+    Message.success(msg);
+    await getData();
+}
+
+onMounted(() => {
+    getData();
+})
 </script>
 
 <template>
@@ -16,33 +110,38 @@ const form = reactive({
     </div>
 
     <div class="mock-card mb-[20px] py-[30px] flex items-center gap-[60px]">
-        <div class="w-[100px] h-[100px] test rounded-[50%]">
-            <img class="w-full h-full rounded-[50%] object-cover" src="" alt=""/>
+        <div class="w-[100px] h-[100px] rounded-[50%] relative">
+            <div class="!size-full rounded-[50%] overflow-hidden cursor-pointer">
+                <a-image width="100%" height="100%" :src="baseImage(vo.avatar)"></a-image>
+            </div>
+            <UploadSlot @success="updateAvatar">
+                <img class="!size-[30px] absolute right-0 bottom-0 cursor-pointer" :src="ICON" alt=""/>
+            </UploadSlot>
         </div>
 
-        <a-descriptions align="right">
-            <a-descriptions-item label="昵称" :span="2">
-                王力群ABCabc
+        <a-descriptions align="right" id="descriptions">
+            <a-descriptions-item label="昵称" :span="1">
+                {{ vo.nickname }}
                 <a-link :hoverable="false" class="ml-[20px]" @click="activeKey='1'">更改</a-link>
             </a-descriptions-item>
             <a-descriptions-item label="微信号" :span="2">
-                luoluo347
+                {{ vo.wechat }}
                 <a-link :hoverable="false" class="ml-[20px]" @click="activeKey='4'">更改</a-link>
             </a-descriptions-item>
-            <a-descriptions-item label="手机绑定" :span="2">
-                15012312300
+            <a-descriptions-item label="手机绑定" :span="1">
+                {{ vo.mobile }}
                 <a-link :hoverable="false" class="ml-[20px]" @click="activeKey='2'">更改</a-link>
             </a-descriptions-item>
             <a-descriptions-item label="ID" :span="2">
-                S1560
+                {{ vo.uid }}
                 <a-link :hoverable="false" class="ml-[20px]">复制</a-link>
             </a-descriptions-item>
-            <a-descriptions-item label="账号密码" :span="2">
-                ********
+            <a-descriptions-item label="账号密码" :span="1">
+                {{ vo.password }}
                 <a-link :hoverable="false" class="ml-[20px]" @click="activeKey='3'">更改</a-link>
             </a-descriptions-item>
             <a-descriptions-item label="邀请码" :span="2">
-                734783
+                {{ vo.invite }}
                 <a-link :hoverable="false" class="ml-[20px]">复制</a-link>
             </a-descriptions-item>
         </a-descriptions>
@@ -57,52 +156,67 @@ const form = reactive({
                 type="rounded">
                 <a-tab-pane title="更改昵称" key="1">
                     <a-form-item label="新昵称">
-                        <a-input v-model:model-value="form.name" placeholder="请输入新昵称"></a-input>
+                        <a-input v-model:model-value="form.nickname" placeholder="请输入新昵称"></a-input>
                     </a-form-item>
                     <a-form-item class="mt-[40px]">
-                        <a-button type="primary">确认更改</a-button>
+                        <a-button type="primary" @click="saveNickname">确认更改</a-button>
                     </a-form-item>
                 </a-tab-pane>
 
                 <a-tab-pane title="手机绑定" key="2">
                     <a-form-item label="原手机号">
-                        <a-input v-model:model-value="form.name" placeholder="请输入原手机号"></a-input>
+                        <a-input v-model:model-value="form.old_mobile" placeholder="请输入原手机号" disabled></a-input>
                     </a-form-item>
                     <a-form-item label="验证码">
-                        <a-input v-model:model-value="form.name" placeholder="请输入验证码"></a-input>
+                        <VerificationCode
+                            :type="4"
+                            :api="Api.merchant.sendSms"
+                            :mobile="form.old_mobile"
+                            v-model:verification-code="form.old_captcha">
+                        </VerificationCode>
                     </a-form-item>
                     <a-form-item label="新手机号">
-                        <a-input v-model:model-value="form.name" placeholder="请输入新手机号"></a-input>
+                        <a-input v-model:model-value="form.new_mobile" placeholder="请输入新手机号"></a-input>
                     </a-form-item>
                     <a-form-item label="验证码">
-                        <a-input v-model:model-value="form.name" placeholder="请输入验证码"></a-input>
+                        <VerificationCode
+                            :type="5"
+                            :api="Api.merchant.sendSms"
+                            :mobile="form.new_mobile"
+                            v-model:verification-code="form.new_captcha">
+                        </VerificationCode>
                     </a-form-item>
                     <a-form-item class="mt-[40px]">
-                        <a-button type="primary">确认更改</a-button>
+                        <a-button type="primary" @click="saveMobile">确认更改</a-button>
                     </a-form-item>
                 </a-tab-pane>
 
                 <a-tab-pane title="账号密码" key="3">
                     <a-form-item label="手机号">
-                        <a-input v-model:model-value="form.name" placeholder="请输入手机号"></a-input>
+                        <a-input v-model:model-value="form.mobile" placeholder="请输入手机号"></a-input>
                     </a-form-item>
                     <a-form-item label="验证码">
-                        <a-input v-model:model-value="form.name" placeholder="请输入验证码"></a-input>
+                        <VerificationCode
+                            :type="3"
+                            :api="Api.merchant.sendSms"
+                            :mobile="form.mobile"
+                            v-model:verification-code="form.captcha">
+                        </VerificationCode>
                     </a-form-item>
                     <a-form-item label="新密码">
-                        <a-input v-model:model-value="form.name" placeholder="请输入新密码"></a-input>
+                        <a-input v-model:model-value="form.password" placeholder="请输入新密码"></a-input>
                     </a-form-item>
                     <a-form-item class="mt-[40px]">
-                        <a-button type="primary">确认更改</a-button>
+                        <a-button type="primary" @click="savePassword">确认更改</a-button>
                     </a-form-item>
                 </a-tab-pane>
 
                 <a-tab-pane title="微信号" key="4">
                     <a-form-item label="微信号">
-                        <a-input v-model:model-value="form.name" placeholder="请输入微信号"></a-input>
+                        <a-input v-model:model-value="form.wechat" placeholder="请输入微信号"></a-input>
                     </a-form-item>
                     <a-form-item class="mt-[40px]">
-                        <a-button type="primary">确认更改</a-button>
+                        <a-button type="primary" @click="saveWechat">确认更改</a-button>
                     </a-form-item>
                 </a-tab-pane>
             </a-tabs>
@@ -110,6 +224,12 @@ const form = reactive({
     </a-card>
 </template>
 
-<style scoped>
-
+<style lang="scss" scoped>
+#descriptions {
+    :deep(.arco-descriptions-row) {
+        td:nth-child(3) {
+            padding-left: 100px;
+        }
+    }
+}
 </style>
diff --git a/src/pages/merchant/pages/personal-center/credit-score.vue b/src/pages/merchant/pages/personal-center/credit-score.vue
index 3f40c2a..c98d613 100644
--- a/src/pages/merchant/pages/personal-center/credit-score.vue
+++ b/src/pages/merchant/pages/personal-center/credit-score.vue
@@ -41,7 +41,7 @@ const po = reactive({
     wd: null,
 });
 
-const {loading, pagination, initFetchData} = useTableQuery({
+const {loading, pagination, fetchData} = useTableQuery({
     parameter: po,
     api: Api.system.getData,
     callback: (data) => {
@@ -60,7 +60,7 @@ const {loading, pagination, initFetchData} = useTableQuery({
     </div>
 
     <a-card>
-        <div class="title">动账明细</div>
+        <div class="title">分值变动记录</div>
 
         <a-table
             @page-change="(e) => pagination.current = e"
diff --git a/src/pages/merchant/pages/task-center/look-min-task.vue b/src/pages/merchant/pages/task-center/look-min-task.vue
index a1023ce..8c6ae4f 100644
--- a/src/pages/merchant/pages/task-center/look-min-task.vue
+++ b/src/pages/merchant/pages/task-center/look-min-task.vue
@@ -6,11 +6,13 @@ import Api from "../../../../api/index.js";
 import RefuseModal from "./components/RefuseModal.vue";
 import openTerminateTask from "../../../../components/TerminateTask/TerminateTask.js";
 import BlackjackExpertModal from "../../components/BlackjackExpertModal.vue";
+import {useRoute} from "vue-router";
 
+const route = useRoute();
 const columns = [
     {
         title: '子任务号',
-        dataIndex: 'key',
+        dataIndex: 'uid',
     },
     {
         title: '子任务状态',
@@ -69,12 +71,13 @@ const vo = reactive({
     total: 0,
 });
 const po = reactive({
+    id: route.query.id,
     wd: null,
 });
 
-const {loading, pagination, initFetchData} = useTableQuery({
+const {loading, pagination} = useTableQuery({
     parameter: po,
-    api: Api.system.getData,
+    api: Api.merchant.getTaskChildrenList,
     callback: (data) => {
         Object.assign(vo, data);
         console.log(vo);
@@ -107,12 +110,14 @@ const {loading, pagination, initFetchData} = useTableQuery({
                 :loading="loading"
                 :columns="columns"
                 class="w-full mt-[20px]">
-                <template v-slot:status>
-                    <a-tag color="green">已领取</a-tag>
-                    <a-tag color="red">请重新上传素材</a-tag>
-                    <a-tag color="orangered">素材审核中</a-tag>
-                    <a-tag color="gray">待领取</a-tag>
-                    <a-tag color="arcoblue">已终止</a-tag>
+                <template v-slot:status="{record}">
+                    <a-tag v-if="record.status === 0" color="red">待上传素材</a-tag>
+                    <a-tag v-if="record.status === 1" color="orangered">素材审核中</a-tag>
+                    <a-tag v-if="record.status === 2" color="orangered">重新上传素材</a-tag>
+                    <a-tag v-if="record.status === 3" color="gray">待领取</a-tag>
+                    <a-tag v-if="record.status === 4" color="green">已领取</a-tag>
+                    <a-tag v-if="record.status === 5" color="green">已结算</a-tag>
+                    <a-tag v-if="record.status === 6" color="arcoblue">已终止</a-tag>
                 </template>
 
                 <template v-slot:action>
diff --git a/src/pages/merchant/pages/task-center/reward-mission.vue b/src/pages/merchant/pages/task-center/reward-mission.vue
index 9fe9348..25e1421 100644
--- a/src/pages/merchant/pages/task-center/reward-mission.vue
+++ b/src/pages/merchant/pages/task-center/reward-mission.vue
@@ -5,6 +5,7 @@ import TooltipTag from "../../../../components/TooltipTag/index.vue";
 import useTableQuery from "../../../../hooks/useTableQuery.js";
 import Api from "../../../../api/index.js";
 import {toPath} from "../../../../utils/index.js";
+import {Message} from "@arco-design/web-vue";
 
 const columns = [
     {
@@ -162,10 +163,12 @@ const {loading, pagination, initFetchData} = useTableQuery({
                         </a-progress>
                     </div>
                 </template>
-                <template v-slot:action>
+                <template v-slot:action="{record}">
                     <div class="flex gap-[16px]">
                         <a-link :hoverable="false">编辑</a-link>
-                        <a-link :hoverable="false" @click="toPath('/home/task-center/look-min-task')">查看子任务
+                        <a-link :hoverable="false"
+                                @click="record.status >= 2 ? toPath('/home/task-center/look-min-task', {id: record.id}) : Message.warning('审核未通过')">
+                            查看子任务
                         </a-link>
                         <a-link :hoverable="false" status="danger">终止</a-link>
                     </div>
diff --git a/src/utils/index.js b/src/utils/index.js
index 32ec61f..bf7f77d 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,7 +1,10 @@
 import router from "../router/index.js";
 
-export const toPath = (path) => {
-    router.push(path).then();
+export const toPath = (path, query = {}) => {
+    router.push({
+        path: path,
+        query: query
+    }).then();
 }
 
 export const VITE_TINYMCE_KEY = () => {
@@ -13,3 +16,8 @@ export const deleteObjectFields = (obj) => {
         delete obj[key];
     });
 }
+
+export const baseImage = (url) => {
+    if (!url) url = '';
+    return url.startsWith('http') ? url : import.meta.env.VITE_API_URL + url;
+}