feat: 可以不绑定微信账号

dist/_umi_route_preload_helper.06791e99.js

@@ -0,0 +1 @@
+!function(){"use strict";var t="/".replace(/([^/])$/,"$1/"),e=location.pathname,n=e.startsWith(t)&&decodeURI("/".concat(e.slice(t.length)));if(n){var a=document,c=a.head,r=a.createElement.bind(a),i=function(t,e,n){var a,c=e.r[t]||(null===(a=Object.entries(e.r).find((function(e){var n=e[0];return new RegExp("^".concat(n.replace(/\/:[^/]+/g,"/[^/]+").replace("/*","/.+"),"$")).test(t)})))||void 0===a?void 0:a[1]);return null==c?void 0:c.map((function(t){var a=e.f[t][1],c=e.f[t][0];return{type:c.split(".").pop(),url:"".concat(n.publicPath).concat(c),attrs:[["data-".concat(e.b),"".concat(e.p,":").concat(a)]]}}))}(n,{"p":"ant-design-pro","b":"webpack","f":[["51.a2ea1b3b.async.js",51],["63.86ff1d28.async.js",63],["134.6fc81d91.async.js",134],["169.57647c7d.async.js",169],["p__Welcome.61596037.async.js",185],["235.ac8537cc.async.js",235],["247.3fe8fb10.async.js",247],["t__plugin-layout__Layout.6cae69f5.chunk.css",301],["t__plugin-layout__Layout.4594a64b.async.js",301],["335.fcb437d3.async.js",335],["p__User__Login__index.9d3ab92e.async.js",366],["p__DeviceOwnerApp.1442f75c.async.js",371],["390.41467286.async.js",390],["393.38316f72.async.js",393],["397.fb5f72c1.async.js",397],["p__SuperAdmin.2c0b0908.async.js",455],["531.3d4ec55a.async.js",531],["p__Bind.b6ee068f.async.js",557],["559.016bfdbb.async.js",559],["p__404.0c100574.async.js",571],["635.20e45f05.async.js",635],["p__App__AppManagement.10ce4bad.async.js",731],["p__AdminManagement.4b0ea38b.async.js",816],["841.2ae59567.async.js",841],["848.32a73e48.async.js",848],["p__AdvRecordList.957040e5.async.js",857],["905.6e225d1b.async.js",905],["930.fca7adbf.async.js",930]],"r":{"/*":[19,26],"/":[2,7,8,18,20,26],"/welcome":[2,3,4,13,18,27,7,8,20,26],"/super":[0,1,2,3,5,6,15,27,7,8,18,20,26],"/adminList":[0,3,5,22,24,2,7,8,18,20,26],"/bind":[2,3,13,14,17,18,27,7,8,20,26],"/appList":[0,1,2,3,5,6,9,14,16,21,24,26,27,7,8,18,20],"/advList/:code":[0,1,2,3,5,9,16,18,23,24,25,26,27,7,8,20],"/app/:code":[0,1,2,3,5,9,11,16,18,23,24,26,27,7,8,20],"/user/login":[1,2,3,5,10,16,24]}},{publicPath:"/"});null==i||i.forEach((function(t){var e,n=t.type,a=t.url;if("js"===n)(e=r("script")).src=a,e.async=!0;else{if("css"!==n)return;(e=r("link")).href=a,e.rel="preload",e.as="style"}t.attrs.forEach((function(t){e.setAttribute(t[0],t[1]||"")})),c.appendChild(e)}))}}();

dist/index.html

@@ -7,10 +7,10 @@
 <title>Ant Design Pro</title>
 <link rel="stylesheet" href="/umi.1ca9308c.css">
 <script async src="/scripts/loading.js"></script>
-<script>!function(){"use strict";var t="/".replace(/([^/])$/,"$1/"),e=location.pathname,n=e.startsWith(t)&&decodeURI("/".concat(e.slice(t.length)));if(n){var a=document,c=a.head,r=a.createElement.bind(a),i=function(t,e,n){var a,c=e.r[t]||(null===(a=Object.entries(e.r).find((function(e){var n=e[0];return new RegExp("^".concat(n.replace(/\/:[^/]+/g,"/[^/]+").replace("/*","/.+"),"$")).test(t)})))||void 0===a?void 0:a[1]);return null==c?void 0:c.map((function(t){var a=e.f[t][1],c=e.f[t][0];return{type:c.split(".").pop(),url:"".concat(n.publicPath).concat(c),attrs:[["data-".concat(e.b),"".concat(e.p,":").concat(a)]]}}))}(n,{"p":"ant-design-pro","b":"webpack","f":[["51.e174e29e.async.js",51],["63.d3cf24e7.async.js",63],["134.6fc81d91.async.js",134],["169.57647c7d.async.js",169],["p__Welcome.61596037.async.js",185],["235.f7c67994.async.js",235],["247.3fe8fb10.async.js",247],["258.355f303f.async.js",258],["287.b21721be.async.js",287],["t__plugin-layout__Layout.6cae69f5.chunk.css",301],["t__plugin-layout__Layout.afe80231.async.js",301],["335.a2e08496.async.js",335],["p__User__Login__index.9d3ab92e.async.js",366],["p__DeviceOwnerApp.0a01face.async.js",371],["390.41467286.async.js",390],["393.b64a7324.async.js",393],["397.fb5f72c1.async.js",397],["p__SuperAdmin.2c0b0908.async.js",455],["531.7b55d7f6.async.js",531],["p__Bind.b6ee068f.async.js",557],["559.016bfdbb.async.js",559],["p__404.0c100574.async.js",571],["635.477947e4.async.js",635],["p__App__AppManagement.3d27b19d.async.js",731],["p__AdminManagement.292eeeb2.async.js",816],["p__AdvRecordList.58dfb141.async.js",857],["905.6e225d1b.async.js",905],["930.fca7adbf.async.js",930]],"r":{"/*":[21,26],"/":[2,9,10,20,22,26],"/welcome":[2,3,4,15,20,27,9,10,22,26],"/super":[0,1,2,3,5,6,17,27,9,10,20,22,26],"/adminList":[0,3,5,8,24,2,9,10,20,22,26],"/bind":[2,3,15,16,19,20,27,9,10,22,26],"/appList":[0,1,2,3,5,6,8,11,16,18,23,26,27,9,10,20,22],"/advList/:code":[0,1,2,3,5,7,8,11,18,20,25,26,27,9,10,22],"/app/:code":[0,1,2,3,5,7,8,11,13,18,20,26,27,9,10,22],"/user/login":[1,2,3,5,8,12,18]}},{publicPath:"/"});null==i||i.forEach((function(t){var e,n=t.type,a=t.url;if("js"===n)(e=r("script")).src=a,e.async=!0;else{if("css"!==n)return;(e=r("link")).href=a,e.rel="preload",e.as="style"}t.attrs.forEach((function(t){e.setAttribute(t[0],t[1]||"")})),c.appendChild(e)}))}}();</script>
+<script src="/_umi_route_preload_helper.06791e99.js"></script>
 </head>
 <body>
 <div id="root"></div>
