diff --git a/common/api.js b/common/api.js index 54fd627..f28f032 100644 --- a/common/api.js +++ b/common/api.js @@ -1,7 +1,7 @@ // appId: 正式 null | 测试 wxb35ef055a4dd8ad4 export const DEV = "dev"; // dev 测试 | prod 正式 export const VERSION = '1.0.0'; // 版本号 -export const DEVURL = 'http://hainan.lanzulive.com'; // 测试服请求地址 +export const DEVURL = 'https://hainan.lanzulive.com'; // 测试服请求地址 // export const DEVURL = 'http://hainan.com'; // 测试服请求地址 export const PRODURL = ''; // 正式服请求地址 diff --git a/pages/discover/discover.vue b/pages/discover/discover.vue index 2dd5792..0604f17 100644 --- a/pages/discover/discover.vue +++ b/pages/discover/discover.vue @@ -2,8 +2,8 @@ - - + + diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue index 1dd6ad6..68ac18a 100644 --- a/pages/goodsDetail/index.vue +++ b/pages/goodsDetail/index.vue @@ -102,7 +102,7 @@ } }, onLoad(options){ - this.goods_id = options.goods_id; + this.goods_id = options.goods_id || options.id; console.log('商品',this.goods_id) this.getGoodsDetail(); @@ -207,7 +207,7 @@ let title = goods.name; let imageUrl = goods.share_cover || goods.cover; let path = '/pages/route/index?route=goods_detail&id='+ goods.id; - + console.log("path", path); return { title, path, diff --git a/pages/index/index.vue b/pages/index/index.vue index 24a73bf..be3bd21 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -192,6 +192,7 @@ onPullDownRefresh(){ this.getIndexData() this.getFavourite() + uni.stopPullDownRefresh() }, onShareAppMessage(){ let shareInfo = { @@ -311,13 +312,14 @@ .recomm-img{ width: 222rpx; height: 222rpx; - border-radius: 5rpx; + border-radius: 15rpx; + overflow: hidden; } .max-recomm-img{ width: 455rpx; height: 455rpx; position: relative; - border-radius: 5rpx; + border-radius: 15rpx; overflow: hidden; .recomm-title{ // height: 142rpx;