update

src/api/merchant.js

@@ -26,6 +26,13 @@ const merchant = {
             data: data,
         });
     },
+    phoneLogin: async (data) => {
+        return request({
+            url: '/index/login/smsLogin',
+            method: Method.POST,
+            data: data,
+        });
+    },
     getMenu: async (data) => {
         return request({
             url: '/index/business/getMenu',
@@ -596,6 +603,23 @@ const merchant = {
             data: data
         });
     },
+    againWithdrawal: async (data) => {
+        return request({
+            url: '/index/business/againWithdrawal',
+            method: Method.POST,
+            data: data
+        });
+    },
+    checkOrder: async (data) => {
+        return request({
+            url: '/index/business/checkOrder',
+            method: Method.POST,
+            data: data,
+            headers: {
+                message: true,
+            }
+        });
+    },
 }
 
 export default merchant;

src/components/Pay/Alipay.vue

@@ -1,5 +1,5 @@
 <script setup>
-import {reactive, ref} from "vue";
+import {reactive, ref, watch} from "vue";
 import {Message} from "@arco-design/web-vue";
 import Api from "../../api/index.ts";
 import {QrcodeCanvas} from "qrcode.vue";
@@ -10,6 +10,8 @@ const {money} = defineProps({
         default: null
     }
 });
