diff --git a/pages/billDetail/index.js b/pages/billDetail/index.js
index b7b66d5..4031d5f 100644
--- a/pages/billDetail/index.js
+++ b/pages/billDetail/index.js
@@ -619,6 +619,10 @@ Page({
// 驻场信息样式统一
userinfo.newZhuchang = userinfo.onSiteInfo.replaceAll(";", "\n");
userinfo.totalZC = userinfo.prevRecordId || (!userinfo.prevRecordId && !userinfo.nextRecordId) ? userinfo.newZhuchang : "";
+
+ console.log(userinfo.totalZC)
+
+
if (userinfo.upOnSiteInfo) {
userinfo.totalZC = userinfo.upOnSiteInfo || !userinfo.prevRecordId ? userinfo.upOnSiteInfo.replaceAll(";", "\n") + "\n" + userinfo.totalZC : userinfo.totalZC;
diff --git a/pages/billDetail/index.wxml b/pages/billDetail/index.wxml
index f6e1430..20f8039 100644
--- a/pages/billDetail/index.wxml
+++ b/pages/billDetail/index.wxml
@@ -553,30 +553,6 @@
代理政策:
{{recordDetail.policy || '-'}}
-
-
-
-
-
复制文本
diff --git a/project.miniapp.json b/project.miniapp.json
index 0eaf316..c21fab7 100644
--- a/project.miniapp.json
+++ b/project.miniapp.json
@@ -1,7 +1,8 @@
{
"miniVersion": "v2",
"name": "伯才供应链",
- "version": "1.1.11",
+ "version": "1.2.0",
+
"i18nFilePath": "i18n",
"mini-android": {
"sdkVersion": "1.6.2",
@@ -107,5 +108,9 @@
"customImage": "/Users/zhangshaokang/Desktop/伯才供应链app上架相关图片/安卓启动页及图标/画板备份 12.png"
}
},
+<<<<<<< HEAD
+ "versionCode": 120
+=======
"versionCode": 125
+>>>>>>> f9e7a56bed4415c8dc3372ab13fd25ed5ac6d5ee
}