diff --git a/src/components/index/topCenter.vue b/src/components/index/topCenter.vue
index d6fc1cc..b8baf70 100644
--- a/src/components/index/topCenter.vue
+++ b/src/components/index/topCenter.vue
@@ -74,7 +74,7 @@
                 <img src="/static/index/JR.png" style="width: 75%;position: relative;margin-top: 3.7vh;" alt="">
                 <div style="margin-top: 2vh;position: relative;"> <span style="color: #9DD2E0;font-size: 16px;">{{
                     data?.merchantCountInfo?.todayMerchantCount }}</span>
-                    件</div>
+                    个</div>
                 <div style="margin-top: 1.5vh;display: flex;justify-content: space-around;padding: 0 1vw;">
                     <div style="font-size: 12px;position: relative;display: flex;align-items: center;">
                         <img src="/static/index/ZRSJ.png" style="width: 1vw;height: 1vw;" alt="">
diff --git a/src/view/order.vue b/src/view/order.vue
index 39c8aac..f27348a 100644
--- a/src/view/order.vue
+++ b/src/view/order.vue
@@ -290,13 +290,17 @@ const addConfigData = (data) => {
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${item.merchant.is_trader ? '自营' : '非自营'} </div>`,
 
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;display:flex;box-sizing: border-box;align-items:center;justify-content: space-between;padding:0 5px'>
-                            <img src='${item.orderProduct[0].cart_info.product.image}'  style='width:30px;height:30px' />
-                        <span>${item.orderProduct[0].cart_info.product.store_name}    </span>
+                       
+                       <div style='display:flex'>  
+                        <img src='${item.orderProduct[0].cart_info.product.image}'  style='width:30px;height:30px' />
+                        <span style='margin-left:10px'>${item.orderProduct[0].cart_info.product.store_name}    </span>
+                        </div>
+                       
                         <span>${item.orderProduct[0].product_num}${item.orderProduct[0].cart_info.product.unit_name}    </span>
                         </div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${item.total_price}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${orderStatus(item.status)}</div>`,
-                    `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${item.user_address}</div>`,
+                    `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${item.user_address_code.substring(item.user_address_code.length - 1)}队</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${payType(item.pay_type)}</div>`,
                 ]
             )
@@ -362,20 +366,23 @@ const addConfigData = (data) => {
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.merchant.mer_name}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.merchant.is_trader ? '自营' : '非自营'}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;display:flex;box-sizing: border-box;align-items:center;justify-content: space-between;padding:0 5px'>
-                            <img src='${item.orderProduct[0].cart_info.product.image}'  style='width:30px;height:30px' />
-                        <span>${item.orderProduct[0].cart_info.product.store_name}    </span>
-
-
+                          
+                        
+                        
+                       
+                        <div style='display:flex'>  
+                        <img src='${item.orderProduct[0].cart_info.product.image}'  style='width:30px;height:30px' />
+                        <span style='margin-left:10px'>${item.orderProduct[0].cart_info.product.store_name}    </span>
+                        </div>
                        
                         <span>${item.orderProduct[0].product_num}${item.orderProduct[0].cart_info.product.unit_name}    </span>
                         
                         
                         
-                        
                         </div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.cost}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${orderStatus(item.status)}</div>`,
-                    `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.user_address}</div>`,
+                    `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.user_address_code.substring(item.user_address_code.length - 1)}队</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${payType(item.pay_type)}</div>`,
                 ]
 
@@ -453,13 +460,23 @@ const addConfigData2 = (data) => {
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;' >${item.user.nickname}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${item.merchant.mer_name}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${item.merchant.is_trader ? '自营' : '非自营'}</div>`,
-                    `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${item.mer_delivery_address || '--'}</div>`,
+                    `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${item.order.user_address_code.substring(item.order.user_address_code.length - 1) || '--'} 队</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${item.refund_price}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;display:flex;box-sizing: border-box;align-items:center;justify-content: space-between;padding:0 5px'     '>
+                      
+                      
+                      
+                      
+                      
+                      
+                        <div style='display:flex'>  
                         <img src=${item.refundProduct[0].product.cart_info.product.image} style='width:30px;height:30px'>
-                        <span>
-                            ${item.refundProduct[0].product.cart_info.product.store_name}
-                            </span>
+                        <span style='margin-left:10px'> ${item.refundProduct[0].product.cart_info.product.store_name}    </span>
+                       </div>
+
+
+
+
                             <span>
                                 ${item.refundProduct[0].product.product_num}    ${item.refundProduct[0].product.cart_info.product.unit_name}
                             </span>
@@ -536,16 +553,19 @@ const addConfigData2 = (data) => {
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.user.nickname}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.merchant.mer_name}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.merchant.is_trader ? '自营' : '非自营'}</div>`,
-                    `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.mer_delivery_address || '--'}</div>`,
+                    `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.order.user_address_code.substring(item.order.user_address_code.length - 1) || '--'} 队</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.refund_price}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;display:flex;box-sizing: border-box;align-items:center;justify-content: space-between;padding:0 5px'     '>
+                        <div style='display:flex'>  
                         <img src=${item.refundProduct[0].product.cart_info.product.image} style='width:30px;height:30px'>
-                        <span>
-                            ${item.refundProduct[0].product.cart_info.product.store_name}
-                            </span>
+                        <span style='margin-left:10px'> ${item.refundProduct[0].product.cart_info.product.store_name}    </span>
+                       </div>
+
+
+
+
                             <span>
                                 ${item.refundProduct[0].product.product_num}    ${item.refundProduct[0].product.cart_info.product.unit_name}
-
                             </span>
                         </div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>   
@@ -631,21 +651,20 @@ const addConfigData3 = (data) => {
                 
                         </div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;' >核销订单</div>`,
