From 78006bd9cf4b30bf3bc2cda6278b6860811eef87 Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Sun, 24 Sep 2023 21:05:33 +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/store/settled/index.vue | 16 +++++++++++++---
 utils/requestb.js             |  4 ++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 38fa10e..b2de447 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -193,9 +193,10 @@
 		</view>
 		<view class="settlementAgreement" v-if="isshow">
 			<view class="setAgCount" style="width: 100%;height: 100%;">
-				<view style="margin-bottom: 30rpx;">所属公司:{{company?company:"暂无公司信息"}}</view>
-				<i class="icon iconfont icon-cha" @click="recuo"></i>
+				<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
 				<div class="title">{{detail.title}}</div>
+				<view style="margin: 20rpx 0;text-align: end;">甲方公司:{{company?company:"暂无公司信息"}}</view>
+				<view style="margin: 20rpx 0;text-align: end;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
 
 				<view class="contenta">
 					<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
@@ -284,6 +285,7 @@
 		data() {
 			return {
 				company: '',
+				organization_code:'',
 				domain: HTTP_REQUEST_URL,
 				cartId: '', //购物车id
 				pinkId: 0, //拼团id
@@ -568,8 +570,16 @@
 				merstreet({
 					street_code: this.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)
 				})
 			},
 			// 获取商户分类
diff --git a/utils/requestb.js b/utils/requestb.js
index fd41a3e..e092928 100644
--- a/utils/requestb.js
+++ b/utils/requestb.js
@@ -27,7 +27,7 @@ function baseRequest(url, method, data, {
 	noVerify = false
 }) {
 	
-	let Url = 'https://ceshi-worker-task.lihaink.cn',
+	let Url = 'https://preview-worker-task.lihaink.cn',
 		header = HEADER;
 
 
@@ -38,7 +38,7 @@ function baseRequest(url, method, data, {
 		uni.request({
 			url: Url + '/api/' + url,
 			method: method || 'GET',
-			header: header,
+			// header: header,
 			data: data || {},
 			success: (res) => {
 				// #ifdef APP-PLUS