From 32986b54a0e2661f7ad6ed79f3ef12c4289eace9 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期五, 20 十二月 2024 17:52:52 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 packagePersonal/pages/activateProduct/index.wxml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packagePersonal/pages/activateProduct/index.wxml b/packagePersonal/pages/activateProduct/index.wxml
index f860b36..c5e3413 100644
--- a/packagePersonal/pages/activateProduct/index.wxml
+++ b/packagePersonal/pages/activateProduct/index.wxml
@@ -44,7 +44,7 @@
                       <view class="rightCon">
                         <view class="productTitle">{{itemes.name}}</view>
                         <view class="typeBox">
-                          <text class="typeCon">鐢靛瓙涔�</text>
+                          <text class="typeCon">{{items.type ? items.type : '鐢靛瓙涔�' }}</text>
                         </view>
                       </view>
                     </view>

--
Gitblit v1.9.1