Pārlūkot izejas kodu

feat: 医务通bind接口对接

carver 2 gadi atpakaļ
vecāks
revīzija
6e47be5cae

+ 2 - 1
.mini-ide/project-ide.json

@@ -1,3 +1,4 @@
 {
-  "enableLegacyRemoteDebug": false
+  "enableLegacyRemoteDebug": false,
+  "disableSimulatorPermissionCheck": true
 }

+ 2 - 0
README.md

@@ -9,3 +9,5 @@ dev
 ## 生产环境分支
 
 master
+
+---

+ 101 - 95
antbuilder/core/utils/constants.js

@@ -1,32 +1,31 @@
-import { getGlobalExt } from '@mas.io/pollen-utils';
-import { joinUrl } from './format';
-import globalConfig from './../../../config.json';
+import { getGlobalExt } from "@mas.io/pollen-utils";
+import { joinUrl } from "./format";
+import globalConfig from "./../../../config.json";
 
-export const prefixPagePath = '/antbuilder/core/pages';
+export const prefixPagePath = "/antbuilder/core/pages";
 
 export const authLoginType = {
-  1: 'user', // 主动授权
-  2: 'base', // 基础信息
-  3: 'single', // 手机号
-  4: 'single', // 身份证
+	1: "user", // 主动授权
+	2: "base", // 基础信息
+	3: "single", // 手机号
+	4: "single", // 身份证
 };
 
 export const scopesType = {
-  1: 'auth_user',
-  2: 'userInfo',
-  3: 'phoneNumber',
-  4: 'IDNumber',
+	1: "auth_user",
+	2: "userInfo",
+	3: "phoneNumber",
+	4: "IDNumber",
 };
 
 export const loginUrl = {
-  auth_user: 'api/v1/user/auth/login',
-  userInfo: 'api/v1/user/base/login',
-  phoneNumber: 'api/v1/user/single/login',
+	auth_user: "api/v1/user/auth/login",
+	userInfo: "api/v1/user/base/login",
+	phoneNumber: "api/v1/user/single/login",
 };
 
 export const globalExt = globalConfig.ext.global || getGlobalExt() || {};
 
-
 export const { authCodeKey } = globalExt;
 
 export const { disableActiveAuthUser } = globalExt;
@@ -35,125 +34,132 @@ export const { url: host } = globalExt;
 export const { openNewVersion } = globalExt;
 export const { debugTemplateUuid } = globalExt;
 export const { debugNoCache } = globalExt;
+export const { ywtUrl: ywtHost } = globalExt;
+
+export const ywtEnvVersionPrefix = "v2/alipaymp/nfyybyfy";
+
+export const gwAppId = "nfyybyfy-alipay-mp";
 
-export const universeUrl = host.replace('ab-saas-api', 'universe');
+export const universeUrl = host.replace("ab-saas-api", "universe");
 
-export const imgSrcPrefix = joinUrl(globalExt.url, 'api/v1/getImage/');
-export const getTicketUrl = 'api/v1/getTicket';
+export const ywtRequestUrl = ywtHost + ywtEnvVersionPrefix;
 
-export const getSettintsUrl = 'api/v1/index/settings/query';
+export const imgSrcPrefix = joinUrl(globalExt.url, "api/v1/getImage/");
+export const getTicketUrl = "api/v1/getTicket";
 
-export const getRegionListUrl = 'api/v1/index/region/list';
+export const getSettintsUrl = "api/v1/index/settings/query";
 
-export const userInfoUrl = 'api/v1/user/info';
+export const getRegionListUrl = "api/v1/index/region/list";
 
-export const openCardUrl = 'api/v1/card/openCard';
+export const userInfoUrl = "api/v1/user/info";
 
-export const openNewCardUrl = 'api/v1/card/openNewCard';
+export const openCardUrl = "api/v1/card/openCard";
 
-export const getCardLevelUrl = 'api/v1/mall/member/card/getLevel';
+export const openNewCardUrl = "api/v1/card/openNewCard";
 
