From cbcb935c0ca24f8d2083bebb834e6d13fb707c32 Mon Sep 17 00:00:00 2001
From: "AERWEN\\26795" <123456789a>
Date: Thu, 26 Oct 2023 13:25:02 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                            |  4 ++--
 pages/goods/details/components/buy-bar/index.wxml |  6 +++---
 pages/goods/details/components/buy-bar/index.wxss |  4 ++--
 pages/goods/details/index.js                      | 12 +++++++++---
 pages/goods/details/index.wxml                    |  8 ++++----
 pages/goods/details/index.wxss                    |  3 ++-
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/app.js b/app.js
index bbb3fcf..3fca3b1 100644
--- a/app.js
+++ b/app.js
@@ -1,8 +1,8 @@
 import updateManager from './common/updateManager';
 
-export const ServerBasePath = 'http://localhost:8888/api/';
+// export const ServerBasePath = 'http://localhost:8888/api/';
 // export const ServerBasePath = 'http://192.168.1.102:8888/api/';
-// export const ServerBasePath = 'http://shop.api.aerwen.net/api/';
+export const ServerBasePath = 'http://mall.api.aerwen.net/api/';
 
 App({
   onLaunch: function () {},
diff --git a/pages/goods/details/components/buy-bar/index.wxml b/pages/goods/details/components/buy-bar/index.wxml
index e75d89b..37538c6 100644
--- a/pages/goods/details/components/buy-bar/index.wxml
+++ b/pages/goods/details/components/buy-bar/index.wxml
@@ -24,12 +24,12 @@
 	</view>
 	<block wx:if="{{buttonType === 1}}">
 		<view class="flex buy-buttons">
-			<view class="bar-separately {{soldout || !isStock ? 'bar-addCart-disabled' : ''}}" bindtap="toAddCart">
+			<view class="bar-buy {{soldout || !isStock ? 'bar-addCart-disabled' : ''}}" bindtap="toAddCart">
 				加入购物车
 			</view>
-			<view class="bar-buy {{soldout || !isStock ? 'bar-buyNow-disabled' : ''}}" bindtap="toBuyNow">
+			<!-- <view class="bar-buy {{soldout || !isStock ? 'bar-buyNow-disabled' : ''}}" bindtap="toBuyNow">
 				立即购买
-			</view>
+			</view> -->
 		</view>
 	</block>
 	<block wx:if="{{isSlotButton}}">
diff --git a/pages/goods/details/components/buy-bar/index.wxss b/pages/goods/details/components/buy-bar/index.wxss
index ce75f09..b06096f 100644
--- a/pages/goods/details/components/buy-bar/index.wxss
+++ b/pages/goods/details/components/buy-bar/index.wxss
@@ -70,7 +70,7 @@
 
 .bar-separately,
 .bar-buy {
-  width: 254rpx;
+  width: 384rpx;
   height: 80rpx;
   color: #fff;
   display: flex;
@@ -86,7 +86,7 @@
 
 .bar-buy {
   background-color: #1989fa;
-  border-radius: 0rpx 40rpx 40rpx 0rpx;
+  border-radius: 40rpx 40rpx 40rpx 40rpx;
 }
 
 .flex {
diff --git a/pages/goods/details/index.js b/pages/goods/details/index.js
index 34ca0c4..7a57523 100644
--- a/pages/goods/details/index.js
+++ b/pages/goods/details/index.js
@@ -63,7 +63,13 @@ Page({
     ],
     storeLogo: `${imgPrefix}common/store-logo.png`,
     storeName: '云mall标准版旗舰店',
-    jumpArray: [{
+    jumpArray: [
+      {
+        title: '客服',
+        url: '',
+        iconName: 'user_list',
+      },
+      {
         title: '收藏',
         url: '',
         iconName: 'star',
@@ -471,13 +477,13 @@ Page({
       // details.desc = details.desc.replace(/<img[^>]*style\s*=\s*(['"])[^'"]*\1[^>]*>/gi, '<img style="max-width:100%;height:auto;" ');
       // details.desc = details.desc.replace(/<img[^>]*>/gi, '<img style="max-3999999996width:100%;height:auto;" >');
       if (details.isCollect === true) {
-        this.data.jumpArray[0].iconName = 'star_filled';
+        this.data.jumpArray[1].iconName = 'star_filled';
         this.setData({
           jumpArray: this.data.jumpArray
         })
       }
       else{
-        this.data.jumpArray[0].iconName = 'star';
+        this.data.jumpArray[1].iconName = 'star';
         this.setData({
           jumpArray: this.data.jumpArray
         })
diff --git a/pages/goods/details/index.wxml b/pages/goods/details/index.wxml
index 9da433e..e751166 100644
--- a/pages/goods/details/index.wxml
+++ b/pages/goods/details/index.wxml
@@ -12,7 +12,7 @@
       list="{{details.images}}"
     ></t-swiper> -->
     <view>
-      <swiper class="swiper-container" autoplay interval="10000" circular indicator-dots indicator-active-color="#fff">
+      <swiper class="swiper-container" circular indicator-dots indicator-active-color="#fff">
           <!-- 第一个元素是视频 -->
           <swiper-item wx:if="{{details.video}}">
             <video src="{{details.video}}" autoplay poster="{{details.primaryImage}}" controls style="width: 100%; height: 100%;"></video>
@@ -66,7 +66,7 @@
       <view class="goods-intro">{{intro}}</view>
     </view>
     <view class="spu-select" bindtap="showSkuSelectPopup">
-      <view class="label">已选</view>
+      <view class="label">选择参数</view>
       <view class="content">
         <view class="{{!selectedAttrStr ? 'tintColor' : ''}}">
           {{selectedAttrStr ? buyNum : ''}}{{selectedAttrStr || '请选择'}}
@@ -105,7 +105,7 @@
   </view>
 
   <!-- 店铺 -->
-  <view style="padding: 10px;" class="shop-big-box">
+  <!-- <view style="padding: 10px;" class="shop-big-box">
       <view style="padding: 10px;" class="shop-left-box">
           <view class="shop-left-img-box" >
             <image alt=""
@@ -121,7 +121,7 @@
       <view class="shop-right-box">
           <view class="shop-right-button" bindtap="gotoShop">进店逛逛 ></view>
       </view>
-  </view>
+  </view> -->
 
   <view class="desc-content">
     <view class="desc-content__title" wx:if="{{details.desc.length > 0}}">
diff --git a/pages/goods/details/index.wxss b/pages/goods/details/index.wxss
index 021b265..78a8ff7 100644
--- a/pages/goods/details/index.wxss
+++ b/pages/goods/details/index.wxss
@@ -229,8 +229,9 @@ page {
 }
 
 .desc-content_box [alt] {
-  width: 100% !important;
+  /* width: 100% !important; */
   max-width: 100%;
+  height: auto;
 }
 
 .goods-bottom-operation {