迭代2

b5ea4d94 · zhangmeng · 08f96dec · b5ea4d94 · b5ea4d94 · 08f96dec
Commit b5ea4d94 authored Nov 14, 2018 by zhangmeng
8 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<<<<<<< HEAD
-<<<<<<< HEAD
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.1d82a5a6816bc5796024ca95599baea5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.ad484ea676beca0f8899.js></script><script type=text/javascript src=/marketing/static/js/app.6cd6b648b1cc6a8c6f5b.js></script></body></html>
-=======
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.50b60f2ce454775a58f1431c490672f6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.3e2a22ee87104fc44e91.js></script><script type=text/javascript src=/marketing/static/js/app.8c9725cbbb69439066e5.js></script></body></html>
->>>>>>> dev
-=======
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.9f60c06f301b140b6f29573a1992aa4f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.131eaee23561dd7a1016.js></script><script type=text/javascript src=/marketing/static/js/app.3e55d4c39d068c877dd6.js></script></body></html>
->>>>>>> dev
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.9f60c06f301b140b6f29573a1992aa4f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.131eaee23561dd7a1016.js></script><script type=text/javascript src=/marketing/static/js/app.797eade6429243a864df.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.9f60c06f301b140b6f29573a1992aa4f.css
+++ b/dist/static/css/app.9f60c06f301b140b6f29573a1992aa4f.css
--- a/dist/static/js/app.3e55d4c39d068c877dd6.js
+++ b/dist/static/js/app.3e55d4c39d068c877dd6.js
--- a/dist/static/js/app.6cd6b648b1cc6a8c6f5b.js
+++ b/dist/static/js/app.6cd6b648b1cc6a8c6f5b.js
--- a/dist/static/js/app.797eade6429243a864df.js
+++ b/dist/static/js/app.797eade6429243a864df.js
--- a/src/test/component/dmStore.zip
+++ b/src/test/component/dmStore.zip
--- a/src/test/component/dmStore/store-card.vue
+++ b/src/test/component/dmStore/store-card.vue
@@ -39,7 +39,7 @@
        <el-button type="text" @click="deleteRightAll">全部清除</el-button>
      </div>
      <div class="dm-store__search">
-        <el-input v-model="rightParams.search" placeholder="请输入门店名称" prefix-icon="el-icon-search" @change="getRightList"></el-input>
+        <el-input v-model="rightParams.search" placeholder="请输入门店名称" prefix-icon="el-icon-search" @change="initRightList"></el-input>
      </div>
      <el-checkbox-group v-model="rightCheckList" class="dm-store__list" v-loading="rightMoreLoading">
        <p v-for="(v,i) in rightList" :key="i" class="dm-store__item"  @mouseover="rightHoverIndex = i" @mouseout="rightHoverIndex = null">

--- a/src/views/game/klfl/record.vue
+++ b/src/views/game/klfl/record.vue
@@ -101,7 +101,6 @@ import {formateDateTimeByType} from '@/utils/index.js'
          this.listParams.endDate=formateDateTimeByType(this.date[1],'yyyy-MM-dd')
        }
        window.location = `${klflRecordExcel}?searchParam=${this.listParams.searchParam}&gameActivityId=${this.listParams.gameActivityId}&prizeReferType=${this.listParams.prizeReferType}&getStatus=${this.listParams.getStatus}&startDate=${this.listParams.startDate}&endDate=${this.listParams.endDate}&requestProject=gic-web`
-
      }
    }
  };