diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 4da93a7..a45c3a9 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -1,6 +1,6 @@
-
-
+
@@ -262,7 +262,7 @@
// 上拉加载配置
upOption: {
// 首次自动执行
- auto: true,
+ auto: false,
// 每页数据的数量; 默认10
page: {
size: pageSize
@@ -340,6 +340,8 @@
// })
// });
// console.log(that.goodsType, that.tabbar)
+ }else{
+ that.upCallback(1)
}
})
.catch(reject)
@@ -429,15 +431,18 @@
keyword: app.options.search || '',
goods_source: this.multiIndex > -1 ? this.multiArray[this.multiIndex].value : ''
}
+ console.log(param)
return new Promise((resolve, reject) => {
GoodsApi.list(param)
.then(result => {
// 合并新数据
+ console.log(app.list)
const newList = result.data.list
+ console.log(newList)
let arr = getMoreListData(newList, app.list, pageNo);
app.list.data = app.arrayUnique(arr, 'goods_id')
app.total = result.data.list.total;
- console.log(app.list)
+ console.log(newList)
resolve(newList)
})
.catch(reject)
@@ -859,6 +864,7 @@
display: flex;
justify-content: space-between;
align-items: center;
+ margin-top: 4rpx;
.left_1 {
height: 100%;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 16e2724..8fe8422 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2531,7 +2531,7 @@
display: flex;
justify-content: space-between;
align-items: center;
-
+ margin-top:4rpx;
.left_1 {
height: 100%;
width: 48rpx;
diff --git a/pages/news/consult/about.vue b/pages/news/consult/about.vue
index 753a802..7a3b739 100644
--- a/pages/news/consult/about.vue
+++ b/pages/news/consult/about.vue
@@ -13,7 +13,7 @@
{{cityInfo.phone}}
-
+
长按识别二维码
添加我的微信
diff --git a/pages/news1/jinqun.vue b/pages/news1/jinqun.vue
index 518a664..12746ac 100644
--- a/pages/news1/jinqun.vue
+++ b/pages/news1/jinqun.vue
@@ -1,43 +1,6 @@
-
-
-
-
- 京选电器
-
-
-
- 进群立领120元
-
-
- 京东电器官方福利群
-
-
-
-
-
- 立即进群>
-
-
-
-
- 福利攻略
-
-
-
-
- 天天抢红包
-
-
-
- 周二特价
-
-
-
- 品质抢团
-
-
-
+
+
@@ -63,6 +26,9 @@
this.cityInfo = data
}
},
+ clickImg(){
+ this.onShareAppMessage()
+ }
},
/**
* 分享当前页面
@@ -93,7 +59,7 @@
.jinqun{
height:100%;
position: relative;
- background: url(https://www.royaum.com.cn/static/jinqun-bg.png);
+
background-repeat: no-repeat;
background-size: cover;
min-height: 100vh;
@@ -142,12 +108,12 @@
}
.qcode{
width: 400upx;
- height:400upx;
- margin:40upx auto;
+ height:300upx;
+ margin:160upx auto;
border:1px solid red;
image{
width: 100%;
- height: 100%;
+ height: 140%;
}
}
.submitBtn{