From 6dd19b59728c7f1d56e7b3f2e178a48290488051 Mon Sep 17 00:00:00 2001
From: xvv <cccccc420590@163.com>
Date: Tue, 11 Jun 2024 14:21:09 +0800
Subject: [PATCH] =?UTF-8?q?pos=20=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pos-uni/config.js                               |  9 ++-------
 pos-uni/manifest.json                           | 10 +++++++---
 pos-uni/pagesHome/BusinessData/BusinessData.vue | 17 +++++++++--------
 pos-uni/pagesHome/Collection/Collection.vue     |  3 ++-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/pos-uni/config.js b/pos-uni/config.js
index 84307d3a0..ad85589c5 100644
--- a/pos-uni/config.js
+++ b/pos-uni/config.js
@@ -1,11 +1,6 @@
 // 应用全局配置
 module.exports = {
-	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
-	// baseUrl: 'http://192.168.0.196:8081/',
-	// baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
-	// baseUrl: 'https://8q4f124343.yicp.fun/',
-	 baseUrl: 'http://192.168.31.96:8080/',
-	// baseUrl: 'http://192.168.1.5:8002/cdJdc',
+	baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
 	imagesUrl: 'http://www.nuoyunr.com/lananRsc',
 	// 应用信息
 	appInfo: {
@@ -28,4 +23,4 @@ module.exports = {
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/pos-uni/manifest.json b/pos-uni/manifest.json
index c04742fc1..f6d022843 100644
--- a/pos-uni/manifest.json
+++ b/pos-uni/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "WX-lift",
+    "name" : "pos",
     "appid" : "__UNI__7A6878C",
     "description" : "",
     "versionName" : "1.0.0",
@@ -41,9 +41,13 @@
                 ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "ad" : {}
+            }
         }
     },
     /* 快应用特有相关 */
diff --git a/pos-uni/pagesHome/BusinessData/BusinessData.vue b/pos-uni/pagesHome/BusinessData/BusinessData.vue
index ddf9b8cfa..935fbc364 100644
--- a/pos-uni/pagesHome/BusinessData/BusinessData.vue
+++ b/pos-uni/pagesHome/BusinessData/BusinessData.vue
@@ -37,7 +37,7 @@
 				<view class="b-bs">
 					<view class="">
 						<view class="hui-">退款金额/笔数</view>
-						<view class="lan-">￥{{dataForm.refBalance}}/{{dataForm.refBalanceCount}}</view>
+						<view class="lan-">￥{{dataForm.refBalance || 0}}/{{dataForm.refBalanceCount}}</view>
 					</view>
 				</view>
 			</view>
@@ -52,11 +52,11 @@
 				<view class="h-b-box">
 					<view class="">
 						<view class="hui-">营业额/笔数</view>
-						<view class="lan-">￥{{dataForm.wechat}}/{{dataForm.wechatcount}}</view>
+						<view class="lan-">￥{{dataForm.wechat || 0}}/{{dataForm.wechatcount}}</view>
 					</view>
 					<view class="">
 						<view class="hui-">会员充值/笔数</view>
-						<view class="lan-">￥{{dataForm.userBalanceByWechat }}/{{dataForm.userBalanceCountByWechat}}
+						<view class="lan-">￥{{dataForm.userBalanceByWechat|| 0 }}/{{dataForm.userBalanceCountByWechat}}
 						</view>
 					</view>
 				</view>
@@ -69,11 +69,11 @@
 				<view class="h-b-box">
 					<view class="">
 						<view class="hui-">营业额/笔数</view>
-						<view class="lan-">￥{{dataForm.alipay}}/{{dataForm.alipaycount}}</view>
+						<view class="lan-">￥{{dataForm.alipay || 0}}/{{dataForm.alipaycount}}</view>
 					</view>
 					<view class="">
 						<view class="hui-">会员充值/笔数</view>
-						<view class="lan-">￥{{dataForm.userBalanceByAli}}/{{dataForm.userBalanceCountByali}}</view>
+						<view class="lan-">￥{{dataForm.userBalanceByAli || 0}}/{{dataForm.userBalanceCountByali}}</view>
 					</view>
 				</view>
 				<!-- 	<view class="d-s" style="margin-bottom: 10px;">
@@ -284,14 +284,15 @@
 		padding: 10px 15px;
 		display: flex;
 		align-items: center;
-		font-size: 14px;
+		font-size: 16px;
+		font-weight: bold;
 		margin: 15px auto;
 
 	}
 
 	.lan-time {
-		font-weight: 500;
-		font-size: 14px;
+		font-weight: 600;
+		font-size: 16px;
 		color: #0864E9;
 	}
 
diff --git a/pos-uni/pagesHome/Collection/Collection.vue b/pos-uni/pagesHome/Collection/Collection.vue
index 2c435de1d..725c30a14 100644
--- a/pos-uni/pagesHome/Collection/Collection.vue
+++ b/pos-uni/pagesHome/Collection/Collection.vue
@@ -636,6 +636,7 @@
 	}
 
 	.bai-kuang {
+		width: 100%;
 		position: fixed;
 		bottom: 0px;
 		left: 0px;
@@ -645,7 +646,7 @@
 	}
 
 	.num-box {
-
+		width: 100%;
 		display: flex;
 		flex-wrap: wrap;
 		justify-content: space-between;