From 78a818552dbf373a8ce81edc606f6e3de18bf8ac Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 5 Feb 2024 16:40:36 +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

---
 config/app.js                    |  4 ++--
 pages/activity/presell/index.vue | 29 ++++++++++++++---------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/config/app.js b/config/app.js
index aed86ed..5d52a61 100644
--- a/config/app.js
+++ b/config/app.js
@@ -12,8 +12,8 @@ let httpApiSix
 let wsApi
 
 // 在打包之前请检查当前环境是否正确
-// const env = 'dev'; // 开发
-const env = 'prod'; // 生产
+const env = 'dev'; // 开发
+// const env = 'prod'; // 生产
 // const env = 'prew'; // 预上线
 
 switch (env) {
diff --git a/pages/activity/presell/index.vue b/pages/activity/presell/index.vue
index dcf26db..dd4c33b 100644
--- a/pages/activity/presell/index.vue
+++ b/pages/activity/presell/index.vue
@@ -25,16 +25,7 @@
                 </view>
                 
                 <view class="card_bottom" >
-                  <view class="card_left">
-                    <view style="white-space: pre-wrap;" v-html="item.store_info"></view>
-                    <!-- <view class="card_item">
-                      <view>品牌:</view>
-                      <view></view>
-                    </view>
-                    <view class="card_item">
-                      <view>规格:</view>
-                      <view>{{item.product.unit_name}}</view>
-                    </view> -->
+                  <view class="card_left" style="white-space: pre-wrap;" v-html="item.store_info">
                   </view>
                   <view class="card_right" >立即采购</view>
                 </view>
@@ -47,7 +38,7 @@
 		</view>		
     <uni-popup ref="tipspopupRef">
       <view class="popup_ref">
-        <image class="p_icon" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/nongzinongju_expression.webp"></image>
+        <image class="p_icon" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/7b63620240205163923734.png"></image>
         <view class="p_item1">非常抱歉！</view>
         <view class="p_item2">供销农资春节期间暂停发货，年后恢复购买~</view>
       </view>
@@ -423,20 +414,28 @@ import { Toast } from '../../../libs/uniApi.js';
   .card_bottom{
     display: flex;
     justify-content: space-between;
+    align-items: flex-end;
+    overflow: hidden;
+    width: 100%;
+    // height: 140rpx;
+    
     .card_left{
       font-size: 24rpx;
       color: #616161;
-      // background-color: red;
-      width: 210rpx;
-      max-height: 140rpx;
+      width: 240rpx;
+      height: 96rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
     .card_right{
+      flex-shrink: 0;
       background-color: #FF593C;
       width: 160rpx;
       height: 80rpx;
       background: #FF593C;
       box-shadow: 0rpx 4rpx 8rpx 0rpx #FF5435;
       border-radius: 84rpx;
+      margin-bottom: 8rpx;
       display: flex;
       justify-content: center;
       align-items: center;
@@ -446,7 +445,7 @@ import { Toast } from '../../../libs/uniApi.js';
   .popup_ref{
     width: 583rpx;
     height: 393rpx;
-    background: #f1f3f4;
+    background: #fff;
     border-radius: 30rpx 30rpx 30rpx 30rpx;
     display: flex;
     flex-direction: column;