From 4d003d43c10a765f37db4762941c101a5407e1af Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 20 Mar 2024 11:50:34 +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

---
 pages/goods_details/index.vue | 2 +-
 pages/store/home/index.vue    | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 7020042..aef9c2c 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -288,7 +288,7 @@
 							<view v-else class="product_content">
 								<view v-if="description.content && description.content.title" class="title">{{description.content.title}}</view>
 								<view v-if="description.content && description.content.image" class="pictures">
-									<image v-for="(item,index) in description.content.image" :key="index" :src="item"></image>
+									<image mode="widthFix" style="width: 100%;" v-for="(item,index) in description.content.image" :key="index" :src="item"></image>
 								</view>
 							</view>
 						</view>
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index d1209c3..a87d76a 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -499,7 +499,8 @@
           order: '',
           keyword: '',
           page: 1,
-          limit: 30
+          limit: 30,
+          sale_type: 1
         },
         // 下拉菜单
         select: {
@@ -639,6 +640,7 @@
       this.diyActive = options.order || 0;
       this.order = options.order;
       this.preview = options.time ? true : false;
+      if(options.sale_type) this.where.sale_type = options.sale_type;
       if (options.spid) {
         this.currSpid = options.spid
         app.globalData.spid = options.spid;
@@ -1051,7 +1053,7 @@
       },
       // 去商品详情页
       goGoodsDetail(item) {
-        goShopDetail(item, this.uid).then(res => {
+        goShopDetail(item, this.uid, this.where.sale_type).then(res => {
           if (this.isLogin) {
             initiateAssistApi(item.activity_id).then(res => {
               let id = res.data.product_assist_set_id;
@@ -1095,7 +1097,8 @@
           order: '',
           keyword: '',
           page: 1,
-          limit: 30
+          limit: 30,
+          sale_type: this.where.sale_type
         }
       },