浏览代码

【换肤、预购、轮播图小程序跳转】

release
GL 4 年前
父节点
当前提交
b87137a71c
共有 83 个文件被更改,包括 474 次插入203 次删除
  1. +1
    -1
      app.js
  2. 二进制
      assets/images/home-a_red.png
  3. +14
    -1
      components/banner/index.js
  4. +20
    -11
      components/coupons/index.wxml
  5. +44
    -22
      components/coupons/index.wxss
  6. +1
    -1
      components/navbar/navbar.wxml
  7. +4
    -2
      components/navbar/navbar.wxss
  8. +44
    -2
      custom-tab-bar/index.js
  9. +1
    -1
      custom-tab-bar/index.wxml
  10. +3
    -3
      index/index.js
  11. +5
    -3
      index/index.wxml
  12. +1
    -5
      index/index.wxss
  13. +1
    -1
      index/passCar.js
  14. +3
    -2
      index/passCar.wxml
  15. +4
    -1
      index/passCar.wxss
  16. +1
    -1
      index/searchbar.js
  17. +8
    -6
      index/searchbar.wxml
  18. +1
    -0
      index/searchbar.wxss
  19. +1
    -0
      index/user.wxml
  20. +2
    -1
      pages/ConsumeDetail/ConsumeDetail.wxml
  21. +1
    -0
      pages/acSignIn/index.wxml
  22. +1
    -1
      pages/addPark/addPark.wxml
  23. +2
    -1
      pages/bannerdetail/index.wxml
  24. +2
    -1
      pages/bargain/bargain.wxml
  25. +2
    -1
      pages/bargain/bargainDatail/bargainDatail.wxml
  26. +1
    -0
      pages/canvas/index.js
  27. +2
    -1
      pages/canvas/index.wxml
  28. +2
    -1
      pages/cardorder/detail/index.wxml
  29. +2
    -1
      pages/cardorder/index/index.wxml
  30. +2
    -1
      pages/cardorder/userule/userule.wxml
  31. +2
    -1
      pages/complete/index.wxml
  32. +13
    -1
      pages/coupon/detail/index.js
  33. +34
    -10
      pages/coupon/detail/index.wxml
  34. +152
    -69
      pages/coupon/detail/index.wxss
  35. +3
    -1
      pages/couponorder/detail/index.js
  36. +5
    -3
      pages/couponorder/detail/index.wxml
  37. +1
    -0
      pages/couponorder/detail/index.wxss
  38. +2
    -1
      pages/couponorder/index/index.wxml
  39. +2
    -1
      pages/czdetail/czdetail.wxml
  40. +2
    -1
      pages/discountCardList/discountCardList.wxml
  41. +2
    -1
      pages/edit/edit.wxml
  42. +2
    -1
      pages/exchange/exchange.wxml
  43. +1
    -1
      pages/exchange/exchange.wxss
  44. +2
    -1
      pages/freeBannerDetail/index.wxml
  45. +1
    -1
      pages/getphoneInfo/index.wxml
  46. +1
    -1
      pages/getuserinfo/index.wxml
  47. +2
    -2
      pages/grade/grade.wxml
  48. +2
    -1
      pages/index/searchbar/detail/index.wxml
  49. +2
    -1
      pages/integralmall/index.wxml
  50. +1
    -1
      pages/integralmall/integraHistory/index.js
  51. +2
    -1
      pages/integralmall/integraHistory/index.wxml
  52. +2
    -1
      pages/integralmall/payIntegcouponStatus/index.wxml
  53. +2
    -1
      pages/integralmall/payIntegcoupondetail/index.wxml
  54. +2
    -1
      pages/joinFrDpell/index.wxml
  55. +2
    -1
      pages/mallInfo/mallInfo.wxml
  56. +1
    -1
      pages/managelicenseplate/managelicenseplate.wxml
  57. +2
    -1
      pages/order/detail/index.wxml
  58. +2
    -1
      pages/order/index/index.wxml
  59. +3
    -2
      pages/orderquanma/index.wxml
  60. +1
    -0
      pages/orderquanma/index.wxss
  61. +2
    -1
      pages/passCar/couponDetail/couponDetail.wxml
  62. +3
    -2
      pages/passCar/couponList/couponList.wxml
  63. +2
    -1
      pages/paySuccess/paySuccess.wxml
  64. +1
    -1
      pages/payrule/payrule.wxml
  65. +2
    -1
      pages/ques/ques.wxml
  66. +2
    -1
      pages/radetail/index.wxml
  67. +2
    -1
      pages/radetail/joinActivity/edit.wxml
  68. +2
    -1
      pages/radetail/success/index.wxml
  69. +2
    -1
      pages/rushToBuy/index.wxml
  70. +2
    -1
      pages/scanPay/scanPay.wxml
  71. +2
    -1
      pages/searchbar/searchbar.wxml
  72. +3
    -1
      pages/specialcourtesy/specialcourtesy.wxml
  73. +2
    -1
      pages/spellDetail/index.wxml
  74. +3
    -2
      pages/spellGroup/mySpellGroup/index.wxml
  75. +2
    -1
      pages/spellGroup/paySpellGroup/index.wxml
  76. +2
    -1
      pages/spellGroup/spellGroup.wxml
  77. +1
    -0
      pages/spellGroup/spellGroup.wxss
  78. +2
    -1
      pages/spellTimeout/index.wxml
  79. +1
    -0
      pages/topicDetail/index.wxml
  80. +2
    -1
      pages/user/myactivity/index.wxml
  81. +2
    -1
      pages2/live/livelist/index.wxml
  82. +1
    -1
      project.config.json
  83. +4
    -0
      utils/imgurl.js

+ 1
- 1
app.js 查看文件