-<script src="/umi.1e97a9b1.js"></script>
+<script src="/umi.3080703f.js"></script>
 </body>
 </html>

src/pages/App/SuperAdminAppManagement.tsx

@@ -2,11 +2,9 @@ import { appList } from '@/services/matrix/admin';
 import { PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
 import { Button, Flex, Input, Popover, QRCode, Tag } from 'antd';
 import { useEffect, useState } from 'react';
-
 import AliPayConfigForm from './AliPayConfigForm';
 import AppBasicConfigForm from './AppBasicConfigForm';
 import UMengConfigForm from './UMengConfigForm';
-import WxConfigForm from './WxConfigForm';
 
 const SuperAdminAppManagement = () => {
   const [visible, setVisible] = useState(false);
@@ -15,7 +13,6 @@ const SuperAdminAppManagement = () => {
 
   const [aliPayVisible, setAliPayVisible] = useState(false);
   const [uMengVisible, setUMengVisible] = useState(false);
-  const [wxVisible, setWxVisible] = useState(false);
 
   const [appCode, setAppCode] = useState<string>();
 
@@ -113,18 +110,6 @@ const SuperAdminAppManagement = () => {
               友盟配置
             </Tag>
           )}
-          {record.enableCash && (
-            <Tag
-              key="ediyWx"
-              color="#87d068"
-              onClick={() => {
-                setAppCode(record.code);
-                setWxVisible(true);
-              }}
-            >
-              微信配置
-            </Tag>
-          )}
           <Tag
             key="ediyAliPay"
             color="#2db7f5"
@@ -209,16 +194,6 @@ const SuperAdminAppManagement = () => {
           }}
         />
       )}
-      {appCode && wxVisible && (
-        <WxConfigForm
-          updateModalOpen={wxVisible}
-          appCode={appCode || ''}
-          onCancel={() => setWxVisible(false)}
-          onSubmit={() => {
-            setWxVisible(false);
-          }}
-        />
-      )}
       <AppBasicConfigForm
         updateModalOpen={visible}
         appCode={appCode}

src/pages/App/UMengConfigForm.tsx

@@ -1,4 +1,4 @@
-import { Form, Input, Modal } from 'antd';
+import { Form, Input, Modal, Switch } from 'antd';
 import React, { useEffect } from 'react';
 import { getUMengConfig, saveUMengConfig } from '../../services/matrix/matrixAppConfigController';
 
@@ -54,6 +54,9 @@ const UMengConfigForm: React.FC<UMengConfigFormProps> = (props) => {
         <Form.Item name="umengAppKey" label="AppKey(友盟)">
           <Input />
         </Form.Item>
+        <Form.Item name="bindWx" label="绑定微信账号">
+          <Switch />
+        </Form.Item>
       </Form>
     </Modal>
   );

src/services/matrix/typings.d.ts

@@ -86,6 +86,11 @@ declare namespace API {
     adminName: string;
   };
 
+  type bindWxParams = {
+    accessToken: string;
+    openId: string;
+  };
+
   type calcParams = {
     date: number;
   };
@@ -586,6 +591,7 @@ declare namespace API {
     umengAppSecret?: string;
     umengAppCode?: string;
     umengAppKey?: string;
+    bindWx?: boolean;
   };
 
   type updateScoreParams = {
@@ -609,6 +615,7 @@ declare namespace API {
     goldCoin?: number;
     inviteCode?: string;
     inviteUrl?: string;
+    wxOpenId?: string;
   };
 
   type UserInfo = {

src/services/matrix/userController.ts

@@ -29,6 +29,21 @@ export async function bindAliPay(body: API.UserBo, options?: { [key: string]: an
   });
 }
 
+/** 此处后端没有提供注释 POST /api/citrus/user/bindWx */
+export async function bindWx(
+  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+  params: API.bindWxParams,
+  options?: { [key: string]: any },
+) {
+  return request<API.RVoid>('/api/citrus/user/bindWx', {
+    method: 'POST',
+    params: {
+      ...params,
+    },
+    ...(options || {}),
+  });
+}
+
 /** 此处后端没有提供注释 GET /api/citrus/user/cashRecords */
 export async function getCashRecord(options?: { [key: string]: any }) {
   return request<API.RListCashRecord>('/api/citrus/user/cashRecords', {