diff --git a/.env.development b/.env.development index 3aebef6..ebfcf54 100644 --- a/.env.development +++ b/.env.development @@ -5,4 +5,12 @@ TARO_APP_ID='wx7b3322daa2cf9c88' TARO_APP_KEY='' # API接口 -TARO_APP_API='https://test.wanzhuanyongcheng.cn/app' \ No newline at end of file +TARO_APP_API='https://test.wanzhuanyongcheng.cn/app' + + +# 版权文字 +TARO_APP_NAME='捷兑通' +TARO_APP_COP='玩赚商城版权所有' + +TARO_APP_TITLE_IMG='../../static/index/1.png' +TARO_APP_LOGO_IMG='../../../static/logo.jpg' \ No newline at end of file diff --git a/.env.production b/.env.production index 47482e1..2029f40 100644 --- a/.env.production +++ b/.env.production @@ -5,4 +5,12 @@ TARO_APP_ID='wxdd00d46fa6f07974' TARO_APP_KEY='private.wxdd00d46fa6f07974.key' # API接口 -TARO_APP_API='https://www.wanzhuanyongcheng.cn/app' \ No newline at end of file +TARO_APP_API='https://www.wanzhuanyongcheng.cn/app' + + +# 版权文字 +TARO_APP_NAME='捷兑通' +TARO_APP_COP='鑫瓴科技版权所有' + +TARO_APP_TITLE_IMG='../../static/index/1.png' +TARO_APP_LOGO_IMG='../../../static/logo.jpg' \ No newline at end of file diff --git a/.env.reserve b/.env.reserve index fc3b697..05b5563 100644 --- a/.env.reserve +++ b/.env.reserve @@ -1,8 +1,16 @@ -# 正式版appid +# 备用版appid TARO_APP_ID='wx4a9380d8bb16d9de' -# 正式版appkey +# 备用版appkey TARO_APP_KEY='private.wx4a9380d8bb16d9de.key' # API接口 -TARO_APP_API='https://api.gxwzwh.com/app' \ No newline at end of file +TARO_APP_API='https://api.gxwzwh.com/app' + +# 版权文字 +TARO_APP_NAME='玩赚商城' + +TARO_APP_COP='玩赚商城版权所有' + +TARO_APP_TITLE_IMG='../../static/index/title.png' +TARO_APP_LOGO_IMG='../../../static/logo-1.jpg' \ No newline at end of file diff --git a/.env.test b/.env.test index 1120df4..cf98689 100644 --- a/.env.test +++ b/.env.test @@ -5,4 +5,12 @@ TARO_APP_ID='wx7b3322daa2cf9c88' TARO_APP_KEY='private.wx7b3322daa2cf9c88.key' # API接口 -TARO_APP_API='https://test.wanzhuanyongcheng.cn/app' \ No newline at end of file +TARO_APP_API='https://test.wanzhuanyongcheng.cn/app' + + +# 版权文字 +TARO_APP_NAME='捷兑通' +TARO_APP_COP='鑫瓴科技版权所有' + +TARO_APP_TITLE_IMG='../../static/index/1.png' +TARO_APP_LOGO_IMG='../../../static/logo.jpg' \ No newline at end of file diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml new file mode 100644 index 0000000..88058a2 --- /dev/null +++ b/.gitea/workflows/ci.yaml @@ -0,0 +1,125 @@ +name: CI Build & Upload (WeApp) + +on: + push: + branches: + - test + - master + +jobs: + build-upload-dev: + if: ${{ gitea.ref == 'refs/heads/test' }} + runs-on: gitea_act_runner + container: + image: node:24-alpine + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install deps + run: | + npm install -g pnpm + pnpm config set registry https://registry.npmmirror.com/ + pnpm install + + - name: Build & Upload (test) + run: | + pnpm build:weapp:test:upload + rm -rf dist.tar || true + + - name: Notify WeCom (Dev) + if: always() + env: + WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }} + STATUS: ${{ job.status }} + REPO: ${{ gitea.repository }} + RUN_URL: ${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }} + BRANCH: ${{ gitea.ref_name }} + COMMIT: ${{ gitea.sha }} + ACTOR: ${{ gitea.actor }} + COMMIT_MSG: ${{ gitea.event.head_commit.message }} + run: | + apk add --no-cache curl jq + EMOJI=$( [ "$STATUS" = "success" ] && echo "✅ 构建成功" || echo "❌ 构建失败" ) + MSG="$(printf "%s\n**项目**: %s (构建 #%s)\n**分支**: %s\n**提交**: %s\n**作者**: %s\n**信息**: %s\n**详情**: [查看构建详情](%s)" \ + "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$BRANCH" "$COMMIT" "$ACTOR" "$(echo "$COMMIT_MSG" | tr '\n' ' ' | tr -s ' ')" "$RUN_URL")" + JSON=$(jq -n --arg content "$MSG" '{msgtype:"markdown", markdown:{content:$content}}') + curl -sS -H 'Content-Type: application/json' -d "$JSON" "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${WEBHOOK_KEY}" + + build-upload-prod: + if: ${{ gitea.ref == 'refs/heads/master' }} + runs-on: gitea_act_runner + container: + image: node:24-alpine + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install deps + run: | + npm install -g pnpm + pnpm config set registry https://registry.npmmirror.com/ + pnpm install + + - name: Build & Upload (prod) + run: | + pnpm build:weapp:prod:upload + rm -rf dist.tar || true + + - name: Notify WeCom (Prod) + if: always() + env: + WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }} + STATUS: ${{ job.status }} + REPO: ${{ gitea.repository }} + RUN_URL: ${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }} + BRANCH: ${{ gitea.ref_name }} + COMMIT: ${{ gitea.sha }} + ACTOR: ${{ gitea.actor }} + COMMIT_MSG: ${{ gitea.event.head_commit.message }} + run: | + apk add --no-cache curl jq + EMOJI=$( [ "$STATUS" = "success" ] && echo "✅ 构建成功" || echo "❌ 构建失败" ) + MSG="$(printf "%s\n**项目**: %s (构建 #%s)\n**分支**: %s\n**提交**: %s\n**作者**: %s\n**信息**: %s\n**详情**: [查看构建详情](%s)" \ + "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$BRANCH" "$COMMIT" "$ACTOR" "$(echo "$COMMIT_MSG" | tr '\n' ' ' | tr -s ' ')" "$RUN_URL")" + JSON=$(jq -n --arg content "$MSG" '{msgtype:"markdown", markdown:{content:$content}}') + curl -sS -H 'Content-Type: application/json' -d "$JSON" "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${WEBHOOK_KEY}" + + build-upload-reserve: + if: ${{ gitea.ref == 'refs/heads/master' }} + runs-on: gitea_act_runner + container: + image: node:24-alpine + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install deps + run: | + npm install -g pnpm + pnpm config set registry https://registry.npmmirror.com/ + pnpm install + + - name: Build & Upload (reserve) + run: | + pnpm build:weapp:reserve:upload + rm -rf dist.tar || true + + - name: Notify WeCom (Reserve) + if: always() + env: + WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }} + STATUS: ${{ job.status }} + REPO: ${{ gitea.repository }} + RUN_URL: ${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }} + BRANCH: ${{ gitea.ref_name }} + COMMIT: ${{ gitea.sha }} + ACTOR: ${{ gitea.actor }} + COMMIT_MSG: ${{ gitea.event.head_commit.message }} + run: | + apk add --no-cache curl jq + EMOJI=$( [ "$STATUS" = "success" ] && echo "✅ 构建成功" || echo "❌ 构建失败" ) + MSG="$(printf "%s\n**项目**: %s (构建 #%s)\n**分支**: %s\n**提交**: %s\n**作者**: %s\n**信息**: %s\n**详情**: [查看构建详情](%s)" \ + "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$BRANCH" "$COMMIT" "$ACTOR" "$(echo "$COMMIT_MSG" | tr '\n' ' ' | tr -s ' ')" "$RUN_URL")" + JSON=$(jq -n --arg content "$MSG" '{msgtype:"markdown", markdown:{content:$content}}') + curl -sS -H 'Content-Type: application/json' -d "$JSON" "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${WEBHOOK_KEY}" diff --git a/package.json b/package.json index 0ba8a99..b0af757 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ }, "scripts": { "build:weapp": "taro build --type weapp", - "build:test": "taro build --type weapp --mode test", + "build:test": "taro build --type weapp --mode reserve", "build:swan": "taro build --type swan", "build:alipay": "taro build --type alipay", "build:tt": "taro build --type tt", diff --git a/src/components/MerList.vue b/src/components/MerList.vue index 8d995f9..682c44d 100644 --- a/src/components/MerList.vue +++ b/src/components/MerList.vue @@ -2,6 +2,7 @@ 搜索