From 6bc4accd86aac225ff99b23b8174da65eb1a85f4 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Wed, 24 Apr 2019 18:56:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=A2=9E=E5=8A=A0sitemap.JSON]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 ++- sitemap.json | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 sitemap.json diff --git a/app.json b/app.json index b8302dc..a03b24f 100644 --- a/app.json +++ b/app.json @@ -112,5 +112,6 @@ "request": 30000, "downloadFile": 10000 }, - "debug": false + "debug": false, + "sitemapLocation": "sitemap.json" } \ No newline at end of file diff --git a/sitemap.json b/sitemap.json new file mode 100644 index 0000000..ca02add --- /dev/null +++ b/sitemap.json @@ -0,0 +1,7 @@ +{ + "desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html", + "rules": [{ + "action": "allow", + "page": "*" + }] +} \ No newline at end of file From 74decfe9817367a9f116d8ed1d3ba5f4212a0430 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Wed, 24 Apr 2019 19:12:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=88=A0=E9=99=A4sitemap.JSON]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 +-- sitemap.json | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 sitemap.json diff --git a/app.json b/app.json index a03b24f..b8302dc 100644 --- a/app.json +++ b/app.json @@ -112,6 +112,5 @@ "request": 30000, "downloadFile": 10000 }, - "debug": false, - "sitemapLocation": "sitemap.json" + "debug": false } \ No newline at end of file diff --git a/sitemap.json b/sitemap.json deleted file mode 100644 index ca02add..0000000 --- a/sitemap.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html", - "rules": [{ - "action": "allow", - "page": "*" - }] -} \ No newline at end of file From d5a717c246975d9b23c4ddc9728fbcfae47799c1 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Thu, 25 Apr 2019 15:08:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E9=A6=96=E9=A1=B5,=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E8=BF=9B=E6=9D=A5][=E4=BF=AE=E6=94=B9]:[?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=9B=BE=E6=A0=87=E7=9A=84=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E6=B8=B8=E6=88=8F=E6=89=AB=E7=A0=81=E8=BF=9B=E6=9D=A5?= =?UTF-8?q?=E7=A9=BA=E7=99=BD=E9=A1=B5=E7=9A=84=E9=97=AE=E9=A2=98=E8=A7=A3?= =?UTF-8?q?=E5=86=B3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/detail/index.wxml | 98 ++++++++++++++++---------------- pages/index/index.js | 17 +++++- pages/main/bargain/index.wxml | 2 +- pages/main/index.wxss | 3 +- pages/main/spellGroup/index.wxml | 2 +- utils/imgurl.js | 2 +- 6 files changed, 68 insertions(+), 56 deletions(-) diff --git a/pages/index/detail/index.wxml b/pages/index/detail/index.wxml index b7f5cc0..e157f6d 100644 --- a/pages/index/detail/index.wxml +++ b/pages/index/detail/index.wxml @@ -1,28 +1,28 @@ - + - - - - - - - - {{data.merchantName}} - {{data.title}} - - - - + + + + + + {{data.merchantName}} + {{data.title}} + + + + - - - - - 商户位置 - - - {{shopVoList[0].buildingName}} {{shopVoList[0].floorName}} {{shopVoList[0].shopNumber}} - {{shopVoList[0].buildingName}} {{shopVoList[0].floorName}} {{shopVoList[0].shopNumber}}.. - 详情 > - - - - - - - 联系商户 - - - + + + + + 商户位置 + + + {{shopVoList[0].buildingName}} {{shopVoList[0].floorName}} {{shopVoList[0].shopNumber}} + {{shopVoList[0].buildingName}} {{shopVoList[0].floorName}} {{shopVoList[0].shopNumber}}.. + 详情 > + + + + + + + 联系商户 + + + {{data.merchantLinkPhone}} - - - - - - - - 商户简介 - - - - {{data.summary}} - {{"信息完善中,敬请期待。"}} - - + + + + + + + 商户简介 + + + + {{data.summary}} + {{"信息完善中,敬请期待。"}} + + + \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 18347ef..d24966e 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -385,8 +385,21 @@ Page({ url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId, }) }) - .catch(err => { - this.alphaClick(); + .catch(err => { + wx.showModal({ + title: '提示', + content: err.message, + showCancel: false, + success:function(res){ + // 如果游戏下架或者找不到,重启首页 + if (res.confirm){ + wx.reLaunch({ + url: '/pages/index/index', + }) + } + } }) + this.alphaClick(); + }) }, }) \ No newline at end of file diff --git a/pages/main/bargain/index.wxml b/pages/main/bargain/index.wxml index 8c1959d..97312b5 100644 --- a/pages/main/bargain/index.wxml +++ b/pages/main/bargain/index.wxml @@ -1,4 +1,4 @@ - + 砍价专场更多砍价> diff --git a/pages/main/index.wxss b/pages/main/index.wxss index d49e804..992b121 100644 --- a/pages/main/index.wxss +++ b/pages/main/index.wxss @@ -256,8 +256,7 @@ height:100%; } .duihuanimg{ display: block; - width: 85rpx; - height: 61rpx; + width: 48rpx; margin-top: 6rpx; } .product{ diff --git a/pages/main/spellGroup/index.wxml b/pages/main/spellGroup/index.wxml index 9ed8149..929ced8 100644 --- a/pages/main/spellGroup/index.wxml +++ b/pages/main/spellGroup/index.wxml @@ -1,4 +1,4 @@ - + 拼团专场更多拼团> diff --git a/utils/imgurl.js b/utils/imgurl.js index caeab86..d90a037 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -542,7 +542,7 @@ module.exports = { 'name': '拼团小图标' }, 'duihuan': { - 'url': baseUrl + 'lqcduihuan.png', + 'url': baseUrl + 'lqcduihuan1.png', 'name': '兑换小图标' }, 'wangmeimeibargin':{