From f584fb14f645f37a83ca67b98a2ae7ab240b0143 Mon Sep 17 00:00:00 2001 From: ltlzx <942659938@qq.com> Date: Wed, 20 Apr 2022 12:08:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E6=A1=A3=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/dateSelect/index.vue | 2 +- src/components/page/admission/index.vue | 11 ++++++++--- src/components/page/afterService/invoice.vue | 11 ++++++++--- src/components/page/classification/Category.vue | 12 +++++++++--- src/components/page/classification/DataQuery.vue | 11 ++++++++--- src/components/page/fundSettlement/index.vue | 11 ++++++++--- .../page/fundSettlement/splitProportion.vue | 11 ++++++++--- src/components/page/order/closed.vue | 11 ++++++++--- src/components/page/order/completed.vue | 2 +- src/components/page/order/index.vue | 11 ++++++++--- src/components/page/order/pendingPayment.vue | 11 ++++++++--- src/components/page/order/toBeDelivered.vue | 11 ++++++++--- src/components/page/order/toBeSettled.vue | 11 ++++++++--- src/utils/request.js | 4 ++-- 14 files changed, 93 insertions(+), 37 deletions(-) diff --git a/src/components/dateSelect/index.vue b/src/components/dateSelect/index.vue index f0dfb52..da5462c 100644 --- a/src/components/dateSelect/index.vue +++ b/src/components/dateSelect/index.vue @@ -63,7 +63,7 @@

标志码：{{item.goods_islicode}}

交易关联标识符：{{item.contract_code}}

标的类型：{{item.goods_type==1?'文化资源数据':'文化数字内容'}}

-

交易方式：{{item.goods_entrust==1?'转让':'许可'}}

+

交易方式：{{item.goods_entrust==1?'转让':'授权'}}

权益：{{item.goods_ownership_str}}

委托周期：{{item.contractual_period==1?'永久性委托':item.contractual_period==2?'一次性委托':'阶段性委托'}}

收费类型：{{item.charges_type==1?'免费':'付费'}}

