集成商品页面样式代码

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/MkActivitiesServiceImpl.java

@@ -50,6 +50,10 @@ public class MkActivitiesServiceImpl implements MkActivitiesService {
     @Override
     @Transactional
     public int save(MkActivitiesEntity mkActivities) {
+
+        // 先根据营销方式跟mkCode查询是否有
+
+
         SysUserEntity user = ShiroUtils.getUserEntity();
 
         mkActivities.setCreaterSn(user.getUserId().toString());

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

@@ -60,15 +60,6 @@
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
-                <!--#if($shiro.hasPermission("mkactivities:save"))
-                <i-button type="info" @click="addMkactivities"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivities:update"))
-                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivities:delete"))
-                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                #end-->
                 <i-button type="info" @click="addMkactivities"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 <i-button type="warning" @click="updateMkactivities"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
                 <i-button type="error" @click="delMkactivities"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
@@ -83,7 +74,12 @@
         <p slot="title">{{title}}</p>
         <i-form ref="formMkactivitiesValidate" :model="mkActivities" :rules="ruleValidate" :label-width="80">
             <Form-item label="活动主题" prop="mkaTopic">
-                <i-input v-model="mkActivities.mkaTopic" placeholder="活动主题"/>
+<!--                <i-input v-model="mkActivities.mkaTopic" placeholder="活动主题"/>-->
+                <i-select v-model="mkActivities.mkaTopic" placeholder="活动主题" filterable label-in-value>
+                    <i-option v-for="marketing in marketings" :value="marketing.id"
+                              :key="marketing.id">{{marketing.name}}
+                    </i-option>
+                </i-select>
             </Form-item>
             <Form-item label="商户" prop="merchSn">
                 <i-select v-model="mkActivities.merchSn" filterable placeholder="商户" @on-change="changeMerch" label-in-value>
@@ -141,4 +137,4 @@
 
 <script src="${rc.contextPath}/js/mk/mkactivityform.js?_${date.systemTime}"></script>
 </body>
-</html>
+</html>

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

@@ -22,11 +22,12 @@ $(function () {
         ],
         viewrecords: true,
         height: 550,
+        width:1680,
         rowNum: 10,
         rowList: [10, 30, 50],
         rownumbers: true,
         rownumWidth: 25,
-        autowidth: true,
+        autowidth: false,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -45,14 +46,41 @@ $(function () {
         }
     });
 
+    var marketing =
+        {'lscx': '临时促销','yhq': '优惠券','rchd': '日常活动','mysy': '买一送一','mj': '满减', 'mz': '满赠','dz': '打折','zhjsp': '组合价商品'};
+
+
+
+
     $("#jqGridOrder").jqGrid({
         url: '../mkactivityform/queryMkactivitiesList',
         datatype: "json",
         colModel: [
             {label: 'mkaId', name: 'mkaId', index: 'mka_id', key: true, hidden: true},
-            {label: '活动主题', name: 'mkaTopic', index: 'mka_topic', width: 80, align: 'center'},
+            {label: '活动主题', name: 'mkaTopic', index: 'mka_topic', width: 80, align: 'center',
+                formatter:function(value){
+                    var mkaTopicName ;
+                    if(value === 'lscx')
+                        mkaTopicName = marketing.lscx;
+                    else if(value === 'yhq')
+                        mkaTopicName = marketing.yhq;
+                    else if(value === 'rchd')
+                        mkaTopicName = marketing.rchd;
+                    else if(value === 'mysy')
+                        mkaTopicName = marketing.mysy;
+                    else if(value === 'mj')
+                        mkaTopicName = marketing.mj;
+                    else if(value === 'mz')
+                        mkaTopicName = marketing.mz;
+                    else if(value === 'dz')
+                        mkaTopicName = marketing.dz;
+                    else if(value === 'zhjsp')
+                        mkaTopicName = marketing.zhjsp;
+                    return mkaTopicName == null? value : mkaTopicName;
+                }},
             {label: '商户名称', name: 'merchName', width: 80, align: 'center'},
             {label: '第三方商户', name: 'thirdMerchName', width: 80, align: 'center'},
+            {label: '门店编号', name: 'storeId', width: 80, align: 'center',hidden: true},
             {label: '活动门店', name: 'storeName', width: 80, align: 'center'},
             {label: '是否启用', name: 'mkaStatus', index: 'mka_status', width: 60, align: 'center',
                 formatter: function (value) {
@@ -77,18 +105,14 @@ $(function () {
                 }
             },
             {label: '提前结束时间', name: 'mkdEndEarlyTime', index: 'mkd_end_early_time', width: 80, align: 'center'},
-            {label: '创建时间', name: 'createTime', index: 'create_time', width: 80, align: 'center',
-                formatter: function (value) {
-                    return transDate(value, 'yyyy-MM-dd hh:mm:ss');
-                }
-            },
-            {label: '创建人', name: 'createrName', width: 80, align: 'center'},
-            {label: '修改时间', name: 'updateTime', index: 'update_time', width: 80, align: 'center',
-                formatter: function (value) {
-                    return transDate(value, 'yyyy-MM-dd hh:mm:ss');
+            {label: '操作', width: 80, align: 'center',
+                formatter: function (value, col, row) {
+                    htmlStr = "<button class='btn btn-outline btn-primary' " +
+                        "onclick='vm.showMkactivitiesGoods(\""+row.mkaId+"\",\""+row.storeId+"\",\""+row.mkaTopic+"\")'>管理商品</button>";
+
+                    return htmlStr;
                 }
-            },
-            {label: '修改人', name: 'moderName', width: 80, align: 'center'}],
+            }],
         viewrecords: true,
         height: 550,
         width:1680,
@@ -96,7 +120,7 @@ $(function () {
         rowList: [10, 30, 50],
         rownumbers: true,
         rownumWidth: 25,
-        autowidth: true,
+        autowidth: false,
         multiselect: true,
         pager: "#jqGridPagerOrder",
         jsonReader: {
@@ -145,7 +169,34 @@ let vm = new Vue({
         storeList: {},//门店
         mkaStartTime: '',//开始时间
         mkdEndTime: '',//结束时间
-        mkdEndEarlyTime: ''//提前结束时间
+        mkdEndEarlyTime: '',//提前结束时间,
+        marketings:[
+            {
+                id: 'lscx',
+                name: '临时促销'
+            }, {
+                id: 'yhq',
+                name: '优惠券'
+            }, {
+                id: 'rchd',
+                name: '日常活动'
+            }, {
+                id: 'mysy',
+                name: '买一送一'
+            }, {
+                id: 'mj',
+                name: '满减'
+            }, {
+                id: 'mz',
+                name: '满赠'
+            }, {
+                id: 'dz',
+                name: '打折'
+            }, {
+                id: 'zhjsp',
+                name: '组合价商品'
+            }
+        ],
 	},
 	methods: {
 		query: function () {
@@ -281,6 +332,8 @@ let vm = new Vue({
             };
             vm.isMkdEndEarlyTimeShow = false;
 
+
+
             vm.getMerchList();
         },
         getMerchList: function() {
@@ -427,6 +480,30 @@ let vm = new Vue({
                 return;
             }
             return grid.getGridParam("selarrrow");
+        },
+
+        // 管理商品
+        showMkactivitiesGoods: function(mkaId,storeId,mkaTopic){
+            var url ;
+            // "/mk/mkstorecampminus.html"
+            if(mkaTopic === 'lscx')
+                url = "/mk/mkactivitiespromotion.html";
+            else if(mkaTopic === 'yhq')
+                url = "/mk/mkactivitiescoupon.html";
+            else if(mkaTopic === 'rchd')
+                url = "/mk/mkdailyactivities.html";
+            else if(mkaTopic === 'mysy')
+                url = "/mk/mkactivitiesgetonefreegoods.html";
+            else if(mkaTopic === 'mj')
+                url = "/mk/mkactivitiesfullreduction.html";
+            else if(mkaTopic === 'mz')
+                url = "/mk/mkactivitiesfullgift.html";
+            else if(mkaTopic === 'dz')
+                url = "/mk/mkactivitiesdiscount.html";
+            else if(mkaTopic === 'zhjsp')
+                url = "/mk/mkactivitiescombinationprice.html";
+            window.location.href =  url ; ;
         }
+
 	}
-});
+});