Browse Source

Merge branch 'dev' into HuNan_test

tags/湖南版5.1.4
meo 6 years ago
parent
commit
0254d5e6ff
6 changed files with 68 additions and 56 deletions
  1. +49
    -49
      pages/index/detail/index.wxml
  2. +15
    -2
      pages/index/index.js
  3. +1
    -1
      pages/main/bargain/index.wxml
  4. +1
    -2
      pages/main/index.wxss
  5. +1
    -1
      pages/main/spellGroup/index.wxml
  6. +1
    -1
      utils/imgurl.js

+ 49
- 49
pages/index/detail/index.wxml View File

@@ -1,28 +1,28 @@
<!--pages/index/detail/index.wxml-->
<view>
<swiper class="index-slide" autoplay="true" circular="false">
<swiper class="index-slide" autoplay="true" circular="false">
<block wx:for="{{imglist}}" wx:key="unique">
<swiper-item>
<image src="{{item}}" class="index-slide-image" />
</swiper-item>
</block>
</swiper>
<!-- <view class='merchant-detail'>
<!-- <view class='merchant-detail'>
<view>{{data.merchantName}}</view>
</view> -->
<view class='merchant-detail'>
<!-- 品牌信息 -->
<view class='merchant-brand'>
<view>
<image src='{{data.brandImg}}'></image>
</view>
<view>
<text>{{data.merchantName}}</text>
<text>{{data.title}}</text>
</view>
</view>
<!-- 一个商铺 -->
<!-- <view class='merchant-shop' wx:if="{{shopVoList.length==1}}">
<!-- 品牌信息 -->
<view class='merchant-brand'>
<view>
<image src='{{data.merchantImgUrl}}'></image>
</view>
<view>
<text>{{data.merchantName}}</text>
<text>{{data.title}}</text>
</view>
</view>
<!-- 一个商铺 -->
<!-- <view class='merchant-shop' wx:if="{{shopVoList.length==1}}">
<view>
<text>商户位置</text>
</view>
@@ -31,40 +31,40 @@
<text></text>
</view>
</view> -->
<!-- 多个商铺 -->
<view class='merchant-shop'>
<view >
<view >
<text>商户位置</text>
</view>
<view>
<text wx:if="{{shopVoList.length==1}}">{{shopVoList[0].buildingName}} {{shopVoList[0].floorName}} {{shopVoList[0].shopNumber}}</text>
<text wx:else>{{shopVoList[0].buildingName}} {{shopVoList[0].floorName}} {{shopVoList[0].shopNumber}}..</text>
<text wx:if="{{shopVoList.length!=1}}" class='godetail' data-id='{{data.id}}' bindtap='shopList'>详情 ></text>
</view>
</view>
</view>
<!-- 联系方式 -->
<view class='merchant-phone'>
<view >
<text>联系商户</text>
</view>
<view>
<view>
<!-- 多个商铺 -->
<view class='merchant-shop'>
<view>
<view>
<text>商户位置</text>
</view>
<view>
<text wx:if="{{shopVoList.length==1}}">{{shopVoList[0].buildingName}} {{shopVoList[0].floorName}} {{shopVoList[0].shopNumber}}</text>
<text wx:else>{{shopVoList[0].buildingName}} {{shopVoList[0].floorName}} {{shopVoList[0].shopNumber}}..</text>
<text wx:if="{{shopVoList.length!=1}}" class='godetail' data-id='{{data.id}}' bindtap='shopList'>详情 ></text>
</view>
</view>
</view>
<!-- 联系方式 -->
<view class='merchant-phone'>
<view>
<text>联系商户</text>
</view>
<view>
<view>
<text>{{data.merchantLinkPhone}}</text>
</view>
<image bindtap='phone' data-merchantLinkPhone='{{data.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" />
</view>
</view>
<!-- 商户简介 -->
<view class='merchant-phone'>
<view>
<text>商户简介</text>
</view>
</view>
<view class='merchant-info'>
<text wx:if="{{data.summary}}">{{data.summary}}</text>
<text wx:else>{{"信息完善中,敬请期待。"}}</text>
</view>
</view>
</view>
<image bindtap='phone' data-merchantLinkPhone='{{data.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" />
</view>
</view>
<!-- 商户简介 -->
<view class='merchant-phone'>
<view>
<text>商户简介</text>
</view>
</view>
<view class='merchant-info'>
<text wx:if="{{data.summary}}">{{data.summary}}</text>
<text wx:else>{{"信息完善中,敬请期待。"}}</text>
</view>
</view>
</view>

+ 15
- 2
pages/index/index.js View File

@@ -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();
})
},
})

+ 1
- 1
pages/main/bargain/index.wxml View File

@@ -1,4 +1,4 @@
<view class="index-rushToBuy" wx:if="{{list.length>2}}">
<view class="index-rushToBuy" style='height:350rpx;' wx:if="{{list.length>2}}">
<view class="index-rushToBuy-title">
<image src="{{barginicon}}" class='barginiconimg' mode='widthFix'/><text class='text-red'>砍价</text>专场<text bindtap="gotomore" class='morebargin'>更多砍价></text>
</view>


+ 1
- 2
pages/main/index.wxss View File

@@ -256,8 +256,7 @@ height:100%;
}
.duihuanimg{
display: block;
width: 85rpx;
height: 61rpx;
width: 48rpx;
margin-top: 6rpx;
}
.product{


+ 1
- 1
pages/main/spellGroup/index.wxml View File

@@ -1,4 +1,4 @@
<view class="index-rushToBuy" wx:if="{{list.length>2}}">
<view class="index-rushToBuy" wx:if="{{list.length>2}}" style='height:350rpx;'>
<view class="index-rushToBuy-title">
<image src="{{pintuan}}" class='barginiconimg' mode='widthFix'/><text class='text-red'>拼团</text>专场<text bindtap="gotomore" class='morebargin'>更多拼团></text>
</view>


+ 1
- 1
utils/imgurl.js View File

@@ -542,7 +542,7 @@ module.exports = {
'name': '拼团小图标'
},
'duihuan': {
'url': baseUrl + 'lqcduihuan.png',
'url': baseUrl + 'lqcduihuan1.png',
'name': '兑换小图标'
},
'wangmeimeibargin':{


Loading…
Cancel
Save