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

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

@@ -45,17 +45,17 @@
             <Form-item label="发送结束时间" prop="sendEndTime">
                 <i-input  type='date'  v-model="storeSmsConfig.sendEndTime" placeholder="发送结束时间" style="width:160px;"/>
             </Form-item>
-<!--            <Form-item label="是否有效" prop="isValid">-->
-<!--                <i-input v-model="storeSmsConfig.isValid" placeholder="是否有效"/>-->
+<!--            <Form-item label="是否启用" prop="isValid">-->
+<!--                <i-input v-model="storeSmsConfig.isValid" placeholder="是否启用"/>-->
 <!--            </Form-item>-->
 
-            <Form-item label="是否有效" prop="isValid">
+            <Form-item label="是否启用" prop="isValid">
                 <Radio-group v-model="storeSmsConfig.isValid">
                     <Radio label="0">
-                        <span>有效</span>
+                        <span>启用</span>
                     </Radio>
                     <Radio label="1">
-                        <span>无效</span>
+                        <span>禁用</span>
                     </Radio>
                 </Radio-group>
             </Form-item>

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

@@ -12,13 +12,10 @@ $(function () {
 			{label: '发送结束时间', name: 'sendEndTime', index: 'send_end_time', align: 'center', width: 80,formatter: function (value) {
 					return transDate(value,'yyyy-MM-dd hh:mm:ss');
 				}},
-			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 80, align: 'center',formatter: function (value) {
-					if (value == '0') {
-						return '有效';
-					} else if (value == '1') {
-						return '无效';
-					}
-					return '';
+			{label: '是否启用', name: 'isValid', index: 'is_valid', width: 80, align: 'center', formatter: function (value) {
+					return value == 0 ?
+						'<span class="label label-success">是</span>' :
+						'<span class="label label-danger">否</span>';
 				}}],
 		viewrecords: true,
         height: 550,
@@ -68,7 +65,7 @@ let vm = new Vue({
 				{required: true, message: '发送结束时间不能为空', trigger: 'blur'}
 			],
 			isValid: [
-				{required: true, message: '是否有效不能为空', trigger: 'blur'}
+				{required: true, message: '是否启用不能为空', trigger: 'blur'}
 			]
 		},
 		q: {