diff --git a/src/components/page/admission/index.vue b/src/components/page/admission/index.vue index d2b7ece..40c57fc 100644 --- a/src/components/page/admission/index.vue +++ b/src/components/page/admission/index.vue @@ -52,7 +52,7 @@ - 查 询 + 查 询 重 置 @@ -208,10 +208,15 @@ export default { Object.assign(this.query, this.$options.data().query) this.getAllDate() }, - getAllDate(){ + getAllDate(type){ let data=this.query data.limit=this.limit - data.page=this.page + if(type==1){ + data.page=1 + this.page=1 + }else{ + data.page=this.page + } getAllDate(data).then(res=>{ // console.info(res) if(res.code==200){ diff --git a/src/components/page/afterService/invoice.vue b/src/components/page/afterService/invoice.vue index f8072c2..a97707d 100644 --- a/src/components/page/afterService/invoice.vue +++ b/src/components/page/afterService/invoice.vue @@ -49,7 +49,7 @@ - 查 询 + 查 询 重 置 @@ -175,10 +175,15 @@ export default { Object.assign(this.query, this.$options.data().query) this.getAllDate() }, - getAllDate(){ + getAllDate(type){ let data=this.query data.limit=this.limit - data.page=this.page + if(type==1){ + data.page=1 + this.page=1 + }else{ + data.page=this.page + } // getAllDate(data).then(res=>{ // // console.info(res) // if(res.code==200){ diff --git a/src/components/page/classification/Category.vue b/src/components/page/classification/Category.vue index 46891ce..707d4a2 100644 --- a/src/components/page/classification/Category.vue +++ b/src/components/page/classification/Category.vue @@ -47,7 +47,7 @@ - 查 询 + 查 询 重 置 @@ -283,10 +283,16 @@ export default { } }) }, - getAllDate(){ + getAllDate(type){ let data=this.query data.limit=this.limit - data.page=this.page + if(type==1){ + data.page=1 + this.page=1 + }else{ + data.page=this.page + } + ClassifyList(data).then(res=>{ console.info(res) if(res.code==200){ diff --git a/src/components/page/classification/DataQuery.vue b/src/components/page/classification/DataQuery.vue index cb65998..a5a7477 100644 --- a/src/components/page/classification/DataQuery.vue +++ b/src/components/page/classification/DataQuery.vue @@ -64,7 +64,7 @@ - 查 询 + 查 询 重 置 @@ -226,10 +226,15 @@ export default { Object.assign(this.query, this.$options.data().query) this.getAllDate() }, - getAllDate(){ + getAllDate(type){ let data=this.query data.limit=this.limit - data.page=this.page + if(type==1){ + data.page=1 + this.page=1 + }else{ + data.page=this.page + } getAllDate(data).then(res=>{ // console.info(res) if(res.code==200){ diff --git a/src/components/page/fundSettlement/index.vue b/src/components/page/fundSettlement/index.vue index 27712fd..81e4e12 100644 --- a/src/components/page/fundSettlement/index.vue +++ b/src/components/page/fundSettlement/index.vue @@ -40,7 +40,7 @@ - 查 询 + 查 询 重 置 @@ -170,10 +170,15 @@ export default { this.getList() }, methods:{ - getList(){ + getList(type){ let data=this.query data.limit=this.limit - data.page=this.page + if(type==1){ + data.page=1 + this.page=1 + }else{ + data.page=this.page + } closeList(data).then(res=>{ if(res.code==200){ this.data=res.data.data diff --git a/src/components/page/fundSettlement/splitProportion.vue b/src/components/page/fundSettlement/splitProportion.vue index 115c51f..50a2424 100644 --- a/src/components/page/fundSettlement/splitProportion.vue +++ b/src/components/page/fundSettlement/splitProportion.vue @@ -36,7 +36,7 @@ - 查 询 + 查 询 重 置 @@ -271,10 +271,15 @@ export default { } }) }, - getList(){ + getList(type){ let data=this.query data.limit=this.limit - data.page=this.page + if(type==1){ + data.page=1 + this.page=1 + }else{ + data.page=this.page + } ratioList(data).then(res=>{ if(res.code==200){ this.data=res.data.data diff --git a/src/components/page/order/closed.vue b/src/components/page/order/closed.vue index 32d0d8a..02d1f14 100644 --- a/src/components/page/order/closed.vue +++ b/src/components/page/order/closed.vue @@ -50,7 +50,7 @@ - 查 询 + 查 询 重 置 @@ -196,10 +196,15 @@ export default { Object.assign(this.query, this.$options.data().query) this.getList() }, - getList(){ + getList(type){ let data=this.query - data.page=this.page data.limit=this.limit + if(type==1){ + data.page=1 + this.page=1 + }else{ + data.page=this.page + } getOrderList(data).then(res=>{ if(res.code==200){ this.data=res.data.data diff --git a/src/components/page/order/completed.vue b/src/components/page/order/completed.vue index 494f44b..eddb8cc 100644 --- a/src/components/page/order/completed.vue +++ b/src/components/page/order/completed.vue @@ -50,7 +50,7 @@ - 查 询 + 查 询 重 置 diff --git a/src/components/page/order/index.vue b/src/components/page/order/index.vue index 58ca806..bd7cdea 100644 --- a/src/components/page/order/index.vue +++ b/src/components/page/order/index.vue @@ -61,7 +61,7 @@ - 查 询 + 查 询 重 置 @@ -219,10 +219,15 @@ export default { Object.assign(this.query, this.$options.data().query) this.getList() }, - getList(){ + getList(type){ let data=this.query - data.page=this.page data.limit=this.limit + if(type==1){ + data.page=1 + this.page=1 + }else{ + data.page=this.page + } getOrderList(data).then(res=>{ if(res.code==200){ this.data=res.data.data diff --git a/src/components/page/order/pendingPayment.vue b/src/components/page/order/pendingPayment.vue index 001fff5..a8447ac 100644 --- a/src/components/page/order/pendingPayment.vue +++ b/src/components/page/order/pendingPayment.vue @@ -50,7 +50,7 @@ - 查 询 + 查 询 重 置 @@ -194,10 +194,15 @@ export default { Object.assign(this.query, this.$options.data().query) this.getList() }, - getList(){ + getList(type){ let data=this.query - data.page=this.page data.limit=this.limit + if(type==1){ + data.page=1 + this.page=1 + }else{ + data.page=this.page + } getOrderList(data).then(res=>{ if(res.code==200){ this.data=res.data.data diff --git a/src/components/page/order/toBeDelivered.vue b/src/components/page/order/toBeDelivered.vue index 249e0c7..e5e37ca 100644 --- a/src/components/page/order/toBeDelivered.vue +++ b/src/components/page/order/toBeDelivered.vue @@ -50,7 +50,7 @@ - 查 询 + 查 询 重 置 @@ -196,10 +196,15 @@ export default { Object.assign(this.query, this.$options.data().query) this.getList() }, - getList(){ + getList(type){ let data=this.query - data.page=this.page data.limit=this.limit + if(type==1){ + data.page=1 + this.page=1 + }else{ + data.page=this.page + } getOrderList(data).then(res=>{ if(res.code==200){ this.data=res.data.data diff --git a/src/components/page/order/toBeSettled.vue b/src/components/page/order/toBeSettled.vue index 73d945f..bf99c0b 100644 --- a/src/components/page/order/toBeSettled.vue +++ b/src/components/page/order/toBeSettled.vue @@ -50,7 +50,7 @@ - 查 询 + 查 询 重 置 @@ -196,10 +196,15 @@ export default { Object.assign(this.query, this.$options.data().query) this.getList() }, - getList(){ + getList(type){ let data=this.query - data.page=this.page data.limit=this.limit + if(type==1){ + data.page=1 + this.page=1 + }else{ + data.page=this.page + } getOrderList(data).then(res=>{ if(res.code==200){ this.data=res.data.data diff --git a/src/utils/request.js b/src/utils/request.js index 6e029b6..e691353 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,9 +3,9 @@ import axios from 'axios'; const service = axios.create({ // process.env.NODE_ENV === 'development' 来判断是否开发环境 // baseURL:process.env.NODE_ENV == 'production' ? 'https://yztapi.xingtongworld.com' : '/api/', - baseURL:'http://jiao.api.alpha.xingtongworld.com', + // baseURL:'http://jiao.api.alpha.xingtongworld.com', // baseURL:'http://58.30.231.138:8899', - // baseURL:'http://192.168.66.254:8080', + baseURL:'http://192.168.66.254:8080', timeout: 5000, });