@@ -144,7 +144,7 @@ App({
})
},
globalData: {
typeLsit: {},//初始哈样式
typeLsit: [],//初始哈样式
scene: "",
// token
token: null,


二进制
assets/images/home-a_red.png 查看文件

之前 之后
宽度: 52  |  高度: 52  |  大小: 2.3 KiB

+ 14
- 1
components/banner/index.js 查看文件

@@ -47,7 +47,20 @@ Component({
wx.navigateTo({
url: `/pages/freeBannerDetail/index?id=${e.currentTarget.dataset.id}`
});
}else{
}else if(e.currentTarget.dataset.data.type==4){
wx.navigateToMiniProgram({
appId: e.currentTarget.dataset.data.goAppid,
// path: 'page/index/index?id=123',
// extraData: {
// foo: 'bar'
// },
// envVersion: 'develop',
success(res) {
// 打开成功
}
})
}
else{
// 固定格式
wx.navigateTo({
url: `/pages/bannerdetail/index?id=${e.currentTarget.dataset.id}`


+ 20
- 11
components/coupons/index.wxml 查看文件

@@ -1,7 +1,8 @@
<view class='navigator' bindtap='gotoDetail' data-id='{{data.id}}' data-targetAd='{{data.targetAd}}' hover-class='hover' data-couponId='{{data.couponId}}' data-title='{{data.title}}'>
<view class="presell" wx:if="{{data.type==10}}">预售 </view>
<!-- 首页优惠券列表页面 -->
<view class="coupons">
<!-- fromMerchant 根据这个字段判断 -->
<!-- fromMerchant 根据这个字段判断 -->
<view class="superscript" wx:if="{{from == 'fromMerchant'}}">
<!-- 角标的三种实现 -->
<view class="rect" style='background: #31b968;' wx:if="{{data.targetAd == 2}}"></view>
@@ -20,11 +21,16 @@
<view class="coupons-info-name tit">{{data.title}}</view>
<view class="coupons-info-name subtitle">{{data.subTitle}}</view>
<view class="coupons-info-price-p">
<view class='price'>
<text wx:if="{{data.targetAd == 1||data.targetAd == 5}}"><text class='rmb'>¥</text><text class='num'>{{data.salePriceStr}}</text><text wx:if="{{!(data.type==5&&data.unit==1)}}" class='view02'>¥{{data.priceStr}}</text></text>
<text wx:if="{{data.targetAd == 2}}"><text class='saleprice'>抢购价</text><text class='rmb'>¥</text>{{data.salePriceStr}}</text>
<text wx:if="{{data.targetAd == 6}}"><text class='saleprice'>可砍至</text><text class='rmb'>¥</text>{{data.salePriceStr}}</text>
<text wx:if="{{data.targetAd == 7}}"><text class='saleprice'>拼团价</text><text class='rmb'>¥</text>{{data.salePriceStr}}</text>
<view class='price' wx:if="{{data.type!=10}}">
<text wx:if="{{data.targetAd == 1||data.targetAd == 5}}"><text class='rmb'>¥</text>
<text class='num'>{{data.salePriceStr}}</text>
<text wx:if="{{!(data.type==5&&data.unit==1)}}" class='view02'>¥{{data.priceStr}}</text></text>
<text wx:if="{{data.targetAd == 2}}"><text class='saleprice'>抢购价</text>
<text class='rmb'>¥</text>{{data.salePriceStr}}</text>
<text wx:if="{{data.targetAd == 6}}"><text class='saleprice'>可砍至</text>
<text class='rmb'>¥</text>{{data.salePriceStr}}</text>
<text wx:if="{{data.targetAd == 7}}"><text class='saleprice'>拼团价</text>
<text class='rmb'>¥</text>{{data.salePriceStr}}</text>

<view class="coupons-info-manjian" style="margin-top:10rpx;" wx:if="{{data.type == 1}}">
<!-- <view class='view01' wx:if="{{data.unit==0}}">¥{{data.priceStr}}</view> -->
@@ -35,15 +41,18 @@
<text wx:if="{{data.unit==1}}">{{data.priceStr}}小时</text>
</view>
</view>
<view class="earnest" wx:if="{{data.type==10}}">
预售定金:¥{{data.salePriceStr}}
</view>
</view>
</view>
<view class="coupons-btn">
<!-- 优惠券价格 -->
<i-button i-class="coupons-btn-gm" wx:if="{{data.salePriceStr==0&&data.remainInventory!=0&&data.targetAd == 1}}" data-date='{{data}}'>免费领</i-button>
<i-button i-class="coupons-btn-gm" wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0&&data.targetAd == 1||data.salePriceStr!=0&&data.remainInventory!=0&&data.targetAd == 5}}" data-date='{{data}}'>购买</i-button>
<i-button i-class="coupons-btn-gm" wx:if="{{data.remainInventory!=0&&data.targetAd == 2}}" data-date='{{data}}'>去抢购</i-button>
<i-button i-class="coupons-btn-gm" wx:if="{{data.remainInventory!=0&&data.targetAd == 6}}" data-date='{{data}}'>去砍价</i-button>
<i-button i-class="coupons-btn-gm" wx:if="{{data.remainInventory!=0&&data.targetAd == 7}}" data-date='{{data}}'>去拼团</i-button>
<i-button i-class="coupons-btn-gm" wx:if="{{data.salePriceStr==0&&data.remainInventory!=0&&data.targetAd == 1}}" data-date='{{data}}'>免费领</i-button>
<i-button i-class="coupons-btn-gm" wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0&&data.targetAd == 1||data.salePriceStr!=0&&data.remainInventory!=0&&data.targetAd == 5}}" data-date='{{data}}'>购买</i-button>
<i-button i-class="coupons-btn-gm" wx:if="{{data.remainInventory!=0&&data.targetAd == 2}}" data-date='{{data}}'>去抢购</i-button>
<i-button i-class="coupons-btn-gm" wx:if="{{data.remainInventory!=0&&data.targetAd == 6}}" data-date='{{data}}'>去砍价</i-button>
<i-button i-class="coupons-btn-gm" wx:if="{{data.remainInventory!=0&&data.targetAd == 7}}" data-date='{{data}}'>去拼团</i-button>
<i-button i-class="coupons-btn-gms" wx:if="{{data.remainInventory==0}}" data-date='{{data}}'>已售罄</i-button>
<i-button i-class="coupons-btn-gms" wx:if="{{data.status==1}}" data-date='{{data}}'>已下架</i-button>
</view>


+ 44
- 22
components/coupons/index.wxss 查看文件

@@ -5,9 +5,13 @@
width: 340rpx;
display: inline-block;
overflow: hidden;
border-radius:12rpx;
border-radius: 12rpx;
}
.earnest{
color: red;
font-size: 24rpx;
padding-left: 10rpx;
}

.coupons-border {
height: 1rpx;
left: 30rpx;
@@ -17,8 +21,6 @@
bottom: 0;
}



.coupons-img image {
display: block;
width: 300rpx;
@@ -37,7 +39,7 @@

.coupons-info-name {
font-size: 30rpx;
color: #3C3C3C;
color: #3c3c3c;
letter-spacing: 0;
line-height: 38rpx;
}
@@ -65,21 +67,23 @@
line-height: 44rpx;
margin-left: 16rpx;
padding-top: 16rpx;
color: #FD832D;
color: #fd832d;
width: 60%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;

}
.rmb{
font-size: 24rpx!important;
margin-right: 4rpx!important;

.rmb {
font-size: 24rpx !important;
margin-right: 4rpx !important;
color: #FD782D!;
}
.num{
color: #FD782D;

.num {
color: #fd782d;
}

.tit {
overflow: hidden;
white-space: nowrap;
@@ -124,7 +128,7 @@
}

.coupons-btn-gm {
border-radius: 10px!important;
border-radius: 10px !important;
margin: 0 !important;
padding: 0 !important;
font-size: 26rpx;
@@ -133,12 +137,12 @@
height: 51rpx !important;
width: 100rpx !important;
line-height: 51rpx !important;
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%)!important;
background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%) !important;
}

.coupons-btn-gms {
background: #b9b9b9 !important;
border-radius: 10px!important;
border-radius: 10px !important;
opacity: 0.6;
margin: 0 !important;
padding: 0 !important;
@@ -198,15 +202,16 @@
opacity: 0.6;
}

