From 5d64234120b43b239121703d4091307e1f74654a Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Mon, 25 Sep 2023 00:19:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 11 +- pages/margin/margin.vue | 256 ++++++++++++++++++++++++++++++ pages/moreProject/moreProject.vue | 121 ++++++-------- pages/store/settled/index.vue | 4 +- 4 files changed, 315 insertions(+), 77 deletions(-) create mode 100644 pages/margin/margin.vue diff --git a/pages.json b/pages.json index 0aea24e..ea535c2 100644 --- a/pages.json +++ b/pages.json @@ -146,7 +146,16 @@ "navigationStyle": "custom" } } - ], + ,{ + "path" : "pages/margin/margin", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ], "subPackages": [{ "root": "pages/goods_cate", "name": "goods_cate", diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue new file mode 100644 index 0000000..a1f7188 --- /dev/null +++ b/pages/margin/margin.vue @@ -0,0 +1,256 @@ + + + + + + \ No newline at end of file diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 810b95d..acfab95 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -67,8 +67,8 @@ 订单核销 - - + + 保证缴纳金 @@ -183,8 +183,8 @@ 商户设置 - - + + 保证缴纳金 @@ -302,8 +302,8 @@ 商户设置 - - + + 保证缴纳金 @@ -373,8 +373,8 @@ 商户设置 - - + + 保证缴纳金 @@ -398,8 +398,8 @@ - - + + 保证缴纳金 @@ -417,7 +417,8 @@
{{detail.title}}
- + 甲方公司:{{company?company:"暂无公司信息"}} + 机构代码:{{organization_code?organization_code:"暂无公司信息"}} @@ -543,7 +544,7 @@ intentionbus } from "@/api/product" import { - + merstreet, getUserInfo } from '@/api/user.js' import { @@ -568,6 +569,8 @@ }, data() { return { + company: '', + organization_code:'', locationArr: ({}), emptyText: '暂无可用应用', jurisdiction: false, // 是否有权限 @@ -619,8 +622,8 @@ this.jurisdiction = true } this.getUserInfo() - this.list() this.codelist() + this.list() }, @@ -640,53 +643,7 @@ }) }, - decimal() { - merchant({ - id: this.mer_id - }).then((res) => { - this.merchant_Data = res.data - }); - }, - //缴纳保证金 - paydecimal() { - if (this.merchant_Data.is_margin != 1) { - this.$util.Tips({ - title: '暂时无需缴纳保证金' - }); - } else { - - - uni.showModal({ - title: '提示', - content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金', - success: function(res) { - if (res.confirm) { - // console.log('用户点击确定'); - paymerchant().then((res) => { - console.log(res.data) - uni.requestPayment({ - provider: 'wxpay', - orderInfo: res.data - .config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】 - success: function(res) { - console.log('success:' + JSON.stringify(res)); - }, - fail: function(err) { - console.log('fail:' + JSON.stringify(err)); - } - }); - }).catch((err) => { - console.log(err) - }) - } else if (res.cancel) { - console.log('用户点击取消'); - } - } - }); - - } - - }, + //提交 formSubmit: function(e) { let that = this; @@ -885,21 +842,17 @@ } }, + margin(url) { + uni.navigateTo({ + url: url+`?mer_id=` + this.mer_id + }) + }, //商户设置 buyserset() { uni.navigateTo({ url: `/pages/product/basicSet?mer_id=` + this.mer_id }) }, - //获取协议内容 - list() { - business({ - type: 'mer_settlement_agree' - }).then(res => { - this.detail = res.data - }) - }, - navigator(url, t) { if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) { this.isFshow = true @@ -913,16 +866,28 @@ getUserInfo: function() { let that = this; getUserInfo().then(res => { - that.userInfoData = res.data; + this.userInfoData = res.data; this.merchantData.phone = res.data.phone - + merstreet({ + street_code: res.data.mer_info.street_id + }).then((res) => { + if(res.code==0){ + this.$util.Tips({ + title: res.msg + }); + return false; + } + this.company=res.data.title + this.organization_code=res.data.organization_code + }).catch(res=>{ + console.log(res) + }) if (res.data.service == null) { // console.log('123'); this.isShow = false } else { this.isShow = true this.mer_id = res.data.service.mer_id - this.decimal() } if (!res.data.mer_info) { @@ -930,7 +895,16 @@ } // console.log(that.userInfoData); }); - } + }, + + //获取协议内容 + list() { + business({ + type: 'mer_settlement_agree' + }).then(res => { + this.detail = res.data + }) + }, } }; @@ -1193,7 +1167,6 @@ top: 50%; left: 50%; - -webkit-border-radius: 12rpx; padding: 52rpx; -webkit-transform: translate(-50%, -50%); -moz-transform: translate(-50%, -50%); diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index b2de447..430c2d5 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -195,8 +195,8 @@
{{detail.title}}
- 甲方公司:{{company?company:"暂无公司信息"}} - 机构代码:{{organization_code?organization_code:"暂无公司信息"}} + 甲方公司:{{company?company:"暂无公司信息"}} + 机构代码:{{organization_code?organization_code:"暂无公司信息"}}