From 0ba0e0c6c2aa7e190c23c3b84faa53c2c1f38ac7 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Fri, 19 Feb 2021 23:54:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/view/default/goods/index.html           | 6 ++++--
 application/service/GoodsService.php                      | 8 +++++++-
 public/static/common/css/common.css                       | 3 +++
 public/static/common/lib/amazeui-dialog/amazeui.dialog.js | 7 +++++--
 public/static/index/default/css/goods.css                 | 6 ++++++
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/application/index/view/default/goods/index.html b/application/index/view/default/goods/index.html
index e061b6dfb..bcd176c63 100755
--- a/application/index/view/default/goods/index.html
+++ b/application/index/view/default/goods/index.html
@@ -501,7 +501,8 @@
                                             <a href="{{if empty($v['value'])}}javascript:;{{else /}}tel:{{$v.value}}{{/if}}" 
                                             class="buy-btn {{if !empty($v['class'])}}{{$v.class}}{{/if}}" 
                                             {{if !empty($v['title'])}}title="{{$v.title}}"{{/if}} 
-                                            data-type="{{$v.type}}">
+                                            data-type="{{$v.type}}" 
+                                            data-value="{{if isset($v['value'])}}{{$v.value}}{{/if}}">
                                                 {{if !empty($v['icon'])}}
                                                     <i class="{{$v.icon}}"></i>
                                                 {{/if}}
@@ -512,7 +513,8 @@
                                             <button type="button" 
                                             class="buy-btn {{$v.type}}-submit {{if !empty($v['color']) and $v['color'] eq 'second'}}buy-btn-second {{/if}} {{if !empty($v['class'])}}{{$v.class}} {{/if}}" 
                                             {{if !empty($v['title'])}}title="{{$v.title}}"{{/if}} 
-                                            data-type="{{$v.type}}">
+                                            data-type="{{$v.type}}" 
+                                            data-value="{{if isset($v['value'])}}{{$v.value}}{{/if}}">
                                                 {{if !empty($v['icon'])}}
                                                     <i class="{{$v.icon}}"></i>
                                                 {{/if}}
diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php
index 4a1826cea..f4fba6e46 100755
--- a/application/service/GoodsService.php
+++ b/application/service/GoodsService.php
@@ -546,7 +546,13 @@ class GoodsService
                 // 虚拟商品展示数据
                 if(isset($v['fictitious_goods_value']))
                 {
-                    $v['fictitious_goods_value'] = ResourcesService::ContentStaticReplace($v['fictitious_goods_value'], 'get');
+                    // 非后台模块移除该字段、避免数据泄露
+                    if(strtolower(request()->module()) != 'admin')
+                    {
+                        unset($v['fictitious_goods_value']);
+                    } else {
+                        $v['fictitious_goods_value'] = ResourcesService::ContentStaticReplace($v['fictitious_goods_value'], 'get');
+                    }
                 }
 
                 // 产地
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 0957c53b9..54bd7cf72 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -140,6 +140,9 @@ form.am-form .am-form-group-refreshing, .plug-file-upload-view { border-bottom:
     margin-left: 0;
     margin-top: 0;
 }
+.am-modal-dialog .am-modal-bd {
+    background: #fff;
+}
 
 
 /**
diff --git a/public/static/common/lib/amazeui-dialog/amazeui.dialog.js b/public/static/common/lib/amazeui-dialog/amazeui.dialog.js
index 327f3237f..966902606 100755
--- a/public/static/common/lib/amazeui-dialog/amazeui.dialog.js
+++ b/public/static/common/lib/amazeui-dialog/amazeui.dialog.js
@@ -14,14 +14,17 @@ var dialog = dialog || {};
 
 dialog.alert = function(options) {
   options = options || {};
-  options.title = options.title || '提示';
+  options.title = options.title || null;
   options.content = options.content || '提示内容';
   options.onConfirm = options.onConfirm || function() {
     };
   var html = [];
   html.push('<div class="am-modal am-modal-alert" tabindex="-1">');
   html.push('<div class="am-modal-dialog">');
-  html.push('<div class="am-modal-hd">' + options.title + '</div>');
+  if(options.title !== null)
+  {
+    html.push('<div class="am-modal-hd">' + options.title + '</div>');
+  }
   html.push('<div class="am-modal-bd">' + options.content + '</div>');
   html.push('<div class="am-modal-footer"><span class="am-modal-btn">确定</span></div>');
   html.push('</div>');
diff --git a/public/static/index/default/css/goods.css b/public/static/index/default/css/goods.css
index 433cf7ae1..593fda5a2 100755
--- a/public/static/index/default/css/goods.css
+++ b/public/static/index/default/css/goods.css
@@ -301,6 +301,12 @@ flex: 1 1 0%;line-height: 16px;cursor: pointer;}
         text-align: left;
     }
 }
+@media only screen and (min-width:1025px) {
+    .buy-nav {
+        padding-left: 65px;
+        margin-top: 10px !important;
+    }
+}
 @media only screen and (max-width:641px) {
     .buy-nav .buy-submit-container,
     .goods-not-buy-tips {
-- 
GitLab