+const successShow = ref(false);
+let timer = null;
 const visible = ref(false);
 const qrInfo = reactive({});
 const open = () => {
@@ -20,13 +22,41 @@ const open = () => {
     visible.value = true;
     initQR();
 }
+let orderData = null;
+const checkOrder = (flag) => {
+    Api.merchant.checkOrder({
+        sn: qrInfo.out_trade_no,
+    }).then(({code}) => {
+        if (code === 1) {
+            Message.success('支付成功');
+            successShow.value = true;
+            clearInterval(timer);
+        }
+    }).catch(() => {
+        if (flag) {
+            Message.warning('未检测到支付');
+        }
+    })
+}
 
 const initQR = async () => {
+    clearInterval(timer);
     const {data: {data}} = await Api.merchant.rechargeOrderQR({
         money: money,
     });
     Object.assign(qrInfo, data);
+    timer = setInterval(() => {
+        checkOrder();
+    }, 1000);
 }
+
+watch(
+    () => visible.value,
+    (val) => {
+        if (!val) clearInterval(timer);
+    },
+    {deep: true}
+)
 </script>
 
 <template>
@@ -41,7 +71,7 @@ const initQR = async () => {
         title-align="start"
         title="支付宝支付"
         v-model:visible="visible">
-        <template v-if="true">
+        <template v-if="!successShow">
             <a-alert>平台提示：支付后未出现成功提示，点击【我已支付】刷新充值状态</a-alert>
 
             <div class="py-[24px] px-[20px]">
@@ -57,7 +87,7 @@ const initQR = async () => {
                         <icon-sync class="mr-[5px]"/>
                         点击刷新
                     </a-link>
-                    <a-button class="mx-auto mt-[20px]" type="primary">我已支付</a-button>
+                    <a-button class="mx-auto mt-[20px]" type="primary" @click="checkOrder(true)">我已支付</a-button>
                 </div>
 
                 <div class="mt-[20px] info mb-[40px]">
@@ -72,11 +102,11 @@ const initQR = async () => {
             <div class="py-[24px] px-[20px]">
                 <a-result status="success" title="充值成功">
                     <template #subtitle>
-                        支付宝付款￥200.00
+                        支付宝付款￥{{ money }}
                     </template>
                     <template #extra>
                         <a-space>
-                            <a-button type='primary'>确定</a-button>
+                            <a-button type='primary' @click="visible=false">确定</a-button>
                         </a-space>
                     </template>
                 </a-result>

src/components/VerificationCode/index.vue

@@ -1,6 +1,6 @@
 <script setup>
 import {defineModel, defineProps, ref} from 'vue';
-import {Message, Notification} from "@arco-design/web-vue";
+import {Message} from "@arco-design/web-vue";
 import Api from "../../api/index.js";
 
 const verificationCode = defineModel('verificationCode', {type: String});
@@ -40,7 +40,7 @@ const verifyPhone = async () => {
         }
         return true;
     } else {
-        Notification.error({
+        Message.warning({
             title: '手机号错误',
             content: '请检查后重新输入'
         });

src/pages/login/Login.vue

@@ -15,7 +15,7 @@ const MODE = {
 const from = reactive({
     mobile: '17502997128',
     code: null,
-    password: '123456',
+    password: '654321',
 });
 
 const mode = ref(MODE.PHONE);
@@ -56,7 +56,7 @@ const loginSYS = (isRoot, form) => {
                 :mobile="from.mobile"
                 v-model:verification-code="from.code">
             </VerificationCode>
-            <a-input v-else v-model:model-value="from.password" placeholder="密码">
+            <a-input v-else v-model:model-value="from.password" placeholder="密码" type="password">
                 <template #append>
                     <a-link @click="toPath('/loginSYS/forgot')" :hoverable="false">忘记密码?</a-link>
                 </template>

src/pages/login/Register.vue

@@ -41,6 +41,7 @@ const register = async () => {
         } else {
             const {msg} = await Api.merchant.register(form);
             Message.success(msg);
+            toPath('/loginSYS/login');
         }
     });
 }

src/pages/manage-materials/manage-materials.vue

@@ -61,6 +61,7 @@ const columns = computed(() => {
             title: '评论',
             dataIndex: 'pl',
             slotName: 'pl',
+            hidden: vo.rows[0].is_comment !== 1
         },
     ].filter(v => !v.hidden)
 });

src/pages/manage/pages/fund/payment-management.vue

@@ -116,12 +116,15 @@ const {loading, pagination, initFetchData, fetchData} = useTableQuery({
 });
 
 const withdrawallogTranfer = async (item) => {
+    try {
         const {msg} = await Api.admin.withdrawallogTranfer({
             id: item.id
         });
         Message.success(msg);
+    } catch (_e) {
         await fetchData();
     }
+}
 
 const changeWithdrawalLogAddRemark = async (content, item) => {
     const {msg} = await Api.admin.withdrawalLogAddRemark({

src/pages/merchant/components/AddWithdrawalInformationModal.vue

@@ -1,8 +1,13 @@
 <script setup>
+import TS_ICON1 from "../../../assets/images/ts1.png";
+import TS_ICON2 from "../../../assets/images/ts2.png";
+import TS_ICON3 from "../../../assets/images/ts3.png";
+import TS_ICON4 from "../../../assets/images/ts4.png";
 import {reactive, ref, useTemplateRef, watch} from 'vue';
 import Api from "../../../api/index.js";
 import VerificationCode from "../../../components/VerificationCode/index.vue";
 import {Message} from "@arco-design/web-vue";
+import {useUserStore} from "../../../pinia/UserStore/index.js";
 
 const {id} = defineProps({
     id: {
@@ -10,6 +15,8 @@ const {id} = defineProps({
         default: null,
     }
 });
+const UserStore = useUserStore();
+const showPreview = ref(false);
 const visible = ref(false);
 const emits = defineEmits(['success']);
 const formRef = useTemplateRef('formRef');
@@ -20,7 +27,7 @@ const state = reactive({
 const form = reactive({
     type: 1,
     id: null,
-    mobile: null,
+    mobile: UserStore.userInfo.mobile,
     captcha: null,
     realname: null,
     id_card: null,
@@ -130,6 +137,7 @@ const success = () => {
         @cancel="visible = false"
         :visible="visible">
         <a-form
+            layout="vertical"
             ref="formRef"
             :model="form"
             :rules="rules">
@@ -138,14 +146,23 @@ const success = () => {
                     <a-form-item label="收款姓名" field="realname">
                         <a-input v-model:model-value="form.realname" placeholder="请输入收款人的姓名"></a-input>
                     </a-form-item>
-                    <a-form-item label="支付宝账号" field="account">
+                    <a-form-item field="account">
+                        <template v-slot:label>
+                            <div class="flex justify-between items-center flex-grow">
+                                <div>支付宝账号</div>
+                                <a-link :hoverable="false" @click="showPreview=true">
+                                    <icon-question-circle/>
+                                    提示
+                                </a-link>
+                            </div>
+                        </template>
                         <a-input v-model:model-value="form.account" placeholder="请输入支付宝账号"></a-input>
                     </a-form-item>
                     <a-form-item label="身份证号" field="id_card">
                         <a-input v-model:model-value="form.id_card" placeholder="请输入身份证号"></a-input>
                     </a-form-item>
                     <a-form-item label="手机号" field="mobile">
-                        <a-input v-model:model-value="form.mobile" placeholder="请输入手机号"></a-input>
+                        <a-input v-model:model-value="form.mobile" disabled placeholder="请输入手机号"></a-input>
                     </a-form-item>
                     <a-form-item label="验证码" field="captcha">
                         <VerificationCode
@@ -173,8 +190,16 @@ const success = () => {
             </a-tabs>
         </a-form>
     </a-modal>
+
+    <a-image-preview-group
+        infinite
+        :srcList="[TS_ICON1, TS_ICON2, TS_ICON3, TS_ICON4]"
+        v-model:visible="showPreview"/>
 </template>
 
-<style scoped>
+<style lang="scss">
-
+.arco-form-item-label {
+    display: flex;
+    flex-grow: 1;
+}
 </style>

src/pages/merchant/pages/my-wallet/components/Reflect.vue

@@ -63,7 +63,7 @@ onMounted(() => {
                                 <img class="w-[15px] h-[15px] object-cover" :src="v.type === 1 ? ZFBICON : YHKICON"
                                      alt=""/>
                                 <div class="ml-[14px]">{{ v.type_text }}</div>
-                                <div class="ml-[12px] mr-auto">{{ v.mobile }}</div>
+                                <div class="ml-[12px] mr-auto">{{ v.account }}</div>
 
                                 <AddWithdrawalInformationModal :id="v.id" @success="getData">
                                     <icon-edit class="cursor-pointer"/>

src/pages/merchant/pages/my-wallet/components/WithdrawAgain.vue

@@ -0,0 +1,66 @@
+<script setup>
+import XSelect from "../../../../../components/XSelect/index.vue";
+import {reactive, ref} from "vue";
+import Api from "../../../../../api/index.js";
+import {debounce} from "lodash";
+import {Message} from "@arco-design/web-vue";
+
+const emits = defineEmits(['success']);
+const props = defineProps({
+    id: {
+        type: Number,
+        default: null,
+    }
+});
+const show = ref(false);
+const getSelect = async () => {
+    const {data} = await Api.merchant.getWithdrawalList();
+    return {
+        data: data.map(v => ({
+            ...v,
+            id: v.id,
+            name: `(${v.type_text}) ${v.mobile}`
+        }))
+    }
+}
+const form = reactive({
+    account_id: null,
+});
+
+const success = debounce(async () => {
+    const {msg} = await Api.merchant.againWithdrawal({
+        id: props.id,
+        ...form,
+    });
+    Message.success(msg);
+    emits('success');
+})
+</script>
+
+<template>
+    <div @click="show=true" class="cursor-pointer">
+        <icon-question-circle style="color: rgb(var(--red-6));"/>
+    </div>
+
+    <a-modal
+        simple
+        :width="500"
+        title="提现失败"
+        title-align="center"
+        v-model:visible="show">
+        <div class="mb-4">
+            请修改您的提现信息，确保所有信息都归属同一个自然人，修改完后，在下方选择正确的提现信息，点击下方按钮，重新发起提现
+        </div>
+        <x-select :api="getSelect" v-model:model-value="form.account_id"></x-select>
+        <template v-slot:footer>
+            <div class="flex gap-3 justify-center">
+                <a-button @click="show=false">取消</a-button>
+                <a-button type="primary" status="warning" @click="success">重新提现</a-button>
+            </div>
+        </template>
+    </a-modal>
+</template>
+
+<style scoped lang="scss">
+
+</style>

src/pages/merchant/pages/my-wallet/wallet-overview.vue

@@ -4,6 +4,7 @@ import Reflect from "./components/Reflect.vue";
 import {onMounted, reactive, ref} from "vue";
 import useTableQuery from "../../../../hooks/useTableQuery.js";
 import Api from "../../../../api/index.js";
+import WithdrawAgain from "./components/WithdrawAgain.vue";
 
 const activeKey = ref('Recharge');
 const columns = [
@@ -111,7 +112,12 @@ const {loading, pagination, initFetchData} = useTableQuery({
     }
 });
 
-const {loading: loading2, pagination: pagination2, initFetchData: initFetchData2} = useTableQuery({
+const {
+    loading: loading2,
+    pagination: pagination2,
+    initFetchData: initFetchData2,
+    fetchData: fetchData2
+} = useTableQuery({
     parameter: po2,
     api: Api.merchant.getWithdrawalLog,
     callback: (data) => {
@@ -207,7 +213,9 @@ onMounted(() => {
                     <div v-if="record.status===2" class="status success">{{ record.status_text }}</div>
                     <div v-if="record.status===0" class="status primary">{{ record.status_text }}</div>
                     <div v-if="record.status===1" class="status warning">{{ record.status_text }}</div>
-                    <div v-if="record.status===-1" class="status danger">{{ record.status_text }}</div>
+                    <div v-if="record.status===-1" class="status danger">{{ record.status_text }}
+                        <WithdrawAgain @success="fetchData2" :id="record.id"></WithdrawAgain>
+                    </div>
                 </template>
                 <template v-slot:dzyt>
                     余额提现

src/pages/merchant/pages/task-center/components/PreviewTaskMaterialModal.vue

@@ -157,12 +157,6 @@ const update = async () => {
 
         <template #footer>
             <div class="flex items-center gap-[8px]">
-                <!--                <a-checkbox-group>-->
-                <!--                    <template v-for="(item, index) in detail.content" :key="item">-->
-                <!--                        <a-checkbox v-show="activeKey === index" :value="item">选中</a-checkbox>-->
-                <!--                    </template>-->
-                <!--                </a-checkbox-group>-->
-
                 <template v-if="detail.check_status === 0">
                     <a-button @click="passTaskChildren" type="primary" class="ml-auto">通过
                     </a-button>

src/pages/merchant/pages/task-center/components/new-task-2.vue

@@ -56,7 +56,7 @@ const success = async () => {
                 </XSelect>
             </a-form-item>
 
-            <a-form-item label="每次素材是否相同" field="is_identical">
+            <a-form-item label="每次素材是否相同" field="is_identical" v-if="form.fb_num!==1">
                 <a-radio-group v-model:model-value="form.is_identical">
                     <a-radio :value="1">相同</a-radio>
                     <a-radio :value="0">不同</a-radio>
@@ -65,8 +65,9 @@ const success = async () => {
 
             <a-form-item label="每次发布间隔时长" field="duration" v-if="form.fb_num > 1">
                 <XSelect
+                    allow-clear
                     v-model:model-value="form.duration"
-                    placeholder="无要求"
+                    placeholder="不选则为无要求"
                     :init="true"
                     :api="Api.merchant.getPublicationDuration">
                 </XSelect>

src/pages/merchant/pages/task-center/components/new-task-6.vue

@@ -43,6 +43,10 @@ const success = async () => {
     });
 }
 
+const openPage = () => {
+    window.open('https://www.baidu.com');
+}
+
 onMounted(() => {
     Api.merchant.getSettlementAfter().then(({data}) => {
         settltment_after_list.length = 0;
@@ -130,7 +134,8 @@ onMounted(() => {
                                         信用分是规范达人行为，确保其维护商家利益的强制手段。
                                         信用分过低，将影响达人参加任务、提现、邀请好友等多项核心功能的使用
                                     </div>
-                                    <div class="text-[#165DFF] text-[12px] cursor-pointer">
+                                    <div class="text-[#165DFF] text-[12px] cursor-pointer"
+                                         @click="openPage">
                                         查看达人信用分管理详情
                                         <icon-double-right/>
                                     </div>

src/pinia/UserStore/index.js

@@ -22,8 +22,8 @@ export const useUserStore = defineStore("UserStore", () => {
             }
         } else { // 商户
             if (form.code) {
-                // const {data: _data} = await Api.admin.phoneLogin(form);
+                const {data: _data} = await Api.merchant.phoneLogin(form);
-                // Object.assign(data, _data);
+                Object.assign(data, _data);
             } else {
                 const {data: _data} = await Api.merchant.login(form);
                 Object.assign(data, _data);

src/utils/request.js

@@ -51,7 +51,9 @@ request.interceptors.response.use((response) => {
         logout();
     }
     if (code !== 1) {
+        if (!response.config.headers.message) {
             Message.error(msg);
+        }
         return Promise.reject(msg);
     }