.view02{
font-size:20rpx;
line-height:34rpx;
.view02 {
font-size: 20rpx;
line-height: 34rpx;
text-decoration: line-through;
color: #999 !important;
font-weight:normal;
letter-spacing:0;
font-weight: normal;
letter-spacing: 0;
margin-left: 10rpx;
}

.view01 {
text-decoration: line-through;
color: #999 !important;
@@ -283,13 +288,30 @@ scroll-view {
opacity: 1 !important;
background: #fff;
}
.hover{
opacity: .6;

.hover {
opacity: 0.6;
}

.navigator {
display: inline-block;
background: #fff;
border-radius: 12rpx;
position: relative;
}

.presell {
position: absolute;
width: 300rpx;
height: 40rpx;
background-color: rgba(247, 21, 21, 0.6);
z-index: 100;
top: 158rpx;
line-height: 20px;
text-align: center;
color: #fff;
margin-left: 20rpx;
font-size: 26rpx;
}

.navigator:nth-of-type(2n+1) {


+ 1
- 1
components/navbar/navbar.wxml 查看文件

@@ -1,4 +1,4 @@
<view class="navbar" style="{{'height: ' + navigationBarHeight}};background:{{background}}!important;">
<view class="navbar" style="background:{{background}}!important;">
<view style="{{'height: ' + statusBarHeight}}"></view>
<view class='title-container'>
<view class='capsule' wx:if="{{ back || home}}">


+ 4
- 2
components/navbar/navbar.wxss 查看文件

@@ -1,10 +1,12 @@
.navbar {
width: 100vw;
background-color: #F4F5F9;
/* position: fixed; */
position: fixed;
left: 0;
top: 0;
/* z-index: 400000000; */
/* height:150rpx; */
overflow: hidden;
z-index: 400000000;
}

.title-container {


+ 44
- 2
custom-tab-bar/index.js 查看文件

@@ -2,8 +2,10 @@ const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
let ifStoreApp = extConfig.attr.ifStoreApp;
const Http = require("../utils/HttpBasics");
var config = require("../config/config.js");
let app = getApp();
Component({
data: {
home_a_img:[],
selected: 0,
"color": "#abb1be",
"selectedColor": "#FD782D",
@@ -33,8 +35,16 @@ Component({
}
]
},
attached() {
created(){
this.getType()
},
// lifetimes: {
// attached: function () {
// // 在组件实例进入页面节点树时执行
// },
// },
attached() {
if (ifStoreApp == 1) {
this.setData({
list: [{
@@ -77,6 +87,12 @@ Component({
},
methods: {
switchTab(e) {
// this.setData({
// list: this.data.home_a_img
// })
// console.log(this.data.home_a_img)

const data = e.currentTarget.dataset;
const url = data.path;
if (data.index == 0 || data.index == 3) {
@@ -129,9 +145,34 @@ Component({
}
],
selectedColor: `${data.t_uc_std.styleClass}`,
home_a_img: [{
"pagePath": "/index/index",
"iconPath": `${data.t_in.icon}`,
"selectedIconPath": `${data.t_in_std.icon}`,
"text": "首页"
},
{
"pagePath": "/index/searchbar",
"iconPath": `${data.t_md.icon}`,
"selectedIconPath": `${data.t_md_std.icon}`,
"text": "门店"
},
{
"pagePath": "/index/passCar",
"iconPath": `${data.t_tc.icon}`,
"selectedIconPath": `${data.t_tc_std.icon}`,
"text": "停车"
},
{
"pagePath": "/index/user",
"iconPath": `${data.t_uc.icon}`,
"selectedIconPath": `${data.t_uc_std.icon}`,
"text": "我的"
}
],
})
}

console.log(this.data.list[0].selectedIconPath, '99999999999999999999999999999999999999999')
})
},
getTemplateId() {
@@ -189,4 +230,5 @@ Component({
},

}
})

+ 1
- 1
custom-tab-bar/index.wxml 查看文件

@@ -1,5 +1,5 @@
<!--miniprogram/custom-tab-bar/index.wxml-->
<cover-view class="tab-bar">
<cover-view class="tab-bar" wx:if="{{list.length!=0}}">
<cover-view class="tab-bar-border"></cover-view>
<cover-view wx:for="{{list}}" wx:key="index" class="tab-bar-item" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="switchTab">
<cover-image src="{{selected === index ? item.selectedIconPath : item.iconPath}}"></cover-image>


+ 3
- 3
index/index.js 查看文件

@@ -1,6 +1,6 @@
const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
let ifStoreApp = extConfig.attr.ifStoreApp;
const navigationBarHeight = (getApp().statusBarHeight + 60) + 'rpx'
const navigationBarHeight = (getApp().statusBarHeight + 44)+"px"
const Http = require("../utils/HttpBasics");
const imgurl = require("../utils/imgurl");
const config = require("../config/config");
@@ -237,11 +237,11 @@ Page({
}).then(res=>{
const{code ,data}=res
if(code==200){
app.globalData.typeLsit=data
this.setData({
typeLsit: data
typeLsit: data,
})
}
console.log(this.data.typeLsit,"???")
})
},
/**


+ 5
- 3
index/index.wxml 查看文件

@@ -1,12 +1,14 @@
<navbar color="{{typeLsit.sy_top_f.styleClass}}" background="{{typeLsit.sy_top.styleClass}}" text="首页"></navbar>
<!-- style="padding-top:{{navigationBarHeight}}" -->
<view class="container" >
<!-- 所属集团 -->
<view style="height:{{navigationBarHeight}} "></view>
<!-- 会员信息 -->
<view class="color_box" style="{{typeLsit.sy_bbg.styleClass}}">
<!-- 所属集团 -->
<view class="underling" bindtap="goSquareList" wx:if="{{isShowSqare}}">
<image class="underlingImg" mode="widthFix" src="https://formall.oss-accelerate.aliyuncs.com/cimg/dingwei.png"></image>
<view class="underlingName">{{squareName}} ↓</view>
</view>
<!-- 会员信息 -->
<view class="color_box" style="{{typeLsit.sy_bbg.styleClass}}">
<view class='userinfo' wx:if="{{ifStoreApp!=1}}">
<!-- 头像 -->
<view class='infoLeft' style="{{typeLsit.sy_xxb.styleClass}}">


+ 1
- 5
index/index.wxss 查看文件

@@ -23,10 +23,6 @@ background-color: #F4F5F9;
margin-bottom: 20rpx;
margin-left: 5rpx;
}
.underling{
font-size: 30rpx;
overflow: hidden;
}
.index-position {
background: rgba(0, 0, 0, 0.5);
height: 88rpx;
@@ -78,7 +74,7 @@ page {
width: 100%;
}
.underling{
margin: 10rpx 30rpx;
padding: 10rpx 30rpx;
}
.userinfo{
width:690rpx;


+ 1
- 1
index/passCar.js 查看文件

@@ -1,5 +1,5 @@

const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px'
const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
let app = getApp();
const format = require("../utils/util.js");


+ 3
- 2
index/passCar.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar text="停车"></navbar>
<view class='container' wx:if="{{ifHaveCarModular == 1}}" style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class='container' wx:if="{{ifHaveCarModular == 1}}" >
<view class='top'>
<view class='header'>
<image src='{{parkUrl}}' mode="widthFix"></image>{{park.addr}}
@@ -112,7 +113,7 @@
</view>
</view>
</view>
<view class="con" wx:if="{{ifHaveCarModular == 0}}" style="padding-top:{{navigationBarHeight}}">
<view class="con" wx:if="{{ifHaveCarModular == 0}}" >
<image class="img" src="{{parkUrl}}" mode="widthFix"></image>
<text class="txt1">智慧停车即将上线</text>
<text class="txt2">敬请期待</text>


+ 4
- 1
index/passCar.wxss 查看文件

@@ -7,7 +7,10 @@ page {
.container {
padding-bottom: 60rpx;
}

.cs{
height: 30rpx;
background-color: aqua
}
.con text {
display: block;
text-align: center;


+ 1
- 1
index/searchbar.js 查看文件

@@ -1,4 +1,4 @@
const navigationBarHeight = (getApp().statusBarHeight + 44)
const navigationBarHeight = (getApp().statusBarHeight + 44)+"px"
const Http = require("../utils/HttpBasics");
const imgurl = require("../utils/imgurl");
const config = require("../config/config");


+ 8
- 6
index/searchbar.wxml 查看文件

@@ -1,10 +1,12 @@
<navbar text="门店"></navbar>
<!-- 左侧滚动栏 -->
<view class="search" style="position:fixed;top:{{navigationBarHeight+5}}px;" bindtap="goSearchBar"><span class="iconfont icon-sousuo searchicon"></span>搜索门店</view>
<view style="margin-top:{{navigationBarHeight+42}}px;">
<view style="height:{{navigationBarHeight}} "></view>
<view class="search" bindtap="goSearchBar">
<span class="iconfont icon-sousuo searchicon"></span>搜索门店</view>
<view>
<view class='under_line'></view>
<view style='float: left' class='left'>
<scroll-view scroll-y scroll-with-animation scroll-left="{{scrollLength}}" class='scrollY' style='height: {{windowHeight-navigationBarHeight-160}}px;top:{{navigationBarHeight+46}}px;'>
<scroll-view scroll-y scroll-with-animation scroll-left="{{scrollLength}}" class='scrollY' style='height: {{windowHeight-navigationBarHeight-160}}px;top:240rpx;'>
<view class='all clear'>
<block wx:for="{{lists}}" wx:key="{{index}}">
<view bindtap='jumpIndex' data-menuindex='{{item.id}}'>
@@ -19,7 +21,7 @@
</view>

<view class='lists'>
<view class='posi' wx:if="{{merchantVoList.length>0}}" style="padding-bottom:100rpx;">
<view class='posi' wx:if="{{merchantVoList.length>0}}">
<view class='posi_logo' wx:for="{{merchantVoList}}" wx:key="index">
<view class='merchants' bindtap='gotoDetail' data-id='{{item.id}}'>
<view style=' margin-left: 24rpx;margin-top: 24rpx;'>
@@ -28,13 +30,13 @@
<view class='leftBox'>
<view class='merchantName'>{{item.merchantName}}</view>
<view class='shopVo'>
<view class='shopVoList' >
<view class='shopVoList'>
<text wx:for="{{item.shopVoList}}" wx:key="{{index}}" wx:for-item="itemName">{{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}</text>
</view>
</view>
</view>
</view>
<image wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" />
<image wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" />
</view>
</view>
<view class='position' wx:if="{{merchantVoList.length==0}}">


+ 1
- 0
index/searchbar.wxss 查看文件

@@ -71,6 +71,7 @@
position: relative;
width: 616rpx;
float: right;
margin-top: 20rpx;
}

.posi>view:nth-child(2) {


+ 1
- 0
index/user.wxml 查看文件

@@ -1,4 +1,5 @@
<navbar text="我的" background='#FD832D' color="white"></navbar>
<view style="height:{{navigationBarHeight}} "></view>
<view class="user">
<view bindlongtap='showVersion' class='version'>
<view wx:if="{{flag=='show'}}">版本号:{{appVersion}}</view>


+ 2
- 1
pages/ConsumeDetail/ConsumeDetail.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar home back text="交易明细" background="#fff" color="#000"></navbar>
<view wx:if="{{showPage}}" class='notes' style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view wx:if="{{showPage}}" class='notes'>
<view class='head'>
<view class='titles' style='font-weight:bold;'>{{cardDetail.title}}</view>
<view class='titles clearfix'>


+ 1
- 0
pages/acSignIn/index.wxml 查看文件

@@ -1,4 +1,5 @@
<navbar back home text="签到" background="#fff"></navbar>
<view style="height:{{navigationBarHeight}}"></view>
<view class='success' wx:if="{{showPage}}">
<text class='tit'>签到成功</text>
<button class='goback' bindtap='goback'>返回首页</button>


+ 1
- 1
pages/addPark/addPark.wxml 查看文件

@@ -1,5 +1,5 @@
<navbar back home text="添加车辆"></navbar>
<view class="addpark-title" style="padding-top:{{navigationBarHeight}}">请输入车牌号(新能源选填)</view>
<view class="addpark-title" >请输入车牌号(新能源选填)</view>
<view class="addpark-num" capture-bind:touchstart="handleTap">
<view class="addpark-num-head">
<view class="{{chooseTop == 'carData.title' ? 'choose-title' : ''}}" data-carData="carData.title" data-msg="{{title}}">{{title}}</view>


+ 2
- 1
pages/bannerdetail/index.wxml 查看文件

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


+ 2
- 1
pages/bargain/bargain.wxml 查看文件

@@ -1,6 +1,7 @@
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<navbar back home text="砍价专场" background='#fff'></navbar>
<view class="page" hover-class="none" hover-stop-propagation="false" style="padding-top:{{navigationBarHeight}};">
<view style="height:{{navigationBarHeight}} "></view>
<view class="page" hover-class="none" hover-stop-propagation="false" >
<!-- <view class='top' wx:if="{{bargaingoods&&list.length>0}}">
<view class="banner" wx:if="{{list.length>0}}" hover-class="none" hover-stop-propagation="false">
<c-banner wx:key="unique" list="{{list}}" />


+ 2
- 1
pages/bargain/bargainDatail/bargainDatail.wxml 查看文件

@@ -1,6 +1,7 @@
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<navbar back home text="砍价详情" background="#fff"></navbar>
<view class="bargainDetail" hover-class="none" hover-stop-propagation="false" wx:if="{{showPage}}" style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class="bargainDetail" hover-class="none" hover-stop-propagation="false" wx:if="{{showPage}}" >
<view class="listitem clearfix" hover-class="none" hover-stop-propagation="false">
<image class="fl" src="{{data.coverImg}}" lazy-load="true" binderror="" bindload="" mode='aspectFill'></image>
<view class="fl ri" hover-class="none" hover-stop-propagation="false">


+ 1
- 0
pages/canvas/index.js 查看文件

@@ -162,6 +162,7 @@ Page({
wx.getImageInfo({
src: src2,
success: function(res) {
console.log(res.path)
that.darwAvatarArc(ctx, res.path, 10, 8, 35, 35);
}
});


+ 2
- 1
pages/canvas/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar back home text="分享" background="#fff"></navbar>
<view class='content' style="margin-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class='content'>
<view class='poster'>
<canvas canvas-id='myCanvas' class='canvas-content' style="width:{{windowWidth-20}}px;height:{{windowHeight}}px;box-shadow: 1px 1px 5px 5px rgba(0, 0, 0, 0.05); position:absolute;z-index:1;">
</canvas>


+ 2
- 1
pages/cardorder/detail/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar back home text="使用优惠券" background="#fff"></navbar>
<view class="container page" style="margin-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class="container page" >
<view class="coupon_detail clearfix">
<view class="fl wmfl">
<image src="{{data.coverImg}}" mode='aspectFill' />


+ 2
- 1
pages/cardorder/index/index.wxml 查看文件

@@ -1,6 +1,7 @@
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<navbar home back text="我的卡包" color="#000" background="#ffff"></navbar>
<view class="market" wx:if="{{showPage}}" style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class="market" wx:if="{{showPage}}" >
<!-- 卡包 我的优惠券 -->
<i-tabs style="top:{{navigationBarHeight}}" class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll">
<i-tab class='i-tab' wx:for="{{tabs}}" wx:key="unique" key="{{item.key}}" title="{{item.name}}"></i-tab>


+ 2
- 1
pages/cardorder/userule/userule.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar back home text="使用规则" background="#fff"></navbar>
<view class="lists" style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class="lists">
<view class="list">
<view class="title">
1、如何使用消费卡?


+ 2
- 1
pages/complete/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar back home text="领取成功" background="#fff"></navbar>
<view class="container" style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class="container" >
<view class='c-top'>
<view class='c-top-top'></view>
<view class='c-top-center'>


+ 13
- 1
pages/coupon/detail/index.js 查看文件

@@ -12,6 +12,7 @@ Page({
fenxiang: imgurl.fenxiang1.url,
fenxiangUrl: imgurl.fenxiang.url,
clockUrl: imgurl.clock.url,
yushouUrl: imgurl.yushou.url,
teljpgUrl: imgurl.teljpg.url,
closedUrl: imgurl.closed.url,
quesGouUrl: imgurl.ques_gou.url,
@@ -595,11 +596,22 @@ Page({
data: res.data,
merchantVoList: res.data.merchantVoList
});

if(res.data.type == 10){
that.setData({
salePriceStr: res.data.salePriceStr,
pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"),
pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"),
priceStr: res.data.priceStr,
tailPriceStr: res.data.tailPriceStr,
origPriceStr: res.data.origPriceStr
})
}
if (res.data.validType == 1) {
that.setData({
validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"),
validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"),
pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"),
pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"),
});
} else {
if (res.data.validDays) {


+ 34
- 10
pages/coupon/detail/index.wxml 查看文件

@@ -1,10 +1,11 @@
<navbar back home text="{{barTitle}}" background='#fff'></navbar>
<view wx:if="{{showPage}}" style="padding-top:{{navigationBarHeight}}">
<view wx:if="{{showPage}}" >
<view style="height:{{navigationBarHeight}} "></view>
<!-- 券的详情页面 -->
<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" 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" />
@@ -20,13 +21,14 @@

<view class='coupons_info' style='position:relative;z-index:9'>
<view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'>
<image src='{{fenxiang}}' mode="widthFix"></image>
<image src='{{fenxiang}}' mode="widthFix"></image>
<text class='gift'>分享</text>
</view>
<view>
<view class='distance' wx:if="{{data.targetAd==2&&data.endTime!=undefined}}">
<view class='distance' wx:if="{{data.targetAd==2&&data.endTime!=undefined||data.type==10}}">
<view style='text-align:center;display:inline-block;'>
<image class='clock' src='{{clockUrl}}' mode='widthFix'></image>
<image class='clock' src='{{clockUrl}}' mode='widthFix' wx:if="{{data.type!=10}}"></image>
<image class='clock' src='{{yushouUrl}}' mode='widthFix' wx:if="{{data.type==10}}"></image>
<text class="qiang" wx:if="{{data.activityStatus!=0}}">距结束 :</text>
<text class="qiang" wx:if="{{data.activityStatus==0}}">距开始 :</text>
</view>
@@ -44,11 +46,30 @@
</view>
<text class='title'>{{data.title}}<text class="elecard" wx:if="{{data.type==100}}">电子卡</text></text>
<text class="subTitle">{{data.subTitle}}</text>
<view class='salePriceStr clearfix'>
<!-- 预购 -->
<view class="moneyBox" wx:if="{{data.type==10}}">
<view class="earnest">定金:</view>
<view class="earnestNum">¥ {{salePriceStr}}</view>
<view class="final">尾款抵扣:</view>
<view class="earnestNum">¥ {{priceStr}}</view>
</view>
<view class="pickFinal_Box" wx:if="{{data.type==10}}">
<view class="earnest">提货尾款:</view>
<view class="earnestNum">¥ {{tailPriceStr}}</view>
<view class="original">{{origPriceStr}}</view>
</view>
<view class="earnestTime time" wx:if="{{data.type==10}}"> 预购时间:{{validStartDate}}至{{validEndDate}}</view>
<view class="finalTime time" wx:if="{{data.type==10}}">提货时间:{{pickStartDate}}至{{pickEndDate}}</view>
<!-- 预售 -->

<view class='salePriceStr clearfix' wx:if="{{data.type!=10}}">
<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>
<view class="pri01" wx:if="{{data.type==50||data.type==51}}">{{data.creditPrice}}<text class='jifen'>积分</text></view>
<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>
@@ -66,11 +87,14 @@
</text>
</view>
</view>



<view class='rest' wx:if="{{data.validType==2}}">自领取之日起
<text class='time'>{{validDays}}</text>天内有效
<text class="use">(请在有效期内使用)</text>
</view>
<view class='rest' wx:if="{{data.validType==1}}">
<view class='rest' wx:if="{{data.validType==1&&data.type!=10}}">
<text class='time'>{{validStartDate}}至{{validEndDate}}</text>
</view>
<view class='rest' wx:if="{{data.type==5}}">
@@ -93,7 +117,7 @@
</view>
</view>
<!-- 适用门店 -->
<store merchantVoList="{{merchantVoList}}"></store>
<store merchantVoList="{{merchantVoList}}"></store>
<view class='notes'>
<view>
<text>购买须知</text>
@@ -124,7 +148,7 @@
<button class='buy' disabled='true' wx:if="{{data.remainInventory==0&&data.type==50||data.remainInventory==0&&data.type==51}}">已兑完</button>
<button class='buy' disabled='true' wx:if="{{endtime=='活动已结束'&&data.activityStatus!=0}}">活动已结束</button>
<button class='buy' disabled='true' wx:if="{{total_micro_second<=0&&data.activityStatus!=0}}">活动已结束</button>
<button class='buy' disabled='true' wx:if="{{data.activityStatus==0}}">活动未开始</button>
<button id='noBuy' disabled='true' wx:if="{{data.activityStatus==0}}">活动未开始</button>
</view>
</form>
</view>


+ 152
- 69
pages/coupon/detail/index.wxss 查看文件

@@ -1,7 +1,7 @@
@import "../../../app.wxss";

page {
background: #F4F5F9;
background: #f4f5f9;
}

button::after {
@@ -13,7 +13,7 @@ button::after {
position: relative;
overflow: hidden;
padding-bottom: 170rpx;
background: #F4F5F9;
background: #f4f5f9;
}

.banner {
@@ -32,6 +32,53 @@ button::after {
height: 454rpx;
}

.moneyBox {
font-size: 24rpx;
overflow: hidden;
}

.earnest {
float: left;
font-size: 28rpx;
color: #a6a6a6;
}

.earnestNum {
float: left;
color: red;
font-size: 32rpx;
}

.final {
float: left;
font-size: 28rpx;
color: #a6a6a6;
margin-left: 30rpx;
}

.pickFinal_Box {
overflow: hidden;
}
.earnestTime{
font-size: 28rpx;
color: #a6a6a6;

}
.finalTime{
font-size: 28rpx;
color: #a6a6a6;

}
.original {
float: left;
width: 100rpx;
margin-left: 10rpx;
text-decoration: line-through;
color: #a6a6a6;
font-size: 24rpx;
line-height: 50rpx;
}

.dots {
position: absolute;
left: 0;
@@ -55,7 +102,6 @@ button::after {
background: #f80;
}


.refound {
border: 1rpx solid red;
padding: 3rpx 0;
@@ -83,12 +129,13 @@ button::after {
}

.fenxiang image {
width:48rpx;
width: 48rpx;
height: 48rpx;
margin: 0 auto;
}
.gift{
color: #3C3C3C;

.gift {
color: #3c3c3c;
font-size: 20rpx;
margin: 0 auto;
}
@@ -101,6 +148,7 @@ button::after {
color: #fff;
position: fixed;
}

.user-motto::after {
border: none;
}
@@ -109,7 +157,7 @@ button::after {
display: block;
font-weight: bold;
font-size: 32rpx;
color: #3C3C3C;
color: #3c3c3c;
letter-spacing: 1.09rpx;
line-height: 45rpx;
width: 542rpx;
@@ -124,7 +172,7 @@ button::after {
width: 588rpx;
/* height: 37rpx; */
font-size: 26rpx;
color: #A6A6A6;
color: #a6a6a6;
letter-spacing: 1.16rpx;
overflow: hidden;
white-space: nowrap;
@@ -150,7 +198,7 @@ button::after {

.time {
font-size: 24rpx;
color: #A6A6A6;
color: #a6a6a6;
letter-spacing: 0;
line-height: 33rpx;
display: inline-block;
@@ -173,30 +221,34 @@ button::after {
color: #999;
letter-spacing: 0;
}
.salePriceStr .rmb{
color: #FD782D;

.salePriceStr .rmb {
color: #fd782d;
font-size: 24rpx;
line-height: 40rpx;
float: left;
}

.salePriceStr .pri01 {
font-size: 40rpx;
color: #FD782D;
color: #fd782d;
letter-spacing: 0;
line-height: 40rpx;
float: left;
}

.salePriceStr .pri01Hr {
font-size: 24rpx!important;
font-size: 24rpx !important;
}

.use {
color: #FD782D;
color: #fd782d;
/* margin-left: 10rpx; */
}

.salePriceStr .yuan {
font-size: 24rpx;
color: #FD782D;
color: #fd782d;
letter-spacing: 0;
}

@@ -210,10 +262,11 @@ button::after {
text-decoration: line-through;
margin-left: 10rpx;
color: #999 !important;
margin-top:8rpx;
margin-top: 8rpx;
height: 32rpx;
line-height: 45rpx;
}

.fl {
float: left;
}
@@ -230,10 +283,11 @@ button::after {
}

.notes {
width:100%;
background: #FFF;
width: 100%;
background: #fff;
padding-bottom: 30rpx;
}

.active {
opacity: 0.6;
}
@@ -245,10 +299,12 @@ button::after {
height: 70rpx;
line-height: 70rpx;
}

.notes view:nth-child(1) {
width: 92%;
margin: 0 auto;
}

.notes view:nth-child(2) {
display: flex;
flex-direction: column;
@@ -275,7 +331,7 @@ button::after {

.buy {
position: relative;
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%);
height: 94rpx;
width: 560rpx;
margin: 0 auto 30rpx;
@@ -284,15 +340,28 @@ button::after {
line-height: 94rpx;
border-radius: 61rpx;
}
.buyHr{
background: #CECECE!important;
#noBuy{
position: relative;
background-color:rgba(0, 0, 0, 0.2);
height: 94rpx;
width: 560rpx;
margin: 0 auto 30rpx;
color: #fff;
font-size: 36rpx;
line-height: 94rpx;
border-radius: 61rpx;
}

.buyHr {
background: #cecece !important;
}

.goback {
position: relative;
float: left;
width: 132rpx !important;
height: 96rpx;
background: rgba(255, 255, 255, 1)!important;
background: rgba(255, 255, 255, 1) !important;
line-height: 95rpx;
border-radius: 32rpx;
margin-left: 20rpx;
@@ -300,13 +369,13 @@ button::after {

.goback image {
position: absolute;
width:52rpx;
width: 52rpx;
height: 50rpx;
left: 0;
right: 0;
top: 0;
bottom:0;
margin:10rpx auto;
bottom: 0;
margin: 10rpx auto;
}

.tel {
@@ -361,9 +430,11 @@ button::after {
font-size: 26rpx;
text-align: center;
}
.timess{
color: #FD782D;

.timess {
color: #fd782d;
}

.times text {
display: inline-block;
margin: 6rpx;
@@ -378,7 +449,6 @@ button::after {
background: #ff4949;
}


.con {
position: absolute;
top: 35rpx;
@@ -469,8 +539,8 @@ button::after {
.elecard {
display: inline-block;
margin-left: 6rpx;
color: rgba(254,70,20,1);
border: 1px solid rgba(254,70,20,1);
color: rgba(254, 70, 20, 1);
border: 1px solid rgba(254, 70, 20, 1);
border-radius: 8rpx;
font-style: normal;
font-size: 30rpx;
@@ -489,18 +559,19 @@ button::after {
z-index: 12;
/* background: #fff; */
}
.btnTxt{

.btnTxt {
width: 50rpx;
height: 30rpx;
line-height: 50rpx;
color: #FD782D;
color: #fd782d;
font-size: 20rpx;
position: absolute;
right:42rpx ;
right: 42rpx;
bottom: 15rpx;
}

.btns .fr,.btns .fl {
.btns .fr, .btns .fl {
width: 277rpx;
height: 95rpx;
border-radius: 48rpx;
@@ -510,7 +581,7 @@ button::after {
.btns .fl {
margin-left: 20rpx;
color: #fff;
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%);
}

.btns .fl text {
@@ -528,7 +599,7 @@ button::after {
color: #fff;
margin-right: 20rpx;
line-height: 95rpx;
background: linear-gradient(90deg,rgba(40,179,255,1) 0%,rgba(48,103,255,1) 100%);
background: linear-gradient(90deg, rgba(40, 179, 255, 1) 0%, rgba(48, 103, 255, 1) 100%);
/* box-shadow: 0px 8px 8px 1px rgba(246, 93, 51, 0.32); */
}

@@ -537,7 +608,7 @@ button::after {
border-radius: 50rpx;
margin-top: 30rpx;
/* background: #02c0ff !important; */
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%);
}

.shaddow {
@@ -655,16 +726,17 @@ button::after {
line-height: 34rpx;
margin-top: 8rpx;
margin-left: 12rpx;
color: #FD782D;
color: #fd782d;
font-size: 20rpx;
letter-spacing: 1.16rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.presslimit text{

.presslimit text {
margin-left: 15rpx;
background:rgba(201,201,201,0.1);
background: rgba(201, 201, 201, 0.1);
}

checkbox-group, radio-group {
@@ -674,7 +746,7 @@ checkbox-group, radio-group {

.detailImg {
width: 100%;
background: #FFF;
background: #fff;
margin: auto;
}

@@ -684,6 +756,7 @@ checkbox-group, radio-group {
padding: 0 4% 0 4%;
margin-bottom: 20rpx;
}

.content {
margin: 0;
padding: 0;
@@ -692,26 +765,29 @@ checkbox-group, radio-group {
background: #f3f3f3;
position: relative;
}
.poster{
width: 100%;

.poster {
width: 100%;
height: 100%;
padding: 20rpx;
position: absolute;
top: 0;
left: 0;
padding: 20rpx;
position: absolute;
top: 0;
left: 0;
}

.bottomsave {
width: 100%;
height: 140rpx;
line-height: 140rpx;
margin: auto 0;
bottom:0;
bottom: 0;
left: 0;
right: 0;
border-top: 1px solid #ccc;
box-shadow: 0 0rpx 150rpx #ccc;
background: #fff;
}

.saveposter {
color: #fff;
width: 380rpx;
@@ -721,6 +797,7 @@ checkbox-group, radio-group {
margin-top: 30rpx;
font-size: 32rpx;
}

.modal {
width: 100%;
height: 100%;
@@ -765,37 +842,43 @@ checkbox-group, radio-group {
width: 90rpx;
height: 90rpx;
}
.wx-swiper-dots{

.wx-swiper-dots {
margin-bottom: 30rpx;
}

.quan{
.quan {
float: left;
margin:18rpx 15rpx 0 0;
margin: 18rpx 15rpx 0 0;
width: 12rpx;
height: 12rpx;
background: #E1E1E1;
background: #e1e1e1;
border-radius: 50%;
}
.swiper-box .wx-swiper-dots.wx-swiper-dots-horizontal{
margin-bottom: 2rpx;

.swiper-box .wx-swiper-dots.wx-swiper-dots-horizontal {
margin-bottom: 2rpx;
}
.swiper-box .wx-swiper-dot{
width:40rpx;
display: inline-flex;
height: 6rpx;
margin-left: 10rpx;
border-radius:6rpx;
justify-content:space-between;

.swiper-box .wx-swiper-dot {
width: 40rpx;
display: inline-flex;
height: 6rpx;
margin-left: 10rpx;
border-radius: 6rpx;
justify-content: space-between;
}
.swiper-box .wx-swiper-dot::before{
content: '';
flex-grow: 1;
background: #ccc8c8;

.swiper-box .wx-swiper-dot::before {
content: '';
flex-grow: 1;
background: #ccc8c8;
}
.swiper-box .wx-swiper-dot-active::before{
background:#f6792b;

.swiper-box .wx-swiper-dot-active::before {
background: #f6792b;
}
.jifen{

.jifen {
font-size: 30rpx;
}
}

+ 3
- 1
pages/couponorder/detail/index.js 查看文件

@@ -134,7 +134,9 @@ Page({
if (that.data.data.validStartDate && that.data.data.validEndDate) {
that.setData({
validStartDate: util.formatTime(that.data.data.validStartDate, "yyyy-MM-dd hh:mm:ss"),
validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss")
validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss"),
pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd hh:mm:ss"),
pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd hh:mm:ss"),
})
}


+ 5
- 3
pages/couponorder/detail/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar home back text="使用优惠券"></navbar>
<view class='box' style="padding-top:{{navigationBarHeight}};margin-top:40rpx;">
<view style="height:{{navigationBarHeight}} "></view>
<view class='box' >
<view class="container page" wx:if="{{data.merchantVoList}}">
<view class="coupon_detail clearfix">
<view class="fl wmfl">
@@ -25,10 +26,11 @@
</view>
<view class="timevalidity" wx:if="{{data.validStatus == 0}}">
<text>有效期:</text>
<text>{{validStartDate}}</text>
<text>{{data.type==10?pickStartDate:validStartDate}}</text>
<i>至</i>
<text>{{validEndDate}}</text>
<text>{{data.type==10?pickEndDate:validEndDate}}</text>
</view>
<view></view>
<view wx:if="{{data.usePrice!=undefined}}" class="manjian">满{{data.usePrice/100}}元可用</view>
<view wx:if="{{data.usePrice==undefined}}" class="manjian">仅限本店使用</view>
<image class='line' mode="widthFix" src="{{topLine}}"></image>


+ 1
- 0
pages/couponorder/detail/index.wxss 查看文件

@@ -8,6 +8,7 @@
width: 92%;
margin: 8% auto 6%;
border-radius: 16rpx;

}
page {
background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);


+ 2
- 1
pages/couponorder/index/index.wxml 查看文件

@@ -1,6 +1,7 @@
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<navbar home back text="我的券包" background="#ffff"></navbar>
<view class="market" wx:if="{{showPage}}" style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class="market" wx:if="{{showPage}}" >
<!-- 券包 我的优惠券 -->
<i-tabs style="top:{{navigationBarHeight}}" class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll">
<i-tab class='i-tab' wx:for="{{tabs}}" wx:key="unique" key="{{item.key}}" title="{{item.name}}"></i-tab>


+ 2
- 1
pages/czdetail/czdetail.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar back home text="成长值"></navbar>
<view class='head' style="padding-top:{{navigationBarHeight}}!important">
<view style="height:{{navigationBarHeight}} "></view>
<view class='head' >
<text>当前</text>
<text>{{score}}</text>
<view class='rule' bindtap='gotorule'>规则</view>


+ 2
- 1
pages/discountCardList/discountCardList.wxml 查看文件

@@ -1,7 +1,8 @@
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<navbar back home text="消费卡" background='#fff'></navbar>
<view style="height:{{navigationBarHeight}} "></view>
<!-- 折扣卡list页面 -->
<view class='content' style="padding-top:{{navigationBarHeight}}">
<view class='content' >
<view class="market clearfix">
<view class='tabss'>
<i-tabs current="{{current_scroll}}" scroll bindchange="handleChangeScroll">


+ 2
- 1
pages/edit/edit.wxml 查看文件

@@ -1,6 +1,7 @@
<navbar back home text="编辑信息"></navbar>
<view style="height:{{navigationBarHeight}} "></view>
<form bindsubmit="formSubmit" wx:if="{{showPage}}">
<view class='section' style="padding-top:{{navigationBarHeight}};">
<view class='section' >
<text>姓名</text>
<input wx:if="{{username}}" name="username" type="text" placeholder='{{username}}' />
<input wx:if="{{!username}}" name="username" type="text" placeholder='请填写名字' />


+ 2
- 1
pages/exchange/exchange.wxml 查看文件

@@ -1,6 +1,7 @@
<navbar text="兑换" home back background='#FD832D' color="white"></navbar>
<view style="height:{{navigationBarHeight}} "></view>
<form bindsubmit='exchange' report-submit='true'>
<view class="section" style="padding-top:{{navigationBarHeight}};">
<view class="section" >
<input name='code'placeholder="请输入兑换码" clearable/>
<button size="{{primarySize}}" style="background:#FD832D;color:#fff;" hover-class="opcaity" form-type="submit">兑换</button>
</view>


+ 1
- 1
pages/exchange/exchange.wxss 查看文件

@@ -1,6 +1,6 @@
/* pages/exchange/exchange.wxss */
.section{
padding: 0 20rpx;
padding: 20rpx 20rpx;
}
.section{
display: flex;


+ 2
- 1
pages/freeBannerDetail/index.wxml 查看文件

@@ -1,6 +1,7 @@
<!-- <web-view src="{{url+'/wxCampaign/printHtmlById?token='+token+'&id='+id+'&date='+date}}" bindmessage="bindGetMsg"></web-view> -->
<navbar back home text="活动详情" background="#fff"></navbar>
<view style="margin-top:{{navigationBarHeight}}"></view>
<view style="height:{{navigationBarHeight}} "></view>
<view ></view>
<import src="../../wxParse/wxParse.wxml" />
<view class="content">
<template is="wxParse" data="{{wxParseData:article.nodes}}" />

+ 1
- 1
pages/getphoneInfo/index.wxml 查看文件

@@ -1,4 +1,4 @@
<navbar home text="微信授权手机号" style="padding-top:200rpx;"></navbar>
<navbar home text="微信授权手机号" ></navbar>
<view class="login-body">
<view class="login-logo">
<image src="{{mallImgUrl}}" mode="widthFix"></image>


+ 1
- 1
pages/getuserinfo/index.wxml 查看文件

@@ -1,5 +1,5 @@
<navbar home text="微信授权"></navbar>
<view class="login-body" style="padding-top:200rpx;">
<view class="login-body" >
<view class="login-logo">
<image src="{{mallImgUrl}}" mode='widthFix'></image>
</view>


+ 2
- 2
pages/grade/grade.wxml 查看文件

@@ -1,5 +1,5 @@
<navbar home back text="成长值规则"></navbar>
<view class='page' style="padding-top:{{navigationBarHeight}}" wx:if="{{flags=='have'}}">
<view class='page' wx:if="{{flags=='have'}}">
<view class='title'>成长值增长规则</view>
<view class='scroll'>
<scroll-view scroll-x class="scroll-header">
@@ -50,7 +50,7 @@
</view>
</view>
</view>
<view wx:if="{{flags=='nothave'}}" style="padding-top:{{navigationBarHeight}}">
<view wx:if="{{flags=='nothave'}}" >
<image class='img' src='{{actUrl}}' mode='widthFix'></image>
<text class="txt">暂无配置信息</text>
</view>


+ 2
- 1
pages/index/searchbar/detail/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar back home text="门店详情"></navbar>
<view style="padding-top:{{navigationBarHeight}};">
<view style="height:{{navigationBarHeight}} "></view>
<view >
<swiper class="index-slide" circular="false">
<block wx:for="{{imglist}}" wx:key="unique">
<swiper-item>


+ 2
- 1
pages/integralmall/index.wxml 查看文件

@@ -1,6 +1,7 @@
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<navbar back home text="积分商城" background='#FD832D' color="#FFF"></navbar>
<view class='content-box' style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class='content-box' >
<view class='topbg'>
<view class='topbg-top'>
<view class="user-avatar" bindtap='gotograde'>


+ 1
- 1
pages/integralmall/integraHistory/index.js 查看文件

@@ -1,4 +1,4 @@
const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px'
const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
var config = require("../../../config/config.js");
var app = getApp();
const Http = require("../../../utils/HttpBasics");


+ 2
- 1
pages/integralmall/integraHistory/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar back home text="积分详情"></navbar>
<view class='head' style="padding-top:{{navigationBarHeight}}!important">
<view style="height:{{navigationBarHeight}} "></view>
<view class='head' >
<text>当前</text>
<text>{{creditAmount+'分'}}</text>
<!-- <view class='rule' bindtap='gotorule'>规则</view> -->


+ 2
- 1
pages/integralmall/payIntegcouponStatus/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar home back text="兑换成功" background='#FFF' ></navbar>
<view class='pay-status'style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class='pay-status'>
<view class='tilte'>兑换成功</view>
<view class='coupon'>
<view class='c-left'>


+ 2
- 1
pages/integralmall/payIntegcoupondetail/index.wxml 查看文件

@@ -1,6 +1,7 @@
<!--pages/spellDetail/index.wxml-->
<navbar home back text="积分换礼" background='#FFF' ></navbar>
<view class='container' style="padding-top:{{navigationBarHeight}}" >
<view style="height:{{navigationBarHeight}} "></view>
<view class='container' >
<!-- 拼团产品详情 -->
<view class='detail'>
<view class='detail-top'>


+ 2
- 1
pages/joinFrDpell/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar back home text="拼团券" background='#fff'></navbar>
<view class="content-box" style="margin-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class="content-box" >
<view class='content'>
<view class='top-img'>
<image src='{{data.coverImg}}'></image>


+ 2
- 1
pages/mallInfo/mallInfo.wxml 查看文件

@@ -1,7 +1,8 @@
<!--pages/mallInfo.wxml-->
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<navbar back home text="关于我们" background='#FD832D' color="#fff"></navbar>
<view style="margin-top:{{navigationBarHeight}}!important;" class='codeBox'>
<view style="height:{{navigationBarHeight}} "></view>
<view class='codeBox'>
<view class='code' >
<image class='icons' src="{{img}}" mode='widthFix'></image>
</view>


+ 1
- 1
pages/managelicenseplate/managelicenseplate.wxml 查看文件

@@ -1,5 +1,5 @@
<navbar back home text="车辆管理"></navbar>
<view class='title' style="padding-top:{{navigationBarHeight}};">30天内最多绑定4次车牌<text class='rem'>解绑前请确认车已经离场</text></view>
<view class='title' >30天内最多绑定4次车牌<text class='rem'>解绑前请确认车已经离场</text></view>
<!-- 车牌 -->
<!-- 有车牌的时候显示 -->
<view class='passUp'>


+ 2
- 1
pages/order/detail/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar home back text="订单详情"></navbar>
<view class='order' wx:if="{{showPage}}" style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class='order' wx:if="{{showPage}}" >
<view wx:if="{{order.orderStatus==1}}" class='tips'>
<image class='success' src='{{succUrl}}' mode='widthFix'></image>
<view wx:if="{{order.salePrice/100==0}}" class='msg' >


+ 2
- 1
pages/order/index/index.wxml 查看文件

@@ -1,6 +1,7 @@
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<navbar home back text="我的订单" background="#fff"></navbar>
<view class="market" style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class="market">
<i-tabs style="top:{{navigationBarHeight}}" class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll">
<i-tab class='i-tab' wx:for="{{tabs}}" wx:key="unique" key="{{item.key}}" title="{{item.name}}"></i-tab>
</i-tabs>


+ 3
- 2
pages/orderquanma/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar home back text="兑换码" background="#fff"></navbar>
<view class='couponBox' style="padding-top:{{navigationBarHeight}};margin-top:60rpx;">
<view style="height:{{navigationBarHeight}} "></view>
<view class='couponBox' >
<view class="couponbg">
<view class="title">{{title}}</view>
<!-- <view class="subtitle">{{subtitle}}</view> -->
@@ -33,7 +34,7 @@
</view> -->
<view class='notes'>
<view>
<text>购买须知:</text>
<!-- <text>购买须知:</text> -->
</view>
<view wx:if="{{curHtml==''}}">
<text><text class='spot'></text>{{data.remark}}</text>


+ 1
- 0
pages/orderquanma/index.wxss 查看文件

@@ -2,6 +2,7 @@

.couponBox{
height: 100%;
margin-top: 20rpx;
background:linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
}
page {


+ 2
- 1
pages/passCar/couponDetail/couponDetail.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar back home background="#fff" text="停车券详情"></navbar>
<view class="container page" wx:if="{{showPage}}" style="padding-top:{{navigationBarHeight}}!important">
<view style="height:{{navigationBarHeight}} "></view>
<view class="container page" wx:if="{{showPage}}" >
<view class="coupon_detail clearfix">
<view class="fl wmfl">
<image src="{{data.coverImg}}"/>


+ 3
- 2
pages/passCar/couponList/couponList.wxml 查看文件

@@ -1,7 +1,8 @@
<navbar back home text="停车券"></navbar>
<view class="market" style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class="market" >
<!-- 券包 我的优惠券 -->
<i-tabs style="top:{{navigationBarHeight}}" class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll">
<i-tabs class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll">
<i-tab class='i-tab' wx:for="{{tabs}}" wx:key="unique" key="{{item.key}}" title="{{item.name}}"></i-tab>
</i-tabs>
<view style='padding-top:120rpx;'>


+ 2
- 1
pages/paySuccess/paySuccess.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar back home text="支付成功" color="#000"></navbar>
<view class='content' style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class='content' >
<view class="payContent">
<view class="payHeader"></view>
<view class="payBody">


+ 1
- 1
pages/payrule/payrule.wxml 查看文件

@@ -1,4 +1,4 @@
<navbar back home text="缴费规则"></navbar>
<view class='rule' style="padding-top:{{navigationBarHeight}};">
<view class='rule' >
{{rule}}
</view>

+ 2
- 1
pages/ques/ques.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar back home text="常见问题"></navbar>
<view class='contain' style="padding-top:{{navigationBarHeight}};">
<view style="height:{{navigationBarHeight}} "></view>
<view class='contain' >
<view class='content'>
<view class="tit"><view class='Q'>Q</view><view class='right'>我怎么添加车牌呢?</view></view>
<view class='description'>首次使用“停车缴费”的用户需绑定车牌号,即可为车辆进行缴费 。您可以最多添加三张车牌。</view>


+ 2
- 1
pages/radetail/index.wxml 查看文件

@@ -1,11 +1,12 @@
<import src="../../wxParse/wxParse.wxml" />
<navbar home back text="活动详情" background="#ffff"></navbar>
<view style="height:{{navigationBarHeight}} "></view>
<!-- <button class='goback' bindtap='goback'>
<image src='{{homeSelectedO}}' mode="widthFix"></image>
<text class='btnTxt'>首页</text>
</button> -->
<!-- 活动正常排版格式 -->
<view class='coupons' style='{{data.type!=2?"padding-bottom: 160rpx":0}};padding-top:{{navigationBarHeight}}'>
<view class='coupons' style='{{data.type!=2?"padding-bottom: 160rpx":0}};'>
<view class="coupons-body">
<view class='banner'>
<image src='{{data.coverImg}}' mode='widthFix'></image>


+ 2
- 1
pages/radetail/joinActivity/edit.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar home back text="活动调查"></navbar>
<view style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view >
<form bindsubmit="formSubmit">
<view style='padding-bottom:100rpx;'>
<view class='section' wx:if="{{selectques.name==1}}">


+ 2
- 1
pages/radetail/success/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar home back text="报名成功"></navbar>
<view style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view >
<view class='title' wx:if="{{credit}}">您已扣除{{credit}}积分</view>
<view class='success'>
<image src='{{chenghr}}' mode="widthFix"></image>


+ 2
- 1
pages/rushToBuy/index.wxml 查看文件

@@ -1,7 +1,8 @@
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<navbar back home background="#fff" text="限时抢购"></navbar>
<view style="height:{{navigationBarHeight}} "></view>
<!-- 限时抢购 查看更多对应的页面 -->
<view wx:if="{{showPage}}" style="padding-top:{{navigationBarHeight}}">
<view wx:if="{{showPage}}" >
<view wx:for="{{list}}" wx:if="{{item.targetA!='end'&&list.length>0}}" class='flashSaleItemWrap' wx:key="index">
<view class='flashSaleItem' data-couponId="{{item.couponId}}" data-couponChannelId="{{item.id}}" data-targetAd="{{item.targetAd}}" bindtap="gotodetail">
<view class='flashSaleItemTop'>


+ 2
- 1
pages/scanPay/scanPay.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar home back text="付款"></navbar>
<view class='content' style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class='content' >
<view class='head clearfix'>
<text class='fl'>付款给{{merChant.merchantName}}</text>
<image class='fr' src='{{merChant.merchantImgUrl}}' mode='widthFix'></image>


+ 2
- 1
pages/searchbar/searchbar.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar home back text="门店搜素"></navbar>
<view class="weui-search-bar {{extClass}}" style="margin-top:{{navigationBarHeight}}rpx">
<view style="height:{{navigationBarHeight}} "></view>
<view class="weui-search-bar {{extClass}}" >
<view class="weui-search-bar__form">
<view class="weui-search-bar__box" style="position:relative;">
<icon class="weui-icon-search_in-box" type="search" size="12"></icon>


+ 3
- 1
pages/specialcourtesy/specialcourtesy.wxml 查看文件

@@ -1,6 +1,8 @@
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<navbar back home text="我的特权" background='#FD832D' color="#fff"></navbar>
<view style="margin-top:{{navigationBarHeight}}!important;" class='codeBox'>
<view style="height:{{navigationBarHeight}} "></view>
<view class='codeBox'>

<view class='code' >
<view class="canWrap">
<canvas canvas-id="mycanvas2" style="width: 1200rpx; height: 800rpx;" />


+ 2
- 1
pages/spellDetail/index.wxml 查看文件

@@ -1,6 +1,7 @@
<!--pages/spellDetail/index.wxml-->
<navbar back home text="{{barTitle}}" background='#fff'></navbar>
<view class='container' style="margin-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class='container' >
<!-- 拼团产品详情 -->
<view class='detail'>
<view class='detail-top'>


+ 3
- 2
pages/spellGroup/mySpellGroup/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar back home text="拼团券" background='#fff'></navbar>
<view class="content-box" style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class="content-box" >
<view class='content'>
<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}}">
@@ -109,7 +110,7 @@
</view>
</view>
<!-- 问卷调查 -->
<view class="b1" style="opacity:{{opacity}};display: {{display}};position: fixed;top:{{navigationBarHeight}};bottom: 0px;left: 0px;right: 0px;background: rgba(0, 0, 0, 0.8);overflow: hidden;z-index: 10;" animation="{{queueData}}">
<view class="b1" style="opacity:{{opacity}};display: {{display}};position: fixed;bottom: 0px;left: 0px;right: 0px;background: rgba(0, 0, 0, 0.8);overflow: hidden;z-index: 10;" animation="{{queueData}}">
<view id='con' class='con'>
<image class='wmclose' mode='widthFix' src="{{closedUrl}}" bindtap="closeQuestion"></image>
<image class='ques_gou' mode='widthFix' src="{{quesGouUrl}}"></image>


+ 2
- 1
pages/spellGroup/paySpellGroup/index.wxml 查看文件

@@ -1,6 +1,7 @@
<!--pages/spellDetail/index.wxml-->
<navbar back home text="拼团券" background='#fff'></navbar>
<view class='container' style="margin-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class='container' >
<!-- 拼团产品详情 -->
<view class='detail'>
<view class='detail-top'>


+ 2
- 1
pages/spellGroup/spellGroup.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar back home text="拼团专场" background='#fff'></navbar>
<view class='content-box' style='{{"padding-bottom:"+(lists.length>0?"200rpx":"0")+";padding-top:"+navigationBarHeight}}'>
<view style="height:{{navigationBarHeight}} "></view>
<view class='content-box'>
<!-- <view class='top' wx:if='{{flag=="spellList"&&list.length>0}}'>
<view class="banner" wx:if="{{list.length>0}}" hover-class="none" hover-stop-propagation="false">
<c-banner wx:key="unique" list="{{list}}" />


+ 1
- 0
pages/spellGroup/spellGroup.wxss 查看文件

@@ -73,6 +73,7 @@ image{
height: 432rpx;
background: #fff;
border-radius: 30rpx;
margin-top: 20rpx;
margin-bottom: 20rpx;
}
.content >view:nth-of-type(2n){


+ 2
- 1
pages/spellTimeout/index.wxml 查看文件

@@ -1,6 +1,7 @@
<!--pages/spellDetail/index.wxml-->
<navbar back home text="拼团" background='#fff'></navbar>
<view class='container' style='padding-top:{{navigationBarHeight}}'>
<view style="height:{{navigationBarHeight}} "></view>
<view class='container' >
<view class='detail'>
<view class='detail-top'>
<view class='detail-top01'>


+ 1
- 0
pages/topicDetail/index.wxml 查看文件

@@ -1,5 +1,6 @@
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<navbar back home text="专题活动"></navbar>
<view style="height:{{navigationBarHeight}} "></view>
<!-- banner活动详情页面 -->
<view class='coupons' style='background:{{data.bgColor}};height:{{winHeight}};padding-top:{{navigationBarHeight}}'>
<view class="coupons-body">


+ 2
- 1
pages/user/myactivity/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar home back text="我的活动"></navbar>
<view class="market" style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class="market">
<i-tabs class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll" style="top:{{navigationBarHeight}}">
<i-tab class='i-tab' wx:for="{{tabs}}" wx:key="unique" key="{{item.key}}" title="{{item.name}}"></i-tab>
</i-tabs>


+ 2
- 1
pages2/live/livelist/index.wxml 查看文件

@@ -1,5 +1,6 @@
<navbar home back text="直播列表" background="#fff"></navbar>
<view class="market" style="padding-top:{{navigationBarHeight}}">
<view style="height:{{navigationBarHeight}} "></view>
<view class="market" >
<view style='padding-top:20rpx;'>
<view wx:for='{{roomInfos}}' wx:if="{{roomInfos.length!=0}}" class='section' data-data="{{item}}" wx:key='index'>
<navigator url="plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id={{item.roomid}}&custom_params={{customParams}}">


+ 1
- 1
project.config.json 查看文件

@@ -4,7 +4,7 @@
"ignore": []
},
"setting": {
"urlCheck": false,
"urlCheck": true,
"es6": true,
"enhance": false,
"postcss": true,


+ 4
- 0
utils/imgurl.js 查看文件

@@ -72,6 +72,10 @@ module.exports = {
'url': baseUrl + 'clock.png',
'name': ''
},
'yushou': {
'url': baseUrl + 'yushou.png',
'name': ''
},
'closed': {
'url': baseUrl + 'closed.png',
'name': ''


正在加载...
取消
保存