Explorar el Código

Merge branch 'dev' into HebeiRelease_2019.08.06

tags/河北版C.8.2.0
meo hace 5 años
padre
commit
1d5c7cca4d
Se han modificado 43 ficheros con 328 adiciones y 783 borrados
  1. +1
    -1
      app.wxss
  2. +1
    -4
      components/banner/index.json
  3. +0
    -7
      components/banner/index.wxml
  4. +2
    -2
      components/banner/index.wxss
  5. +0
    -1
      components/navbar/navbar.js
  6. +78
    -0
      components/store/index.js
  7. +3
    -0
      components/store/index.json
  8. +19
    -0
      components/store/index.wxml
  9. +78
    -0
      components/store/index.wxss
  10. +1
    -3
      pages/acSignIn/index.js
  11. +1
    -1
      pages/bannerdetail/index.wxml
  12. +11
    -8
      pages/bargain/bargain.wxml
  13. +6
    -5
      pages/bargain/bargain.wxss
  14. +1
    -1
      pages/bargain/bargainDatail/bargainDatail.wxss
  15. +1
    -1
      pages/cardorder/detail/index.js
  16. +1
    -5
      pages/cardorder/index/index.wxss
  17. +12
    -50
      pages/coupon/detail/index.js
  18. +2
    -1
      pages/coupon/detail/index.json
  19. +4
    -21
      pages/coupon/detail/index.wxml
  20. +6
    -79
      pages/coupon/detail/index.wxss
  21. +3
    -12
      pages/couponorder/detail/index.js
  22. +2
    -1
      pages/couponorder/detail/index.json
  23. +18
    -17
      pages/couponorder/detail/index.wxml
  24. +6
    -82
      pages/couponorder/detail/index.wxss
  25. +1
    -5
      pages/couponorder/index/index.wxss
  26. +3
    -2
      pages/discountCardList/discountCardList.wxss
  27. +17
    -50
      pages/freeBannerDetail/index.js
  28. +1
    -3
      pages/index/searchbar/detail/index.wxml
  29. +6
    -97
      pages/index/searchbar/detail/index.wxss
  30. +0
    -204
      pages/index/searchbar/index.wxss
  31. +3
    -1
      pages/integralmall/payIntegcouponStatus/index.wxss
  32. +1
    -1
      pages/joinFrDpell/index.wxss
  33. +1
    -13
      pages/main/index.js
  34. +1
    -43
      pages/main/index.wxml
  35. +9
    -7
      pages/main/index.wxss
  36. +1
    -1
      pages/order/detail/index.js
  37. +2
    -1
      pages/order/detail/index.json
  38. +2
    -12
      pages/order/detail/index.wxml
  39. +6
    -14
      pages/order/detail/index.wxss
  40. +1
    -0
      pages/orderquanma/index.wxss
  41. +4
    -1
      pages/spellGroup/mySpellGroup/index.wxss
  42. +3
    -7
      pages/spellGroup/spellGroup.wxss
  43. +9
    -19
      pages/user/index.wxss

+ 1
- 1
app.wxss Ver fichero

@@ -1,4 +1,4 @@
@import "weui.wxss";
/* @import "weui.wxss"; */

@font-face {
font-family: "iconfont"; /* project id 777313 */


+ 1
- 4
components/banner/index.json Ver fichero

@@ -1,6 +1,3 @@
{
"component": true,
"usingComponents": {
}
"component": true
}

+ 0
- 7
components/banner/index.wxml Ver fichero

@@ -1,11 +1,4 @@
<view wx:if="{{list.length>0}}" class="index-slide-view">
<!-- <swiper class="index-slide" autoplay="true" circular="false">
<block wx:for="{{list}}" wx:key="unique">
<swiper-item>
<image data-id="{{item.id}}" data-data="{{item}}" mode='widthFix' bindtap='gotobannerdetail' src="{{item.coverImg}}" class="index-slide-image" />
</swiper-item>
</block>
</swiper> -->
<swiper class="imageContainer" bindchange="handleChange" previous-margin="39rpx" next-margin="40rpx" circular autoplay>
<block wx:for="{{list}}" wx:key="{{index}}">
<swiper-item class="item">


+ 2
- 2
components/banner/index.wxss Ver fichero

@@ -57,12 +57,12 @@
.itemImg{
position: absolute;
width: 640rpx;
height: 248rpx;
height: 227rpx;
border-radius: 15rpx;
overflow: hidden;
z-index: 5;
opacity: 0.7;
top: 15%;
top: 20%;
margin: 0 20rpx;
}
.active{


+ 0
- 1
components/navbar/navbar.js Ver fichero

@@ -48,6 +48,5 @@ Component({
back: false
})
}
console.debug()
}
})

+ 78
- 0
components/store/index.js Ver fichero

@@ -0,0 +1,78 @@
const imgurl = require("../../utils/imgurl");
Component({
/**
* 组件的属性列表
*/
properties: {
merchantVoList: {
value: [],
type: Array
}
},

/**
* 组件的初始数据
*/
data: {
teljpgUrl: imgurl.teljpg.url,
showMore:true,
more: "点击查看更多",
hidden:"hidden",
height: ""
},
/**
* 组件的方法列表
*/
methods: {
/**
* 跳转到门店列表的详情页面
*/
gotoDetail(e) {
wx.navigateTo({
url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
})
},
// 点击查看更多
more: function () {
let that = this;
if (that.data.more == '点击查看更多') {
this.setData({
hidden: "",
height: 'auto!important',
more: "点击收起",
showMore: true
})
} else {
that.setData({
hidden: "hidden",
height: 4 * 140 + 'rpx',
more: "点击查看更多",
showMore: true
})
}
},
phone: function (e) {
let that = this;
wx.makePhoneCall({
phoneNumber: e.target.dataset.merchantlinkphone
});
}
},
ready: function () {
let merchantVoList = this.properties.merchantVoList;
if (merchantVoList.length>0){
if (merchantVoList.length <= 4) {
this.setData({
height: merchantVoList.length * 140 + 'rpx',
showMore: false,
hidden:"hidden"
})
} else if (merchantVoList && merchantVoList.length > 4) {
this.setData({
height: 4 * 140 + 'rpx'
})
}
}
}
});

+ 3
- 0
components/store/index.json Ver fichero

@@ -0,0 +1,3 @@
{
"component": true
}

+ 19
- 0
components/store/index.wxml Ver fichero

