Merge branch 'master' of zyh/kmall-haikong into master

kmall-admin/src/main/java/com/kmall/admin/controller/vip/Mall2PointsRulesController.java

@@ -1,9 +1,6 @@
 package com.kmall.admin.controller.vip;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import com.kmall.admin.dto.Mall2RulesDto;
 import com.kmall.admin.entity.vip.Mall2DetilEntity;
@@ -150,7 +147,8 @@ public class Mall2PointsRulesController {
     public R detilList(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
-
+        query.put("pointsDetilName", Objects.isNull(query.get("pointsDetilName")) ? null:query.get("pointsDetilName").toString().trim()) ;
+        query.put("pointsDetilNameId",Objects.isNull(query.get("pointsDetilNameId")) ? null:query.get("pointsDetilNameId").toString().trim());
         List<Mall2RulesDto> mall2PointsRulesList = mall2PointsRulesService.queryDetilList(query);
         int total = mall2PointsRulesService.querymall2PointsRulesDetilTotal(query);
         PageUtils pageUtil = new PageUtils(mall2PointsRulesList, total, query.getLimit(), query.getPage());

kmall-admin/src/main/webapp/WEB-INF/page/mk/mall2RulesDetil.html

@@ -77,8 +77,8 @@
                 </Form-item>
             </div>
             <div v-show="pointsType==2">
-                <Form-item label="商品条码" prop="pointsRulesName">
-                    <i-input v-model="mall2PointsRulesDetil.pointsRulesName" placeholder="商品条码"/>
+                <Form-item label="SKU" prop="pointsRulesName">
+                    <i-input v-model="mall2PointsRulesDetil.pointsRulesName" placeholder="SKU"/>
                 </Form-item>
 <!--                <Form-item label="对应的商品门店" prop="storeName">-->
 <!--                    <i-input v-model="mall2PointsRulesDetil.storeName" placeholder="门店名称"/>-->

kmall-admin/src/main/webapp/WEB-INF/page/shop/offilineOrderList.html

@@ -16,7 +16,10 @@
                     <i-input v-model="q.goodsSn" @on-enter="query" placeholder="sku"/>
                 </i-col>
                 <i-col span="3">
-                    <i-input v-model="q.storeName" @on-enter="query" placeholder="门店名称"/>
+<!--                    <i-input v-model="q.storeName" @on-enter="query" placeholder="门店名称"/>-->
+                    <i-select v-model="q.storeName" filterable placeholder="门店名称" label-in-value>
+                        <i-option v-for="store in storeSelects" :value="store.storeName" :key="store.storeName">{{store.storeName}}</i-option>
+                    </i-select>
                 </i-col>
                 <i-col span="3">
                     <i-select v-model="q.orderStatus" placeholder="订单状态">

kmall-admin/src/main/webapp/js/shop/offilineOrderList.js

@@ -230,7 +230,8 @@ let vm = new Vue({
         macros: [],
         orderProcessRecordEntity: {},
         orderGoodsList: [],
-        payRecordList:[]
+        payRecordList:[],
+        storeSelects:{}
     },
     methods: {
         query: function () {
@@ -641,12 +642,21 @@ let vm = new Vue({
             exportFile('#rrapp', '../exportExcel/exportSalesExcel', params);
             setTimeout(msg, 1000);
 
-        }
+        },
+        storeSelect:function (){
+            $.get("../store/list", function (r) {
+                vm.storeSelects = r.page.list;
+            });
+
+        },
     },
     created: function () {
         $.get("../shipping/queryAll", function (r) {
             vm.shippings = r.list;
         });
+    },
+    mounted:function (){
+        this.storeSelect();
     }
 });
     function getPrintContent(ticket) {