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

kmall-admin/src/main/java/com/kmall/admin/service/impl/vip/Mall2PointsRulesServiceImpl.java

@@ -233,7 +233,7 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
 
                 List<Mall2RulesDto> mall2RulesDtos = mall2PointsRulesDao.querymall2PointsRulesDetil(query);
                 if (!mall2RulesDtos.isEmpty()){
-                    stringBuilder.append(mall2RulesDto.getPointsRulesName()+"已存在,无法添加，请进行修改操作");
+                    stringBuilder.append(mall2RulesDto.getPointsRulesName()+"已存在,无法添加");
                 }
             }
             if (stringBuilder.length()>0){

kmall-admin/src/main/resources/mybatis/mapper/vip/Mall2PointsRulesDao.xml

@@ -268,8 +268,8 @@
 		<if test="pointsDetilNameId !=null and pointsDetilNameId !=''">
 			and points_detil_name_id=#{pointsDetilNameId}
 		</if>
-		<if test="pointsDetilName !=null and pointsDetilName !=''">
-			and points_detil_name=#{pointsDetilName}
+		<if test="pointsDetilName !=null and pointsDetilName.trim() !=''">
+			and points_detil_name like concat('%',#{pointsDetilName},'%')
 		</if>
 		<if test="storeName !=null and storeName !=''">
 			and points_store_name=#{storeName}

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

@@ -57,23 +57,36 @@
 <!--            </Form-item>-->
             <div v-show="pointsType==0">
                 <Form-item label="门店名称" prop="pointsRulesName">
-                    <i-input v-model="mall2PointsRulesDetil.pointsRulesName" placeholder="门店名称"/>
+                    <i-select v-model="mall2PointsRulesDetil.pointsRulesName" 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-input v-model="mall2PointsRulesDetil.pointsRulesName" placeholder="门店名称"/>-->
                 </Form-item>
             </div>
             <div v-show="pointsType==1">
                 <Form-item label="类别名称" prop="pointsRulesName">
                     <i-input v-model="mall2PointsRulesDetil.pointsRulesName" placeholder="类别名称"/>
                 </Form-item>
+<!--                <Form-item label="对应的商品门店" prop="storeName">-->
+<!--                    <i-input v-model="mall2PointsRulesDetil.storeName" placeholder="门店名称"/>-->
+<!--                </Form-item>-->
                 <Form-item label="对应的商品门店" prop="storeName">
-                    <i-input v-model="mall2PointsRulesDetil.storeName" placeholder="门店名称"/>
+                    <i-select v-model="mall2PointsRulesDetil.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>
                 </Form-item>
             </div>
             <div v-show="pointsType==2">
                 <Form-item label="商品条码" prop="pointsRulesName">
                     <i-input v-model="mall2PointsRulesDetil.pointsRulesName" placeholder="商品条码"/>
                 </Form-item>
+<!--                <Form-item label="对应的商品门店" prop="storeName">-->
+<!--                    <i-input v-model="mall2PointsRulesDetil.storeName" placeholder="门店名称"/>-->
+<!--                </Form-item>-->
                 <Form-item label="对应的商品门店" prop="storeName">
-                    <i-input v-model="mall2PointsRulesDetil.storeName" placeholder="门店名称"/>
+                    <i-select v-model="mall2PointsRulesDetil.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>
                 </Form-item>
             </div>
             <Form-item>

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

@@ -210,7 +210,7 @@
             </div>
             <div class="col-md-6 col-sm-8" style="padding: 0px;background-color: #f0f0f0">
                 <ul class="list-unstyled; ">
-                    <li ref="overflowLi" style="height: 250px;overflow:auto">
+                    <li ref="overflowLi" style="height: 310px;overflow:auto">
                         <table id="cbec" class="table .table-striped">
                             <tr style="border: white;background-color: #F5DCB3;font-size: 1.3em" >
                                 <th style="width: 26%;">跨境商品名称</th>
@@ -269,12 +269,13 @@
                             <li v-if="showReduceMoney != 0"><h3 style="border: white;padding: 8px;font-weight:600;">满减:{{showReduceMoney}}</h3></li>
                         </ul>
                     </li>
-                    <li  style="height: 90px;">
+                    <li style="padding-bottom: 10px;">
                         <i-button type="error" @click="clearGoodsList" class="goods-button"><i class="fa fa-pencil-square-o"></i>&nbsp;清空</i-button>
                         <i-button data-toggle="modal" @click="pendingOrder" class="goods-button" ><i class="fa fa-pencil-square-o"></i>&nbsp;订单挂起</i-button>
                         <i-button data-toggle="modal" @click="toResumePending" class="goods-button" ><i class="fa fa-pencil-square-o"></i>&nbsp;恢复挂起</i-button>
                         <i-button data-toggle="modal" @click="calculateOrderPrice" type="primary" class="goods-button" ><i class="fa fa-pencil-square-o"></i>&nbsp;计算优惠后价格</i-button>
                         <i-button data-toggle="modal" @click="toOrderSubmit" type="primary" class="goods-button" ><i class="fa fa-pencil-square-o"></i>&nbsp;提交订单</i-button>
+<!--                        <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="demo" id="demo" data-dismiss="modal">测试打印小票</button>-->
 
 <!--                        45636914-->
                         <div class="modal fade" id="pendignOrderModal"  role="dialog" aria-labelledby="pendignOrderLabel" aria-hidden="true">

kmall-admin/src/main/webapp/js/mk/mall2RulesDetil.js

@@ -115,7 +115,8 @@ let vm = new Vue({
 		storeId : '',
 		mkaId : '',
 		mall2PointsRulesDetil:{},
-		pointsType:""
+		pointsType:"",
+		storeSelects:{}
 	},
 	methods: {
 		query: function () {
@@ -258,6 +259,12 @@ let vm = new Vue({
 		uploadExcelError: function () {
 			alert('上传出现异常，请重试！');
 		},
+		storeSelect:function (){
+			$.get("../store/list", function (r) {
+				vm.storeSelects = r.page.list;
+			});
+
+		},
 		uploadExcelFormatError: function (file) {
 			this.$Notice.warning({
 				title: '文件格式不正确',
@@ -274,5 +281,9 @@ let vm = new Vue({
 			});
 			return promise; //通过返回一个promis对象解决
 		},
+	},
+	mounted:function (){
+		this.storeSelect();
 	}
+
 });

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -1548,6 +1548,15 @@ let vm = new Vue({
         },
 
 
+    },
+    mounted:function (){
+        // 页面开始加载时修改font-size
+        var html = document.getElementsByTagName("html")[0];
+        var oWidth =
+            document.body.clientWidth || document.documentElement.clientWidth;
+        // 这里的1920是指设计图的大小,自己根据实际情况改变
+        html.style.fontSize = (oWidth / 1920) * 100 + "px";
+        console.log("rem:", html.style.fontSize);
     }
 });