@@ -0,0 +1,19 @@
<view class='applyshop'>适用门店</view>
<view class='posi' style='overflow:{{hidden}};height:{{height}}'>
<view class='posi_logo' wx:for="{{merchantVoList}}" wx:key="index">
<view bindtap='gotoDetail' data-id='{{item.id}}'>
<image src='{{item.merchantImgUrl}}'></image>
</view>
<view bindtap='gotoDetail' data-id='{{item.id}}'>
<view class='name'>{{item.merchantName}}</view>
<view class='shopVoList'>
<view wx:for="{{item.shopVoList}}" wx:key="{{index}}" wx:for-item="itemName">
<text>{{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}</text>
<text class='douhao' wx:if="{{item.shopVoList.length>1}}">,</text>
</view>
</view>
</view>
<image wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" />
</view>
</view>
<view class='bottom' bindtap='more' wx:if="{{showMore}}">{{more}}</view>

+ 78
- 0
components/store/index.wxss Ver fichero

@@ -0,0 +1,78 @@
.applyshop {
font-size: 30rpx;
height: 70rpx;
line-height: 70rpx;
color: #333;
text-indent: 1em;
background: #fff;
}

.posi {
position: relative;
width: 100%;
background: #FFF;
}
.posi_logo {
position: relative;
width: 92%;
display: flex;
padding: 20rpx 0;
background: #fff;
z-index: 10;
margin: 0 auto;
}

.posi_logo view:nth-child(1) {
border-radius: 16rpx;
}

.posi_logo view:nth-child(1) image {
display: block;
width: 100rpx;
height: 100rpx;
border-radius: 16rpx;
margin-right: 16rpx;
border: 1px solid #e5e5e5;
}
.name{
font-size: 32rpx;
color: #333;
letter-spacing: 0;
width: 500rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.posi_logo view:nth-child(2) view:nth-child(1) {
font-size: 32rpx;
color: #333;
letter-spacing: 0;
}

.shopVoList {
display: flex !important;
padding-left: 0 !important;
flex-direction: row !important;
}

.shopVoList text {
font-size: 20rpx !important;
color: #b8b8b8 !important;
}
.bottom{
background: #fff;
color: #666;
text-align: center;
padding: 20rpx 0;
font-size: 32rpx;
}
.tel {
position: absolute;
right: 0;
top: 0;
bottom: 0;
margin: auto;
width: 50rpx;
height: 50rpx;
z-index: 10;
}

+ 1
- 3
pages/acSignIn/index.js Ver fichero

@@ -23,7 +23,6 @@ Page({
})
}
},
// pages/index/searchbar/index
signIn(id){
let that = this;
Http.post({
@@ -55,11 +54,10 @@ Page({
title: '此活动报名已结束',
})
}
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
})
},
}
})

+ 1
- 1
pages/bannerdetail/index.wxml Ver fichero

@@ -1,5 +1,5 @@
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<navbar back home text="签到" background="#fff"></navbar>
<navbar back home text="详情" background="#fff"></navbar>
<!-- banner活动详情页面 -->
<view class='coupons' style="padding-top:{{navigationBarHeight}}">
<view class="coupons-body">


+ 11
- 8
pages/bargain/bargain.wxml Ver fichero

@@ -15,7 +15,10 @@
<view class="fl ri" hover-class="none" hover-stop-propagation="false">
<text class="txt01">{{item.title}}</text>
<!-- <text class="txt02">{{item.subTitle}}</text> -->
<view class="txt04">可砍至¥<text class="money">{{item.salePriceStr}}</text></view>
<view class="txt04">
<view>可砍至¥</view>
<view class="money">{{item.salePriceStr}}</view>
</view>
<text class="txt03">原价{{item.priceStr}}</text>
</view>
<view class="botton" wx:if="{{item.remainInventory != 0}}" hover-class="none" hover-stop-propagation="false">发起砍价</view>
@@ -31,16 +34,16 @@
<image class="frImg" wx:if="{{item.orderStatus == 6&&todayDate<=item.pressEndDate}}" src="{{orangeImg}}" mode="aspectFill" lazy-load="true"><text>进行中</text></image>
<image class="frImg" wx:if="{{item.orderStatus == 7}}" src="{{blueImg}}" mode="aspectFill" lazy-load="true"><text>已完成</text></image>
<image class="frImg" wx:if="{{item.orderStatus == 8||item.orderStatus == 6&&todayDate>item.pressEndDate}}" src="{{grayImg}}" mode="aspectFill" lazy-load="true"><text>已失效</text></image>

<image class="fl" src="{{item.coverImg}}" mode="aspectFill" lazy-load="true"></image>
<view class="fl ri" hover-class="none" hover-stop-propagation="false">
<text class="txt01">{{item.title}}</text>
<!-- <text class="txt02">{{item.subTitle}}</text> -->
<view class="txt04 mr txt004" wx:if="{{item.orderStatus !=7}}">已砍至¥ <text class='money'>{{item.price/100-(item.price/100-item.salePrice/100-item.pressCurrentValue/100)}}</text><text class="txt03">原价{{item.price/100}}</text></view>
<!-- <text class="txt04 mr" wx:if="{{item.orderStatus == 6&&todayDate<=item.pressEndDate}}">{{item.pressCurrentValue/100}}元</text> -->
<text class="txt04 mr" wx:if="{{item.orderStatus == 7}}">已砍价到底价:{{item.salePrice/100}}元</text>
<text class="txt01">{{item.title}}</text>
<view class="txt04 mr txt004" wx:if="{{item.orderStatus !=7}}">
<view>已砍至¥</view>
<view class='money'>{{item.price/100-(item.price/100-item.salePrice/100-item.pressCurrentValue/100)}}</view>
</view>
<text class="txt03">原价{{item.price/100}}</text>
<text class="txt04 mr" wx:if="{{item.orderStatus == 7}}">已砍价到底价:{{item.salePrice/100}}元</text>
</view>

<view class='again' wx:if="{{item.orderStatus == 6&&todayDate<=item.pressEndDate}}" hover-class="none" hover-stop-propagation="false" data-id="{{item.id}}" bindtap="inviteFriend">
<view class="botton1">邀请好友</view>
</view>


+ 6
- 5
pages/bargain/bargain.wxss Ver fichero