-                    `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'> ${item.user_address}</div>`,
+                    `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'> ${item.user_address_code.substring(item.user_address_code.length - 1)}队</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${item.real_name}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${item.merchant.mer_name}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>${item.merchant.is_trader ? '自营' : '非自营'}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;display:flex;box-sizing: border-box;align-items:center;justify-content: space-between;padding:0 5px'>
-                            <img src='${item.orderProduct[0].cart_info.product.image}'  style='width:30px;height:30px' />
-                        <span>${item.orderProduct[0].cart_info.product.store_name}    </span>
+                           
+                        <div style='display:flex'>  
+                        
+                        
+                        <img src='${item.orderProduct[0].cart_info.product.image}'  style='width:30px;height:30px' />
+                        <span style='margin-left:10px'>${item.orderProduct[0].cart_info.product.store_name}    </span>
+                       </div>
 
-
-                       
                         <span>${item.orderProduct[0].product_num}${item.orderProduct[0].cart_info.product.unit_name}    </span>
-                        
-                        
-                        
-                        
                         </div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #02243D;'>
                     ${item.pay_price}
@@ -708,19 +727,20 @@ const addConfigData3 = (data) => {
                     
                     </div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>核销订单</div>`,
-                    `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.user_address}</div>`,
+                    `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.user_address_code.substring(item.user_address_code.length - 1)}队</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.real_name}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.merchant.mer_name}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;'>${item.merchant.is_trader ? '自营' : '非自营'}</div>`,
                     `<div style='width: 100%;text-align: center; height: 100%; color: aliceblue; background: #102B3E;display:flex;box-sizing: border-box;align-items:center;justify-content: space-between;padding:0 5px'>
-                            <img src='${item.orderProduct[0].cart_info.product.image}'  style='width:30px;height:30px' />
-                        <span>${item.orderProduct[0].cart_info.product.store_name}    </span>
-
-
-                       
-                        <span>${item.orderProduct[0].product_num}${item.orderProduct[0].cart_info.product.unit_name}    </span>
+                        <div style='display:flex'>  
                         
                         
+                        <img src='${item.orderProduct[0].cart_info.product.image}'  style='width:30px;height:30px' />
+                        <span style='margin-left:10px'>${item.orderProduct[0].cart_info.product.store_name}    </span>
+                       </div>
+
+                        <span>${item.orderProduct[0].product_num}${item.orderProduct[0].cart_info.product.unit_name}    </span>
+                        
                         
                         
                         </div>`,
