Merge remote-tracking branch 'origin/main'

src/stores/OrderStore.js

@@ -79,7 +79,7 @@ export const useOrderStore = create(devtools((set, get) => ({
     formData.append('coli_id', formValues.orderNumber)
     formData.append('wlemail', formValues.notifyEmail)
     formData.append('ordertype', formValues.orderType)
-    formData.append('opisn', 29)
+    formData.append('opisn', formValues.userId)
     formData.append('paytype', 'SYT')
     formData.append('wxzh', 'cht')
     formData.append('fq', 0)
@@ -89,7 +89,6 @@ export const useOrderStore = create(devtools((set, get) => ({
     return postForm(`${API_HOST}/generate_payment_links`, formData)
       .then(json => {
         if (json.errcode === 0) {
-          console.info(json)
           return json.result
         } else {
           throw new Error(json?.errmsg + ': ' + json.errcode)

src/views/DesktopApp.jsx

@@ -172,6 +172,10 @@ function DesktopApp() {
                     label: <Link to='/account/profile'>个人资料</Link>,
                     key: 'profile',
                   },
+                  {
+                    label: <Link to='/account/generate-payment'>付款链接</Link>,
+                    key: 'generate-payment',
+                  },
                   {
                     label: '图文集管理',
                     key: 'snippet-list',

src/views/accounts/GeneratePayment.jsx

@@ -1,24 +1,23 @@
-import { App, Radio, Row, Col, Tooltip, Flex, Form, Input, Button, InputNumber, Select, message } from 'antd'
+import { Radio, Row, Col, Tooltip, Flex, Form, Input, Button, InputNumber, Select, message } from 'antd'
 import { useState, useEffect } from 'react'
 import HtmlPreview from './HtmlPreview'
 import useAuthStore from '@/stores/AuthStore'
 import { useOrderStore } from '@/stores/OrderStore'
-import { HomeOutlined, LoadingOutlined, InfoCircleOutlined, QuestionOutlined, QuestionCircleOutlined } from '@ant-design/icons'
+import { InfoCircleOutlined } from '@ant-design/icons'
 
 function GeneratePayment() {
   const [messageApi, contextHolder] = message.useMessage()
 
   const [generateForm] = Form.useForm()
 
-  const [getPrimaryEmail] = useAuthStore((s) => [s.getPrimaryEmail])
-  const [generatePayment] = useOrderStore((s) => [s.generatePayment])
+  const [getPrimaryEmail, loginUser] = useAuthStore(s => [s.getPrimaryEmail, s.loginUser])
+  const [generatePayment] = useOrderStore(s => [s.generatePayment])
 
   const [isHtmlLoading, setHtmlLoading] = useState(false)
   const [generatedObject, setGeneratedObject] = useState('')
 
   const handleGenerate = () => {
     setHtmlLoading(true)
-    console.info(generateForm.getFieldsValue())
     generatePayment(generateForm.getFieldsValue())
       .then((result) => {
         setGeneratedObject(result)
@@ -27,11 +26,6 @@ function GeneratePayment() {
       .finally(() => setHtmlLoading(false))
   }
 
-  useEffect(() => {
-    const primaryEmail = getPrimaryEmail()
-    console.info('primaryEmail: %o', primaryEmail)
-  }, [])
-
   return (
     <>
       <Row gutter={16}>
@@ -49,8 +43,10 @@ function GeneratePayment() {
               langauge: 'US',
               orderType: '227001',
               currency: 'USD',
-              amount: 1
+              amount: 1,
+              userId: loginUser.userId
             }}>
+            <Form.Item name='userId' className='hidden' ><Input /></Form.Item>
             <Form.Item label='订单类型' name='orderType'
               rules={[
                 {
@@ -154,11 +150,6 @@ function GeneratePayment() {
               </Tooltip>
             </Flex>
             <HtmlPreview value={generatedObject.payhtml} loading={isHtmlLoading} onCopied={() => messageApi.success('已复制')} />
-            {/* <pre >
-          <a href="https://www.chinahighlights.com/slink/d02824bb8bdabb5apay" target="_blank" rel="noreferrer">
-          <img src="https://data.chinahighlights.com/pic/pay-button.png" alt="Pay now" draggable="false"  />
-          </a>
-          </pre> */}
             <Flex gap='small'>
               <span>支付链接</span>
               <Tooltip placement='topLeft' title='发送 WhatsApp 使用'>

src/views/dingding/AuthCode.jsx

@@ -7,8 +7,7 @@ import * as dd from 'dingtalk-jsapi'
 function AuthCode() {
 
   const [result, setResult] = useState('')
-  const [clientValue, setClientValue] = useState('dingwgdx6emlxr3fcrg8')
-
+  const [clientValue, setClientValue] = useState('dingl3jyntkazyg4coxf')
   const handleRequest = () => {
     dd.requestAuthCode({
       clientId: clientValue,