@@ -14,10 +14,7 @@ page{
width: 142rpx;
height: 142rpx!important;
border-radius: 10rpx;
/* overflow: hidden; */
margin-top:10rpx;
/* word-wrap: break-word;
word-break: break-all; */
display: block;
}
.listitem .icon{
@@ -66,8 +63,12 @@ page{
width: 100%;
font-size:26rpx;
color:rgba(253,131,45,1);
line-height:44rpx;
line-height:40rpx;
height: 48rpx;
display: flex;
}
.txt04 view:nth-child(1) {
margin-top: 15rpx;
}
.frImg{
height: 78rpx;
@@ -93,7 +94,7 @@ page{
font-size:40rpx;
font-weight:500;
color:rgba(253,131,45,1);
width:150rpx;
width:200rpx;
margin-top: 10rpx;
overflow:hidden;
white-space: nowrap;


+ 1
- 1
pages/bargain/bargainDatail/bargainDatail.wxss Ver fichero

@@ -331,7 +331,7 @@ page{
line-height: 75rpx;
text-align: center;
border: none;
font-size: 32rpx;
font-size: 28rpx;
margin: 0 auto;
}
button::after{ border: none; }


+ 1
- 1
pages/cardorder/detail/index.js Ver fichero

@@ -38,7 +38,7 @@ Page({
},
gotogame: function () {
let that = this;
wx.navigateTo({
wx.redirectTo({
url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId,
})
},


+ 1
- 5
pages/cardorder/index/index.wxss Ver fichero

@@ -6,10 +6,9 @@

.tabs {
width: 100% !important;
height: 88rpx;
height: 96rpx;
text-align: center;
position: fixed;
/* top: 136rpx; */
left: 0;
right: 0;
z-index: 100000;
@@ -247,7 +246,6 @@
}
.txt2{
/* opacity: .99; */
margin-top: 36rpx;
}
.imgicon {
@@ -287,8 +285,6 @@
font-family: PingFang-SC-Regular;
font-weight: 400;
color: #FD832D;
/* opacity: .99; */
line-height: 44rpx;
margin-top: 30rpx;
background: #fff;
position: fixed;


+ 12
- 50
pages/coupon/detail/index.js Ver fichero

@@ -22,12 +22,8 @@ Page({
fail: imgurl.fail.url,
wmhome: imgurl.wmhome.url,
swiperCurrent: 0,
hidden: "hidden",
height: "",
detailPicture:[],
coverPicture:[],
more: "点击查看更多",
showMore: true,
data: {
title: null
},
@@ -86,7 +82,8 @@ Page({
minLimit:0,
maxLimit:0,
dispressEndDate:false,
barTitle:""
barTitle:"",
activityStatus:""
},
/**
* 显示分享弹框
@@ -104,14 +101,7 @@ Page({
isshowposter: false,
})
},
/**
* 跳转到门店列表的详情页面
*/
gotoDetail(e) {
wx.navigateTo({
url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
})
},
/**
* 显示分享海报
*/
@@ -126,31 +116,8 @@ Page({
swiperCurrent: e.detail.current
});
},
phone: function(e) {
let that = this;
wx.makePhoneCall({
phoneNumber: e.target.dataset.merchantlinkphone
});
},
// 点击查看更多
more: function() {
let that = this;
if (that.data.more == '点击查看更多') {
this.setData({
hidden: "",
height: that.data.data.merchantVoList.length * 140 + 'rpx',
more: "点击收起",
showMore: true
})
} else {
this.setData({
hidden: "hidden",
height: 4 * 140 + 'rpx',
more: "点击查看更多",
showMore: true
})
}
},
//获取当前登录用户信息
getUserInfo: function() {
let that = this;
@@ -510,6 +477,7 @@ Page({
that.setData({
begin_time: res.data.beginTime,
end_time: res.data.endTime,
activityStatus: res.data.activityStatus ? res.data.activityStatus:''
})
if (res.data.activityStatus == 0 && flag != 'endclock') {
that.countdown(res.data.beginTime);
@@ -544,19 +512,10 @@ Page({
}
wx.hideLoading();
that.setData({
data: res.data
data: res.data,
merchantVoList: res.data.merchantVoList
});

if (that.data.data.merchantVoList && that.data.data.merchantVoList.length <= 4) {
that.setData({
height: that.data.data.merchantVoList.length * 140 + 'rpx',
showMore: false
})
} else if (that.data.data.merchantVoList && that.data.data.merchantVoList.length > 4) {
that.setData({
height: 4 * 140 + 'rpx'
})
}
if (res.data.validType == 1) {
that.setData({
validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"),
@@ -957,9 +916,12 @@ Page({
showbutton: false,
showbutton1: false
})
if (this.data.end_time) {
if (this.data.end_time && this.data.activityStatus!=0) {
this.countdown(this.data.end_time)
}
else if (this.data.begin_time && this.data.activityStatus == 0) {
this.countdown(this.data.begin_time)
}
},
onUnload: function() {
let that = this;


+ 2
- 1
pages/coupon/detail/index.json Ver fichero

@@ -1,7 +1,8 @@
{
"usingComponents": {
"c-shareposter": "../../../../components/shareposter/index",
"navbar": "../../../../components/navbar/navbar"
"navbar": "../../../../components/navbar/navbar",
"store": "../../../../components/store/index"
},
"navigationBarTitleText": "",
"backgroundColor":"#f4f4f4",


+ 4
- 21
pages/coupon/detail/index.wxml Ver fichero

@@ -4,7 +4,7 @@
<view class='coupons'>
<view class="coupons-body">
<view wx:if="{{coverPicture.length>0}}" class="banner">
<swiper class="index-slide swiper-box" bindchange="swiperChange" indicator-dots="true" autoplay="true" circular="false" current="{{swiperCurrent}}">
<swiper class="index-slide swiper-box" bindchange="swiperChange" indicator-dots="true" circular="false" current="{{swiperCurrent}}">
<block wx:for="{{coverPicture}}" wx:key="unique">
<swiper-item>
<image data-data="{{item}}" src="{{item}}" class="index-slide-image" />
@@ -48,7 +48,7 @@
<text class='rmb'>¥</text>
<view class="fl" wx:if="{{data.type!=8}}">
<text class="pri01" wx:if="{{data.type!=50&&data.type!=51}}">{{data.salePriceStr}}</text>
<text class="pri01" wx:if="{{data.type==50||data.type==51}}">{{data.creditPrice}}积分</text>
<view class="pri01" wx:if="{{data.type==50||data.type==51}}">{{data.creditPrice}}<text class='jifen'>积分</text></view>
<!-- <text class="yuan" wx:if="{{data.type!=50&&data.type!=51}}">元</text> -->
<text class='throgh' wx:if="{{data.unit==0&&data.type!=50&&data.type!=51}}">{{data.priceStr}}元</text>
<text wx:if="{{data.unit==1&&data.type!=50&&data.type!=51}}">{{data.priceStr}}小时</text>
@@ -89,25 +89,8 @@
</view>
</view>
</view>
<!-- <view class='applyshop'>适用门店</view> -->
<view class='posi' style='overflow:{{hidden}};height:{{height}}'>
<view class='posi_logo' wx:for="{{data.merchantVoList}}" wx:key="index">
<view bindtap='gotoDetail' data-id='{{item.id}}'>
<image src='{{item.merchantImgUrl}}'></image>
</view>
<view bindtap='gotoDetail' data-id='{{item.id}}'>
<view class='name'>{{item.merchantName}}</view>
<view class='shopVoList'>
<view wx:for="{{item.shopVoList}}" wx:key="{{index}}" wx:for-item="itemName">
<text>{{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}</text>
<text class='douhao' wx:if="{{item.shopVoList.length>1}}">,</text>
</view>
</view>
</view>
<image wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" />
</view>
</view>
<view class='bottom' bindtap='more' wx:if="{{showMore}}">{{more}}</view>
<!-- 适用门店 -->
<store merchantVoList="{{merchantVoList}}"></store>
<view class='notes'>
<view>
<text>购买须知</text>


+ 6
- 79
pages/coupon/detail/index.wxss Ver fichero

@@ -220,74 +220,6 @@ button::after {
float: right;
}

.posi {
position: relative;
width: 100%;
background: #FFF;
margin: 18rpx 0 0;
}

/* .posi>view:nth-child(2) text:nth-child(1) {
font-size: 30rpx;
color: #a9a9a9;
} */

/*
.posi>view:nth-child(2) text:nth-child(2) {
font-size: 30rpx;
color: #a9a9a9;
} */

.posi_logo {
position: relative;
width: 92%;
display: flex;
padding: 20rpx 0;
background: #fff;
z-index: 10;
margin: 0 auto;
}

.posi_logo view:nth-child(1) {
/* width: 100rpx; *//* margin-right: 16rpx; */
border-radius: 16rpx;
/* height: 100rpx; */
}

.posi_logo view:nth-child(1) image {
display: block;
width: 100rpx;
height: 100rpx;
border-radius: 16rpx;
margin-right: 16rpx;
border: 1px solid #e5e5e5;
}
.name{
font-size: 32rpx;
color: #333;
letter-spacing: 0;
width: 500rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.posi_logo view:nth-child(2) view:nth-child(1) {
font-size: 32rpx;
color: #333;
letter-spacing: 0;
}

.shopVoList {
display: flex !important;
padding-left: 0 !important;
flex-direction: row !important;
}

.shopVoList text {
font-size: 20rpx !important;
color: #b8b8b8 !important;
}

.notes view:nth-child(1) {
height: 87rpx;
line-height: 87rpx;
@@ -535,8 +467,8 @@ button::after {
.elecard {
display: inline-block;
margin-left: 6rpx;
color: #af6e34;
border: 1px solid #af6e34;
color: rgba(254,70,20,1);
border: 1px solid rgba(254,70,20,1);
border-radius: 8rpx;
font-style: normal;
font-size: 30rpx;
@@ -544,14 +476,6 @@ button::after {
padding: 0 6rpx;
}

.applyshop {
font-size: 30rpx;
height: 70rpx;
line-height: 70rpx;
color: #333;
text-indent: 1em;
}

.btns {
/* padding: 0 33rpx; */
position: fixed;
@@ -721,7 +645,7 @@ button::after {
color: #999;
font-size: 32rpx;
background: #fff;
padding-top: 20rpx;
}

.presslimit {
@@ -869,4 +793,7 @@ background: #ccc8c8;
}
.swiper-box .wx-swiper-dot-active::before{
background:#f6792b;
}
.jifen{
font-size: 30rpx;
}

+ 3
- 12
pages/couponorder/detail/index.js Ver fichero

@@ -44,18 +44,10 @@ Page({
},
gotogame: function () {
let that = this;
wx.navigateTo({
wx.redirectTo({
url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId,
})
},
/**
* 跳转到门店列表的详情页面
*/
gotoDetail(e) {
wx.navigateTo({
url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
})
},
// 获取游戏
getStaticGame(token) {
let _this = this;
@@ -108,10 +100,9 @@ Page({
couponOrderId: options.quancode
}
}).then(res => {
console.log(res);
that.setData({
couponorderstatus: res.data.couponOrderStatus,
data: res.data
data: res.data,
});
if (res.data.couponOrderStatus == 1) {
/**
@@ -148,7 +139,7 @@ Page({
})
}
}, 2000);
/**
* 页面需要初始渲染的效果
*/


+ 2
- 1
pages/couponorder/detail/index.json Ver fichero

@@ -1,5 +1,6 @@
{
"usingComponents": {
"navbar": "../../../components/navbar/navbar"
"navbar": "../../../components/navbar/navbar",
"store": "../../../components/store/index"
}
}

+ 18
- 17
pages/couponorder/detail/index.wxml Ver fichero

@@ -1,6 +1,6 @@
<navbar home back text="使用优惠券"></navbar>
<view class='box' style="padding-top:{{navigationBarHeight}};margin-top:40rpx;">
<view class="container page">
<view class="container page" wx:if="{{data.merchantVoList}}">
<view class="coupon_detail clearfix">
<view class="fl wmfl">
<image src="{{data.coverImg}}" mode='aspectFill' />
@@ -49,26 +49,27 @@
<text>优惠券码:</text>{{code}}</view>
</view>
</view>

<view class="posi">
<view class="tit">
适用门店
</view>
<view wx:for="{{data.merchantVoList}}" wx:key="{{index}}">
<view class='posi_logo'>
<view bindtap='gotoDetail' data-id='{{item.id}}'>
<image src='{{item.merchantImgUrl}}'></image>
</view>
<view bindtap='gotoDetail' data-id='{{item.id}}'>
<text>{{item.merchantName}}</text>
<text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text>
</view>
<view wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone}}'>
<image class="tel" src="{{teljpgUrl}}" mode="widthFix" />
<!-- 适用门店 -->
<store merchantVoList="{{data.merchantVoList}}"></store>
<!-- <view class='applyshop'>适用门店</view>
<view class='posi' style='overflow:{{hidden}};height:{{height}}'>
<view class='posi_logo' wx:for="{{data.merchantVoList}}" wx:key="index">
<view bindtap='gotoDetail' data-id='{{item.id}}'>
<image src='{{item.merchantImgUrl}}'></image>
</view>
<view bindtap='gotoDetail' data-id='{{item.id}}'>
<view class='name'>{{item.merchantName}}</view>
<view class='shopVoList'>
<view wx:for="{{item.shopVoList}}" wx:key="{{index}}" wx:for-item="itemName">
<text>{{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}</text>
<text class='douhao' wx:if="{{item.shopVoList.length>1}}">,</text>
</view>
</view>
</view>
<image wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" />
</view>
</view>
<view class='bottom' bindtap='more' wx:if="{{showMore}}">{{more}}</view> -->

<image class='line' mode="widthFix" src="{{btomLine}}"></image>
<view class='note'>


+ 6
- 82
pages/couponorder/detail/index.wxss Ver fichero

@@ -10,12 +10,12 @@
border-radius: 16rpx;
}
page {
/* background: #02c0ff; */
background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
height: auto !important;
/* padding-bottom: 20rpx; */
}

.zhuangtai{
margin-bottom: 20rpx;
}
.panel, .zhuangtai image {
position: relative;
width: 600rpx;
@@ -197,70 +197,6 @@ page {
letter-spacing: 0;
text-align: left;
}
.posi {
width: 100%;
display: flex;
flex-direction: column;
background: #fff;
position: relative;
}

.posi_logo {
width: 92%;
padding: 30rpx 4% 0;
display: flex;
position: relative;
}

.shiji {
font-size: 24rpx !important;
color: #919191 !important;
letter-spacing: 0;
}

.posi_logo view:nth-child(1) {
width: 126rpx;
height: 126rpx;
overflow: hidden;
flex: 2;
border: 2rpx solid #e7e7e7;
border-radius: 16rpx;
}

.posi_logo view:nth-child(1) image {
width: 100%;
height: 100%;
}

.posi_logo view:nth-child(2) {
position: relative;
display: flex;
flex-direction: column;
flex: 8;
padding-left: 30rpx;
}

.posi_logo view:nth-child(2) text:nth-child(1) {
font-size: 30rpx;
width: 320rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.timevalidity i{
font-style: normal;
font-size: 28rpx;
}
.posi_logo view:nth-child(2) text:nth-child(2) {
font-size: 24rpx;
color: #b8b8b8;
padding-top: 10rpx;
width: 386rpx;
white-space: wrap;
text-overflow: ellipsis;
overflow: hidden;
height: 78rpx;
}

.tit {
padding: 53rpx 0 0;
@@ -270,17 +206,6 @@ page {
letter-spacing: 0;
}

.tel {
position: absolute;
right: 30rpx;
top: 0;
bottom: 0;
margin: auto;
width: 50rpx;
height: 50rpx;
z-index: 10;
}

.notes view:nth-child(1) {
width: 92%;
height: 87rpx;
@@ -290,8 +215,8 @@ page {
}

.notes view:nth-child(1) text {
font-size: 24rpx;
color: #919191;
font-size: 30rpx;
color: #333;
letter-spacing: 0;
}

@@ -301,7 +226,6 @@ page {
background: #fff;
display: flex;
flex-direction: column;
padding-top: 2%;
}

.notes view:nth-child(2) > text {
@@ -373,4 +297,4 @@ page {
color: red!important;
border: 1px solid red;
padding: 3rpx;
}
}

+ 1
- 5
pages/couponorder/index/index.wxss Ver fichero

@@ -4,7 +4,6 @@ page{
.market {
width: 100%;
height: 100%;
/* background: #f5f5f5; */
}

button::after{ border: none; }
@@ -32,10 +31,9 @@ button::after{ border: none; }

.tabs {
width: 100% !important;
height: 88rpx;
height: 96rpx;
text-align: center;
position: fixed;
/* top: 0; */
left: 0;
right: 0;
z-index: 100000;
@@ -67,7 +65,6 @@ button::after{ border: none; }
height: 140rpx;
line-height: 140rpx;
text-align: center;
/* padding: 30rpx 0 0; */
color: #FFFFFF;
font-size: 30rpx;
@@ -117,7 +114,6 @@ button::after{ border: none; }
.info view:nth-child(1) {
display: flex;
justify-content: space-between;
/* padding: 0 2%; */
}

.info {


+ 3
- 2
pages/discountCardList/discountCardList.wxss Ver fichero

@@ -181,9 +181,10 @@ button::after{ border: none; }
}

.nocoupon image {
width: 300rpx;
width: 261rpx;
height: 272rpx;
display: block;
margin: 3% auto 0;
margin: 0 auto;
}

.txt001 {


+ 17
- 50
pages/freeBannerDetail/index.js Ver fichero

@@ -30,26 +30,22 @@ Page({
id:options.id,
token: app.globalData.token
})
wx.request({
url: configUrls + config.api.printHtmlById,
data: {
token: app.globalData.token,
id: options.id,
date: new Date()
},
header: {
'content-type': 'application/html'
},
success: function (res) {
var temp = WxParse.wxParse('article', 'html',res.data, that, 5);
}
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {

if (options&&options.id){
wx.request({
url: configUrls + config.api.printHtmlById,
data: {
token: app.globalData.token,
id: options.id,
date: new Date()
},
header: {
'content-type': 'application/html'
},
success: function (res) {
var temp = WxParse.wxParse('article', 'html', res.data, that, 5);
}
})
}
},
/**
* 生命周期函数--监听页面显示
@@ -58,34 +54,5 @@ Page({
this.setData({
date:new Date()
})
},

/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {

},

/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {

},

/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {

},

/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {

},

}
})

+ 1
- 3
pages/index/searchbar/detail/index.wxml Ver fichero

@@ -1,7 +1,6 @@
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<navbar back home text="门店详情"></navbar>
<view style="padding-top:{{navigationBarHeight}};">
<swiper class="index-slide" autoplay="true" circular="false">
<swiper class="index-slide" circular="false">
<block wx:for="{{imglist}}" wx:key="unique">
<swiper-item>
<image src="{{item}}" class="index-slide-image" />
@@ -53,7 +52,6 @@
<text wx:if="{{data.linkLinePhone}}">{{data.linkLinePhone}}</text>
<text wx:else>{{data.merchantLinkPhone}}</text>
</view>
<!-- <image bindtap='phone' data-merchantLinkPhone='{{data.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> -->
</view>
</view>
</view>


+ 6
- 97
pages/index/searchbar/detail/index.wxss Ver fichero

@@ -38,15 +38,6 @@ page{
opacity: 1;
}

.bannerbg {
width: 100%;
}

.bannerbg image {
display: block;
width: 100%;
}

.merchant-detail {
width: 100%;
background: #fff;
@@ -56,14 +47,11 @@ page{

.merchant-brand, .merchant-shop, .merchant-phone {
width: 100%;
/* display: flex; */
/* padding: 10rpx 0; */
background: #fff;
}

.merchant-brand view:nth-child(1) {
width: 88%;
/* height: 700rpx; */
display: flex;
flex-direction: column;
white-space: nowrap;
@@ -77,35 +65,13 @@ page{
color:rgba(60,60,60,1);
margin-top: 20rpx;
}
/* .merchant-brand view:nth-child(1) image {
display: block;
width: 130rpx;
height: 130rpx;
border-radius: 16rpx;
border: 1px solid #e5e5e5;
}

.merchant-brand view:nth-child(2) {
display: flex;
flex-direction: column;
width: 61%;
padding-left: 30rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
} */


.merchant-shop text, .merchant-phone text {
font-size: 30rpx;
/* color: #A6A6A6; */
}
.merchant-shop .fl{
color: #A6A6A6;
}
.merchant-phone view {
/* display: flex;
flex: 2; */
color: #A6A6A6;
}
.merchant-activity view{
@@ -118,7 +84,6 @@ page{
display:flex;
flex-direction:column;
}

.merchant-shop view:nth-child(2) {
font-size: 30rpx;
color: #A6A6A6;
@@ -141,50 +106,18 @@ page{
}

.merchant-phones {
/* border-top:8px solid #efefef; */
padding: 20rpx 0;
display: block;
font-size: 30rpx;
background: #F4F5F9;
}

.merchant-activity{
padding: 20rpx 0;
display: block;
font-size: 30rpx;
}

.tel {
/* right: 0;
top: 0;
bottom: 0;
margin: auto; */
display: inline-block;
width: 50rpx;
height: 50rpx;
vertical-align: middle;
}

.shoplists {
display: flex;
}

.shoplists text {
flex: 2;
}

.godetail {
color: #999;
font-size: 30rpx;
position: absolute;
right: 10rpx;
}

.merchants text {
display: inline-block;
font-size: 26rpx;
color: #A6A6A6;
line-height: 22rpx;
margin-right: 10rpx;
}
.posi{
color: #FD832D!important;
@@ -276,18 +209,16 @@ page{
display: flex;
flex-direction: column;
}
.merchant-activity{
padding: 0 4% 10rpx;
}

.fenxiang image {
width: 48rpx;
height: 48rpx;
margin: 0 auro;
}
margin: 0 auto;
}
.gift{
color: #3C3C3C;
font-size: 20rpx;
margin: 0 auro;
margin: 0 auto;
}
.user-motto {
width: 270rpx;
@@ -302,8 +233,6 @@ page{
border: none;
}

/* 商户活动列表 */

.coupons c-coupons {
width: 335rpx;
height: 354rpx;
@@ -390,32 +319,12 @@ page{
}

/*分享海报样式*/

.canvas-content {
display: flex;
top: 0;
left: 0;
/* left: 500%; 分享图不显示在页面上面,就将画布设置在页面之外*/
}

.save-button {
position: fixed;
width: 80rpx;
height: 80rpx;
bottom: 40rpx;
right: 40rpx;
border-radius: 50rpx;
z-index: 200;
background: rgba(0, 0, 0, 0.75);
}

.save-button .share-image {
position: absolute;
top: 22rpx;
left: 22rpx;
width: 36rpx;
height: 36rpx;
}
}

.dingdan image {
display: block;


+ 0
- 204
pages/index/searchbar/index.wxss Ver fichero

@@ -131,222 +131,18 @@
page {
padding: 0 0 30rpx;
}
.tabTit {
height: 90rpx;
line-height: 82rpx;
position: fixed;
top: 0;
width: 750rpx;
z-index: 1;
}

.tabTit > view:nth-of-type(1) {
border-left: 0;
}

.tabTit > view:nth-of-type(4) {
border-right: 0;
}


.tabTit .active image {
transform: rotate(180deg);
background: none;
}

.tabTit image {
width: 18rpx;
height: 9rpx;
vertical-align: middle;
margin-left: 5px;
}

.tabLayer {
width: 750rpx;
overflow: hidden;
position: fixed;
top: 90rpx;
z-index: 1;
background: #fff;
padding-bottom: 26rpx;
box-shadow:2px 9px 10px rgba(0, 0, 0, 0.05);
bottom: 0;
border-top:1px solid #eee;
}

.tabLayer a {
float: left;
width: 210rpx;
height: 80rpx;
line-height: 80rpx;
margin: 30rpx 0 0 26rpx;
text-align: center;
color: #888;
font-size: 30rpx;
background: rgba(255, 255, 255, 1);
border: 1px solid rgba(234, 234, 234, 1);
border-radius: 10rpx;
}

.tabLayer .active {
text-align: center;
height: 80rpx;
background: rgba(255, 255, 255, 1);
border: 1px solid rgba(101, 158, 246, 1);
border-radius: 10rpx;
color: #659ef6;
}
.tabTit .active {
background: #fff;
font-size: 32prx;
font-weight: 500;
color: rgba(101, 158, 246, 1);
}
/*弹性盒模型*/

.box {
background: #fff;
border-bottom:1px solid #eee;
}

.flex1 {
overflow: hidden;
width: 25%;
display: block;
text-align: center;
}

.flex1 text,.text {
font-size: 30rpx;
}
.text{
display: block;
width: 25%;
text-align: center;
}
/* 日期选择 */

.picker_group {
height: 85rpx;
line-height: 85rpx;
justify-content: center;
display: flex;
align-items: center;
font-size: 30rpx;
color: #888;
}

.picker_group picker {
height: 55rpx;
line-height: 55rpx;
margin: 0 2%;
padding: 2% 5%;
border-bottom: 1px solid #eee;
}

.view view:nth-of-type(1) {
font-size: 28rpx;
color: #888;
}

.list {
width: 644rpx;
border-radius: 16rpx;
padding: 32rpx;
margin: 40rpx auto;
box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.1);
}

.list >view {
height: 60rpx;
line-height: 60rpx;
font-size: 30rpx;
}

.txt1 {
font-size: 32rpx;
font-weight: 500;
color: rgba(85, 85, 85, 1);
}

.txt2 {
font-size: 28rpx;
font-weight: 500;
color: rgba(255, 106, 106, 1);
}

.money {
font-weight: 500;
color: rgba(85, 85, 85, 1);
font-size: 26rpx;
padding-right: 20rpx;
}

.time {
font-size: 28rpx;
font-weight: 500;
color: rgba(125, 125, 125, 1);
}

.status1 {
color: #659ef6;
}

.status2 {
color: #eea959;
}

.status3 {
color: #ff6a6a;
}

.status4 {
color: #8aaa6b;
}

.btn {
float: right;
height: 52rpx;
line-height: 52rpx;
background: rgba(101, 158, 246, 1);
border-radius: 10rpx;
font-size: 28rpx;
font-weight: 500;
padding: 0 25rpx;
color: rgba(255, 255, 255, 1);
}


.btns {
width:137rpx;
margin-top: 21rpx;
background: #52a0fd;
border-radius: 8rpx;
color: #fff;
font-size: 26rpx;
height: 64rpx;
line-height: 64rpx;
}
.active2{
border: 1px solid #52a0fd!important;
color: #52a0fd!important;
}
.recond{
text-align: center;
font-size: 30rpx;
margin-top: 60rpx;
}
.active3{
color: #659ef6;
}
.loading{
text-align: center;
font-size: 28rpx;
color: #999;
}
.mr{
margin-top: 200rpx!important;
}
.shopVoList{
padding-left: 0!important;
display: inline-block!important;


+ 3
- 1
pages/integralmall/payIntegcouponStatus/index.wxss Ver fichero

@@ -35,8 +35,10 @@ page{
.c-right{
width: 510rpx;
float: left;
line-height: 120rpx;
line-height: 50rpx;
color: #3C3C3C;
font-size: 32rpx;
margin-top: 10rpx;
}
.detail-text{
font-size:30rpx;


+ 1
- 1
pages/joinFrDpell/index.wxss Ver fichero

@@ -408,7 +408,7 @@ button::after{ border: none; }
position: fixed;
width: 545rpx;
z-index: 300;
top: 200rpx;
top: 300rpx;
left: 102rpx;
border-radius: 15rpx;
}


+ 1
- 13
pages/main/index.js Ver fichero

@@ -69,15 +69,7 @@ Page({
display: 'none',
display1: 'none',
optionsData: null,
credit: 0,
score: '0',
page: 1 ,// 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载
topicTitle:'',
},
close: function() {
this.setData({
showIf: false
})
page: 1 // 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载
},
alphaClick: function(even) {
var animation = wx.createAnimation({})
@@ -272,13 +264,10 @@ Page({
levelName: res.data.levelName,
upgradePercent: res.data.upgradePercent,
upgradeScore: res.data.upgradeScore,
credit: res.data.credit ? res.data.credit : 0,
score: res.data.score
})
if (res.data.nickName) {
that.setData({
ismember: true,
memberId: res.data.id
})
var initUrl = JSON.stringify({
@@ -528,7 +517,6 @@ Page({
that.setData({
name: res.data.name,
cover: res.data.cover,
topicTitle: res.data.title,
id: res.data.id,
showTopic: true
})


+ 1
- 43
pages/main/index.wxml Ver fichero

@@ -16,19 +16,10 @@
</view>
</view>
<view class="view">
<!-- 成长值<text class="score">{{score}}</text> -->
<progress percent="{{upgradePercent}}" stroke-width="6" activeColor="{{activeColor}}" />
<view class='remainchengzhangzhi'>还需{{upgradeScore}}成长值可升级</view>
</view>
</view>
<!-- 积分 -->
<!-- <view class='fl integral' bindtap='gotouser'>
<view class='clearfix'>
<text class='jifen fl'>积分</text>
<text class='jifenNumber fl'>{{credit}}</text>
</view>
<image src="{{duihuan}}" class='duihuanimg' mode='widthFix'></image>
</view> -->
</view>
<!-- 二维码 -->
@@ -70,46 +61,13 @@
今日好物推荐,
<text>'{{xslist[0].title}}'</text>原价 <text>{{xslist[0].priceStr}}</text> 现价...
</view>
<view class='qg' style='border-color:{{qg}}'><text>抢购</text></view>
<view class='qg' style='border-color:{{qg}}'>抢购</view>
</view>
<!-- 专题 -->
<!-- <view class='product' wx:if="{{showTopic}}" bindtap='gotoTopic'>
<view class='gift' >
<image src='{{giftHr}}' mode='aspectFill' ></image>
</view>
<view class='textBox'>
<view class='name'>{{name}}</view>
<view class='title'>{{topicTitle}}</view>
</view>
<view class='next'>
<image src='{{next}}' mode='widthFix' ></image>
</view>
</view> -->
<!-- 爆款专区 -->
<c-hot id="hot"/>
<view class='product' wx:if="{{showTopic}}" bindtap='gotoTopic'>
<image src='{{cover}}' mode='widthFix' ></image>
<!-- <view class='textBox'>
<view class='name'>{{name}}</view>
<view class='title'>{{topicTitle}}</view>
</view>
<view class='next'>
<image src='{{next}}' mode='aspectFill' ></image>
</view> -->
</view>
<!-- 砍价专场 -->
<!-- <c-bargain id="bargain"/> -->
<!-- 拼团专场 -->
<!-- <c-spellGroup id="spellGroup"/> -->
<!-- 小游戏暂时注释 -->
<!-- <view class='game' wx-if="{{showIf}}">
<view class='game-entry'>
<image src="{{guanbi1}}" bindtap="close" style='width:30rpx;height:30rpx;position:absolute;right:0;top:-20rpx;' mode='widthFix'></image>
<image src="{{usergift}}" bindtap="gotogame" class='gameimg' mode='widthFix'></image>
</view>
</view> -->
<!-- 限时抢购和消费卡 -->
<!-- <c-rushtobyCard id="rushtobyCard"/> -->
<c-coupons id="lists" bind:myevent="onGetCode" class="business" loadingtext="{{loadingtext}}" loading="{{loading}}" />
<g-entry id="listss" wx:if="{{showGame&&!played&&!havePlayEd}}" gamedata="{{gamedata}}" bind:myevent="" />
</view>


+ 9
- 7
pages/main/index.wxss Ver fichero

@@ -426,6 +426,7 @@ progress{
border-radius:12rpx;
margin-top: 18rpx;
margin-bottom:18rpx;
position: relative;
}
.toutiao view:nth-child(2){
font-size:26rpx;
@@ -459,20 +460,21 @@ progress{
.toutiao .qg{
width: 80rpx;
height: 44rpx;
line-height: 36rpx;
line-height: 44rpx;
border-radius:18rpx;
border:2rpx solid;
float: right;
text-align: center;
margin: 20rpx 20rpx 20rpx 0;
}
.toutiao .qg>text{
width: 100%;
position: absolute;
top: 0;
bottom: 0;
right: 20rpx;
margin: auto;
font-size:24rpx;
font-family:PingFangSC-Medium;
font-weight:500;
color:#FD782D;
text-align: center;
}

i-tabs i-tabs-scroll{
background: #F4F5F9!important;


+ 1
- 1
pages/order/detail/index.js Ver fichero

@@ -114,7 +114,7 @@ Page({
},
gotogame: function () {
let that = this;
wx.navigateTo({
wx.redirectTo({
url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId,
})
},


+ 2
- 1
pages/order/detail/index.json Ver fichero

@@ -1,5 +1,6 @@
{
"usingComponents": {
"navbar": "../../../components/navbar/navbar"
"navbar": "../../../components/navbar/navbar",
"store": "../../../components/store/index"
}
}

+ 2
- 12
pages/order/detail/index.wxml Ver fichero

@@ -74,18 +74,8 @@
</view>
</view>
</view>
<view class='classifShop'>
<view class="clearfix" bindtap='showDoorList'>
<text>适用门店</text>
</view>
<view wx:if="{{order.merchantVoList.length>=1}}" wx:for="{{order.merchantVoList}}" wx:key="{{index}}">
<view class='merchantVoList'>
<image bindtap='gotoDetail' data-id='{{item.id}}' class='merchantImgUrl' src='{{item.merchantImgUrl}}' mode='widthFix'></image>
<view bindtap='gotoDetail' data-id='{{item.id}}' class='merchantName'>{{item.merchantName}} {{item.buildingName}}{{item.floorName}}</view>
<image wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantlinkphone='{{item.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix"></image>
</view>
</view>
</view>
<!-- 适用门店 -->
<store merchantVoList="{{order.merchantVoList}}"></store>
<!-- 待付款 显示立即购买的按钮 -->
<view wx:if="{{(order.orderStatus==0&&order.salePrice!=0)||(order.orderStatus==7&&order.salePrice!=0)}}" class="buy-view app-border-top">
<button bindtap='orderFunc' hover-class='active' data-couponChannelId="{{order.id}}" disabled='{{showButton}}' class='buy'>立即支付</button>


+ 6
- 14
pages/order/detail/index.wxss Ver fichero

@@ -165,7 +165,7 @@ page {
width: 100%;
margin-top: 20rpx;
}
/*
.classifShop{
background: #FFFFFF;
width: 100%;
@@ -185,7 +185,7 @@ page {
.classifShop >view:nth-child(1){
height: 88rpx!important;
line-height:94rpx;
}
} */

.classif > view:nth-child(2),.classif > view:nth-child(3){
position: relative;
@@ -196,9 +196,6 @@ page {
padding-left: 5%;
padding-right: 5%;
/* border-bottom: 1rpx solid #eee; */
}
.bianhao{
}
.classif > view text:nth-child(2) {
font-size: 28rpx;
@@ -213,10 +210,6 @@ page {
.classif > view:nth-child(1) {
display: block;
}
.classif > view:nth-child(3) view text:nth-child(2) {
/* padding-left: 15rpx; */
}

.classif > view:nth-child(6) text:nth-child(2) {
color: #666;
}
@@ -486,10 +479,9 @@ radio {
width: 100%;
height: 140rpx;
}
/*
.merchantVoList {
width: 100%;
/* position: relative; */
}

.merchantVoList .tel {
@@ -498,7 +490,7 @@ radio {
float: right;
z-index: 10;
margin-top: 30rpx;
}
} */

.btns {
background: #00c0ff;
@@ -510,13 +502,13 @@ radio {
line-height: 94rpx;
border-radius: 61rpx;
}
.merchantImgUrl{
/* .merchantImgUrl{
width: 90rpx;
float: left;
border-radius: 10rpx;
z-index: 10;
margin: 0 auto;
}
} */
.support-tansfer{
width: 690rpx;
border-radius: 50rpx;


+ 1
- 0
pages/orderquanma/index.wxss Ver fichero

@@ -11,6 +11,7 @@
width: 92%;
margin: 0 auto 6%;
border-radius: 16rpx;
padding-bottom: 20rpx;
}

.title {


+ 4
- 1
pages/spellGroup/mySpellGroup/index.wxss Ver fichero

@@ -72,7 +72,10 @@ button::after{ border: none; }
font-weight:500;
color:rgba(134,134,134,1);
line-height: 48rpx;
padding: 0 30rpx;
padding: 0 80rpx 0 30rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.des{
width: 100%;


+ 3
- 7
pages/spellGroup/spellGroup.wxss Ver fichero

@@ -13,7 +13,6 @@ page {
}
.content-box{
height: auto;
/* padding-bottom: 200rpx; */
padding: 0 16rpx 200rpx;
}
.loading {
@@ -166,9 +165,6 @@ image{
font-weight:500;
color:#FD782D;
line-height:44rpx;
width: 50%;
white-space: nowrap;
text-overflow: ellipsis;
}
.spell-centerH .price02{
font-size: 24rpx;
@@ -176,7 +172,7 @@ image{
font-weight:500;
text-decoration:line-through;
color:rgba(140,140,140,1);
line-height: 30rpx;
line-height: 44rpx;
margin-top: 15rpx;
}
.spell-centerH .price-num{
@@ -192,7 +188,7 @@ image{
.spell-centerHr .price-num{
display: inline-block;
font-size: 32rpx;
width: 95rpx;
width: 100rpx;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
@@ -204,7 +200,7 @@ image{
}
.spell-centerH .price-numHr{
font-size:32rpx;
line-height: 32rpx;
line-height: 44rpx;
}
.content .price-unit{
font-size:24rpx;


+ 9
- 19
pages/user/index.wxss Ver fichero

@@ -46,22 +46,26 @@ page{
.user-name{
font-family: PingFangSC-Medium;
height: 42rpx;
margin-left: 310rpx;
margin-top:66rpx;
letter-spacing: 0.64rpx;
line-height: 44rpx;
margin-top: 66rpx;
font-size: 30rpx;
color: #3C3C3C;
font-weight:600;
display: flex; /*设置显示样式**/
align-items: center; /**子view垂直居中*/
vertical-align: center; /**垂直居中*/
justify-content: center; /**内容居中*/
flex-direction: row;
}
.user-phone {
font-family: PingFangSC-Regular;
height: 30rpx;
letter-spacing: 0.64rpx;
line-height: 44rpx;
font-size: 36rpx;
color: #000;
margin:20rpx 0 50rpx 180rpx;
padding:20rpx;
text-align: center;
}
.user-avatar {
position: absolute;
@@ -82,7 +86,6 @@ page{

.view {
font-size: 24rpx;
/* color: #FD832D; */
}

.view image {
@@ -105,7 +108,6 @@ page{
width: 120rpx;
height: 120rpx;
}

.user-btns{
background: #fff;
display: flex;
@@ -114,10 +116,9 @@ page{
}
.user-btns navigator{
width: 33.3%;
height: 160rpx;
}



.user-btns:nth-of-type(3){
margin-bottom: 0;
}
@@ -139,7 +140,6 @@ page{
box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10);
}
.btns_bg{
/* position: relative; */
width: 94%;
background: #fff;
border-radius: 16rpx;
@@ -196,13 +196,7 @@ page{
border: none!important;
}
.gzh {
/* display: none; */
/* position: absolute; */
/* bottom: 70rpx; */
width: 100%;
/* left: 0;
right: 0; */
/* margin: auto; */
height: 170rpx;
z-index: 10;
background: #fff;
@@ -216,10 +210,6 @@ page{
}

.of {
/* position:absolute;
bottom:50rpx;
left:0;
right:0; */
width: 90%;
margin: 30rpx auto;
height: auto;


Cargando…
Cancelar
Guardar