From 0a97756fe6160f9e567a7a7d5c8aa5e984654c62 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 25 Jun 2024 16:58:51 +0800
Subject: [PATCH] add

---
 config/app.js         |  6 ++--
 pages/index/index.vue | 68 +++++++++++++++++++++++--------------------
 2 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/config/app.js b/config/app.js
index 877f933..50a915c 100644
--- a/config/app.js
+++ b/config/app.js
@@ -2,9 +2,9 @@ let BASE_URL
 let WSS_URL
 import store from "@/store/user.js"
 // 环境
-let env = "dev"
+// let env = "dev"
 // let env = "prod"
-// let env = "liu";
+let env = "liu";
 
 switch (env) {
 	case 'dev':
@@ -13,7 +13,7 @@ switch (env) {
 		// WSS_URL = 'ws://192.168.1.22:8787'
 		break;
 	case 'liu':
-		BASE_URL = 'http://192.168.1.201:8545';
+		BASE_URL = 'https:ceshi-multi-store.lihaink.cn';
 		WSS_URL = 'wss://test-multi-store.lihaink.cn/pull'
 		break;
 	default:
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d21d3b1..a33f1c7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -154,7 +154,32 @@
 						<view class="shop-img"
 							:style="{ backgroundImage: `url(${item.image}?x-oss-process=image/format,webp)` }">
 						</view>
+
 						<view class="shop-content">
+							<view class="goods-name">
+								{{ item.store_name }}
+							</view>
+							<view class="shop-content-li">
+								<text class="shop-content-li-l">活动价</text>
+								<text class="shop-content-li-r">32.52</text>
+							</view>
+							<view class="shop-content-li">
+								<text class="shop-content-li-l">原价</text>
+								<text class="shop-content-li-r">32.52</text>
+							</view>
+							<view class="shop-content-li">
+								<text class="shop-content-li-l">规格</text>
+								<text class="shop-content-li-r">32.52</text>
+							</view>
+							<view class="shop-content-li">
+								<text class="shop-content-li-l">起批量</text>
+								<text class="shop-content-li-r">32.52</text>
+							</view>
+
+						</view>
+
+
+						<!-- <view class="shop-content">
 							<view class="title">
 								<view class="name u-line-2">{{ item.store_name }}</view>
 							</view>
@@ -171,17 +196,19 @@
 								</view>
 							</view>
 							<view style="display: flex;" v-if='item.batch > 0'>
-								<view style="color: red;">规格: {{ item.price }}/{{ item.unit_name }}</view>
+								<view style="font-size: 22rpx;">规&ensp;
+									格&ensp;&nbsp;{{ item.price }}/{{ item.unit_name }}
+								</view>
 							</view>
 							<view class="price-btn">
-								<view class="price">
-									起批量： {{ item.batch }}{{ item.unit_name }}起卖
+								<view style="font-size: 22rpx;">
+									起批量 {{ item.batch }}{{ item.unit_name }}起卖
 								</view>
 								<view class="btn">
 									<u--icon name="plus-circle-fill" size="20" color="#20b128"></u--icon>
 								</view>
 							</view>
-						</view>
+						</view> -->
 					</view>
 					<view style="width: 100%;height: 470rpx;"></view>
 				</scroll-view>
@@ -1014,38 +1041,17 @@
 						flex-direction: column;
 						justify-content: space-between;
 
-						.title {
-							.name {
-								font-size: 28rpx;
-							}
-
-							.tip {
-								color: #999;
-								font-size: 24rpx;
-								margin: 2rpx 0;
-							}
+						.shop-content-li-l {
+							font-size: 22rpx;
+							color: #333333;
+							background-color: red;
 						}
 
-						.price {
-							font-size: 30rpx;
-							font-weight: bold;
-							color: #F55726;
-						}
 
-						.price-btn {
-							display: flex;
-							justify-content: space-between;
 
-							.btn {
-								display: flex;
-								align-items: center;
 
-								.num {
-									width: 60rpx;
-									text-align: center;
-								}
-							}
-						}
+
+
 					}
 				}
 			}