Merge branch 'master' of lsp/kmall-pt-general into master

kmall-admin/src/main/resources/mybatis/mapper/mk/MkActivityFormDao.xml

@@ -99,6 +99,9 @@
 		<if test="mkCode != null and mkCode.trim() != ''">
 			AND mk_code LIKE concat('%',#{mkCode},'%')
 		</if>
+        <if test="topic != null and topic.trim() != ''">
+            AND mka_topic LIKE concat('%',#{topic},'%')
+        </if>
 	</select>
 
 	<select id="queryMkactivitiesList" resultType="com.kmall.admin.entity.mk.MkActivitiesEntity">
@@ -133,6 +136,9 @@
 		<if test="mkCode != null and mkCode.trim() != ''">
 			AND a2.mk_code LIKE concat('%',#{mkCode},'%')
 		</if>
+        <if test="topic != null and topic.trim() != ''">
+            AND mka_topic LIKE concat('%',#{topic},'%')
+        </if>
 		<choose>
 			<when test="sidx != null and sidx.trim() != ''">
 				order by ${sidx} ${order}

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

@@ -25,6 +25,7 @@
                 #if($shiro.hasPermission("mkactivitiescombinationprice:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 #end
+                <i-button type="warning" @click="reloadMkactivities" v-show="!isMkactivitiesShow">返回营销方式页</i-button>
             </div>
         </Row>
 	    <table id="jqGrid"></table>

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

@@ -25,6 +25,7 @@
                 #if($shiro.hasPermission("mkactivitiescoupon:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 #end
+                <i-button type="warning" @click="reloadMkactivities" v-show="!isMkactivitiesShow">返回营销方式页</i-button>
             </div>
         </Row>
 	    <table id="jqGrid"></table>

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

@@ -25,6 +25,7 @@
                 #if($shiro.hasPermission("mkactivitiesdiscount:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 #end
+                <i-button type="warning" @click="reloadMkactivities" v-show="!isMkactivitiesShow">返回营销方式页</i-button>
             </div>
         </Row>
 	    <table id="jqGrid"></table>

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

@@ -25,6 +25,7 @@
                 #if($shiro.hasPermission("mkactivitiesfullgift:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 #end
+                <i-button type="warning" @click="reloadMkactivities" v-show="!isMkactivitiesShow">返回营销方式页</i-button>
             </div>
         </Row>
 	    <table id="jqGrid"></table>

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

@@ -25,6 +25,7 @@
                 #if($shiro.hasPermission("mkactivitiesfullreduction:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 #end
+                <i-button type="warning" @click="reloadMkactivities" v-show="!isMkactivitiesShow">返回营销方式页</i-button>
             </div>
         </Row>
 	    <table id="jqGrid"></table>

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

@@ -26,6 +26,7 @@
                 #if($shiro.hasPermission("mkactivitiesgetonefreegoods:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 #end
+                <i-button type="warning" @click="reloadMkactivities" v-show="!isMkactivitiesShow">返回营销方式页</i-button>
             </div>
         </Row>
 	    <table id="jqGrid"></table>

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

@@ -25,6 +25,7 @@
                 #if($shiro.hasPermission("mkactivitiespromotion:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 #end
+                <i-button type="warning" @click="reloadMkactivities" v-show="!isMkactivitiesShow">返回营销方式页</i-button>
             </div>
         </Row>
 	    <table id="jqGrid"></table>

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

@@ -31,7 +31,6 @@
         <table id="jqGrid"></table>
         <div id="jqGridPager"></div>
     </Card>
-
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
 		<i-form ref="formValidate" :model="mkActivityForm" :rules="ruleValidate" :label-width="80">
@@ -49,15 +48,16 @@
         </i-form>
 	</Card>
 
+    <!--营销方式-->
     <Card v-show="!showMkactivitiesViewList">
         <p slot="title">{{title}}</p>
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.topic" @on-enter="queryMkactivities" placeholder="名称"/>
                 </i-col>
-                <i-button @click="query">查询</i-button>
-                <i-button @click="reloadSearch">重置</i-button>
+                <i-button @click="queryMkactivities">查询</i-button>
+                <i-button @click="reloadMkactivitiesSearch">重置</i-button>
             </div>
             <div class="buttons-group">
                 <i-button type="info" @click="addMkactivities"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
@@ -69,7 +69,6 @@
         <table id="jqGridOrder"></table>
         <div id="jqGridPagerOrder"></div>
     </Card>
-
     <Card v-show="!showMkactivitiesList">
         <p slot="title">{{title}}</p>
         <i-form ref="formMkactivitiesValidate" :model="mkActivities" :rules="ruleValidate" :label-width="80">

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

@@ -25,6 +25,7 @@
                 #if($shiro.hasPermission("mkdailyactivities:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 #end
+                <i-button type="warning" @click="reloadMkactivities" v-show="!isMkactivitiesShow">返回营销方式页</i-button>
             </div>
         </Row>
 	    <table id="jqGrid"></table>

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

@@ -38,6 +38,15 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
+
+    let flag = getQueryString("flag");
+    if(flag != null && flag == "false"){
+        vm.isMkactivitiesShow = false;
+    }
+    let mkCode = getQueryString("mkCode");
+    if(mkCode){
+        vm.mkCode = mkCode;
+    }
 });
 
 let vm = new Vue({
@@ -53,7 +62,9 @@ let vm = new Vue({
 		},
 		q: {
 		    name: ''
-		}
+		},
+        isMkactivitiesShow: true,
+        mkCode: ''
 	},
 	methods: {
 		query: function () {
@@ -143,6 +154,10 @@ let vm = new Vue({
         },
         handleReset: function (name) {
             handleResetForm(this, name);
+        },
+        //返回营销方式页
+        reloadMkactivities: function () {
+            window.location.href = "/mk/mkactivityform.html?mkCode="+vm.mkCode;
         }
 	}
 });

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

@@ -39,6 +39,15 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
+
+    let flag = getQueryString("flag");
+    if(flag != null && flag == "false"){
+        vm.isMkactivitiesShow = false;
+    }
+    let mkCode = getQueryString("mkCode");
+    if(mkCode){
+        vm.mkCode = mkCode;
+    }
 });
 
 let vm = new Vue({
@@ -54,7 +63,9 @@ let vm = new Vue({
 		},
 		q: {
 		    name: ''
-		}
+		},
+        isMkactivitiesShow: true,
+        mkCode: ''
 	},
 	methods: {
 		query: function () {
@@ -144,6 +155,10 @@ let vm = new Vue({
         },
         handleReset: function (name) {
             handleResetForm(this, name);
+        },
+        //返回营销方式页
+        reloadMkactivities: function () {
+            window.location.href = "/mk/mkactivityform.html?mkCode="+vm.mkCode;
         }
 	}
 });

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

@@ -41,6 +41,15 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
+
+    let flag = getQueryString("flag");
+    if(flag != null && flag == "false"){
+        vm.isMkactivitiesShow = false;
+    }
+    let mkCode = getQueryString("mkCode");
+    if(mkCode){
+        vm.mkCode = mkCode;
+    }
 });
 
 let vm = new Vue({
@@ -56,7 +65,9 @@ let vm = new Vue({
 		},
 		q: {
 		    name: ''
-		}
+		},
+        isMkactivitiesShow: true,
+        mkCode: ''
 	},
 	methods: {
 		query: function () {
@@ -146,6 +157,10 @@ let vm = new Vue({
         },
         handleReset: function (name) {
             handleResetForm(this, name);
+        },
+        //返回营销方式页
+        reloadMkactivities: function () {
+            window.location.href = "/mk/mkactivityform.html?mkCode="+vm.mkCode;
         }
 	}
 });

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

@@ -42,6 +42,15 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
+
+    let flag = getQueryString("flag");
+    if(flag != null && flag == "false"){
+        vm.isMkactivitiesShow = false;
+    }
+    let mkCode = getQueryString("mkCode");
+    if(mkCode){
+        vm.mkCode = mkCode;
+    }
 });
 
 let vm = new Vue({
@@ -57,7 +66,9 @@ let vm = new Vue({
 		},
 		q: {
 		    name: ''
-		}
+		},
+        isMkactivitiesShow: true,
+        mkCode: ''
 	},
 	methods: {
 		query: function () {
@@ -147,6 +158,10 @@ let vm = new Vue({
         },
         handleReset: function (name) {
             handleResetForm(this, name);
+        },
+        //返回营销方式页
+        reloadMkactivities: function () {
+            window.location.href = "/mk/mkactivityform.html?mkCode="+vm.mkCode;
         }
 	}
 });

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

@@ -42,6 +42,15 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
+
+    let flag = getQueryString("flag");
+    if(flag != null && flag == "false"){
+        vm.isMkactivitiesShow = false;
+    }
+    let mkCode = getQueryString("mkCode");
+    if(mkCode){
+        vm.mkCode = mkCode;
+    }
 });
 
 let vm = new Vue({
@@ -57,7 +66,9 @@ let vm = new Vue({
 		},
 		q: {
 		    name: ''
-		}
+		},
+        isMkactivitiesShow: true,
+        mkCode: ''
 	},
 	methods: {
 		query: function () {
@@ -147,6 +158,10 @@ let vm = new Vue({
         },
         handleReset: function (name) {
             handleResetForm(this, name);
+        },
+        //返回营销方式页
+        reloadMkactivities: function () {
+            window.location.href = "/mk/mkactivityform.html?mkCode="+vm.mkCode;
         }
 	}
 });

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

@@ -43,6 +43,15 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
+
+    let flag = getQueryString("flag");
+    if(flag != null && flag == "false"){
+        vm.isMkactivitiesShow = false;
+    }
+    let mkCode = getQueryString("mkCode");
+    if(mkCode){
+        vm.mkCode = mkCode;
+    }
 });
 
 let vm = new Vue({
@@ -58,7 +67,9 @@ let vm = new Vue({
 		},
 		q: {
 		    name: ''
-		}
+		},
+        isMkactivitiesShow: true,
+        mkCode: ''
 	},
 	methods: {
 		query: function () {
@@ -148,6 +159,10 @@ let vm = new Vue({
         },
         handleReset: function (name) {
             handleResetForm(this, name);
+        },
+        //返回营销方式页
+        reloadMkactivities: function () {
+            window.location.href = "/mk/mkactivityform.html?mkCode="+vm.mkCode;
         }
 	}
 });

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

@@ -41,6 +41,15 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
+
+    let flag = getQueryString("flag");
+    if(flag != null && flag == "false"){
+        vm.isMkactivitiesShow = false;
+	}
+	let mkCode = getQueryString("mkCode");
+    if(mkCode){
+    	vm.mkCode = mkCode;
+	}
 });
 
 let vm = new Vue({
@@ -56,7 +65,9 @@ let vm = new Vue({
 		},
 		q: {
 		    name: ''
-		}
+		},
+        isMkactivitiesShow: true,
+		mkCode: ''
 	},
 	methods: {
 		query: function () {
@@ -146,6 +157,10 @@ let vm = new Vue({
         },
         handleReset: function (name) {
             handleResetForm(this, name);
+        },
+		//返回营销方式页
+        reloadMkactivities: function () {
+            window.location.href = "/mk/mkactivityform.html?mkCode="+vm.mkCode;
         }
 	}
 });

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

@@ -138,6 +138,10 @@ $(function () {
             $("#jqGridOrder").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
+
+
+    let mkCode = getQueryString("mkCode");
+    vm.showMkactivities(mkCode);
 });
 
 let vm = new Vue({
@@ -156,7 +160,8 @@ let vm = new Vue({
             ]
         },
         q: {
-            name: ''
+            name: '',
+            topic: ''
         },
 
         showMkactivitiesViewList: true,//管理营销方式
@@ -269,9 +274,7 @@ let vm = new Vue({
             });
 		},
         reloadSearch: function() {
-            vm.q = {
-                name: ''
-            }
+            vm.q.name = '';
             vm.reload();
 		},
 		reload: function (event) {
@@ -296,6 +299,9 @@ let vm = new Vue({
 
 
 		/*===营销方式===*/
+        queryMkactivities: function(){
+            vm.reloadMkactivities();
+        },
         showMkactivities: function (mkCode) {
             if(null == mkCode){
                 return;
@@ -308,6 +314,7 @@ let vm = new Vue({
             vm.reloadMkactivitiesSearch();
         },
         reloadMkactivitiesSearch: function() {
+            vm.q.topic = '';
             vm.reloadMkactivities();
         },
         reloadMkactivities: function () {
@@ -317,7 +324,7 @@ let vm = new Vue({
 
             let page = $("#jqGridOrder").jqGrid('getGridParam', 'page');
             $("#jqGridOrder").jqGrid('setGridParam', {
-                postData: {'mkCode': vm.mkCode},
+                postData: {'mkCode': vm.mkCode, 'topic': vm.q.topic},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formMkactivitiesValidate');
@@ -502,8 +509,7 @@ let vm = new Vue({
                 url = "/mk/mkactivitiesdiscount.html";
             else if(mkaTopic === 'zhjsp')
                 url = "/mk/mkactivitiescombinationprice.html";
-            window.location.href =  url ; ;
+            window.location.href =  url+"?flag=false&mkCode="+vm.mkCode;
         }
-
 	}
-});
+});

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

@@ -41,6 +41,15 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
+
+    let flag = getQueryString("flag");
+    if(flag != null && flag == "false"){
+        vm.isMkactivitiesShow = false;
+    }
+    let mkCode = getQueryString("mkCode");
+    if(mkCode){
+        vm.mkCode = mkCode;
+    }
 });
 
 let vm = new Vue({
@@ -56,7 +65,9 @@ let vm = new Vue({
 		},
 		q: {
 		    name: ''
-		}
+		},
+        isMkactivitiesShow: true,
+        mkCode: ''
 	},
 	methods: {
 		query: function () {
@@ -146,6 +157,10 @@ let vm = new Vue({
         },
         handleReset: function (name) {
             handleResetForm(this, name);
+        },
+        //返回营销方式页
+        reloadMkactivities: function () {
+            window.location.href = "/mk/mkactivityform.html?mkCode="+vm.mkCode;
         }
 	}
 });