-export const getOpenCardUrl = 'api/v1/component/service/card/getCardConfig';
+export const getCardLevelUrl = "api/v1/mall/member/card/getLevel";
 
-export const getMemberInfoUrl = 'api/v1/card/getMemberInfo';
+export const getOpenCardUrl = "api/v1/component/service/card/getCardConfig";
 
-export const getSettingsUrl = 'api/v1/index/settings/query';
+export const getMemberInfoUrl = "api/v1/card/getMemberInfo";
 
-export const getIndexQueryUrl = 'api/v2/index/basic/query';
+export const getSettingsUrl = "api/v1/index/settings/query";
 
-export const checkCertifyValidUrl = 'api/v1/checkCertifyValid';
+export const getIndexQueryUrl = "api/v2/index/basic/query";
 
-export const authAndApplyFaceUrl = 'api/v1/authAndApplyFace';
+export const checkCertifyValidUrl = "api/v1/checkCertifyValid";
 
-export const authCertTypeUrl = 'api/v1/cert/status/authCertType';
+export const authAndApplyFaceUrl = "api/v1/authAndApplyFace";
 
-export const serviceReportUrl = 'api/v1/data/report';
+export const authCertTypeUrl = "api/v1/cert/status/authCertType";
 
-export const getComponentDetailUrl = 'api/v1/component/list';
+export const serviceReportUrl = "api/v1/data/report";
 
-export const serviceReportCloudMonitorUrl = 'api/v1/data/reportCM';
+export const getComponentDetailUrl = "api/v1/component/list";
 
-export const getServiceInfoUrl = 'api/v2/component/service/info';
+export const serviceReportCloudMonitorUrl = "api/v1/data/reportCM";
 
-export const activeStatusUrl = 'api/v1/plugin_api/medicareQuery/activeStatus'; // 未激活测试 ?bind=NOT_BIND
+export const getServiceInfoUrl = "api/v2/component/service/info";
 
-export const paymentUrl = 'api/v1/plugin_api/medicareQuery/payment'; // todo remove city
+export const activeStatusUrl = "api/v1/plugin_api/medicareQuery/activeStatus"; // 未激活测试 ?bind=NOT_BIND
 
-export const expenseUrl = 'api/v1/plugin_api/medicareQuery/expense'; // todo remove city
+export const paymentUrl = "api/v1/plugin_api/medicareQuery/payment"; // todo remove city
 
-export const accountinfoUrl = 'api/v1/plugin_api/medicareQuery/accountinfo';// todo remove city
+export const expenseUrl = "api/v1/plugin_api/medicareQuery/expense"; // todo remove city
 
-export const updateUserInfoUrl = 'api/v1/user/update';
+export const accountinfoUrl = "api/v1/plugin_api/medicareQuery/accountinfo"; // todo remove city
 
-export const getTabBarDetailUrl = 'api/v2/index/basic/tabbar';
+export const updateUserInfoUrl = "api/v1/user/update";
 
-export const getFormConfigDetailUrl = 'api/v1/form/detail.json';
+export const getTabBarDetailUrl = "api/v2/index/basic/tabbar";
 
-export const saveFormDataUrl = 'api/v1/formData/save.json';
+export const getFormConfigDetailUrl = "api/v1/form/detail.json";
 
-export const getServiceDynamicListUrl = 'api/v1/component/service/dynamic/list';
+export const saveFormDataUrl = "api/v1/formData/save.json";
+
+export const getServiceDynamicListUrl = "api/v1/component/service/dynamic/list";
 
 // 页面缓存key
-export const pageDataKey = 'PAGE_DATA_KEY';
+export const pageDataKey = "PAGE_DATA_KEY";
 
 // 获取页面信息
-export const getPageInfoUrl = 'api/v2/index/basic/pageInfo';
-
-export const defaultErrMsg = '抱歉,系统异常,请稍后再试';
+export const getPageInfoUrl = "api/v2/index/basic/pageInfo";
 
