套餐价格区分为指导价，展示价，底价

shop/src/main/resources/template/js/meal/mealAdd.js

@@ -64,6 +64,8 @@ layui.config({
                     logo: $("#logo").find("input[type='hidden'][name='upload']").attr("oldurl"),
                     type: $("input[name='type']:checked").val(),
                     price: $("#price").val(),
+                    showPrice: $("#showPrice").val(),
+                    lowPrice: $("#lowPrice").val(),
                     mealNum: $("#mealNum").val(),
                     mealExplain: $("#mealExplain").val(),
                     state: $("input[name='state']:checked").val(),

shop/src/main/resources/template/js/meal/mealChoose.js

@@ -45,7 +45,9 @@ layui.config({
 					}
 					return "-";
 				}},
-				{ field: 'price', title: '价格', width: 100 }
+				{ field: 'price', title: '指导价', width: 100 },
+				{ field: 'showPrice', title: '展示价', width: 100 },
+				{ field: 'lowPrice', title: '底价', width: 100 }
 		    ]],
 		    done: function(res, curr, count){
 		    	matchingLanguage();

shop/src/main/resources/template/js/meal/mealEdit.js

@@ -87,6 +87,8 @@ layui.config({
                             logo: $("#logo").find("input[type='hidden'][name='upload']").attr("oldurl"),
                             type: $("input[name='type']:checked").val(),
                             price: $("#price").val(),
+                            showPrice: $("#showPrice").val(),
+                            lowPrice: $("#lowPrice").val(),
                             mealNum: $("#mealNum").val(),
                             mealExplain: $("#mealExplain").val(),
                             state: $("input[name='state']:checked").val(),

shop/src/main/resources/template/js/meal/mealList.js

@@ -44,7 +44,9 @@ layui.config({
                     return "上线";
                 }
             }},
-            { field: 'price', title: '价格', width: 100 },
+            { field: 'price', title: '指导价', width: 100 },
+            { field: 'showPrice', title: '展示价', width: 100 },
+            { field: 'lowPrice', title: '底价', width: 100 },
             { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
             { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
             { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },

shop/src/main/resources/template/tpl/meal/mealAdd.html

@@ -21,19 +21,31 @@
                     <div class="upload" id="logo"></div>
                 </div>
             </div>
-            <div class="layui-form-item layui-col-xs6">
+            <div class="layui-form-item layui-col-xs6" style="height: 108px">
                 <label class="layui-form-label">套餐类型<i class="red">*</i></label>
                 <div class="layui-input-block winui-radio">
                     <input type="radio" name="type" value="1" title="保养套餐" checked="checked"/>
                 </div>
             </div>
             <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">套餐价格<i class="red">*</i></label>
+                <label class="layui-form-label">指导价<i class="red">*</i></label>
                 <div class="layui-input-block">
-                    <input type="text" id="price" name="price" win-verify="required|money" placeholder="请输入套餐价格" class="layui-input"/>
+                    <input type="text" id="price" name="price" win-verify="required|money" placeholder="请输入指导价" class="layui-input"/>
                 </div>
             </div>
-            <div class="layui-form-item layui-col-xs12">
+            <div class="layui-form-item layui-col-xs6">
+                <label class="layui-form-label">展示价<i class="red">*</i></label>
+                <div class="layui-input-block">
+                    <input type="text" id="showPrice" name="showPrice" win-verify="required|money" placeholder="请输入展示价" class="layui-input"/>
+                </div>
+            </div>
+            <div class="layui-form-item layui-col-xs6">
+                <label class="layui-form-label">底价<i class="red">*</i></label>
+                <div class="layui-input-block">
+                    <input type="text" id="lowPrice" name="lowPrice" win-verify="required|money" placeholder="请输入底价" class="layui-input"/>
+                </div>
+            </div>
+            <div class="layui-form-item layui-col-xs6">
                 <label class="layui-form-label">可使用次数<i class="red">*</i></label>
                 <div class="layui-input-block">
                     <input type="text" id="mealNum" name="mealNum" win-verify="required|number" placeholder="请输入可使用次数" class="layui-input"/>

shop/src/main/resources/template/tpl/meal/mealEdit.html

@@ -27,19 +27,31 @@
                 <div class="upload" id="logo"></div>
             </div>
         </div>
-        <div class="layui-form-item layui-col-xs6">
+        <div class="layui-form-item layui-col-xs6" style="height: 108px">
             <label class="layui-form-label">套餐类型<i class="red">*</i></label>
             <div class="layui-input-block winui-radio">
                 <input type="radio" name="type" value="1" title="保养套餐"/>
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">套餐价格<i class="red">*</i></label>
+            <label class="layui-form-label">指导价<i class="red">*</i></label>
             <div class="layui-input-block">
-                <input type="text" id="price" name="price" win-verify="required|money" placeholder="请输入套餐价格" class="layui-input" value="{{price}}"/>
+                <input type="text" id="price" name="price" win-verify="required|money" placeholder="请输入指导价" class="layui-input" value="{{price}}"/>
             </div>
         </div>
-        <div class="layui-form-item layui-col-xs12">
+        <div class="layui-form-item layui-col-xs6">
+            <label class="layui-form-label">展示价<i class="red">*</i></label>
+            <div class="layui-input-block">
+                <input type="text" id="showPrice" name="showPrice" win-verify="required|money" placeholder="请输入展示价" class="layui-input" value="{{showPrice}}"/>
+            </div>
+        </div>
+        <div class="layui-form-item layui-col-xs6">
+            <label class="layui-form-label">底价<i class="red">*</i></label>
+            <div class="layui-input-block">
+                <input type="text" id="lowPrice" name="lowPrice" win-verify="required|money" placeholder="请输入底价" class="layui-input" value="{{lowPrice}}"/>
+            </div>
+        </div>
+        <div class="layui-form-item layui-col-xs6">
             <label class="layui-form-label">可使用次数<i class="red">*</i></label>
             <div class="layui-input-block">
                 <input type="text" id="mealNum" name="mealNum" win-verify="required|number" placeholder="请输入可使用次数" class="layui-input" value="{{mealNum}}"/>

shop/src/main/resources/template/tpl/meal/mealInfo.html

@@ -32,12 +32,24 @@
                 </div>
             </div>
             <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">套餐价格：</label>
+                <label class="layui-form-label">指导价：</label>
                 <div class="layui-input-block ver-center">
                     {{price}}
                 </div>
             </div>
-            <div class="layui-form-item layui-col-xs12">
+            <div class="layui-form-item layui-col-xs6">
+                <label class="layui-form-label">展示价：</label>
+                <div class="layui-input-block ver-center">
+                    {{showPrice}}
+                </div>
+            </div>
+            <div class="layui-form-item layui-col-xs6">
+                <label class="layui-form-label">底价：</label>
+                <div class="layui-input-block ver-center">
+                    {{lowPrice}}
+                </div>
+            </div>
+            <div class="layui-form-item layui-col-xs6">
                 <label class="layui-form-label">可使用次数：</label>
                 <div class="layui-input-block ver-center">
                     {{mealNum}}