diff --git a/App.vue b/App.vue
index 2c6e748..64bdde6 100644
--- a/App.vue
+++ b/App.vue
@@ -89,7 +89,7 @@
onShow: function() {
- console.log('App Show')
+ // console.log('App Show')
},
onHide: function() {
// console.log('App Hide')
diff --git a/common/common.scss b/common/common.scss
index 08c8561..c0abbf8 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -1112,3 +1112,61 @@
}
}
}
+.wishlist-modification{
+ padding: 0 2.67rpx 40rpx 10rpx;
+ display: flex;
+ // padding-top: 40rpx;
+
+ // justify-content: space-between;
+ flex-wrap: wrap;
+
+ .wishlist_item{
+ display: flex;
+ flex-direction: column;
+ font-size: 25.33rpx;
+ font-weight: 500;
+ width: 100%;
+ margin-top: 33.33rpx;
+ // margin-right: 18.67rpx;
+ box-sizing: border-box;
+ &:nth-child(2n+0){
+ padding-left: 10px;
+ }
+
+ .wishlist_item_img{
+ width: 100%;
+ height: 190px;
+ object-fit: cover;
+ margin-bottom: 20rpx;
+ background-color: #999999;
+ position: relative;
+ border-radius: 10rpx;
+ .wishlist_item_img_goods{
+ width: 100%;
+ height: 100%;
+ border-radius: 10rpx;
+ }
+ .select{
+ position: absolute;
+ width: 28rpx;
+ height: 28rpx;
+ top: 8rpx;
+ right: 8rpx;
+ }
+ }
+ .wishlist_item_bottom{
+ display: flex;
+ align-items: center;
+ padding-right: 18.67rpx;
+ justify-content: space-between;
+
+ .wishlist_item_bottom_icon{
+ width: 30rpx;
+ height: 30rpx;
+ }
+ }
+ }
+}
+.uni-page-refresh {
+ background: #000 !important;
+}
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ae7ca41..62bd554 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -157,65 +157,66 @@
}, 2000)
},
// onReady() {
- // 轮询判断
- // typee = 2 有网络
- //判断是否有网络(尝试解决IOS白屏)
- // let that = this;
- // let s = 0;
- // let time = setInterval(()=>{
- // console.log('6666')
- // uni.getNetworkType({
- // success:(res)=>{
- // console.log(res.networkType,s);
- // if(res.networkType !== 'none'){
- // that.typee = 2;
- // clearInterval(time);
- // console.log('清楚网络..')
- // }
- // }
- // })
- // s++;
- // },1000);
- /* uni.getNetworkType({
- success: function(res) {
- console.log(res.networkType);
- //网络类型 wifi、2g、3g、4g、ethernet、unknown、none
- setTimeout(function() {
- if (res.networkType === "none") {
- that.typee = 1;
- console.log("当前无网络", that.typee);
- uni.showToast({
- title: '网络不佳,请重新打开........',
- duration: 20000
- });
+ // 轮询判断
+ // typee = 2 有网络
+ //判断是否有网络(尝试解决IOS白屏)
+ // let that = this;
+ // let s = 0;
+ // let time = setInterval(()=>{
+ // console.log('6666')
+ // uni.getNetworkType({
+ // success:(res)=>{
+ // console.log(res.networkType,s);
+ // if(res.networkType !== 'none'){
+ // that.typee = 2;
+ // clearInterval(time);
+ // console.log('清楚网络..')
+ // }
+ // }
+ // })
+ // s++;
+ // },1000);
+ /* uni.getNetworkType({
+ success: function(res) {
+ console.log(res.networkType);
+ //网络类型 wifi、2g、3g、4g、ethernet、unknown、none
+ setTimeout(function() {
+ if (res.networkType === "none") {
+ that.typee = 1;
+ console.log("当前无网络", that.typee);
+ uni.showToast({
+ title: '网络不佳,请重新打开........',
+ duration: 20000
+ });
- } else {
- that.typee = 2
- console.log("有网络", that.typee);
- uni.showToast({
- title: '网络不佳,请重新打开........',
- duration: 2000
- });
+ } else {
+ that.typee = 2
+ console.log("有网络", that.typee);
+ uni.showToast({
+ title: '网络不佳,请重新打开........',
+ duration: 2000
+ });
- }
- }, 3000)
- }
- }); */
+ }
+ }, 3000)
+ }
+ }); */
// },
-
+
onLoad() {
- let that = this; // 作用域
+ let that = this; // 作用域
let s = 0;
// 定时轮询网络 （IOS网络判断）
- let time = setInterval(()=>{
+ let time = setInterval(() => {
console.log('6666')
uni.getNetworkType({
- success:(res)=>{
- console.log(res.networkType,s);
- if(res.networkType !== 'none'){
- that.typee = 2;
+ success: (res) => {
+ console.log(res.networkType, s);
+ if (res.networkType !== 'none') {
+ that.typee = 2;
clearInterval(time);
- console.log('清楚网络..')
+ console.log('清除网络..')
+ console.log('轮询结束...');
let home = 'HOME'
this.getIndex(home)
this.isLogin = uni.getStorageSync('isLogin')
@@ -235,18 +236,19 @@
// color: "#999",
});
}
-
+
}
}
})
s++;
- },5000);
+ }, 1);
// 轮询时间
},
mounted() {
this.getimgheight()
this.getimgheight1()
+ this.getimgheight2()
console.log(this.open_img)
if (this.open_img) {
setTimeout(() => {
@@ -261,7 +263,7 @@
created() {
this.getPullMes()
this.getimgheight()
-
+ this.getimgheight2()
},
onShow() {
this.isLogin = uni.getStorageSync('isLogin')
@@ -530,12 +532,12 @@
if (res.error == 0) {
this.indexDate = res.data
- // console.log(this.indexDate,'首页配置')
+ console.log(this.indexDate,'首页配置')
this.len = 0
let height = 0
this.indexDate.zones.map(item => {
item.blocks.map(item1 => {
- console.log(item.zone_code, item)
+ console.log(item.zone_code, item + '11111111111111')
uni.getImageInfo({
src: item1.block_pic,
success: (image) => {
@@ -565,6 +567,12 @@
// console.log(this.Swiper_H)
})
}
+ if (item.zone_code == 'BANNER1') {
+ item.blocks.map(item1 => {
+ this.getimgheight2(item1.block_pic)
+ // console.log(this.Swiper_H)
+ })
+ }
if (item.zone_code == 'HONLIST3') {
item.blocks.map(item1 => {
// console.log('HONLIST3',item1)
@@ -1013,6 +1021,24 @@
}
})
+ },
+ getimgheight2(item) {
+ const that = this
+
+ // 获取图片宽高
+ uni.getImageInfo({
+ src: item,
+ success: (image) => {
+ // //console.log(image)
+ // this.Swiper_H = 0
+ this.Swiper_Hb = image.height
+ // 计算图片渲染高度
+ let showH = (50 * image.height) / image.width
+ // //console.log(showH)
+ return this.Swiper_Hb
+ }
+ })
+
},
// 获取的推荐商品数据
@@ -1277,13 +1303,32 @@
+
+
+
-
+
+
+
+
+
+
+
+
+
+