+export const defaultErrMsg = "抱歉,系统异常,请稍后再试";
 
 // 获取用户状态接口
-export const checkLoginUrl = 'api/v1/user/login';
+export const checkLoginUrl = "api/v1/user/login";
 
-export const dynamicPageName = 'one';
+export const dynamicPageName = "one";
 
-export const industryEntry = '/antbuilder/industry';
+export const industryEntry = "/antbuilder/industry";
 
 // C端订阅成功后,通知后端存储数据
-export const messageSubscribeNotifyUrl = 'api/v2/index/message/subscribe/notify';
+export const messageSubscribeNotifyUrl =
+	"api/v2/index/message/subscribe/notify";
 
-export const mktApplyNotifyUrl = '/api/v1/marketing/receiveAlipayCoupon';
+export const mktApplyNotifyUrl = "/api/v1/marketing/receiveAlipayCoupon";
 
 export const userInfoList = [
-  {
-    name: '头像',
-    key: 'avatar',
-    value: '',
-    hasImg: true,
-    notNeedArrow: true,
-    canShow: true, // 是否必须展示
-  },
-  {
-    name: '昵称',
-    key: 'nickName',
-    value: '',
-    notNeedArrow: true,
-    canShow: true, // 是否必须展示
-  },
-  {
-    name: '手机号码',
-    key: 'phone',
-    value: '',
-    notNeedArrow: true,
-  },
-  {
-    name: '姓名',
-    key: 'fullName',
-    value: '',
-    notNeedArrow: true,
-    canShow: true, // 是否必须展示
-  },
-  // {
-  //   name: '邮箱',
-  //   key: 'email',
-  //   placeholder: '请填写',
-  //   value: '',
-  //   canShow: true, // 是否必须展示
-  // },
-  {
-    name: '身份证号',
-    key: 'idCardNo',
-    value: '',
-    notNeedArrow: true,
-  },
+	{
+		name: "头像",
+		key: "avatar",
+		value: "",
+		hasImg: true,
+		notNeedArrow: true,
+		canShow: true, // 是否必须展示
+	},
+	{
+		name: "昵称",
+		key: "nickName",
+		value: "",
+		notNeedArrow: true,
+		canShow: true, // 是否必须展示
+	},
+	{
+		name: "手机号码",
+		key: "phone",
+		value: "",
+		notNeedArrow: true,
+	},
+	{
+		name: "姓名",
+		key: "fullName",
+		value: "",
+		notNeedArrow: true,
+		canShow: true, // 是否必须展示
+	},
+	// {
+	//   name: '邮箱',
+	//   key: 'email',
+	//   placeholder: '请填写',
+	//   value: '',
+	//   canShow: true, // 是否必须展示
+	// },
+	{
+		name: "身份证号",
+		key: "idCardNo",
+		value: "",
+		notNeedArrow: true,
+	},
 ];

+ 221 - 137
antbuilder/core/utils/request.js

@@ -1,155 +1,239 @@
-import { getIn } from 'herculex/dist/utils/manipulate';
-import { host, getTicketUrl } from './constants';
-import { getSilentAuthCode, getAppId, getServerTime } from './jsapi';
-import { joinUrl } from './format';
+import { getIn } from "herculex/dist/utils/manipulate";
+import { host, getTicketUrl, ywtRequestUrl } from "./constants";
+import { getSilentAuthCode, getAppId, getServerTime } from "./jsapi";
+import { joinUrl } from "./format";
+import { getStorage } from "./index";
 
