From 83a891cddada0d1ee6694ae5406532f2c24588b4 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Fri, 8 Sep 2023 19:19:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=AF=BC=E7=95=8C=E9=9D=A2=20?= =?UTF-8?q?=E6=94=B6=E5=88=B0=E5=A7=94=E6=89=98=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WaterfallsFlowItem/WaterfallsFlowItem.vue | 2 +- config/app.js | 8 +- manifest.json | 4 +- .../initiateDelegation/index.vue | 26 +- .../receivedCommission/index.vue | 261 +++++++++----- pages/guide/guide.vue | 323 ++++++++++++++++++ pages/guide/judge.vue | 34 ++ pages/moreProject/moreProject.vue | 4 +- static/images/guide.png | Bin 0 -> 642862 bytes 9 files changed, 562 insertions(+), 100 deletions(-) create mode 100644 pages/guide/guide.vue create mode 100644 pages/guide/judge.vue create mode 100644 static/images/guide.png diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue index 620dbcf..09a9e07 100644 --- a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue +++ b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue @@ -80,7 +80,7 @@ export default { require: true }, type: { - type: Number, + type: Number|String, default: 0 }, isStore: { diff --git a/config/app.js b/config/app.js index 29070a6..f6c51a7 100644 --- a/config/app.js +++ b/config/app.js @@ -9,8 +9,8 @@ let httpApiThree // 网络接口修改此字符 小程序域名要求https // let httpApi = 'http://192.168.31.110:8324' // 测试 if (process.env.NODE_ENV === "development") { - httpApi = 'https://shop.lihaink.cn' // 生产 - // httpApi = "https://crmeb-test.shop.lihaink.cn" + // httpApi = 'https://shop.lihaink.cn' // 生产 + httpApi = "https://crmeb-test.shop.lihaink.cn" // httpApi = "http://192.168.0.222" // httpApi = "http://192.168.0.108:8325" // httpApi = 'http://192.168.0.108:8325' @@ -20,12 +20,12 @@ if (process.env.NODE_ENV === "development") { // #endif // #ifdef H5 // httpApiTwo = "baseUrl" // h5跨域配置 - httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置 + httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置 // httpApiThree = 'baseUrlTest' // h5跨域配置 // #endif } else if (process.env.NODE_ENV === 'production') { httpApi = 'https://shop.lihaink.cn' // 生产 - // httpApi = "https://crmeb-test.shop.lihaink.cn" + //httpApi = "https://crmeb-test.shop.lihaink.cn" httpApiTwo = 'https://nk.lihaink.cn' // 生产 httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 } diff --git a/manifest.json b/manifest.json index e07e880..abe0f2c 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.3.0", - "versionCode" : 130, + "versionName" : "1.3.1", + "versionCode" : 131, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue index bc22a0f..bbc03ad 100644 --- a/pages/commissionedSales/initiateDelegation/index.vue +++ b/pages/commissionedSales/initiateDelegation/index.vue @@ -33,6 +33,10 @@ 处理 + + 删除 + + 详情 @@ -309,7 +313,11 @@ //获取分类数据 commislist() { entrustlist(this.where).then((res) => { - this.orderList = res.data.list + this.orderList.push(...res.data.list) + if (res.data.list.length < this.where.limit) this.status = 'nomore' + + if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true + }) }, @@ -363,14 +371,22 @@ }, //删除订单 deleteOrder(item) { - + checkchain(item.entrust_mer_id).then(res => { + this.$util.Tips({ + title: res.message, + icon: 'success' + }) + this.orderList = [] + this.tabTitle = "tabOne" + this.commislist() + }) }, // 审核未通过 编辑 auditEdit() { }, //审核通过 拒绝 - passDelete() { + passDelete(item) { checkchain(item.entrust_mer_id, { status: 2 }).then((res) => { @@ -379,7 +395,7 @@ icon: 'success' }) this.orderList = [] - this.tabTitle ="tabOne" + this.tabTitle = "tabOne" this.commislist() }) }, @@ -393,7 +409,7 @@ icon: 'success' }) this.orderList = [] - this.tabTitle ="tabOne" + this.tabTitle = "tabOne" this.commislist() this.$refs.bindmobile.close() }) diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue index 2a290fc..6e0bd48 100644 --- a/pages/commissionedSales/receivedCommission/index.vue +++ b/pages/commissionedSales/receivedCommission/index.vue @@ -5,8 +5,8 @@ - - + + @@ -14,81 +14,90 @@ - {{item.content}} + {{item.title}} - 委托周期:{{item.day}} + 委托周期:{{item.credit_buy}} - - + + + + 待处理 - + 处理 - + + 删除 + + + 详情 - + 已接受 - 结束委托 - + 详情 - + 已拒绝 - + 删除 - + 详情 - - 已完成 - + 删除 - + 详情 - + + + + + + 新增委托 + + - @@ -100,19 +109,16 @@ 委托申请处理 - 结算周期: 30天 - - + 结算周期: {{obj.settle_cycle}}天 - 利息比例: 0.05% + 利息比例: {{obj.interest_rate}}% - - + 拒绝 - + 接受 @@ -122,7 +128,6 @@ - @@ -142,15 +147,11 @@ - - - - @@ -163,13 +164,10 @@ 结算周期: 30天 - - 利息比例: 0.05% - 拒绝 @@ -197,20 +195,15 @@ 结算周期: 30天 - - 利息比例: 0.05% - 拒绝原因： -