Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/commonPage/DMCchooseImg.vue

@@ -178,7 +178,7 @@
     </div>
     <div v-if="activeName == 'first'">
       <span style="margin-left:24px;">
-        <input type="text" class="resource-name resAddImg" v-model="queryMsg.Name" @keyup.enter="getList"
+        <input type="text" class="resource-name resAddImg" v-model="queryMsg.Name" @keyup.enter="queryMsg.currentPage=1,queryMsg.pageIndex=1,getList()"
           placeholder="请输入关键字" />
         <span class="search-imgicon"><i class="iconfont icon-img_cz searchImgIcon" @click="queryMsg.currentPage=1,queryMsg.pageIndex=1,getList()"></i></span>
       </span>