release(other): 4.0.14

.env.development

@@ -5,4 +5,12 @@ TARO_APP_ID='wx7b3322daa2cf9c88'
 TARO_APP_KEY=''
 
 # API接口
-TARO_APP_API='https://test.wanzhuanyongcheng.cn/app'
+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'

.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'
+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'

.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'
+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'

.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'
+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'

.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}"

package.json

@@ -1,12 +1,12 @@
 {
   "name": "jdt-user",
-  "version": "4.0.13",
+  "version": "4.0.14",
   "taroConfig": {
-    "version": "4.0.13"
+    "version": "4.0.14"
   },
   "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",
@@ -43,8 +43,7 @@
   "author": "JDT",
   "lint-staged": {
     "*.{ts,vue}": [
-      "eslint --ext .ts,.vue .",
+      "eslint --ext .ts,.vue ."
-      "npx prettier --write --end-of-line lf ."
     ]
   },
   "config": {

src/components/MerList.vue

@@ -2,6 +2,7 @@
   <view class="list-box">
     <view class="list">
       <swiper
+        v-if="bannerList.length !== 0"
         class="item"
         :style="{
           height: '250px',
@@ -167,7 +168,7 @@ const bannerList = ref<any[]>([]);
 
 const get_banner_list = async () => {
   const { data }: any = await getBanner();
-  bannerList.value = data.data;
+  bannerList.value = data.data || [];
 };
 
 const toPage = async (url: string) => {

src/pages/goods/pay/index.vue

@@ -188,23 +188,22 @@ const pay = async () => {
 
 const confirmPay = async () => {
   try {
-    const res = await payOrder({
+    const { data: res } = await payOrder({
       oid: opt.value.oid,
       OrderType: payVal.value,
       PayType: payVal.value,
     });
     Taro.requestPayment({
-      timeStamp: res.data.data.timeStamp,
+      timeStamp: res.data.timeStamp,
-      nonceStr: res.data.data.nonceStr,
+      nonceStr: res.data.nonceStr,
-      package: res.data.data.package,
+      package: res.data.package,
-      signType: res.data.data.signType,
+      signType: res.data.signType,
-      paySign: res.data.data.paySign,
+      paySign: res.data.paySign,
       success: function () {
         Taro.showToast({
           title: '支付成功',
           icon: 'success',
         });
-        isLoading.value = false;
       },
       fail: function () {
         Taro.showToast({
@@ -218,7 +217,6 @@ const confirmPay = async () => {
             url: `/pages/users/order_list/index?type=0`,
           });
         }, 2000);
-        // isLoading.value = false;
       },
     });
   } catch (err) {
@@ -227,7 +225,7 @@ const confirmPay = async () => {
       icon: 'none',
     });
   } finally {
-    // isLoading.value = false;
+    isLoading.value = false;
   }
 };
 

src/pages/index/index.scss

@@ -38,12 +38,12 @@ page {
 }
 
 .banner {
+  position: relative;
+  text-align: center;
   .title {
-    background-image: url('//p0.meituan.net/csc/542112fc072d4687b437848bc29b0a1730495.png');
-    background-size: 100% 100%;
     width: 600px;
     height: 90px;
-    margin: auto;
+    left: 50%;
   }
 
   .jf-btn {

src/pages/index/index.vue

@@ -13,7 +13,12 @@
       <view class="search-btn" @click="clickSearch">搜索</view>
     </view>
     <view class="banner">
-      <view class="title"></view>
+      <!-- <view
+        class="title"
+        :style="{
+          backgroundImage: `url('${titleImgPath}')`,
+        }"></view> -->
+      <image class="title" :src="titleImgPath"></image>
       <view class="jf-btn" hover-class="none"></view>
       <!-- <view class="footer">
         <navigator
@@ -62,6 +67,8 @@ import Popup from '@/components/Popup.vue';
 const statusBarHeight = Taro.getSystemInfoSync().statusBarHeight;
 const BarHeight = ref((statusBarHeight as number) + 7);
 
+const titleImgPath = require(process.env.TARO_APP_TITLE_IMG as string);
+
 interface navigationType {
   ID?: number;
   type: number;
@@ -74,7 +81,8 @@ const navigationList = ref<Array<navigationType>>([]);
 
 const imgList = ref([
   // require('../../static/popTip-1.png'),
-  require('../../static/popTip.png'),
+  // require('../../static/popTip.png'),
+  require('../../static/zhenggai.png'),
 ]);
 
 Taro.useShareAppMessage(() => ({

src/pages/user/index.vue

@@ -171,7 +171,7 @@
 
     <!--    版权    -->
     <view class="mt-5 text-[20px] text-center">
-      <view class="text-[#999999]">鑫瓴科技版权所有</view>
+      <view class="text-[#999999]">{{ copText }}</view>
       <!-- <view>v4.0.0</view> -->
     </view>
     <!-- 登录 -->
@@ -198,6 +198,8 @@ const isShowLogin = ref(false);
 
 const isLogin = ref(false);
 
+const copText = process.env.TARO_APP_COP;
+
 interface UserInfo {
   data?: {
     nickName?: string;

src/pages/users/login/index.vue

@@ -3,12 +3,17 @@ import Taro from '@tarojs/taro';
 import UserModal from '@/components/UserModal.vue';
 import { ref } from 'vue';
 import { getPhone, login, getPersonalInfo } from '@/api/user';
-import logoImg from '../../../static/logo.jpg';
+// import logoImg from '../../../static/logo.jpg';
 import { Left, Home } from '@nutui/icons-vue-taro';
 
 const statusBarHeight = Taro.getSystemInfoSync().statusBarHeight;
 const BarHeight = ref((statusBarHeight as number) - 7);
 
+const appName = process.env.TARO_APP_NAME;
+
+const logoImg = require(process.env.TARO_APP_LOGO_IMG as string);
+// const logoImg = process.env.TARO_APP_LOGO_IMG;
+
 const isShow = ref(false);
 
 const val = ref(false);
@@ -157,8 +162,8 @@ const clickText = (type: number, text: string) => {
     </view>
     <image src="../../../static/wechat_login.jpg" />
     <view class="logo">
-      <image :src="logoImg" />
+      <image :src="logoImg"></image>
-      <view>捷兑通</view>
+      <view>{{ appName }}</view>
     </view>
     <view class="center">
       <nut-button