diff --git a/main.js b/main.js index 4b2d064..98e650c 100644 --- a/main.js +++ b/main.js @@ -4,9 +4,9 @@ import ios from '@/ios/index.js' // #ifndef VUE3 import Vue from 'vue' -Vue.prototype.$onLaunched = new Promise(resolve => { - Vue.prototype.$isResolve = resolve -}) +// Vue.prototype.$onLaunched = new Promise(resolve => { +// Vue.prototype.$isResolve = resolve +// }) Vue.config.productionTip = false App.mpType = 'app' const app = new Vue({ diff --git a/pages.json b/pages.json index cc4a522..ded9ff7 100644 --- a/pages.json +++ b/pages.json @@ -382,7 +382,10 @@ "optimization": { "subPackages": true }, - + "pullToRefresh": { + "style": "circle", + "color": "#630102" + }, "runmode" : "liberate" // 开启分包优化后,必须配置资源释放模式 } }, diff --git a/pages/account/index.vue b/pages/account/index.vue index f82afa7..426c8da 100644 --- a/pages/account/index.vue +++ b/pages/account/index.vue @@ -695,8 +695,8 @@ border-top-left-radius: 10rpx !important; border-top-right-radius: 10rpx !important; // border-bottom: #fafafa 1rpx solid !important; - background-color: #999999; - + // background-color: #999999; + background-color: transparent; image { width: 100%; height: 100%; diff --git a/pages/account/message.vue b/pages/account/message.vue index 9a6a6fe..ae3b421 100644 --- a/pages/account/message.vue +++ b/pages/account/message.vue @@ -5,18 +5,18 @@ - Message + Message - No comment! + - + - + {{ item.title}} @@ -153,7 +153,7 @@ async onLoad() { width: 100%; z-index: 999; height: 42px; - padding-top: 20px; + padding-top: 25px; text-align: center; top:0; left: 0; diff --git a/pages/index/index.vue b/pages/index/index.vue index 13419eb..a1248ca 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -204,19 +204,15 @@ // }, onLoad() { - let that = this; // 作用域 + let that = this; let s = 0; - // 定时轮询网络 (IOS网络判断) 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('清除网络..') - console.log('轮询结束...'); let home = 'HOME' this.getIndex(home) this.isLogin = uni.getStorageSync('isLogin') @@ -242,7 +238,6 @@ }) s++; }, 5000); - // 轮询时间 }, mounted() { @@ -537,7 +532,7 @@ let height = 0 this.indexDate.zones.map(item => { item.blocks.map(item1 => { - console.log(item.zone_code, item + '11111111111111') + // console.log(item.zone_code, item + '11111111111111') uni.getImageInfo({ src: item1.block_pic, success: (image) => { @@ -635,8 +630,7 @@ let url if (res.error == 0) { if (res.data.page_code == 'HOMESALEICON') { - let src = - 'https://www.dopeplus.com/images/mapp_customized/202210/1665653173499940520.png' + let src = 'https://www.dopeplus.com/images/mapp_customized/202211/1667961215280331818.png' if (src == res.data.zones[0].blocks[0].block_pic) { this.tarbar[2].src = '../../static/img/min.png' } else { @@ -1305,15 +1299,9 @@ - - - + diff --git a/pages/productDetails/index.vue b/pages/productDetails/index.vue index b244d34..3474470 100644 --- a/pages/productDetails/index.vue +++ b/pages/productDetails/index.vue @@ -1376,7 +1376,8 @@ .select_size_item2 { background-color: #1b1b1b; - width: 97.67rpx; + // width: 97.67rpx; + width: auto; height: 37.67rpx; display: flex; background-size: 100% !important; @@ -1495,7 +1496,8 @@ background-color: #F9F7FA; border-radius: 6.67rpx; margin-right: 12.67rpx; - width: 134.67rpx; + width: auto; + // width: 134.67rpx; image { width: 134.67rpx; @@ -1522,7 +1524,8 @@ } .color_select_item_bottom { - padding: 10rpx 0rpx; + padding: 10rpx 4rpx; + // padding: 10rpx 0rpx; font-size: 24rpx; text-align: center; diff --git a/pages/shippingCart/index.vue b/pages/shippingCart/index.vue index ee1e0f0..53fd1f2 100644 --- a/pages/shippingCart/index.vue +++ b/pages/shippingCart/index.vue @@ -41,10 +41,10 @@ @click="cartCheck(1,0,gitem.rec_id,gitem)"> - + - - + + {{gitem.goods_name}} @@ -1234,6 +1234,9 @@ background-color: #fff !important; // padding: 0 20rpx; } + .recommend_content_item_image { + background-color: transparent !important; + } .recommend_content_item_image_name{ color:#333 !important; height:60rpx; @@ -1847,6 +1850,6 @@ } } /deep/ .uni-nav-bar-text { - padding-left: 16%; + padding-left: 10%; } diff --git a/pages/specialTitle/index.vue b/pages/specialTitle/index.vue index d0de3cb..ac43872 100644 --- a/pages/specialTitle/index.vue +++ b/pages/specialTitle/index.vue @@ -6,48 +6,67 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/img/min.png b/static/img/min.png index 4b3a31b..54a084b 100644 Binary files a/static/img/min.png and b/static/img/min.png differ