Merge branch 'dev' of http://gogs.ywtinfo.com/chenjunkun/th_net_hospital_ali_mp into dev

antbuilder/industry/abMall/components/components/scroll-fetch/index.js

@@ -1,61 +1,54 @@
 Component({
-  props: {
-    className: '',
-    pageSize: 10,
-    height: '100vh',
-    emptyTitle: '暂无数据',
-    emptyMessage: '前不见古人、后不见来者',
-    onRef: () => null,
-    onService: () => Promise.reject(new Error('请传入service'))
-  },
-  data: {
-    list: [],
-    loadContent: ['正在加载', '没有更多记录']
-  },
-  methods: {
-    saveRef(ref) {
-      this.scrollRef = ref;
-    },
+	props: {
+		className: "",
+		pageSize: 10,
+		height: "100vh",
+		emptyTitle: "暂无数据",
+		emptyMessage: "前不见古人、后不见来者",
+		onRef: () => null,
+		onService: () => Promise.reject(new Error("请传入service")),
+	},
+	data: {
+		list: [],
+		loadContent: ["正在加载", "没有更多记录"],
+	},
+	methods: {
+		saveRef(ref) {
+			this.scrollRef = ref;
+		},
 
-    /* 分页逻辑 */
-    async onFetchData(page, limit) {
-      const {
-        list: _list
-      } = this.data;
-      const {
-        onService
-      } = this.props;
+		/* 分页逻辑 */
+		async onFetchData(page, limit) {
+			const { list: _list } = this.data;
+			const { onService } = this.props;
 
-      try {
-        const {
-          list = [],
-          pagination: {
-            total
-          }
-        } = await onService({
-          page,
-          pageSize: limit
-        });
-        const newList = page === 1 ? list : [..._list, ...list];
-        this.setData({
-          list: newList
-        });
-        return {
-          total,
-          list
-        };
-      } catch (err) {
-        return {
-          total: 0,
-          list: []
-        };
-      }
-    },
+			try {
+				const {
+					list = [],
+					pagination: { total },
+				} = await onService({
+					page,
+					pageSize: limit,
+				});
+				const newList = page === 1 ? list : [..._list, ...list];
+				this.setData({
+					list: newList,
+				});
+				return {
+					total,
+					list,
+				};
+			} catch (err) {
+				return {
+					total: 0,
+					list: [],
+				};
+			}
+		},
 
-    /* 刷新 */
-    async refresh() {
-      this.scrollRef.refresh();
-    }
-
-  }
-});
+		/* 刷新 */
+		async refresh() {
+			this.scrollRef.refresh();
+		},
+	},
+});

antbuilder/industry/hospitalV2/components/appointment-result/index.js

@@ -104,7 +104,6 @@ Component({
 			orderDetail({
 				orderId: query.orderId,
 			}).then((data) => {
-				console.log("data====", data);
 				this.setData({
 					result: Object.assign(data, cuttingDate(data.startTime)),
 				});

antbuilder/industry/hospitalV2/components/hospital-payment/index.js

@@ -59,7 +59,7 @@ Component({
 		},
 
 		onService(page) {
-			const { type, status } = this.filters || {};
+			const { status } = this.filters || {};
 			if (!this.hisPatientId) return;
 			return payHistory({
 				...this.filters,

antbuilder/industry/hospitalV2/components/pay-result/index.js

@@ -68,8 +68,11 @@ Component({
 				// 		console.log("authCode ===>", res.authCode);
 				// 	},
 				// });
-				const authResult = await getAuthUser(["auth_user", "hospital_order"]);
-				console.log("authResult ===>", authResult);
+				const [err, authResult] = await getAuthUser([
+					"auth_user",
+					"hospital_order",
+				]);
+				console.log("authResult ===>", authResult.authCode);
 				const subscribeID = await getsubscribeID();
 				await this.requestSubscribeMessageFn(subscribeID.depositTemplateId);
 			} catch (error) {

antbuilder/industry/hospitalV2/components/subscribe-record/index.js

@@ -1,48 +1,50 @@
-import services from './service';
-import { reportCmPV_YL } from '../../utils/cloudMonitorHelper';
+import services from "./service";
+import { reportCmPV_YL } from "../../utils/cloudMonitorHelper";
 Component({
-  props: {},
-  tabsShow: false,
-  data: {
-    typeOptions: [{
-      value: 'normal',
-      label: '普通号'
-    }, {
-      value: 'expert',
-      label: '专家号'
-    }, {
-      value: 'nucleic',
-      label: '核酸'
-    }],
-    showInpatient: false,
-    hasFilter: false,
-  },
+	props: {},
+	tabsShow: false,
+	data: {
+		typeOptions: [
+			{
+				value: "normal",
+				label: "普通号",
+			},
+			{
+				value: "expert",
+				label: "专家号",
+			},
+			{
+				value: "nucleic",
+				label: "核酸",
+			},
+		],
+		showInpatient: false,
+		hasFilter: false,
+	},
 
-  didMount() {
-    /* 服务预警， 挂号记录查询 */
-    reportCmPV_YL({
-      title: '挂号记录查询'
-    });
-  },
+	didMount() {
+		/* 服务预警， 挂号记录查询 */
+		reportCmPV_YL({
+			title: "挂号记录查询",
+		});
+	},
 
-  methods: {
-    onFilterHandel(filters) {
-      this.filters = filters;
-      this.saveRef.refresh();
-    },
+	methods: {
+		onFilterHandel(filters) {
+			this.filters = filters;
+			this.saveRef.refresh();
+		},
 
-    saveRef(ref) {
-      this.saveRef = ref;
-    },
+		saveRef(ref) {
+			this.saveRef = ref;
+		},
 
-    /* 分页逻辑 */
-    async onService(params) {
-      console.log('11111111111');
-      return services.getSubscribeRecordList({
-        ...this.filters,
-        ...params
-      });
-    }
-
-  }
-});
+		/* 分页逻辑 */
+		async onService(params) {
+			return services.getSubscribeRecordList({
+				...this.filters,
+				...params,
+			});
+		},
+	},
+});