Переглянути джерело

Merge branch 'dev' into HuNan_test

tags/湖南版5.1.4
meo 6 роки тому
джерело
коміт
25fd5dd237
10 змінених файлів з 27 додано та 21 видалено
  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 Переглянути файл

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

+ 1
- 1
ext.json Переглянути файл

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


+ 1
- 1
pages/coupon/detail/index.wxml Переглянути файл

@@ -78,7 +78,7 @@
<text>{{item.merchantName}}</text> <text>{{item.merchantName}}</text>
<view class='shopVoList'> <view class='shopVoList'>
<view wx:for="{{item.shopVoList}}" wx:key="{{index}}" wx:for-item="itemName"> <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> </view>
</view> </view>


+ 3
- 2
pages/getuserinfo/index.js Переглянути файл

@@ -34,6 +34,7 @@ Page({
that.setData({ that.setData({
couponChannelId: options.couponChannelId, couponChannelId: options.couponChannelId,
cuserId: options.cuserId, cuserId: options.cuserId,
updateDate: options.updateDate,
coverImg: options.coverImg, coverImg: options.coverImg,
userName: options.userName, userName: options.userName,
avatarUrl: options.avatarUrl, avatarUrl: options.avatarUrl,
@@ -88,7 +89,7 @@ Page({
}); });
} else { } 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({ wx.navigateTo({
url: `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}` url: `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}`
@@ -123,7 +124,7 @@ Page({
url: `/pages/bannerdetail/index?id=${that.data.optionData.id}`, 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({ wx.navigateTo({
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${that.data.orderId}` url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${that.data.orderId}`


+ 2
- 2
pages/index/detail/index.wxml Переглянути файл

@@ -26,7 +26,7 @@
<text>商户位置</text> <text>商户位置</text>
</view> </view>
<view class='merchants'> <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> </view>
</view> </view>
@@ -36,7 +36,7 @@
<text>联系商户</text> <text>联系商户</text>
</view> </view>
<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> <text>{{data.merchantLinkPhone}}</text>
</view> </view>
<image bindtap='phone' data-merchantLinkPhone='{{data.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> <image bindtap='phone' data-merchantLinkPhone='{{data.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" />


+ 2
- 2
pages/index/detail/index.wxss Переглянути файл

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


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


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


+ 12
- 10
pages/index/index.js Переглянути файл

@@ -106,17 +106,19 @@ Page({
}); });
return; return;
} }
// 跳转普通券/消费卡/限时秒杀/砍价详情
else if (options && options.couponChannelId) { 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') { else if (options && options.couponChannelId && app.globalData.type == 'sd') {


+ 1
- 1
pages/index/searchbar/index.wxml Переглянути файл

@@ -26,7 +26,7 @@
<text>{{item.merchantName}}</text> <text>{{item.merchantName}}</text>
<view class='shopVo'> <view class='shopVo'>
<view class='shopVoList' wx:for="{{item.shopVoList}}" wx:key="{{index}}" wx:for-item="itemName"> <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> </view>
</view> </view>


+ 2
- 1
pages/index/searchbar/index.wxss Переглянути файл

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


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




+ 1
- 0
pages/main/bargain/index.wxss Переглянути файл

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


Завантаження…
Відмінити
Зберегти