From a33112e76e728978d34500ca5ab5329d30584b2d Mon Sep 17 00:00:00 2001
From: yyx <15348303523@163.com>
Date: Thu, 10 Jul 2025 14:40:22 +0800
Subject: [PATCH] h5

---
 .env.production          | 1 +
 src/axios/api.js         | 2 +-
 src/views/login.vue      | 4 ++--
 src/views/task/add.vue   | 4 ++--
 src/views/task/index.vue | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 .env.production

diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..dfdb86c
--- /dev/null
+++ b/.env.production
@@ -0,0 +1 @@
+VITE_APP_API_URL = /api
\ No newline at end of file
diff --git a/src/axios/api.js b/src/axios/api.js
index 591c3e9..0a5f1b8 100644
--- a/src/axios/api.js
+++ b/src/axios/api.js
@@ -3,7 +3,7 @@ import { showSuccessToast, showFailToast } from 'vant'
 import { useRouter } from 'vue-router'
 const router = useRouter()
 const instance = axios.create({
-  baseURL: import.meta.env.VITE_API_URL,
+  baseURL: process.env.NODE_ENV === 'production' ? '/api' : '',
   timeout: 1000 * 30,
   headers: { 'Content-Type': 'application/json' },
 })
diff --git a/src/views/login.vue b/src/views/login.vue
index 3bfa441..d6d1a6d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -10,7 +10,7 @@
                             <div class="tg-btn-span"> {{ `/login ${tg_login}` }}</div>
                             <van-icon name="notes-o" />
                         </div>
-                        <van-button round block type="primary" @click="goPage" style="margin-top: 12px;">
+                        <van-button round block type="primary" @click="goPage" style="margin-top: 12px;width: 100%;">
                             跳转TG机器人
                         </van-button>
                     </div>
@@ -167,7 +167,7 @@ onMounted(() => {
             display: flex;
             align-items: center;
             justify-content: space-between;
-            width: 75vw;
+            width: 100% !important;
 
             .tg-btn-span {
                 display: block;
diff --git a/src/views/task/add.vue b/src/views/task/add.vue
index c4f269c..790b032 100644
--- a/src/views/task/add.vue
+++ b/src/views/task/add.vue
@@ -115,7 +115,7 @@ const onConfirm = ({ selectedOptions }) => {
     form.cycle = template?.cycle + '天'
     form.price = template?.price
     let filter_groups = group_id.map(id => {
-        return group_info.find(item => item.id == id).tg_name
+        return group_info.find(item => item.id == id).tg_name + '@' + group_info.find(item => item.id == id).tg_url
     })
     form.group = filter_groups.join(',');
 };
@@ -233,7 +233,7 @@ onBeforeMount(async () => {
 const handleConfrimPay = (val = '', type) => {
     console.log('handleConfrimPay', current_order)
     updatePayHash({
-        order_id: current_order.id.toString(),
+        order_id: current_order.order_id.toString(),
         hash: val
     }).then(res => {
         router.push('/h5')
diff --git a/src/views/task/index.vue b/src/views/task/index.vue
index 2348d08..b692899 100644
--- a/src/views/task/index.vue
+++ b/src/views/task/index.vue
@@ -50,9 +50,9 @@
                         style="margin-left: 12px;" @click="addTask(item)">编辑</van-button>
                     <van-button type="primary" size="small" style="margin-left: 12px;"
                         v-if="item.order_status == 0 || item.order_status == 8" @click="payTask(item)">支付</van-button>
-                    <van-button type="primary" size="small" style="margin-left: 12px;" v-if="item.status == 2"
+                    <van-button type="primary" size="small" style="margin-left: 12px;" v-if="item.status == 5"
                         @click="handleTask(item.id, '2')">执行</van-button>
-                    <van-button type="primary" size="small" style="margin-left: 12px;"
+                    <van-button type="primary" size="small" v-if="item.status == 2" style="margin-left: 12px;"
                         @click="handleTask(item.id, '5')">暂停</van-button>
                     <van-button type="danger" size="small" style="margin-left: 12px;"
                         v-if="item.status == 6 || item.status == 0" @click="deleteTask(item.id)">删除</van-button>