diff --git a/src/view/storeLogin.vue b/src/view/storeLogin.vue
index e58a9db..73e69a6 100644
--- a/src/view/storeLogin.vue
+++ b/src/view/storeLogin.vue
@@ -308,7 +308,7 @@ const addData2 = (data) => {
                 `<div style='background:red;position:relative'><img src="${item.image}" style="width: 30px;height: 30px;position:absolute" alt=""></div>`,
                 `<div style='height:40px;line-height:40px;  white-space: nowrap; overflow: hidden;text-overflow: ellipsis;'>${item.store_name}</div>`,
                 `<div style='  transform: translateY(12px); width: 100%; height: 10px; background-color: #122E3F;overflow: hidden;'> <div style=' width:${(item.total / total2) * 100}%;height: 100%; background: linear-gradient(to right, #4459CC, #53CAE2);transition: width 0.5s ease-in-out;'></div> </div>`,
-                `<div style=' position: relative;line-height:30px;text-align:center;' >${item.total} <span style='font-size:10px'>单</span>
+                `<div style=' position: relative;line-height:30px;text-align:center;' >${item.total} <span style='font-size:10px'>人</span>
                      <img src="/static/index/PHBBG.png" style="position: absolute;width: 90px;height: 30px; top:0px;left:0px" alt="">
                  </div>`,
             ]
@@ -341,7 +341,6 @@ const addData3 = (data) => {
 
 
 merchant_count_mainApi(
-
     { ...query }
 ).then((res) => {
     for (let key in res.data) {
@@ -360,61 +359,8 @@ watch(
 }
 
 )
-onMounted(() => {
 
 
-    // for (let i = 0; i < 20; i++) {
-    //     config3.data.push(
-    //         [
-    //             `<div style="line-height:30px; text-align: center;background-image: url('/static/index/PM${(i + 1) <= 3 ? (i + 1) : 4}.png');width: 30px;height: 30px;background-size: cover;" >${i + 1}</div> `,
-    //             `<div style='background:red;position:relative'><img :src="i" style="width: 30px;height: 30px;position:absolute" alt=""></div>`,
-    //             `<div style='height:40px;line-height:40px;  white-space: nowrap; overflow: hidden;text-overflow: ellipsis;'>商asdasdasdssadasdasdasd品名称</div>`,
-    //             `<div style='  transform: translateY(12px); width: 100%; height: 10px; background-color: #122E3F;overflow: hidden;'> <div style=' width: 40%;height: 100%; background: linear-gradient(to right, #4459CC, #53CAE2);transition: width 0.5s ease-in-out;'></div> </div>`,
-    //             `<div style=' position: relative;line-height:30px;text-align:center;' >5495 <span style='font-size:10px'>单</span>
-    //                  <img src="/static/index/PHBBG.png" style="position: absolute;width: 90px;height: 30px; top:0px;left:0px" alt="">
-    //              </div>`,
-
-    //         ],
-
-
-    //     )
-    // }
-    // for (let i = 0; i < 20; i++) {
-    //     config1.data.push(
-    //         [
-    //             `<div style="line-height:30px; text-align: center;background-image: url('/static/index/PM${(i + 1) <= 3 ? (i + 1) : 4}.png');width: 30px;height: 30px;background-size: cover;" >${i + 1}</div> `,
-    //             `<div style='background:red;position:relative'><img :src="i" style="width: 30px;height: 30px;position:absolute" alt=""></div>`,
-    //             `<div style='height:40px;line-height:40px'>商品名称</div>`,
-    //             `<div style='  transform: translateY(12px); width: 100%; height: 10px; background-color: #122E3F;overflow: hidden;'> <div style=' width: 40%;height: 100%; background: linear-gradient(to right, #0292EB, #53CAE2);transition: width 0.5s ease-in-out;'></div> </div>`,
-    //             `<div style=' position: relative;line-height:30px;text-align:center' >5495 <span style='font-size:10px'>单</span>
-    //                  <img src="/static/index/PHBBG.png" style="position: absolute;width: 90px;height: 30px; top:0px;left:0px" alt="">
-    //              </div>`,
-
-    //         ],
-
-
-    //     )
-    // } for (let i = 0; i < 20; i++) {
-    //     config2.data.push(
-    //         [
-    //             `<div style="line-height:30px; text-align: center;background-image: url('/static/index/PM${(i + 1) <= 3 ? (i + 1) : 4}.png');width: 30px;height: 30px;background-size: cover;" >${i + 1}</div> `,
-    //             `<div style='background:red;position:relative'><img :src="i" style="width: 30px;height: 30px;position:absolute" alt=""></div>`,
-    //             `<div style='height:40px;line-height:40px'>商品名称</div>`,
-    //             `<div style='  transform: translateY(12px); width: 100%; height: 10px; background-color: #122E3F;overflow: hidden;'> <div style=' width: 40%;height: 100%; background: linear-gradient(to right, #B15641, #52C8E1);transition: width 0.5s ease-in-out;'></div> </div>`,
-    //             `<div style=' position: relative;line-height:30px;text-align:center' >5495 <span style='font-size:10px'>单</span>
-    //                  <img src="/static/index/PHBBG.png" style="position: absolute;width: 90px;height: 30px; top:0px;left:0px" alt="">
-    //              </div>`,
-
-    //         ],
-
-
-    //     )
-    // }
-
-
-
-})
-
 </script>