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 @@
-
+
加入购物车
-
+
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(/
]*style\s*=\s*(['"])[^'"]*\1[^>]*>/gi, '
]*>/gi, '
');
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}}"
> -->
-
+
@@ -66,7 +66,7 @@
{{intro}}
- 已选
+ 选择参数
{{selectedAttrStr ? buyNum : ''}}{{selectedAttrStr || '请选择'}}
@@ -105,7 +105,7 @@
-
+
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 {