Browse Source

Merge branch 'dev' into HuNan_test

tags/湖南版5.1.4
meo 6 years ago
parent
commit
25fd5dd237
10 changed files with 27 additions and 21 deletions
  1. +2
    -1
      app.json
  2. +1
    -1
      ext.json
  3. +1
    -1
      pages/coupon/detail/index.wxml
  4. +3
    -2
      pages/getuserinfo/index.js
  5. +2
    -2
      pages/index/detail/index.wxml
  6. +2
    -2
      pages/index/detail/index.wxss
  7. +12
    -10
      pages/index/index.js
  8. +1
    -1
      pages/index/searchbar/index.wxml
  9. +2
    -1
      pages/index/searchbar/index.wxss
  10. +1
    -0
      pages/main/bargain/index.wxss

+ 2
- 1
app.json View File

@@ -112,5 +112,6 @@
"request": 30000,
"downloadFile": 10000
},
"debug": false
"debug": false,
"sitemapLocation": "sitemap.json"
}

+ 1
- 1
ext.json View File

@@ -4,7 +4,7 @@
"ext": {
"weappId": "wxea71200db93d756b",
"name": "富茂客官开发",
"appVersion": "C.4.1.8",
"appVersion": "C.5.1.107",
"attr": {
"configUrl": "https://ciformall.youlane.cn/C/api",
"socketUrl": "wss://mp.youlane.cn/W/ws",


+ 1
- 1
pages/coupon/detail/index.wxml View File

@@ -78,7 +78,7 @@
<text>{{item.merchantName}}</text>
<view class='shopVoList'>
<view wx:for="{{item.shopVoList}}" wx:key="{{index}}" wx:for-item="itemName">
<text>{{itemName.shopNumber}}{{itemName.buildingName}}{{itemName.floorName}}</text><text class='douhao' wx:if="{{item.shopVoList.length>1}}">,</text>
<text>{{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}</text><text class='douhao' wx:if="{{item.shopVoList.length>1}}">,</text>
</view>
</view>
</view>


+ 3
- 2
pages/getuserinfo/index.js View File

@@ -34,6 +34,7 @@ Page({
that.setData({
couponChannelId: options.couponChannelId,
cuserId: options.cuserId,
updateDate: options.updateDate,
coverImg: options.coverImg,
userName: options.userName,
avatarUrl: options.avatarUrl,
@@ -88,7 +89,7 @@ Page({
});
} else {
//返回主页
if (that.data.couponChannelId && !that.data.cuserId&&app.globalData.type == 'cd') {
if (that.data.couponChannelId && !that.data.cuserId||that.data.couponChannelId && !that.data.cuserId&&app.globalData.type == 'cd') {
// 跳转普通券/消费卡/限时秒杀/砍价详情
wx.navigateTo({
url: `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}`
@@ -123,7 +124,7 @@ Page({
url: `/pages/bannerdetail/index?id=${that.data.optionData.id}`,
})
}
} else if (that.data.orderId&&app.globalData.type=='bg') {
} else if (that.data.orderId||that.data.orderId&&app.globalData.type=='bg') {
// 参与砍价
wx.navigateTo({
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${that.data.orderId}`


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

@@ -26,7 +26,7 @@
<text>商户位置</text>
</view>
<view class='merchants'>
<text wx:for="{{shopVoList}}" wx:key="{{index}}">{{item.buildingName}} {{item.floorName}} {{item.shopNumber}}</text>
<text wx:for="{{shopVoList}}" wx:key="{{index}}">{{item.buildingName}}{{item.floorName}}--{{item.shopNumber}}</text>
</view>
</view>
</view>
@@ -36,7 +36,7 @@
<text>联系商户</text>
</view>
<view>
<view style='display:block;text-align:right;margin-right:20rpx;'>
<view style='display:block;text-align:left;margin-right:20rpx;'>
<text>{{data.merchantLinkPhone}}</text>
</view>
<image bindtap='phone' data-merchantLinkPhone='{{data.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" />


+ 2
- 2
pages/index/detail/index.wxss View File

@@ -90,7 +90,7 @@

.merchant-shop view, .merchant-phone view {
display: flex;
flex: 4;
flex: 3;
color: #333;
}

@@ -133,7 +133,7 @@
}
.merchants text{
display: block;
text-align: right;
text-align: left;
height: 50rpx;
line-height: 50rpx;
}


+ 12
- 10
pages/index/index.js View File

@@ -106,17 +106,19 @@ Page({
});
return;
}
// 跳转普通券/消费卡/限时秒杀/砍价详情
else if (options && options.couponChannelId) {
wx.redirectTo({
url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}`,
})
}
// 转赠判断
else if (options && options.couponChannelId && options.cuserId) {
wx.redirectTo({
url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}&cuserId=${options.cuserId}&coverImg=${options.coverImg}&userName=${options.userName}&avatarUrl=${options.avatarUrl}&couponOrderId=${options.couponOrderId}&updateDate=${options.updateDate}`,
})
// 转赠判断
if (options.cuserId){
wx.redirectTo({
url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}&cuserId=${options.cuserId}&coverImg=${options.coverImg}&userName=${options.userName}&avatarUrl=${options.avatarUrl}&couponOrderId=${options.couponOrderId}&updateDate=${options.updateDate}`,
})
}else{
// 跳转普通券/消费卡/限时秒杀/砍价详情
wx.redirectTo({
url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}`,
})
}
}
// 拼团详情页(只有通过扫码进入才可能进入拼团详情页面,只有这一个入口)
else if (options && options.couponChannelId && app.globalData.type == 'sd') {


+ 1
- 1
pages/index/searchbar/index.wxml View File

@@ -26,7 +26,7 @@
<text>{{item.merchantName}}</text>
<view class='shopVo'>
<view class='shopVoList' wx:for="{{item.shopVoList}}" wx:key="{{index}}" wx:for-item="itemName">
<text>{{itemName.shopNumber}}{{itemName.buildingName}}{{itemName.floorName}}</text><text class='douhao' wx:if="{{item.shopVoList.length>1}}">,</text>
<text>{{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}</text><text class='douhao' wx:if="{{item.shopVoList.length>1}}">,</text>
</view>
</view>
</view>


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

@@ -122,6 +122,7 @@
color: #333;
letter-spacing: 0;
height: 40rpx;
margin-top: 10rpx;
line-height: 40rpx;
}

@@ -130,7 +131,7 @@
color: #b8b8b8;
padding-top: 3rpx;
height: 36rpx;
line-height: 36rpx;
line-height: 56rpx;
overflow: hidden;
}



+ 1
- 0
pages/main/bargain/index.wxss View File

@@ -37,6 +37,7 @@
.index-scroll-view {
width: 100%;
white-space: nowrap;
height: 300rpx;
}
.index-scroll-view .commodity {
display: inline-block;


Loading…
Cancel
Save