From b87922420561a35c1e99b67fb6caf3fe30bc8ccf Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 16 十一月 2023 08:57:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html
index 50c9381..3502038 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html
@@ -81,6 +81,7 @@
 
     function updateT(e) {
         var oneId = $('#type option:selected').text();
+
         console.log(oneId);
         if (oneId!="详情"&&oneId!="指定商品"&&oneId!="指定折扣"){
             $("#t3").hide()
@@ -88,6 +89,12 @@
         }else{
             $("#t3").show()
         }
+        var page = $('#page option:selected').text();
+        if (page=="线上课得积分" || page=="看视频得奖励"){
+            if (oneId == "列表"){
+                $("#t3").show()
+            }
+        }
     }
 
     function updateType(e) {

--
Gitblit v1.7.1