-
-function showErrorMessgage({
-  isShowError,
-  error,
-}) {
-  if (isShowError) {
-    my.showToast({
-      type: 'fail',
-      content: error && (error.msg || error.errorMessage),
-      duration: 3000,
-    });
-  }
+function showErrorMessgage({ isShowError, error }) {
+	if (isShowError) {
+		my.showToast({
+			type: "fail",
+			content: error && (error.msg || error.errorMessage),
+			duration: 3000,
+		});
+	}
 }
 
 async function checkTimeExpire(time) {
-  if (!time) return false;
-  const [err, res] = await getServerTime();
-  const currentTime = err ? new Date().getTime() : +res.time;
-  return time < currentTime;
+	if (!time) return false;
+	const [err, res] = await getServerTime();
+	const currentTime = err ? new Date().getTime() : +res.time;
+	return time < currentTime;
 }
 
 export function _request({
-  url,
-  method = 'post',
-  data = {},
-  headers = {},
-  isShowLoadig = false,
-  isShowError = false,
+	url,
+	method = "post",
+	data = {},
+	headers = {},
+	isShowLoadig = false,
+	isShowError = false,
+} = {}) {
+	return new Promise((resolve) => {
+		if (isShowLoadig) {
+			my.showLoading();
+		}
+		// eslint-disable-next-line no-undef
+		const app = getApp();
+		my.request({
+			url: url.startsWith("http") ? url : joinUrl(host, url),
+			method,
+			data,
+			headers: {
+				"content-type": "application/x-www-form-urlencoded",
+				ticket: app.globalData.ticketData.ticket, // todo test
+				appId: app.globalData.appId, // todo test
+				ywtToken: "ywtToken",
+				...headers,
+			},
+			dataType: "json",
+			success(res) {
+				const result = res.data || {};
+				const code = +result.code;
+				if (result && code === 200) {
+					resolve([
+						null,
+						{
+							data: result.data,
+							code,
+						},
+					]);
+				} else if (code === 20002 || code === 20001 || code === 20008) {
+					resolve([
+						null,
+						{
+							code,
+							data: null,
+						},
+					]);
+				} else {
+					showErrorMessgage({
+						isShowError,
+						error: result,
+					});
+					resolve([result, null]);
+				}
+			},
+			fail(err) {
+				showErrorMessgage({
+					isShowError,
+					error: err,
+				});
+				resolve([err, null]);
+			},
+			complete() {
+				if (isShowLoadig) {
+					my.hideLoading();
+				}
+			},
+		});
+	});
+}
+
+export function _ywtRequest({
+	url,
+	method = "post",
+	data = {},
+	headers = {},
+	isShowLoadig = false,
+	isShowError = false,
 } = {}) {
-  return new Promise((resolve) => {
-    if (isShowLoadig) {
-      my.showLoading();
-    }
-    // eslint-disable-next-line no-undef
-    const app = getApp();
-    my.request({
-      url: url.startsWith('http') ? url : joinUrl(host, url),
-      method,
-      data,
-      headers: {
-        'content-type': 'application/x-www-form-urlencoded',
-        ticket: app.globalData.ticketData.ticket, // todo test
-        appId: app.globalData.appId, // todo test
-        ywtToken:'ywtToken',
-        ...headers,
-      },
-      dataType: 'json',
-      success(res) {
-        const result = res.data || {};
-        const code = +result.code;
-        if (result && code === 200) {
-          resolve([null, {
-            data: result.data,
-            code,
-          }]);
-        } else if (code === 20002 || code === 20001 || code === 20008) {
-          resolve([null, {
-            code,
-            data: null,
-          }]);
-        } else {
-          showErrorMessgage({
-            isShowError,
-            error: result,
-          });
-          resolve([result, null]);
-        }
-      },
-      fail(err) {
-        showErrorMessgage({
-          isShowError,
-          error: err,
-        });
-        resolve([err, null]);
-      },
-      complete() {
-        if (isShowLoadig) {
-          my.hideLoading();
-        }
-      },
-    });
-  });
+	return new Promise((resolve) => {
+		if (isShowLoadig) {
+			my.showLoading();
+		}
+		const token = getStorage("YWT_TOKEN");
+		my.request({
+			url: url.startsWith("http") ? url : joinUrl(ywtRequestUrl, url),
+			method,
+			data,
+			headers: {
+				ywtToken: token || "",
+				...headers,
+			},
+			dataType: "json",
+			success(res) {
+				const result = res.data || {};
+				const code = +result.code;
+				if (result && code === 0) {
+					resolve([
+						null,
+						{
+							data: result.data,
+							code,
+						},
+					]);
+				} else if (code === 20002 || code === 20001 || code === 20008) {
+					resolve([
+						null,
+						{
+							code,
+							data: null,
+						},
+					]);
+				} else {
+					showErrorMessgage({
+						isShowError,
+						error: result,
+					});
+					resolve([result, null]);
+				}
+			},
+			fail(err) {
+				showErrorMessgage({
+					isShowError,
+					error: err,
+				});
+				resolve([err, null]);
+			},
+			complete() {
+				if (isShowLoadig) {
+					my.hideLoading();
+				}
+			},
+		});
+	});
 }
 
 export async function getTicket() {
-  // eslint-disable-next-line no-undef
-  const app = getApp();
-  const { appId } = app.globalData;
-  if (!appId) {
-    app.globalData.appId = getAppId();
-  }
-  const [err, res] = await getSilentAuthCode();
-  if (err) return [err, null];
-  const data = {
-    authCode: res.authCode,
-    appId: app.globalData.appId,
-  };
-  const result = await _request({
-    url: getTicketUrl,
-    data,
-  });
-  return result;
+	// eslint-disable-next-line no-undef
+	const app = getApp();
+	const { appId } = app.globalData;
+	if (!appId) {
+		app.globalData.appId = getAppId();
+	}
+	const [err, res] = await getSilentAuthCode();
+	if (err) return [err, null];
+	const data = {
+		authCode: res.authCode,
+		appId: app.globalData.appId,
+	};
+	const result = await _request({
+		url: getTicketUrl,
+		data,
+	});
+	return result;
 }
 
 export async function setTicket() {
-  const app = getApp();
-  const { expiresTime } = app.globalData.ticketData;
-  // 如果当前其他请求更新了ticket,则不用重新请求
-  if (expiresTime && checkTimeExpire(expiresTime)) {
-    return;
-  }
-  // 如果没有ticket正在请求,则在gloabl上增加setTicket
-  if (!app.globalData.getTicketing) {
-    app.globalData.setTicket = (async function () {
-      app.globalData.getTicketing = true;
-      const [err, res] = await getTicket();
-      if (err) {
-        return [err, null];
-      }
-      // eslint-disable-next-line no-undef
-      app.globalData.ticketData.ticket = res.data.ticket;
-      app.globalData.ticketData.expiresTime = res.data.expiresTime;
-      app.globalData.getTicketing = false;
-      return [null, res];
-    })();
-  }
-  // 如果ticket正在请求,则返回正在请求的ticket
-  return app.globalData.setTicket;
+	const app = getApp();
+	const { expiresTime } = app.globalData.ticketData;
+	// 如果当前其他请求更新了ticket,则不用重新请求
+	if (expiresTime && checkTimeExpire(expiresTime)) {
+		return;
+	}
+	// 如果没有ticket正在请求,则在gloabl上增加setTicket
+	if (!app.globalData.getTicketing) {
+		app.globalData.setTicket = (async function () {
+			app.globalData.getTicketing = true;
+			const [err, res] = await getTicket();
+			if (err) {
+				return [err, null];
+			}
+			// eslint-disable-next-line no-undef
+			app.globalData.ticketData.ticket = res.data.ticket;
+			app.globalData.ticketData.expiresTime = res.data.expiresTime;
+			app.globalData.getTicketing = false;
+			return [null, res];
+		})();
+	}
+	// 如果ticket正在请求,则返回正在请求的ticket
+	return app.globalData.setTicket;
 }
 
 export default async function request(options) {
-  const app = getApp();
-  // 如果没有ticket直接请求ticket
-  if (!app.globalData.ticketData.ticket && !options.noNeedTicket) {
-    await setTicket();
-  }
-  const [err, res] = await _request(options);
-  if (err) return [err, null];
-  const code = +getIn(res, ['code'], '');
-  if (code === 20001 || code === 20002 || code === 20008) {
-    const [error] = await setTicket();
-    if (!error) {
-      const result = await request(options);
-      return result;
-    }
-    return [error, null];
-  }
-  const data = res.data || null;
-  return [null, data];
+	const app = getApp();
+	// 如果没有ticket直接请求ticket
+	if (!app.globalData.ticketData.ticket && !options.noNeedTicket) {
+		await setTicket();
+	}
+	const [err, res] = await _request(options);
+	if (err) return [err, null];
+	const code = +getIn(res, ["code"], "");
+	if (code === 20001 || code === 20002 || code === 20008) {
+		const [error] = await setTicket();
+		if (!error) {
+			const result = await request(options);
+			return result;
+		}
+		return [error, null];
+	}
+	const data = res.data || null;
+	return [null, data];
+}
+
+export async function ywtRequest(options) {
+	const [err, res] = await _ywtRequest(options);
+	if (err) return [err, null];
+	const code = +getIn(res, ["code"], "");
+	if (code === 20001 || code === 20002 || code === 20008) {
+		const [error] = await setTicket();
+		if (!error) {
+			const result = await _ywtRequest(options);
+			return result;
+		}
+		return [error, null];
+	}
+	const data = res.data || null;
+	return [null, data];
 }

+ 154 - 132
antbuilder/core/utils/service.js

@@ -1,170 +1,192 @@
-import request from './request';
-import { getComponentDetailUrl, updateUserInfoUrl, checkLoginUrl, getPageInfoUrl, getServiceDynamicListUrl, messageSubscribeNotifyUrl, mktApplyNotifyUrl } from './constants';
-import { getSilentAuthCode, getAppId } from './jsapi';
-
+import request from "./request";
+import {
+	getComponentDetailUrl,
+	updateUserInfoUrl,
+	checkLoginUrl,
+	getPageInfoUrl,
+	getServiceDynamicListUrl,
+	messageSubscribeNotifyUrl,
+	mktApplyNotifyUrl,
+	gwAppId,
+} from "./constants";
+import { ywtAuth } from "./ywtService";
+import { getSilentAuthCode, getAppId } from "./jsapi";
+import { setStorage } from ".";
 
 // 扫码通行api
-export const getCourtlistInfoUrl = 'api/v1/proxy/intelli_court/courtList';
+export const getCourtlistInfoUrl = "api/v1/proxy/intelli_court/courtList";
 
-const openCardCaseUrl = '/api/v1/card/openCardCase';
+const openCardCaseUrl = "/api/v1/card/openCardCase";
 
-export const reportCourtInfoUrl = 'api/v1/data/template/report';
+export const reportCourtInfoUrl = "api/v1/data/template/report";
 // eslint-disable-next-line import/prefer-default-export
 
 export async function getComponentDetail(payload) {
-  try {
-    const [error, response] = await request({ data: payload, url: getComponentDetailUrl });
-    if (error) throw error;
-    return [undefined, response];
-  } catch (error) {
-    return [error, undefined];
-  }
+	try {
+		const [error, response] = await request({
+			data: payload,
+			url: getComponentDetailUrl,
+		});
+		if (error) throw error;
+		return [undefined, response];
+	} catch (error) {
+		return [error, undefined];
+	}
 }
 
 export async function updateUserInfo(payload) {
-  try {
-    const [authErr, res = {}] = await getSilentAuthCode();
-    if (authErr) {
-      // 授权失败
-      throw authErr;
-    }
-    const data = { ...payload, authCode: res.authCode };
-    const [error, response] = await request({ data, url: updateUserInfoUrl });
-    console.log('=====getComponentList====', 'error', error, 'response', response);
-    if (error) throw error;
-    return [undefined, response];
-  } catch (error) {
-    return [error, undefined];
-  }
+	try {
+		const [authErr, res = {}] = await getSilentAuthCode();
+		if (authErr) {
+			// 授权失败
+			throw authErr;
+		}
+		const data = { ...payload, authCode: res.authCode };
+		const [error, response] = await request({ data, url: updateUserInfoUrl });
+		console.log(
+			"=====getComponentList====",
+			"error",
+			error,
+			"response",
+			response
+		);
+		if (error) throw error;
+		return [undefined, response];
+	} catch (error) {
+		return [error, undefined];
+	}
 }
 
 // 检查登陆态加获取ticket
 export async function checkUserInfo() {
-  // eslint-disable-next-line no-undef
-  const app = getApp();
-  const { appId } = app.globalData;
-  if (!appId) {
-    app.globalData.appId = getAppId();
-  }
-  const [authCodeErr, authCodeRes] = await getSilentAuthCode();
-  if (authCodeErr) return [authCodeErr, null];
-  const [err, res] = await request({
-    url: checkLoginUrl,
-    data: { authCode: authCodeRes.authCode },
-    noNeedTicket: true,
-  });
-  if (err) return [err, null];
-  if (!res) return [null, null];
-  const { ticket, expiresTime } = res;
-  app.globalData.ticketData.ticket = ticket;
-  app.globalData.ticketData.expiresTime = expiresTime;
-  return [null, res];
+	// eslint-disable-next-line no-undef
+	const app = getApp();
+	const { appId } = app.globalData;
+	if (!appId) {
+		app.globalData.appId = getAppId();
+	}
+	const [authCodeErr, authCodeRes] = await getSilentAuthCode();
+	if (authCodeErr) return [authCodeErr, null];
+	const [err, res] = await request({
+		url: checkLoginUrl,
+		data: { authCode: authCodeRes.authCode },
+		noNeedTicket: true,
+	});
+	if (err) return [err, null];
+	if (!res) return [null, null];
+	const { ticket, expiresTime } = res;
+	app.globalData.ticketData.ticket = ticket;
+	app.globalData.ticketData.expiresTime = expiresTime;
+	const [ywtErr, ywtResult] = await ywtAuth({ ticket, gwAppId });
+	if (!ywtErr && ywtResult && ywtResult.token) {
+		setStorage("YWT_TOKEN", ywtResult.token);
+	}
+	return [null, res];
 }
 
-
 // 获取页面配置信息
 export async function getPageInfo(data) {
-  const [err, res] = await request({
-    url: getPageInfoUrl,
-    data,
-    noNeedTicket: true,
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
+	const [err, res] = await request({
+		url: getPageInfoUrl,
+		data,
+		noNeedTicket: true,
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
 }
 
-
 // 动态数据源
 export async function getServiceDynamicList(data) {
-  try {
-    const [err, res] = await request({
-      url: getServiceDynamicListUrl,
-      method: 'get',
-      data: {
-        componentUuid: data.componentUuid,
-        current: data.current || 1,
-        pageSize: data.pageSize || 10,
-      },
-    });
-    if (err) return [err, undefined];
-    //   return [undefined, res];
-    // } catch (error) {
-    //   return [error, undefined];
-    // }
-    return {
-      ...res,
-      index: data.index,
-    };
-  } catch (error) {
-    return {
-      index: data.index,
-      list: [],
-    };
-  }
+	try {
+		const [err, res] = await request({
+			url: getServiceDynamicListUrl,
+			method: "get",
+			data: {
+				componentUuid: data.componentUuid,
+				current: data.current || 1,
+				pageSize: data.pageSize || 10,
+			},
+		});
+		if (err) return [err, undefined];
+		//   return [undefined, res];
+		// } catch (error) {
+		//   return [error, undefined];
+		// }
+		return {
+			...res,
+			index: data.index,
+		};
+	} catch (error) {
+		return {
+			index: data.index,
+			list: [],
+		};
+	}
 }
 
 // C端订阅成功后,通知后端存储数据
 export async function messageSubscribeNotify({ userResult, templateIds }) {
-  if (!userResult || !userResult.success) return;
-
-  const messageTemplateList = templateIds.map(id => {
-    const ids = id.split(';');
-    const templateId = ids[0];
-    const alipayTemplateId = ids[1];
-    const status = userResult[alipayTemplateId] === 'accept' ? 'success' : 'fail';
-    const message = userResult.errorMessage;
-    return { templateId, alipayTemplateId, status, message };
-  });
-
-  const [err, res] = await request({
-    url: messageSubscribeNotifyUrl,
-    method: 'post',
-    data: {
-      subscribeList: JSON.stringify(messageTemplateList),
-    },
-  });
-  console.log(err, res);
+	if (!userResult || !userResult.success) return;
+
+	const messageTemplateList = templateIds.map((id) => {
+		const ids = id.split(";");
+		const templateId = ids[0];
+		const alipayTemplateId = ids[1];
+		const status =
+			userResult[alipayTemplateId] === "accept" ? "success" : "fail";
+		const message = userResult.errorMessage;
+		return { templateId, alipayTemplateId, status, message };
+	});
+
+	const [err, res] = await request({
+		url: messageSubscribeNotifyUrl,
+		method: "post",
+		data: {
+			subscribeList: JSON.stringify(messageTemplateList),
+		},
+	});
+	console.log(err, res);
 }
 
 export async function getCourtlistInfo(data) {
-  const [err, res] = await request({
-    url: getCourtlistInfoUrl,
-    method: 'get',
-    data,
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
+	const [err, res] = await request({
+		url: getCourtlistInfoUrl,
+		method: "get",
+		data,
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
 }
 // 小区数据上报
 export async function reportCourtInfo(data) {
-  const [err, res] = await request({
-    url: reportCourtInfoUrl,
-    headers: {
-      'content-type': 'application/json',
-    },
-    data,
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
+	const [err, res] = await request({
+		url: reportCourtInfoUrl,
+		headers: {
+			"content-type": "application/json",
+		},
+		data,
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
 }
 export async function openCardCase(data) {
-  const [err, res] = await request({
-    url: openCardCaseUrl,
-    headers: {
-      'content-type': 'application/json',
-    },
-    data,
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
+	const [err, res] = await request({
+		url: openCardCaseUrl,
+		headers: {
+			"content-type": "application/json",
+		},
+		data,
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
 }
 
 export async function notifyMktApply(data) {
-  const [err, res] = await request({
-    url: mktApplyNotifyUrl,
-    method: 'post',
-    data,
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
+	const [err, res] = await request({
+		url: mktApplyNotifyUrl,
+		method: "post",
+		data,
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
 }

+ 11 - 0
antbuilder/core/utils/ywtService.js

@@ -0,0 +1,11 @@
+import { ywtRequest } from "./request";
+
+export async function ywtAuth(data) {
+	const [err, res] = await ywtRequest({
+		url: "/auth/bind",
+		method: "post",
+		data,
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
+}

+ 13 - 12
config.json

@@ -1,14 +1,15 @@
 {
-  "extEnable": true,
-  "ext": {
-    "global": {
-      "url": "https://ab-saas-api.alipay-eco.com/",
-      "disableActiveAuthUser": true,
-      "pid": "",
-      "authCodeKey": "auth_code",
-      "openNewVersion": true,
-      "debugNoCache": true,
-      "debugTemplateUuid": ""
-    }
-  }
+	"extEnable": true,
+	"ext": {
+		"global": {
+			"url": "https://ab-saas-api.alipay-eco.com/",
+			"ywtUrl": "https://api-qa.ywtinfo.com/",
+			"disableActiveAuthUser": true,
+			"pid": "",
+			"authCodeKey": "auth_code",
+			"openNewVersion": true,
+			"debugNoCache": true,
+			"debugTemplateUuid": ""
+		}
+	}
 }