diff --git a/app/admin/view/Goods/goods_add.html b/app/admin/view/Goods/goods_add.html
index 84c946f..c3afaf8 100755
--- a/app/admin/view/Goods/goods_add.html
+++ b/app/admin/view/Goods/goods_add.html
@@ -337,6 +337,26 @@
$("#div_daily_xiangou").show(); // 初始显示每日限购次数
$(".flw_time_config").hide(); // 显示福利屋时间配置
$(".lian_ji_num").hide();
+ $(".id_stock").show();
+ $(".id_lock_is").show();
+ $(".id_lock_time").show();
+ $(".id_prize_num").hide();
+ $(".coupon_is").show();
+ $(".coupon_pro").show();
+ $(".integral_is").show();
+ $(".show_is").show();
+ $(".sale_time").show();
+ $("#div_daily_xiangou").show(); // 显示每日限购
+
+ //2023-11
+ $(".rage_is").hide();
+ $(".rage").hide();
+ $(".item_card_id").hide();
+ $(".lingzhu_is").hide();
+ $(".lingzhu_fan").hide();
+ $(".lingzhu_shang_id").hide();
+ $(".lian_ji_num").hide();
+ $(".lian_ji_shang_id").hide();
form.on('radio(type)', function (data) {
var value = data.value; // 当前选中的value值
$("#div_daily_xiangou").show();
diff --git a/app/api/controller/Notify.php b/app/api/controller/Notify.php
index 6816aea..f1a2600 100755
--- a/app/api/controller/Notify.php
+++ b/app/api/controller/Notify.php
@@ -240,7 +240,7 @@ class Notify extends Base
Db::rollback();
}
}
- } elseif ($table == 'order_yfs' || $table == 'order_lts' || $table == 'order_zzs') {#抽赏一番赏 擂台赏
+ } elseif ($table == 'order_yfs' || $table == 'order_lts' || $table == 'order_zzs' || $table == 'order_flw'|| $table == 'order_scs') {#抽赏一番赏 擂台赏
$orderInfo = Order::where('order_num', '=', $out_trade_no)
->where('status', '=', 0)
->find();
@@ -518,6 +518,9 @@ class Notify extends Base
if ($order['order_type'] == 15) {
$res[] = $this->ordinary_prize_notice_flw($order);
+ } elseif ($order['order_type'] == 10) {
+ $res[] = $this->infinite_shangchengshang($order);
+
} else {
#普通奖品==========================================================
$res[] = $this->ordinary_prize_notice($order);