Skip to content

I
integral-mall
Commit 36f3f925 by damodmg
Options

更新搜索

parent 92a100db
Showing with 43 additions and 7 deletions
dist/index.html
......@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=./static/css/app.69b7b9632e8bccd17c6822f5f9a44612.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.a306a0a29651efd7d040.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.ae5b8826c6dccc62782947fb47a5ab7d.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.936dcc0fccc45c6b01a2.js></script></body></html>
\ No newline at end of file
dist/static/js/app.936dcc0fccc45c6b01a2.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.a306a0a29651efd7d040.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/order/couponExchange.vue
......@@ -27,7 +27,15 @@
</el-select>
</div> -->
<div class="search-item">
<el-input v-model.trim="searchValue" style="width:260px;" placeholder="请输入会员/卡券/订单进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input>
<el-input placeholder="请输入关键词搜索" v-model.trim="searchValue" style="width:280px;" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)">
<el-select v-model="searchType" slot="prepend" placeholder="请选择" style="width:100px;">
<el-option label="订单编号" :value="1"></el-option>
<el-option label="卡券名称" :value="2"></el-option>
<el-option label="会员名" :value="3"></el-option>
<el-option label="会员卡号" :value="4"></el-option>
</el-select>
</el-input>
<!-- <el-input v-model.trim="searchValue" style="width:260px;" placeholder="请输入会员/卡券/订单进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input> -->
</div>
<div class="search-item">
<el-checkbox v-model="showSelfStatus" label="仅看本人" border @change="handleInputSearch" v-if="showFlag"></el-checkbox>
......@@ -162,6 +170,7 @@ export default {
tableData: [],
deliverNum: 0,
searchValue: '',
searchType: 1,
changeType: '', //配送方式
windowUrl: window.location.origin,
orderStatus: '-1',
......@@ -248,6 +257,7 @@ export default {
orderStatus: this.orderStatus,
changeType: this.changeType,
searchParams: this.searchValue,
searchType: this.searchType,
beginTime: this.beginTime,
endTime: this.endTime,
pageType: 1, //1、代表优惠券订单列表 2、礼品订单
......@@ -275,6 +285,7 @@ export default {
orderStatus: this.orderStatus,
changeType: -1,
searchParams: this.searchValue,
searchType: this.searchType,
beginTime: this.beginTime,
endTime: this.endTime,
integralMallProId: '',
......@@ -332,6 +343,7 @@ export default {
pageSize: this.pageSize,
orderStatus: this.orderStatus,
searchParams: this.searchValue,
searchType: this.searchType,
pageType: 1,
changeType: -1,
beginTime: this.beginTime,
......
src/views/order/giftExchange.vue
......@@ -18,10 +18,10 @@
<div class="operate-top">
<div class="fl">
<div class="search-item">
<el-date-picker class="date-picker" @change="changeTime" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width:360px;"></el-date-picker>
<el-date-picker class="date-picker" @change="changeTime" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width:350px;"></el-date-picker>
</div>
<div class="search-item">
<el-select v-model="changeType" placeholder="配送方式" clearable @change="getListCurr" style="width:140px;">
<el-select v-model="changeType" placeholder="配送方式" clearable @change="getListCurr" style="width:120px;">
<el-option label="物流发货" :value="2"></el-option>
<el-option label="在线发货（虚拟商品）" :value="3"></el-option>
<el-option label="门店自提" :value="4"></el-option>
......@@ -29,7 +29,15 @@
</el-select>
</div>
<div class="search-item">
<el-input style="width:240px;" v-model.trim="searchValue" placeholder="请输入会员/商品/订单搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input>
<el-input placeholder="请输入关键词搜索" v-model.trim="searchValue" style="width:280px;" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)">
<el-select v-model="searchType" slot="prepend" placeholder="请选择" style="width:100px;">
<el-option label="订单编号" :value="1"></el-option>
<el-option label="商品名称" :value="2"></el-option>
<el-option label="会员名" :value="3"></el-option>
<el-option label="会员卡号" :value="4"></el-option>
</el-select>
</el-input>
<!-- <el-input style="width:240px;" v-model.trim="searchValue" placeholder="请输入会员/商品/订单搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input> -->
</div>
<div class="search-item">
<el-checkbox v-model="showSelfStatus" label="仅看本人" border @change="getListCurr" v-if="showFlag"></el-checkbox>
......@@ -281,6 +289,7 @@ export default {
deliverNum: 0,
dateValue: [new Date() - 90 * 24 * 60 * 60 * 1000, new Date().valueOf()],
searchValue: '',
searchType: 1,
beginTime: '',
endTime: '',
changeType: '', //配送方式
......@@ -374,6 +383,7 @@ export default {
this.changeType = this.giftOrderObj.changeType; //配送方式
this.orderStatus = this.giftOrderObj.orderStatus; //-1:全部 1、待发货 11、待付款 3、已发货 0 、已取消 4、交易成功
this.searchValue = this.giftOrderObj.searchValue; //搜索
this.searchType = this.giftOrderObj.searchType;
this.pageType = this.giftOrderObj.pageType; //1、代表优惠券订单列表 2、礼品订单
this.beginTime = this.giftOrderObj.beginTime;
this.endTime = this.giftOrderObj.endTime;
......@@ -480,6 +490,7 @@ export default {
changeType: this.changeType === '' ? '-1' : this.changeType,
orderStatus: this.orderStatus, //-1:全部 1、待发货 11、待付款 3、已发货 0 、已取消 4、交易成功
searchParams: this.searchValue,
searchType: this.searchType,
pageType: 2, //1、代表优惠券订单列表 2、礼品订单
beginTime: this.beginTime,
endTime: this.endTime,
......@@ -539,6 +550,7 @@ export default {
orderStatus: this.orderStatus,
changeType: this.changeType ? this.changeType : -1,
searchParams: this.searchValue,
searchType: this.searchType,
beginTime: this.beginTime,
endTime: this.endTime,
integralMallProId: this.integralMallProId ? this.integralMallProId : '',
......@@ -775,6 +787,7 @@ export default {
changeType: this.changeType, //配送方式
orderStatus: this.orderStatus, //-1:全部 1、待发货 11、待付款 3、已发货 0 、已取消 4、交易成功
searchValue: this.searchValue, //搜索
searchType: this.searchType,
pageType: 2, //1、代表优惠券订单列表 2、礼品订单
beginTime: this.beginTime,
endTime: this.endTime,
......
src/views/order/refundList.vue
......@@ -27,7 +27,16 @@
</el-select>
</div>
<div class="search-item">
<el-input class="w-340" v-model.trim="searchValue" placeholder="请输入商品/会员/订单/退款编号进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input>
<el-input placeholder="请输入关键词搜索" v-model.trim="searchValue" style="width:280px;" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)">
<el-select v-model="searchType" slot="prepend" placeholder="请选择" style="width:100px;">
<el-option label="退款单编号" :value="1"></el-option>
<el-option label="订单编号" :value="2"></el-option>
<el-option label="商品名称" :value="3"></el-option>
<el-option label="会员名" :value="4"></el-option>
<el-option label="会员卡号" :value="5"></el-option>
</el-select>
</el-input>
<!-- <el-input class="w-340" v-model.trim="searchValue" placeholder="请输入商品/会员/订单/退款编号进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input> -->
</div>
<div class="search-item">
<el-checkbox v-model="showSelfStatus" label="仅看本人" border @change="getListCurr" v-if="showFlag"></el-checkbox>
......@@ -178,6 +187,7 @@ export default {
loading: false,
tableData: [],
searchValue: '', //搜索字段
searchType: 1,
refundType: '', //退款方式
dateValue: [new Date() - 90 * 24 * 60 * 60 * 1000, new Date().valueOf()], //时间
startTime: '',
......@@ -291,6 +301,7 @@ export default {
pageSize: this.pageSize,
refundType: this.refundType,
search: this.searchValue,
searchType: this.searchType,
sort: this.sortType,
startTime: this.startTime,
endTime: this.endTime,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment