From 9173f6e5b34a12c01804676d76842031e9ec6724 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 26 六月 2024 11:52:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

---
 CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html
index 75f7f33..211aeb2 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html
@@ -25,16 +25,16 @@
             <div class="layui-col-md12">
                 <div class="layui-card">
                     <!--<div class="layui-card-header">
-                        鍒嗛攢璁剧疆
+                        缁忛攢璁剧疆
                     </div>-->
 
                     <div class="layui-card-body">
 
                         <div class="layui-tab  layui-tab-card" lay-filter="setting">
                             <ul class="layui-tab-title">
-                                <li lay-id="distributionSet" class="layui-this">鍒嗛攢璁剧疆</li>
+                                <li lay-id="distributionSet" class="layui-this">缁忛攢璁剧疆</li>
                                 <li lay-id="userAgreement ">鐢ㄦ埛椤荤煡</li>
-                                <li lay-id="distributionAgreement">鍒嗛攢鍗忚</li>
+                                <li lay-id="distributionAgreement">缁忛攢鍗忚</li>
                             </ul>
                             <div class="layui-tab-content">
 
@@ -65,9 +65,16 @@
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['dictionaryUserGroupKey']['sKey']}}锛�</label>
                                             <div class="layui-input-inline ">
-                                                <input type="text" name="dictionaryUserGroupKey" value="{{d.data.configs['dictionaryUserGroupKey']['sValue']}}"  autocomplete="off" placeholder="" class="layui-input">
+                                                <input type="text" name="dictionaryUserGroupKey" value="{{d.data.configs['dictionaryUserGroupKey']['sValue']}}" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                             <div class="layui-form-mid layui-word-aux">*闈炲繀瑕佷笉淇敼*</div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['dictionaryDeliverFees']['sKey']}}锛�</label>
+                                            <div class="layui-input-inline ">
+                                                <input type="text" name="dictionaryDeliverFees" lay-verify="title|number" value="{{d.data.configs['dictionaryDeliverFees']['sValue']}}" autocomplete="off" placeholder="" class="layui-input">
+                                            </div>
+                                            <div class="layui-form-mid layui-word-aux">鍏�</div>
                                         </div>
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['dictionaryAchievementOnOff']['sKey']}}锛�</label>
@@ -79,7 +86,7 @@
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['dictionaryAchievementSet']['sKey']}}锛�</label>
                                             <div class="layui-input-inline  layui-inline-2">
-                                                <input type="text" name="dictionaryAchievementSet" value="{{d.data.configs['dictionaryAchievementSet']['sValue']}}"  autocomplete="off" placeholder="" class="layui-input" lay-verify="title|number" >
+                                                <input type="text" name="dictionaryAchievementSet" value="{{d.data.configs['dictionaryAchievementSet']['sValue']}}" autocomplete="off" placeholder="" class="layui-input" lay-verify="title|number">
                                             </div>
                                             <div class="layui-form-mid layui-word-aux">%</div>
                                         </div>
@@ -126,6 +133,20 @@
                                             </div>
                                         </div>
 
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['dictionaryTuiGuangFeiYong']['sKey']}}锛�</label>
+                                            <div class="layui-input-inline  layui-inline-2">
+                                                <input type="text" name="dictionaryTuiGuangFeiYong" value="{{d.data.configs['dictionaryTuiGuangFeiYong']['sValue']}}" autocomplete="off" placeholder="" class="layui-input" lay-verify="title|number">
+                                            </div>
+                                            <div class="layui-form-mid layui-word-aux">%</div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['dictionaryYeJiMenKan']['sKey']}}锛�</label>
+                                            <div class="layui-input-inline  layui-inline-2">
+                                                <input type="text" name="dictionaryYeJiMenKan" value="{{d.data.configs['dictionaryYeJiMenKan']['sValue']}}" autocomplete="off" placeholder="" class="layui-input" lay-verify="title|number">
+                                            </div>
+                                            <div class="layui-form-mid layui-word-aux">鍏�</div>
+                                        </div>
 
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">&nbsp;</label>
@@ -240,7 +261,7 @@
                 }
             });
 
-            //鍒濆鍖栧垎閿�璁剧疆鏄惁閫変腑鍟嗗搧
+            //鍒濆鍖栫粡閿�璁剧疆鏄惁閫変腑鍟嗗搧
             if (d.data.configs.distributionGoodsId) {
                 var obj = d.data.configs.distributionGoodsId;
                 if (obj.sValue) {

--
Gitblit v1.9.1