zhengyiming
2 天以前 92264a516c8c695c38d4cc9358c50bcfbed36f06
fix: bug
1个文件已添加
8个文件已修改
63 ■■■■ 已修改文件
apps/cMiniApp/.eslintrc-auto-import.json 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/auto-imports.d.ts 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/project.private.config.json 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/hooks/app.ts 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/hooks/index.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/stores/modules/user.ts 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/utils/file.ts 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/.eslintrc-auto-import.json
@@ -104,6 +104,7 @@
    "watchPostEffect": true,
    "watchSyncEffect": true,
    "useUpdateResume": true,
    "useAccessReal": true
    "useAccessReal": true,
    "useLaunchOptions": true
  }
}
apps/cMiniApp/auto-imports.d.ts
@@ -83,6 +83,7 @@
  const useGoLogin: typeof import('./src/hooks/user')['useGoLogin']
  const useId: typeof import('vue')['useId']
  const useIsLogin: typeof import('./src/hooks/user')['useIsLogin']
  const useLaunchOptions: typeof import('./src/hooks/app')['useLaunchOptions']
  const useLink: typeof import('vue-router')['useLink']
  const useLoginedJump: typeof import('./src/hooks/login')['useLoginedJump']
  const useModel: typeof import('vue')['useModel']
@@ -195,6 +196,7 @@
    readonly useGoLogin: UnwrapRef<typeof import('./src/hooks/user')['useGoLogin']>
    readonly useId: UnwrapRef<typeof import('vue')['useId']>
    readonly useIsLogin: UnwrapRef<typeof import('./src/hooks/user')['useIsLogin']>
    readonly useLaunchOptions: UnwrapRef<typeof import('./src/hooks/app')['useLaunchOptions']>
    readonly useLink: UnwrapRef<typeof import('vue-router')['useLink']>
    readonly useLoginedJump: UnwrapRef<typeof import('./src/hooks/login')['useLoginedJump']>
    readonly useModel: UnwrapRef<typeof import('vue')['useModel']>
apps/cMiniApp/project.private.config.json
@@ -10,6 +10,13 @@
        "miniprogram": {
            "list": [
                {
                    "name": "subpackages/mine/mineAgreementSignDetail/mineAgreementSignDetail",
                    "pathName": "subpackages/mine/mineAgreementSignDetail/mineAgreementSignDetail",
                    "query": "scene=66688",
                    "launchMode": "default",
                    "scene": 1047
                },
                {
                    "name": "实名认证",
                    "pathName": "subpackages/authentication/authenticationRealName/authenticationRealName",
                    "query": "type=realName",
apps/cMiniApp/src/hooks/app.ts
New file
@@ -0,0 +1,13 @@
import Taro from '@tarojs/taro';
import { useUserStoreWithOut } from '@/stores/modules/user';
export function useLaunchOptions() {
  const options = Taro.getLaunchOptionsSync();
  const userStore = useUserStoreWithOut();
  console.log('userStore: ', userStore);
  if (userStore.firstLaunch) {
    userStore.setFirstLaunch(false);
    return options;
  }
  return {} as Taro.getLaunchOptionsSync.LaunchOptions;
}
apps/cMiniApp/src/hooks/index.ts
@@ -3,3 +3,4 @@
export * from './access';
export * from './login';
export * from './authentication';
export * from './app';
apps/cMiniApp/src/stores/modules/user.ts
@@ -33,6 +33,7 @@
  refreshToken?: Nullable<string>;
  userDetail?: Nullable<API.GetPersonalLoginInfoQueryResult>;
  firstGetUserDetail?: boolean;
  firstLaunch?: boolean;
  locationCity?: string;
  locationProvince?: string;
@@ -71,6 +72,7 @@
      refreshToken: userInfo?.refreshToken ?? '',
      userDetail: userDetail,
      firstGetUserDetail: true,
      firstLaunch: true,
      locationCity: storageLocation?.city ?? '北京市',
      locationProvince: storageLocation?.province ?? '北京',
      firstSetLocation: true,
@@ -277,6 +279,10 @@
      // }
      LocationUtils.currentProvinceName = provinceName;
    },
    setFirstLaunch(firstLaunch: boolean) {
      this.firstLaunch = firstLaunch;
    },
  },
});
apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue
@@ -55,7 +55,9 @@
        page: pageParam,
        orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
      },
      userSignContractStatus: queryState.userSignContractStatus,
      userSignContractStatus: Number(queryState.userSignContractStatus)
        ? queryState.userSignContractStatus
        : null,
    };
    return enterpriseEmployeeServices.getPersonalUserElectronSigns(params, {
apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue
@@ -77,7 +77,7 @@
  EnumTaskUserSignContractStatus,
  EnumTaskUserSignContractStatusSignText,
} from '@12333/constants';
import { format, hiddenPhone, Message, setOSSLink } from '@12333/utils';
import { format, hiddenPhone, Message, setOSSLink, openDocument } from '@12333/utils';
import Taro from '@tarojs/taro';
defineOptions({
@@ -86,8 +86,10 @@
const { userDetail } = useUser();
const router = Taro.useRouter();
const launchOption = useLaunchOptions();
//灵工Id
const id = router.params?.id;
const code = router.params?.code;
const code = launchOption?.query?.scene || router.params?.code;
const {
  isLoading,
@@ -118,10 +120,11 @@
    detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Stop ||
    detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Pass
  ) {
    const encodedUrl = encodeURIComponent(setOSSLink(detail?.value?.contractUrl));
    Taro.navigateTo({
      url: `${RouterPath.mineAgreementSignExtraPage}?url=${encodedUrl}`,
    });
    if (!detail?.value?.contractUrl) {
      Message.warning('协议无法查看,请稍后再试');
      return;
    }
    openDocument(setOSSLink(detail?.value?.contractUrl));
  }
}
packages/utils/file.ts
@@ -86,3 +86,15 @@
    return fileName;
  });
}
export function openDocument(url: string) {
  Taro.downloadFile({
    url: url,
    success: function (res) {
      var filePath = res.tempFilePath;
      Taro.openDocument({
        filePath: filePath,
      });
    },
  });
}