门店信息设定修改

shop/src/main/resources/template/js/mealOrder/allMealOrderList.js

@@ -43,11 +43,11 @@ layui.config({
             { field: 'phone', title: '会员手机号', width: 100, rowspan: '2', align: "center"},
             { title: '下单地址', align: 'center', colspan: '2'},
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left", rowspan: '2'},
+            { field: 'payPrice', title: '实付金额', width: 100, align: "left", rowspan: '2'},
             { field: 'state', title: '订单状态', width: 80, align: "center", rowspan: '2', templet: function(d){
                 return shopUtil.getMealOrderStateName(d);
             }},
-            { field: 'payPrice', title: '实付金额', width: 100, align: "left", rowspan: '2'},
-            { field: 'payTime', title: '实付日期', align: 'center', rowspan: '2', width: 150 },
+            { field: 'payTime', title: '支付时间', align: 'center', rowspan: '2', width: 150 },
             { field: 'type', title: '订单来源', width: 80, align: "center", rowspan: '2', templet: function(d){
                 if(d.type == 1){
                     return "线上下单";
@@ -55,8 +55,8 @@ layui.config({
                     return "线下下单";
                 }
             }},
-            { field: 'createName', title: '录入人', width: 120, rowspan: '2' },
-            { field: 'createTime', title: '单据日期', align: 'center', width: 150, rowspan: '2' },
+            { field: 'createName', title: '专属顾问', width: 120, rowspan: '2' },
+            { field: 'createTime', title: '创建时间', align: 'center', width: 150, rowspan: '2' },
         ],[
             { field: 'areaName', title: '区域', align: 'left', width: 120},
             { field: 'storeName', title: '门店', align: 'left', width: 120}

shop/src/main/resources/template/js/mealOrder/memberMealOrderList.js

@@ -34,11 +34,11 @@ layui.config({
             { field: 'contacts', title: '会员名称', width: 100 },
             { field: 'phone', title: '会员手机号', width: 100, align: "center"},
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left"},
+            { field: 'payPrice', title: '实付金额', width: 100, align: "left"},
             { field: 'state', title: '订单状态', width: 80, align: "center", templet: function(d){
                 return shopUtil.getMealOrderStateName(d);
             }},
-            { field: 'payPrice', title: '实付金额', width: 100, align: "left"},
-            { field: 'payTime', title: '实付日期', align: 'center', width: 150 },
+            { field: 'payTime', title: '支付时间', align: 'center', width: 150 },
             { field: 'type', title: '订单来源', width: 80, align: "center", templet: function(d){
                 if(d.type == 1){
                     return "线上下单";
@@ -46,8 +46,8 @@ layui.config({
                     return "线下下单";
                 }
             }},
-            { field: 'createName', title: '录入人', width: 120 },
-            { field: 'createTime', title: '单据日期', align: 'center', width: 150 },
+            { field: 'createName', title: '专属顾问', width: 120 },
+            { field: 'createTime', title: '创建时间', align: 'center', width: 150 },
         ]],
         done: function(){
             matchingLanguage();

shop/src/main/resources/template/js/mealOrder/storeMealOrderList.js

@@ -38,11 +38,11 @@ layui.config({
             { field: 'contacts', title: '会员名称', width: 100 },
             { field: 'phone', title: '会员手机号', width: 100, align: "center"},
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left"},
+            { field: 'payPrice', title: '实付金额', width: 100, align: "left"},
             { field: 'state', title: '订单状态', width: 80, align: "center", templet: function(d){
                 return shopUtil.getMealOrderStateName(d);
             }},
-            { field: 'payPrice', title: '实付金额', width: 100, align: "left"},
-            { field: 'payTime', title: '实付日期', align: 'center', width: 150 },
+            { field: 'payTime', title: '支付时间', align: 'center', width: 150 },
             { field: 'type', title: '订单来源', width: 80, align: "center", templet: function(d){
                 if(d.type == 1){
                     return "线上下单";
@@ -50,8 +50,8 @@ layui.config({
                     return "线下下单";
                 }
             }},
-            { field: 'createName', title: '录入人', width: 120 },
-            { field: 'createTime', title: '单据日期', align: 'center', width: 150 },
+            { field: 'createName', title: '专属顾问', width: 120 },
+            { field: 'createTime', title: '创建时间', align: 'center', width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
         ]],
         done: function(){

shop/src/main/resources/template/js/storeOnlineSetUp/storeOnlineSetUp.js

@@ -14,7 +14,10 @@ layui.config({
 
     // 加载我所在的门店
     shopUtil.queryStaffBelongStoreList(function (json){
-        $("#storeId").html(getDataUseHandlebars(getFileContent('tpl/template/select-option.tpl'), json));
+        $("#storeId").html(getDataUseHandlebars(getFileContent('tpl/template/select-option-must.tpl'), json));
+        if(json.rows.length > 0){
+            loadStoreMation($("#storeId").val());
+        }
     });
 
     form.on('select(storeId)', function(data) {
@@ -22,10 +25,15 @@ layui.config({
         if(isNull(thisRowValue)){
             $("#formContent").html("");
         }else{
+            loadStoreMation(thisRowValue);
+        }
+    });
+
+    function loadStoreMation(storeId){
         showGrid({
             id: "formContent",
             url: shopBasePath + "store008",
-                params: {rowId: thisRowValue},
+            params: {rowId: storeId},
             pagination: false,
             method: "GET",
             template: beanTemplate,
@@ -130,7 +138,6 @@ layui.config({
             }
         });
     }
-    });
 
     $("body").on("click", "#calc", function() {
         var startTime = $("#businessStartTime").val();

shop/src/main/resources/template/tpl/keepFitOrder/keepFitOrderAdd.html

@@ -23,7 +23,7 @@
             <div class="layui-form-item layui-col-xs6">
                 <label class="layui-form-label">用户类型<i class="red">*</i></label>
                 <div class="layui-input-block winui-radio">
-                    <input type="radio" name="userType" value="1" title="匿名用户" lay-filter="userType"/>
+<!--                    <input type="radio" name="userType" value="1" title="匿名用户" lay-filter="userType"/>-->
                     <input type="radio" name="userType" value="2" title="会员" lay-filter="userType" checked="checked"/>
                 </div>
             </div>

shop/src/main/resources/template/tpl/mealOrder/storeMealOrderDetails.html

@@ -34,7 +34,7 @@
             </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">
                 {{createName}}
             </div>