diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 34e021f..e5478d7 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -533,7 +533,7 @@
.goodsInfo {
width: 720rpx;
- height: 484rpx;
+ max-height: 484rpx;
background: #FFFFFF;
border-radius: 6rpx 6rpx 6rpx 6rpx;
opacity: 1;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 40fb824..39fcf55 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -28,9 +28,9 @@
-
+
@@ -615,7 +615,7 @@
overflow-y: auto;
display: flex;
flex-direction: column;
- background-image: url('../../static/home/homeback.png');
+ background-image: url('https://www.saas.njrenzhou.com/static/home/homeback.png');
background-size: 100% 100%;
}
diff --git a/pages/sureOrder/index.vue b/pages/sureOrder/index.vue
index dea2fee..07aa581 100644
--- a/pages/sureOrder/index.vue
+++ b/pages/sureOrder/index.vue
@@ -5,7 +5,7 @@
:background="background">
-
+
送货上门
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 86f32cd..7f151b8 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,7 +1,7 @@
-
-
+
+
@@ -35,7 +35,7 @@
分销码
-
@@ -390,13 +390,15 @@
我要找货
-
+
数据统计
-
+
会员管理
@@ -418,22 +420,22 @@
-
+
-
+
-
+
+ {{item.goods_name}}
¥
- 7599
+ {{item.goods_price_min}}
到手价
- ¥7089
+ ¥{{item.line_price_max}}
- 200+条评论 99%好评率
+
@@ -461,7 +463,8 @@
import {
checkLogin
} from '@/core/app'
- import * as UserApi from '@/api/user'
+ import * as UserApi from '@/api/user';
+ import * as Api from '@/api/goods'
export default {
data() {
return {
@@ -475,12 +478,23 @@
userInfo: {
user_type: 40
},
+ suggestGoodsList:[],
}
},
onShow(options) {
this.onRefreshPage()
+ this.getSuggest()
},
methods: {
+ getSuggest() {
+ // 获取推荐商品
+ const that = this
+ Api.recommended()
+ .then(res => {
+ that.suggestGoodsList = res.data.goodsList
+ })
+
+ },
// 刷新页面
onRefreshPage() {
this.isLogin = checkLogin()
@@ -497,7 +511,7 @@
})
.then(result => {
that.userInfo = result.data.userInfo
- uni.setStorageSync('userInfo',that.userInfo)
+ uni.setStorageSync('userInfo', that.userInfo)
resolve(that.userInfo)
})
.catch(err => {
@@ -511,14 +525,14 @@
})
},
toFuwu(type) {
- if(!uni.getStorageSync('token')){
+ if (!uni.getStorageSync('token')) {
uni.navigateTo({
url: "/pages/login/index"
- })
- return ;
+ })
+ return;
}
uni.navigateTo({
- url: "/pages/news/recycling/orderList?type="+type
+ url: "/pages/news/recycling/orderList?type=" + type
})
},
goLogin() {
@@ -582,6 +596,7 @@
display: flex;
flex-direction: column;
justify-content: flex-end;
+
}
.section_1 {
@@ -592,6 +607,8 @@
display: flex;
flex-direction: column;
margin: -26rpx 0 0 -60rpx;
+ background: url('https://www.saas.njrenzhou.com/static/member/head.png') center -44px no-repeat;
+ background-size: 100% auto;
}
@@ -1425,6 +1442,9 @@
text-align: left;
white-space: nowrap;
line-height: 24rpx;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.text-wrapper_5 {
@@ -1450,7 +1470,7 @@
}
.text_15 {
- width: 86rpx;
+ // min-width: 86rpx;
height: 50rpx;
overflow-wrap: break-word;
color: rgba(242, 26, 28, 1.000000);