diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42c33bab..78aab862 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: WeChat MiniProgram Demo CI/CD on: - push: + pull_request: branches: - feat-ce jobs: diff --git a/build/ci.js b/build/ci.js index d51dba2d..494c1a4f 100644 --- a/build/ci.js +++ b/build/ci.js @@ -6,6 +6,10 @@ import packageJson from '../package.json' with { type: 'json' } const __filename = fileURLToPath(import.meta.url) const __dirname = path.dirname(__filename) const privateKeyPath = path.resolve(__dirname, './key') + +// 检查私钥文件是否已存在 +if (!fs.existsSync(privateKeyPath)) { + console.log(); try { const content = fs.readFileSync(privateKeyPath, 'utf8'); console.log('文件内容:', content); @@ -58,3 +62,5 @@ ci.upload({ // 删除临时私钥文件 fs.unlinkSync(privateKeyPath) }) + + diff --git a/miniprogram/packageXRFrame/pages/index/index.js b/miniprogram/packageXRFrame/pages/index/index.js index 0c2fb188..e2d2aa24 100644 --- a/miniprogram/packageXRFrame/pages/index/index.js +++ b/miniprogram/packageXRFrame/pages/index/index.js @@ -15,8 +15,6 @@ import '../../xr-custom/assets/effect-last-record-final' import list from './data/index' -let lastOpened = false -let lastCount = 0 let first = true Page({ @@ -52,7 +50,6 @@ Page({ } if (path === '/pages/scene-last-record/index') { - this.handleLastRecord() return } @@ -65,50 +62,5 @@ Page({ }, }) } - }, - async handleLastRecord() { - // if (lastOpened) { - // return - // } - - // lastCount += 1 - // // if (Math.random() >= (0.34 + lastCount * 0.1)) { - // // return; - // // } - - // const root = this.data.root - // lastOpened = true - - // wx.request({ - // url: 'https://mmbizwxaminiprogram-1258344707.cos.ap-guangzhou.myqcloud.com/xr-frame/demo/xr-frame-team/last-gate.txt', - // success(res) { - // wx.showModal({ - // title: '一把钥匙', - // content: res.data, - // confirmText: '探寻真实', - // cancelText: '放下钥匙', - // success(res) { - // if (res.cancel) { - // wx.onAppShow((result) => { - // lastOpened = false - // }) - // return - // } - - // wx.navigateTo({ - // url: root + '/pages/scene-last-record/index', - // success: () => { - // wx.onAppShow((result) => { - // lastOpened = false - // }) - // } - // }) - // } - // }) - // }, - // fail(err) { - // lastOpened = false - // } - // }) } }) diff --git a/miniprogram/packageXRFrame/pages/index/index.wxml b/miniprogram/packageXRFrame/pages/index/index.wxml index d4f07ce0..7a8cd563 100644 --- a/miniprogram/packageXRFrame/pages/index/index.wxml +++ b/miniprogram/packageXRFrame/pages/index/index.wxml @@ -1,6 +1,6 @@ - + XRFrame 小程序低成本高性能XR解决方案