From 48e44cb31168d715d2d407e676b66dbc72196fb2 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 17 Apr 2026 16:21:16 +0800
Subject: [PATCH] 11

---
 .env                                          |  8 +++----
 src/pages/merchant/components/coupon-card.vue |  2 ++
 src/pages/wallet/list.vue                     |  2 +-
 src/sheep/components/MeetingTabbar.vue        | 15 +++++--------
 .../verify-device-imp-model.vue               | 22 +++++--------------
 5 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/.env b/.env
index 3564bc1..272088f 100644
--- a/.env
+++ b/.env
@@ -19,16 +19,16 @@ VITE_OAUTH2_APP_CLIENT='mini:mini'
 # --------------------------- 开发环境 api地址 ----------------------------------
 # VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api # 域名线上
 #VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
-# VITE_APP_DEV_SERVICE = http://192.168.101.174:9999 # 邓-本地
+VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc # 邓-本地
 # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # 邓-本地
-VITE_APP_DEV_SERVICE = http://123.157.250.162:8089/api # 测试线上
+# VITE_APP_DEV_SERVICE = http://123.157.250.162:8089/api # 测试线上
 
 # --------------------------- 开发环境 图片访问基础地址 ---------------------------
 # VITE_IMAGE_DEV_PATH = https://stgl.pj.gov.cn/api # 域名线上
 #VITE_IMAGE_DEV_PATH = http://59.202.170.152:81/api # 信创线上
-# VITE_IMAGE_DEV_PATH = http://192.168.101.174:9999 # 邓-本地
+VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc # 邓-本地
 #VITE_IMAGE_DEV_PATH = http://127.0.0.1:9999
-VITE_IMAGE_DEV_PATH = http://123.157.250.162:8089/api # 测试线上
+# VITE_IMAGE_DEV_PATH = http://123.157.250.162:8089/api # 测试线上
 
 # --------------------------- 生产环境 api地址 ----------------------------------
 VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api # 域名线上
diff --git a/src/pages/merchant/components/coupon-card.vue b/src/pages/merchant/components/coupon-card.vue
index 7361a6c..229d8de 100644
--- a/src/pages/merchant/components/coupon-card.vue
+++ b/src/pages/merchant/components/coupon-card.vue
@@ -31,6 +31,8 @@ const doVisibleQrcode = () => {
                     class="iconfont icon-weishiyong1 absolute font-size-80rpx! color-#cccccc" />
                 <!-- 已过期 -->
                 <view v-if="detail.status == 3" class="iconfont icon-yiguoqi absolute font-size-80rpx! color-#cccccc" />
+                <!-- 已核销 -->
+                <view v-if="detail.status == 4" class="iconfont icon-yiguoqi absolute font-size-80rpx! color-#cccccc" />
             </view>
             <view class="info-box">
                 <view class="price-row">
diff --git a/src/pages/wallet/list.vue b/src/pages/wallet/list.vue
index 69c1eaf..d743d02 100644
--- a/src/pages/wallet/list.vue
+++ b/src/pages/wallet/list.vue
@@ -154,7 +154,7 @@ const doTransferMoney = (v: any) => {
 						<view class="second-text-50">
 							<text v-if="v.cardNumber" class="iconfont icon-fuzhi"
 								@tap.stop="hooks.useCopy(v.cardNumber)" />
-							<text v-if="v.walletTypeUniqueCode != '2'" class="m-l-20rpx iconfont icon-erweima"
+							<text v-if="v.walletTypeUniqueCode == '1'" class="m-l-20rpx iconfont icon-erweima"
 								@tap.stop="doPreviewQrCode(v)" />
 						</view>
 					</view>
diff --git a/src/sheep/components/MeetingTabbar.vue b/src/sheep/components/MeetingTabbar.vue
index 0537379..03456a8 100644
--- a/src/sheep/components/MeetingTabbar.vue
+++ b/src/sheep/components/MeetingTabbar.vue
@@ -1,18 +1,10 @@
 <template>
   <view class="tabbar">
-    <view
-      class="tabbar-item"
-      :class="{ active: activeTab === 'home' }"
-      @tap="goHome"
-    >
+    <view class="tabbar-item" :class="{ active: activeTab === 'home' }" @tap="goHome">
       <image src="/static/icons/home.png" class="tabbar-icon" />
       <text>首页</text>
     </view>
-    <view
-      class="tabbar-item"
-      :class="{ active: activeTab === 'mine' }"
-      @tap="goMine"
-    >
+    <view class="tabbar-item" :class="{ active: activeTab === 'mine' }" @tap="goMine">
       <image src="/static/icons/mine.png" class="tabbar-icon" />
       <text>我的</text>
     </view>
@@ -45,6 +37,7 @@ function goMine() {
   border-top: 1px solid #eee;
   z-index: 999;
 }
+
 .tabbar-item {
   flex: 1;
   display: flex;
@@ -54,11 +47,13 @@ function goMine() {
   color: #888;
   font-size: 24rpx;
 }
+
 .tabbar-icon {
   width: 48rpx;
   height: 48rpx;
   margin-bottom: 4rpx;
 }
+
 .tabbar-item.active {
   color: #1777FF;
 }
diff --git a/src/sheep/components/verifyDeviceImpModel/verify-device-imp-model.vue b/src/sheep/components/verifyDeviceImpModel/verify-device-imp-model.vue
index c38ce7b..0a3c129 100644
--- a/src/sheep/components/verifyDeviceImpModel/verify-device-imp-model.vue
+++ b/src/sheep/components/verifyDeviceImpModel/verify-device-imp-model.vue
@@ -1,27 +1,17 @@
 <template>
-	<tm-modal
-		:show="show"
-		:overlayClick="false"
-		position="bottom"
-		:showCancel="showCancel"
-		title="您的设备需要验证"
-		height="650rpx"
-		zIndex="999"
-		cancelText="取消"
-		confirmText="确认"
-		@confirm=""
-		@cancel=""
-		@close="close"
-	>
+	<tm-modal :show="show" :overlayClick="false" position="bottom" :showCancel="showCancel" title="您的设备需要验证"
+		height="650rpx" zIndex="999" cancelText="取消" confirmText="确认" @confirm="" @cancel="" @close="close">
 		<tm-form ref="formRef" v-model="form" :rules="formRules" direction="vertical">
 			<tm-form-item name="mobilePhone" label="手机号">
 				<tm-input v-model.trim="form.mobilePhone" :maxlength="11" placeholder="请输入手机号" />
 			</tm-form-item>
 			<view class="h-10rpx" />
 			<tm-form-item name="code" label="验证码">
-				<tm-input v-model.trim="form.code" :maxlength="6" placeholder="请输入验证码" :disabled="form.mobilePhone.length != 11">
+				<tm-input v-model.trim="form.code" :maxlength="6" placeholder="请输入验证码"
+					:disabled="form.mobilePhone.length != 11">
 					<template v-slot:right>
-						<tm-button class="ml-1 px-2" color="primary" size="m" @click="getCode" :disabled="state.codeBtnDisabled">
+						<tm-button class="ml-1 px-2" color="primary" size="m" @click="getCode"
+							:disabled="state.codeBtnDisabled">
 							<text>获取验证码</text><text v-if="state.isTiming">{{ state.countDown }} s</text>
 						</tm-button>
 					</template>