From 084f2cfb4b17c0509b3ed56b41e07061b852ebb7 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 18 Mar 2024 15:34:30 +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

---
 App.vue                          |  2 +-
 pages/store/home/index.vue       | 39 ++++++++++++++++++++++++++------
 pages/user/index.vue             |  2 +-
 pages/users/login/login_copy.vue |  2 +-
 pages/users/order_list/index.vue |  3 ++-
 5 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/App.vue b/App.vue
index d75ac5b..c0b2923 100644
--- a/App.vue
+++ b/App.vue
@@ -215,7 +215,7 @@
             fail: function(res) {
               // 内容获取失败
             }
-          })
+          })   
         }
       }, 1500)
       // #endif	
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 858a4e7..f0b1417 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -14,17 +14,20 @@
 			</view>
 
 			<view class="shop">
-				<view class="shop-img">
+				<!-- <view class="shop-img">
 					<u-image width="100rpx" height="154rpx" :lazyLoad="true" :fade="true" :src="store.mer_avatar"
 						radius="10">
 						<template v-slot:loading>
 							<u-loading-icon color="#999"></u-loading-icon>
 						</template>
 					</u-image>
-				</view>
+				</view> -->
 
 				<view class="shop-info">
-					<view class="shop-info-title">{{store.mer_name}}</view>
+					<view class="shop-info-title" @click="navTo('/pages/store/detail/index?id='+id)">
+            <text>{{store.mer_name}}</text>
+            <u-icon name="arrow-right" color="#fff"></u-icon>
+          </view>
 					<view class="shop-info-eva">
 						<view class="star">
 							<u-rate count="5" :value="score.star" size="12" activeColor="#FFBC21"
@@ -39,7 +42,9 @@
 					</view>
 					<view class="shop-info-runtime">营业时间 : 90:00－21:00</view>
 					<view class="shop-info-addr iconfont iconfont-xiangyou" @click="showMaoLocation">
-						{{store.mer_address}}</view>
+						<text>{{store.mer_address}}</text>
+            <u-icon name="arrow-right" :size="12" color="#fff"></u-icon>
+          </view>
 				</view>
 
 				<view class="shop-logo">
@@ -689,6 +694,11 @@
 		},
 		// #endif
 		methods: {
+      navTo(url){
+        uni.navigateTo({
+          url:url
+        })
+      },
 			// 查看地图
 			showMaoLocation: function() {
 				if (!this.store.lat || !this.store.long) return this
@@ -1258,12 +1268,19 @@
 
 			.shop-info {
 				.shop-info-title {
-					max-width: 400rpx;
+					width: 530rpx;
 					margin-bottom: 10rpx;
 					font-weight: 600;
 					font-size: 28rpx;
 					color: #FFFFFF;
-					word-break: break-word;
+          display: flex;
+          align-items: flex-end;
+          text{
+            max-width: 480rpx;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
 				}
 
 				.shop-info-eva {
@@ -1294,12 +1311,20 @@
 				}
 
 				.shop-info-addr {
-					width: 440rpx;
+					width: 530rpx;
 					overflow: hidden;
 					white-space: nowrap;
 					text-overflow: ellipsis;
 					font-size: 22rpx;
 					color: #FFFFFF;
+          display: flex;
+          align-items: center;
+          text{
+            max-width: 480rpx;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
 				}
 			}
 		}
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 17ecf8e..5c6cfcb 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -224,7 +224,7 @@
 				<view class="text">{{copyright.Copyright}}</view>
 				<view class="">备案号:蜀ICP备2022030133号-2A</view>
 				<view class="">增值电信营业许可证号:川B2-20221250</view>
-
+        <view>版本号</view>
 			</view>
 			<!-- <view v-else class="copy-right">
 				<view class="iconfont icon-crmeb"></view>
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 8adeb35..bce871f 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -685,7 +685,7 @@ import { Toast } from "../../../libs/uniApi";
       		}
       		uni.hideLoading();
       	}).catch(res => {
-          console.log( '错误', res);
+          console.log('错误--', res);
       		uni.hideLoading();
       		uni.showToast({
       			title: res.message || res,
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 48cf7b1..0d79374 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -173,7 +173,9 @@
 														<view>￥{{goods.cart_info.productAttr.price}}</view>
 														<view>x{{goods.product_num}}</view>
 													</view>
+                          <text style="font-size: 22rpx;background-color: #ecfaed;color: #40ae36;border-radius: 40rpx;padding: 5rpx 10rpx;">{{item.merchant.cloud_warehouse}}</text>
 												</view>
+                        
 											</view>
 										</block>
 									</view>
@@ -202,7 +204,6 @@
 										<text class="iconfont icon-shangjiadingdan"></text>
 										<view class="store-name">
                       <view>{{item.merchant.mer_name}}</view>
-                      <text style="font-size: 22rpx;background-color: #ecfaed;color: #40ae36;border-radius: 40rpx;padding: 5rpx 10rpx;">{{item.merchant.cloud_warehouse}}</text>
                     </view>
 										<text class="iconfont icon-xiangyou"></text>
 									</view>