Merge branch 'master' of dq/kmall-pt into master

kmall-admin/src/main/resources/mybatis/mapper/HelpTypeDao.xml

@@ -25,8 +25,8 @@
     		`sort`
 		from mall_help_type
 		WHERE 1=1
-		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+		<if test="typeName != null and typeName.trim() != ''">
+			AND type_name LIKE concat('%',#{typeName},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -44,9 +44,9 @@
  	<select id="queryTotal" resultType="int">
 		select count(*) from mall_help_type
 		WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
-        </if>
+		<if test="typeName != null and typeName.trim() != ''">
+			AND type_name LIKE concat('%',#{typeName},'%')
+		</if>
 	</select>
 	 
 	<insert id="save" parameterType="com.kmall.admin.entity.HelpTypeEntity" useGeneratedKeys="true" keyProperty="id">

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

@@ -10,7 +10,7 @@
         <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.typeName" @on-enter="query" placeholder="名称"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

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

@@ -141,7 +141,7 @@ let vm = new Vue({
             vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
             $("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.userName},
+                postData: {'userName': vm.q.userName},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');

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

@@ -460,7 +460,7 @@ var vm = new Vue({
             });
 
             if (opt.flag != 1 && !(value === vm.categoryId)) {
-                if (vm.attributeEntityList.length > 0) {
+                if (vm.attributeEntityList.length > 0 && vm.attributeEntityList[0].attributeId != '') {
                     for (var i = 0; i < vm.attributeEntityList.length; i++) {
                         if (!(vm.attributeEntityList[0].attributeId === '')) {
                             vm.attributeEntityList[i].isDelete = 1;

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

@@ -41,6 +41,9 @@ var vm = new Vue({
         ruleValidate: {
             question: [
                 {required: true, message: '问题不能为空', trigger: 'blur'}
+            ],
+            answer: [
+                {required: true, message: '回答不能为空', trigger: 'blur'}
             ]
         },
         q: {

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

@@ -39,12 +39,12 @@ let vm = new Vue({
         title: null,
 		helpType: {},
 		ruleValidate: {
-			name: [
-				{required: true, message: '名称不能为空', trigger: 'blur'}
+            typeName: [
+				{required: true, message: '问题分类不能为空', trigger: 'blur'}
 			]
 		},
 		q: {
-		    name: ''
+            typeName: ''
 		}
 	},
 	methods: {
@@ -115,7 +115,7 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                typeName: ''
             }
             vm.reload();
 		},
@@ -123,7 +123,7 @@ let vm = new Vue({
 			vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'typeName': vm.q.typeName},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');