哥哥玩剑魂呢 4 rokov pred
rodič
commit
a8df44b62e
3 zmenil súbory, kde vykonal 19 pridanie a 6 odobranie
  1. 8 2
      src/init.vue
  2. 2 2
      src/views/set/jurisdiction.vue
  3. 9 2
      src/views/set/rule.vue

+ 8 - 2
src/init.vue

@@ -46,11 +46,17 @@ export default {
 		bundleOfServices(){
 			this.$dd.biz.util.openSlidePanel({
 				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: 'title',
+				title: '客服群',
 				onSuccess : function(result) {
 					console.log('onSuccess')
 					console.log(result)
-					// this.onFail()
+					this.$dd.biz.navigation.quit({
+						message: result,//退出信息,传递给openModal或者openSlidePanel的onSuccess函数的result参数
+						onSuccess : function(result) {
+							/**/
+						},
+						onFail : function() {}
+					})
 				/**/
 				},
 				onFail : function(err) {

+ 2 - 2
src/views/set/jurisdiction.vue

@@ -147,7 +147,7 @@
 									</div>
 								</template>
 							</el-table-column>
-							<el-table-column label="每月奖分上限">
+							<el-table-column label="每月B分奖分上限">
 								<template slot-scope="scope">
 									<div @click="open_integral_limit(scope.row)" v-show="scope.row.entry_limit == 0" class="cursor_pointer" style="text-decoration:underline">
 										未设置
@@ -292,7 +292,7 @@
 		        <el-input v-model.number="item.point" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
 		      </el-form-item>
 		    </span>
-		    <el-form-item label="每月奖分上限" prop="entry_limit" >
+		    <el-form-item label="每月B分奖分上限" prop="entry_limit" >
 		      <el-input v-model.number="integral_limit_form.entry_limit" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
 		    </el-form-item>
 		    <el-form-item style="text-align: right; margin-bottom: 0">

+ 9 - 2
src/views/set/rule.vue

@@ -17,20 +17,21 @@
 						<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" style="justify-content: space-between;">
+					<div class="flex-box ruleSearch" style="">
 						<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;">
+						<div class="" style="display:inline-block; width:180px;margin:20px 0 0 10px;">
 							<el-input
 								placeholder="搜索规则内容"
 								ref="search-bar"
 								v-model="keyword"
 								class="input-with-select"
 								@keyup.enter.native="onFilterChanged"
+								style=""
 							>
 								<el-button slot="append" icon="el-icon-search" @click="onFilterChanged"></el-button>
 							</el-input>
@@ -1025,6 +1026,9 @@ $red: #f56c6c;
 		margin-right: 20px;
 	}
 	.btns button {
+		font-size: 14px;
+		height: 38px;
+		width: 90px;
 		margin-top: 20px;
 		margin-right: 5px;
 	}
@@ -1101,4 +1105,7 @@ $red: #f56c6c;
 .lookQrcode:hover {
 	color: #2490fd;
 }
+.ruleSearch ::v-deep .el-input__inner{
+	height:38px;
+}
 </style>