wupengfei пре 2 година
родитељ
комит
85e36a18b7
2 измењених фајлова са 50 додато и 71 уклоњено
  1. 1 2
      .idea/workspace.xml
  2. 49 69
      application/mall/view/store_goods/form.html

+ 1 - 2
.idea/workspace.xml

@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/mall/controller/StoreGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/controller/StoreGoods.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/mall/view/store_goods/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/view/store_goods/form.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -202,7 +201,7 @@
       <workItem from="1662342663926" duration="3749000" />
       <workItem from="1662424055312" duration="8281000" />
       <workItem from="1662528828371" duration="14923000" />
-      <workItem from="1662597494801" duration="11570000" />
+      <workItem from="1662597494801" duration="11725000" />
     </task>
     <servers />
   </component>

+ 49 - 69
application/mall/view/store_goods/form.html

@@ -20,8 +20,6 @@
             <ul class="layui-tab-title">
                 <li class="layui-this">基础设置</li>
                 <li>规格设置</li>
-                <li>优惠设置</li>
-                <li>其他</li>
             </ul>
                 <div class="layui-tab-content">
                     <!--基础设置-->
@@ -103,22 +101,57 @@
                             <script>$('[name="content"]').uploadMultipleImage()</script>
                         </div>
 
-                        <div class="layui-form-item">
-                            <span class="color-green label-required-prev">商品溯源图</span>
-                            <table class="layui-table">
-                                <thead>
-                                <tr>
-                                    <th class="text-left">展示图片</th>
-                                </tr>
-                                <tr>
-                                    <td width="auto" class="text-left"><input name="source_pic" type="hidden" value="{$vo.source_pic|default=''}"></td>
-                                </tr>
-                                </thead>
-                            </table>
-                            <script>$('[name="source_pic"]').uploadMultipleImage()</script>
+                        <!--  运费设置-->
+                        <div class="freight_box">
+
+                            <div class="layui-form-item layui-row layui-col-space15">
+                                <label class="layui-col-xs9 relative" style="width: 100%;">
+                                    <span class="color-green">模板开关</span>
+                                    <div class="layui-input-block margin-left-0 margin-top-15">
+                                        <label >
+                                            <input  type="radio"  class="layui-input" value="0" name="freight_type"  lay-filter="freight_type"   {if  !isset($vo.freight_type) || !$vo.freight_type}checked{/if} >
+                                        </label>
+                                        <span class="margin-right-10">固定运费</span>
+
+                                        <label>
+                                            <input type="radio" class="layui-input" value="1" name="freight_type"   lay-filter="freight_type" {if  isset($vo.freight_type) && $vo.freight_type}checked{/if} >
+                                        </label>
+                                        <span class="margin-right-10">运费模板</span>
+                                    </div>
+                                </label>
+                            </div>
+
+
+                            <div class="layui-form-item layui-row layui-col-space15 freight_mud" {if  !isset($vo.freight_type) || !$vo.freight_type}style="display:none"{/if}>
+                            <label class="layui-col-xs9 relative" style="width: 100%;">
+                                <span class="color-green">运费模板</span>
+                                <select name="freight_id" class="layui-select" lay-filter ="freight_id">
+                                    <option value="0" >请选择</option>
+                                    {if !empty($express)}
+                                    {foreach $express as $tk=>$tv}
+                                    {if isset($vo.freight_id) &&  $vo.freight_id ==$tv['id'] }
+                                    <option selected value="{$tv['id']}">{$tv['name']}</option>
+                                    {else}
+                                    <option value="{$tv['id']}">{$tv['name']}</option>
+                                    {/if}
+                                    {/foreach}
+                                    {/if}
+                                </select>
+                            </label>
                         </div>
 
+                        <div class="layui-form-item layui-row layui-col-space15 postage" {if isset($vo.freight_type) &&  $vo.freight_type}style="display:none"{/if}>
+                        <label class="layui-col-xs9 relative" style="width: 100%;">
+                            <span class="color-green">运费金额</span>
+                            <input type="number" step="1" min="0" name="postage"   value="{$vo.postage|default=''}" class="layui-input">
+                        </label>
+                        <div class="layui-form-mid layui-word-aux" style="margin-left: 10px">不填(或0)表示包邮</div>
                     </div>
+                </div>
+            <!-- 运费设置 end-->
+
+
+        </div>
                     <!--规格设置start-->
                     <div class="layui-tab-item">
                         <div class="layui-form-item">
@@ -193,66 +226,13 @@
                             <textarea class="layui-textarea layui-hide" name="specs">{{specs}}</textarea>
                             <textarea class="layui-textarea layui-hide" name="lists">{{specsTreeData}}</textarea>
                         </div>
-                    </div>
-
-                    <!--其他设置-->
-                    <div class="layui-tab-item">
-                        <!--  运费设置-->
-                        <div class="freight_box">
-
-                            <div class="layui-form-item layui-row layui-col-space15">
-                                <label class="layui-col-xs9 relative" style="width: 100%;">
-                                    <span class="color-green">模板开关</span>
-                                    <div class="layui-input-block margin-left-0 margin-top-15">
-                                        <label >
-                                            <input  type="radio"  class="layui-input" value="0" name="freight_type"  lay-filter="freight_type"   {if  !isset($vo.freight_type) || !$vo.freight_type}checked{/if} >
-                                        </label>
-                                        <span class="margin-right-10">固定运费</span>
-
-                                        <label>
-                                            <input type="radio" class="layui-input" value="1" name="freight_type"   lay-filter="freight_type" {if  isset($vo.freight_type) && $vo.freight_type}checked{/if} >
-                                        </label>
-                                        <span class="margin-right-10">运费模板</span>
-                                    </div>
-                                </label>
-                            </div>
-
-
-                            <div class="layui-form-item layui-row layui-col-space15 freight_mud" {if  !isset($vo.freight_type) || !$vo.freight_type}style="display:none"{/if}>
-                                <label class="layui-col-xs9 relative" style="width: 100%;">
-                                    <span class="color-green">运费模板</span>
-                                    <select name="freight_id" class="layui-select" lay-filter ="freight_id">
-                                        <option value="0" >请选择</option>
-                                        {if !empty($express)}
-                                            {foreach $express as $tk=>$tv}
-                                                {if isset($vo.freight_id) &&  $vo.freight_id ==$tv['id'] }
-                                                    <option selected value="{$tv['id']}">{$tv['name']}</option>
-                                                {else}
-                                                    <option value="{$tv['id']}">{$tv['name']}</option>
-                                                {/if}
-                                            {/foreach}
-                                        {/if}
-                                    </select>
-                                </label>
-                            </div>
-
-                            <div class="layui-form-item layui-row layui-col-space15 postage" {if isset($vo.freight_type) &&  $vo.freight_type}style="display:none"{/if}>
-                                <label class="layui-col-xs9 relative" style="width: 100%;">
-                                    <span class="color-green">运费金额</span>
-                                    <input type="number" step="1" min="0" name="postage"   value="{$vo.postage|default=''}" class="layui-input">
-                                </label>
-                                <div class="layui-form-mid layui-word-aux" style="margin-left: 10px">不填(或0)表示包邮</div>
-                            </div>
-                        </div>
-                        <!-- 运费设置 end-->
-
-
 
                         <div class="layui-form-item text-center">
                             {notempty name='vo.id'}<input type="hidden" name="id" value="{$vo.id}">{/notempty}
                             <button class="layui-btn layui-btn-danger" ng-click="hsitoryBack()" type="button">取消编辑</button>
                             <button class="layui-btn" type="submit">保存商品</button>
                         </div>
+
                     </div>
                 </div>
             </div>