Merge branch 'dev' of http://git.pro.g107.net/guojy/dd_pc into dev

src/init.vue

@@ -48,9 +48,15 @@ export default {
 				url:"https://page.dingtalk.com/wow/dingtalk/act/serviceconversation?wh_biz=tm&showmenu=false&goodsCode=DT_GOODS_881607043109331&corpId="+localStorage.getItem('corpId')+"&token=5784a3e6b5e025ee891517ea814180f4",
 				title: '客服群',
 				onSuccess : function(result) {
+					console.log('onSuccess')
+					console.log(result)
+					// this.onFail()
 				/**/
 				},
-				onFail : function(err) {}
+				onFail : function(err) {
+					console.log('onFail')
+					console.log(err)
+				}
 			})
 		},
 		//重新登录

src/views/set/rule.vue

@@ -17,12 +17,26 @@
 						<div class="name">{{ selectItem.name }}</div>
 						<el-button size="medium" plain v-if="selectItem.id" @click="edit_class">编辑</el-button>
 					</div>
-					<div class="flex-box btns flex-v-ce">
-						<el-button size="small" @click="del_item" type="danger" plain>批量删除</el-button>
-						<el-button size="small" @click="add_rule" type="primary">添加规则</el-button>
-						<el-button size="small" type="success" @click="import_rules_show = true" plain>导入规则</el-button>
-						<el-button size="small" type="success" @click="derivedRule" plain>导出规则</el-button>
+					<div class="flex-box" style="justify-content: space-between;">
+						<div class="flex-box btns flex-v-ce">
+							<el-button size="small" @click="del_item" type="danger" plain>批量删除</el-button>
+							<el-button size="small" @click="add_rule" type="primary">添加规则</el-button>
+							<el-button size="small" type="success" @click="import_rules_show = true" plain>导入规则</el-button>
+							<el-button size="small" type="success" @click="derivedRule" plain>导出规则</el-button>
+						</div>
+						<div class="" style="display:inline-block; width:180px;margin-top:12px;">
+							<el-input
+								placeholder="搜索规则内容"
+								ref="search-bar"
+								v-model="keyword"
+								class="input-with-select"
+								@keyup.enter.native="onFilterChanged"
+							>
+								<el-button slot="append" icon="el-icon-search" @click="onFilterChanged"></el-button>
+							</el-input>
+						</div>
 					</div>
+							
 					<el-table stripe ref="multipleTable" :data="item_list" tooltip-effect="dark" @selection-change="handleSelectionChange" @row-click="editDetails" align="center">
 						<el-table-column type="selection" width="55"></el-table-column>
 						<el-table-column prop="remark" label="内容" align="left"></el-table-column>
@@ -234,6 +248,8 @@ import QRCode from 'qrcodejs2';
 export default {
 	data() {
 		return {
+			keyword:'',//搜索关键字
+			
 			ruleDetails: {},
 			innerVisible: false,
 			bodyLoad: false,
@@ -853,11 +869,15 @@ export default {
 			});
 			return items;
 		},
+		//点击搜索
+		onFilterChanged: function() {
+			this.getData(true)
+		},
 
 		getData(is) {
 			this.rule_loading = true;
 			var that = this;
-			this.$axios('get', '/api/integral/rule/trees', { cycle_type: 1 })
+			this.$axios('get', '/api/integral/rule/trees', { cycle_type: 1 , keyword:this.keyword})
 				.then(res => {
 					var item_list = res.data.data.item_list || [];
 					var list = [];