瀏覽代碼

Merge branch 'dev' of https://git.youlane.cn/weapp/C into dev

tags/河北版C.8.1.01
hurui 6 年之前
父節點
當前提交
987c334e66
共有 8 個文件被更改,包括 17 次插入24 次删除
  1. +0
    -2
      components/hot/index.js
  2. +0
    -8
      components/navbar/navbar.js
  3. +1
    -1
      pages/coupon/detail/index.wxss
  4. +1
    -1
      pages/managelicenseplate/managelicenseplate.wxml
  5. +1
    -1
      pages/passCar/couponList/couponList.wxml
  6. +13
    -7
      pages/passCar/passCar.js
  7. +1
    -1
      pages/passCar/passCar.wxml
  8. +0
    -3
      pages/spellGroup/paySpellGroup/index.wxml

+ 0
- 2
components/hot/index.js 查看文件

@@ -52,8 +52,6 @@ Component({
url: config.api.change, url: config.api.change,
data:param, data:param,
}).then(res => { }).then(res => {
console.log(res)
console.log(123)
if(res.data != undefined && res.data){ if(res.data != undefined && res.data){
if(val=='1'){ if(val=='1'){
that.setData({ that.setData({


+ 0
- 8
components/navbar/navbar.js 查看文件

@@ -29,14 +29,6 @@ Component({
statusBarHeight: app.statusBarHeight + 'px', statusBarHeight: app.statusBarHeight + 'px',
navigationBarHeight: (app.statusBarHeight + 44) + 'px' navigationBarHeight: (app.statusBarHeight + 44) + 'px'
}, },
ready(){
let pages = getCurrentPages();
if (pages&&pages.length>0){
this.setData({
back:false
})
}
},
methods: { methods: {
backHome: function () { backHome: function () {
wx.switchTab({ wx.switchTab({


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

@@ -566,7 +566,7 @@ button::after {
bottom: 0; bottom: 0;
padding-bottom: 22rpx; padding-bottom: 22rpx;
padding-top: 22rpx; padding-top: 22rpx;
z-index: 12;
z-index: 10;
/* background: #fff; */ /* background: #fff; */
} }
.btnTxt{ .btnTxt{


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

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


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

@@ -1,4 +1,4 @@
<navbar back home background="#fff" text="停车券"></navbar>
<navbar back home text="停车券"></navbar>
<view class="market" style="padding-top:{{navigationBarHeight}}"> <view class="market" style="padding-top:{{navigationBarHeight}}">
<!-- 券包 我的优惠券 --> <!-- 券包 我的优惠券 -->
<i-tabs style="top:{{navigationBarHeight}}" class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll"> <i-tabs style="top:{{navigationBarHeight}}" class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll">


+ 13
- 7
pages/passCar/passCar.js 查看文件

@@ -76,10 +76,12 @@ Page({
quanid: quanid, quanid: quanid,
showTicketModal: false, showTicketModal: false,
}); });
wx.setStorage({
that.bindCoupon(that.data.quanid);
/* wx.setStorage({
key: 'chosed', key: 'chosed',
data: 'chosed', data: 'chosed',
})
}) */
}, },
/* /*
*/ */
@@ -242,14 +244,14 @@ Page({
* 只有用户选择了优惠券 * 只有用户选择了优惠券
* 才会进行券和车牌的绑定 * 才会进行券和车牌的绑定
*/ */
if (wx.getStorageSync("chosed") && that.data.quanid) {
/* if (wx.getStorageSync("chosed") && that.data.quanid) {
that.getStopFee(that.data.listCardNum); that.getStopFee(that.data.listCardNum);
that.bindCoupon(that.data.quanid); that.bindCoupon(that.data.quanid);
wx.setStorage({ wx.setStorage({
key: 'chosed', key: 'chosed',
data: '', data: '',
}) })
};
}; */
if (app.globalData.token) { if (app.globalData.token) {
// that.initUsrCarList(); // that.initUsrCarList();
that.initUsrCarList("flags"); that.initUsrCarList("flags");
@@ -446,6 +448,7 @@ Page({
data: postCouponData data: postCouponData
}) })
.then(res => { .then(res => {
that.getStopFee(that.data.listCardNum);
that.initUsrCarList(); that.initUsrCarList();
}) })
.catch(err => { .catch(err => {
@@ -488,11 +491,14 @@ Page({
this.setData({ this.setData({
showTicketModal: true, showTicketModal: true,
allow_load: true, allow_load: true,
ticketList: [],
curPageNum: 1,
}) })
if (!this.data.ticketList.length){
this.getTicketList(0, 1);
/* if (!this.data.ticketList.length){
this.getTicketList(0, 1); this.getTicketList(0, 1);
}
} */
}, },


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

@@ -127,7 +127,7 @@
<view class='section' wx:for='{{ticketList}}' wx:key='{{index}}' bindtap="choicecoupon" data-title="{{item.title}}" data-id="{{item.id}}"> <view class='section' wx:for='{{ticketList}}' wx:key='{{index}}' bindtap="choicecoupon" data-title="{{item.title}}" data-id="{{item.id}}">
<view class='mms'> <view class='mms'>
<!-- <text>{{index}}</text> --> <!-- <text>{{index}}</text> -->
<image class='gou' wx:if="{{item.id==quanid}}" mode='widthFix' src='{{gouHr}}'></image>
<!-- <image class='gou' wx:if="{{item.id==quanid}}" mode='widthFix' src='{{gouHr}}'></image> -->
<view class='detail_msg'> <view class='detail_msg'>
<view class='info'> <view class='info'>
<view class='title'> <view class='title'>


+ 0
- 3
pages/spellGroup/paySpellGroup/index.wxml 查看文件

@@ -3,9 +3,6 @@
<view class='container' style="margin-top:{{navigationBarHeight}}"> <view class='container' style="margin-top:{{navigationBarHeight}}">
<!-- 拼团产品详情 --> <!-- 拼团产品详情 -->
<view class='detail'> <view class='detail'>
<view class='return-index' bindtap='gotoIndex'>
<image src='{{home}}' mode="widthFix"></image>
</view>
<view class='detail-top'> <view class='detail-top'>
<view class='detail-top01'> <view class='detail-top01'>
<image src='{{data.coverImg}}' mode="aspectFill"></image> <image src='{{data.coverImg}}' mode="aspectFill"></image>


Loading…
取消
儲存