소스 검색

[异常问题的处理,折扣修改]

tags/广东版3.2.1
meo 6 년 전
부모
커밋
1aff4a4525
15개의 변경된 파일159개의 추가작업 그리고 161개의 파일을 삭제
  1. +9
    -16
      pages/coupon/detail/index.js
  2. +99
    -97
      pages/coupon/detail/index.wxml
  3. +0
    -1
      pages/coupon/detail/index.wxss
  4. +0
    -5
      pages/couponorder/index/index.js
  5. +15
    -1
      pages/edit/edit.js
  6. +1
    -1
      pages/edit/edit.wxml
  7. +4
    -12
      pages/index/index.js
  8. +1
    -1
      pages/index/index.wxss
  9. +17
    -3
      pages/order/detail/index.js
  10. +1
    -1
      pages/order/detail/index.wxml
  11. +1
    -1
      pages/order/detail/index.wxss
  12. +5
    -13
      pages/order/index/index.js
  13. +1
    -1
      pages/specialcourtesy/specialcourtesy.wxml
  14. +5
    -6
      pages/user/index.js
  15. +0
    -2
      utils/HttpBasics.js

+ 9
- 16
pages/coupon/detail/index.js 파일 보기

@@ -8,6 +8,7 @@ Page({
data: {
title: null
},
showPage:false,
questions1: null,
questions2: null,
carList: [],
@@ -221,7 +222,13 @@ Page({
couponChannelId: options.couponChannelId
}
};
Http.get(parmer).then(res => {
Http.get(parmer)
.then(res => {
if(res.code==200){
that.setData({
showPage:true
})
}
if (res.data.endTime) {
that.countdown(res.data.endTime);
//当前时间与优惠券下架时间做计算
@@ -236,11 +243,11 @@ Page({
});
}
}

wx.hideLoading();
that.setData({
data: res.data
});

if (res.data.validType == 1) {
that.setData({
validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"),
@@ -309,7 +316,6 @@ Page({
// wx.showLoading({
// title: "加载中..."
// });
if (that.data.data.type == 6) {} else {
Http.post({
url: config.api.checkPhoneStatus,
data: {}
@@ -461,13 +467,6 @@ Page({
key: 'couponNum',
data: "couponNum",
})
// if (that.data.data.type == 5) {
// setTimeout(() => {
// wx.switchTab({
// url: '/pages/passCar/passCar'
// });
// }, 1600);
// }
}
},
fail: res => {
@@ -499,11 +498,6 @@ Page({
key: 'couponNum',
data: "couponNum"
})
// wx.navigateTo({
// url: `/pages/order/detail/index?orderId=${
// that.data.orderId
// }`
// });
}
}
})
@@ -515,7 +509,6 @@ Page({
mask: false
});
})
}
},
onShow(){
this.setData({


+ 99
- 97
pages/coupon/detail/index.wxml 파일 보기

@@ -1,124 +1,126 @@
<!-- 券的详情页面 -->
<view class='coupons'>
<view class="coupons-body">
<view class='banner'>
<image src='{{data.coverImg}}'></image>
</view>
<view class='coupons_info' style='position:relative;z-index:9'>
<view class='fenxiang'>
<image class="fenxiang" src='./../../../assets/img/fenxiang.png' mode="widthFix"></image>
<button class='share user-motto' data-id='{{data.id}}' data-couponId='{{data.couponId}}' data-title='{{data.title}}' id="shareBtn" open-type="share" hover-class="other-button-hover"></button>
<view wx:if="{{showPage}}">
<!-- 券的详情页面 -->
<view class='coupons'>
<view class="coupons-body">
<view class='banner'>
<image src='{{data.coverImg}}'></image>
</view>
<view>
<view class='distance' wx:if="{{data.targetAd==2&&data.endTime!=undefined&&data.type!=5}}">
<view style='text-align:center;display:inline-block;'>
<image class='clock' src='./../../../assets/img/clock.png' mode='widthFix'></image>
<text class="qiang">距结束还剩 :</text>
<view class='coupons_info' style='position:relative;z-index:9'>
<view class='fenxiang'>
<image class="fenxiang" src='./../../../assets/img/fenxiang.png' mode="widthFix"></image>
<button class='share user-motto' data-id='{{data.id}}' data-couponId='{{data.couponId}}' data-title='{{data.title}}' id="shareBtn" open-type="share" hover-class="other-button-hover"></button>
</view>
<view>
<view class='distance' wx:if="{{data.targetAd==2&&data.endTime!=undefined&&data.type!=5}}">
<view style='text-align:center;display:inline-block;'>
<image class='clock' src='./../../../assets/img/clock.png' mode='widthFix'></image>
<text class="qiang">距结束还剩 :</text>
</view>
<view wx:if="{{clock=='已经截止'||data.remainInventory==0||data.status==1}}" class='times'>
<text>{{day}}</text>天
<text>{{hour}}</text>:
<text>{{min}}</text>:
<text>{{sec}}</text>
</view>
<view wx:if="{{clock!='已经截止'&&data.remainInventory!=0}}" class='times'>
<text>{{day}}</text>天
<text>{{hour}}</text>:
<text>{{min}}</text>:
<text>{{sec}}</text>
</view>
</view>
<view wx:if="{{clock=='已经截止'||data.remainInventory==0||data.status==1}}" class='times'>
<text>{{day}}</text>天
<text>{{hour}}</text>:
<text>{{min}}</text>:
<text>{{sec}}</text>
<text class='title'>{{data.title}}</text>
<text class="subTitle">{{data.subTitle}}</text>
<view class='salePriceStr clearfix'>
<view class="fl">售价:
<text class="pri01">{{data.salePriceStr}}</text>
<text class="yuan">元</text>
<text class='throgh' wx:if="{{data.unit==0}}">{{data.priceStr}}元</text>
<text wx:if="{{data.unit==1}}">{{data.priceStr}}小时</text>
</view>
<text class="restNum fr">剩余<text>{{data.remainInventory}}件</text></text>
</view>
<view wx:if="{{clock!='已经截止'&&data.remainInventory!=0}}" class='times'>
<text>{{day}}</text>天
<text>{{hour}}</text>:
<text>{{min}}</text>:
<text>{{sec}}</text>
<view class='rest' wx:if="{{data.validType==2}}">有效期:自领取之日起
<text class='time'>{{validDays}}</text>天内有效</view>
<view class='rest' wx:if="{{data.validType==1}}">有效期:
<text class='time'>{{validStartDate}}至{{validEndDate}}</text>
</view>
</view>
<text class='title'>{{data.title}}</text>
<text class="subTitle">{{data.subTitle}}</text>
<view class='salePriceStr clearfix'>
<view class="fl">售价:
<text class="pri01">{{data.salePriceStr}}</text>
<text class="yuan">元</text>
<text class='throgh' wx:if="{{data.unit==0}}">{{data.priceStr}}元</text>
<text wx:if="{{data.unit==1}}">{{data.priceStr}}小时</text>
<view class='rest' wx:if="{{data.type==5}}">
<text class='time'>当次有效</text>
</view>
<view class='rest' wx:if="{{data.type==1}}">
<text class='txt01'>使用条件:</text>
<text class='time'>满{{data.usePriceStr}}元可用</text>
</view>
<view class='rest'>
<text class='txt01'>限购条件:</text>
<text class='time'>每人{{data.useLimitQuantity}}张</text>
</view>
<text class="restNum fr">剩余<text>{{data.remainInventory}}件</text></text>
</view>
<view class='rest' wx:if="{{data.validType==2}}">有效期:自领取之日起
<text class='time'>{{validDays}}</text>天内有效</view>
<view class='rest' wx:if="{{data.validType==1}}">有效期:
<text class='time'>{{validStartDate}}至{{validEndDate}}</text>
</view>
<view class='rest' wx:if="{{data.type==5}}">
<text class='time'>当次有效</text>
</view>
<view class='rest' wx:if="{{data.type==1}}">
<text class='txt01'>使用条件:</text>
<text class='time'>满{{data.usePriceStr}}元可用</text>
</view>
<view class='rest'>
<text class='txt01'>限购条件:</text>
<text class='time'>每人{{data.useLimitQuantity}}张</text>
</view>
<view class='posi'>
<view class='posi_logo' wx:for="{{data.merchantVoList}}" wx:key="index">
<view>
<image src='{{item.merchantImgUrl}}'></image>
</view>
<view>
<text>{{item.merchantName}}</text>
<text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text>
</view>
<image bindtap='phone' data-merchantLinkPhone='{{item.merchantLinkPhone}}' class="tel" src="./../../../assets/img/tel.jpg" mode="widthFix" />
</view>
</view>
</view>
<view class='posi'>
<view class='posi_logo' wx:for="{{data.merchantVoList}}" wx:key="index">
<view class='notes'>
<view>
<image src='{{item.merchantImgUrl}}'></image>
<text>购买须知</text>
</view>
<view>
<text>{{item.merchantName}}</text>
<text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text>
<text><text class='spot'></text>{{data.remark}}</text>
</view>
<image bindtap='phone' data-merchantLinkPhone='{{item.merchantLinkPhone}}' class="tel" src="./../../../assets/img/tel.jpg" mode="widthFix" />
</view>
</view>
<view class='notes'>
<view>
<text>购买须知</text>
</view>
<view>
<text><text class='spot'></text>{{data.remark}}</text>
</view>
</view>
</view>

<view class="buy-view app-border-top" style="position:fixed;z-index:{{zIndex}};">
<button bindtap='gotopay' disabled='{{showbutton}}' hover-class='active' class='buy' wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0&&endtime!='活动已结束'}}">
<text class='txt'>{{data.salePriceStr}}元</text>马上购买</button>
<button bindtap='gotopay' disabled='{{showbutton}}' class='buy' wx:if="{{data.salePriceStr==0&&data.remainInventory!=0&&endtime!='活动已结束'}}">免费领取</button>
<button class='buy' disabled='true' wx:if="{{data.remainInventory==0&&endtime!='活动已结束'}}">已售罄</button>
<button class='buy' disabled='true' wx:if="{{endtime=='活动已结束'}}">活动已结束</button>
<button class='buy' disabled='true' wx:if="{{total_micro_second<=0}}">活动已结束</button>
<view class="buy-view app-border-top" style="position:fixed;z-index:{{zIndex}};">
<button bindtap='gotopay' disabled='{{showbutton}}' hover-class='active' class='buy' wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0&&endtime!='活动已结束'}}">
<text class='txt'>{{data.salePriceStr}}元</text>马上购买</button>
<button bindtap='gotopay' disabled='{{showbutton}}' class='buy' wx:if="{{data.salePriceStr==0&&data.remainInventory!=0&&endtime!='活动已结束'}}">免费领取</button>
<button class='buy' disabled='true' wx:if="{{data.remainInventory==0&&endtime!='活动已结束'}}">已售罄</button>
<button class='buy' disabled='true' wx:if="{{endtime=='活动已结束'}}">活动已结束</button>
<button class='buy' disabled='true' wx:if="{{total_micro_second<=0}}">活动已结束</button>
</view>
</view>
</view>


<!-- 问卷调查 -->
<view class="b1" style="opacity:{{opacity}};display: {{display}};" animation="{{queueData}}">
<view id='con' class='con'>
<image class='close' mode='widthFix' src="./../../../assets/img/closed.png" bindtap="closeQuestion"></image>
<image class='ques_gou' mode='widthFix' src="./../../../assets/img/ques_gou.png"></image>
<image class='image' src="./../../../assets/img/headbg.png" mode='widthFix'></image>
<image class='img image' src="./../../../assets/img/ques_bg.png" mode='widthFix'></image>
<view class='question'>
<text class='titles'>{{questionnaire.title}}</text>
<!-- 单选 -->
<radio-group class="radio-group" wx:if="{{questionnaire.flag=='single'}}" data-flags="single" bindchange="formSubmit" data-questionId="{{questionId}}">
<!-- <label wx:for="{{questionnaire.answers}}" wx:key="{{index}}" data-answer="{{item.name}}" data-answerId="{{item.id}}">
<!-- 问卷调查 -->
<view class="b1" style="opacity:{{opacity}};display: {{display}};" animation="{{queueData}}">
<view id='con' class='con'>
<image class='close' mode='widthFix' src="./../../../assets/img/closed.png" bindtap="closeQuestion"></image>
<image class='ques_gou' mode='widthFix' src="./../../../assets/img/ques_gou.png"></image>
<image class='image' src="./../../../assets/img/headbg.png" mode='widthFix'></image>
<image class='img image' src="./../../../assets/img/ques_bg.png" mode='widthFix'></image>
<view class='question'>
<text class='titles'>{{questionnaire.title}}</text>
<!-- 单选 -->
<radio-group class="radio-group" wx:if="{{questionnaire.flag=='single'}}" data-flags="single" bindchange="formSubmit" data-questionId="{{questionId}}">
<!-- <label wx:for="{{questionnaire.answers}}" wx:key="{{index}}" data-answer="{{item.name}}" data-answerId="{{item.id}}">
<radio class="radio ques" value="{{item.id}}" />{{item.name}}
</label> -->

<label class="radios" wx:for="{{questionnaire.answers}}" wx:key="{{index}}">
<radio value="{{item.id}}" checked="{{item.checked}}" />{{item.name}}
</label>
<label class="radios" wx:for="{{questionnaire.answers}}" wx:key="{{index}}">
<radio value="{{item.id}}" checked="{{item.checked}}" />{{item.name}}
</label>



</radio-group>
<!-- 多选 -->
<checkbox-group bindchange="checkboxChange" wx:if="{{questionnaire.flag=='multi'}}" bindchange="checkboxChange">
<label class="radio ques" wx:for="{{questionnaire.answers}}" wx:key="index">
<checkbox value="{{item.id}}" />{{item.name}}
</label>
</checkbox-group>
<view class='ques btns' wx:if="{{questionnaire.flag=='multi'}}" data-flags='multi' bindtap='formSubmit' data-questionId="{{questionId}}">确定</view>
</radio-group>
<!-- 多选 -->
<checkbox-group bindchange="checkboxChange" wx:if="{{questionnaire.flag=='multi'}}" bindchange="checkboxChange">
<label class="radio ques" wx:for="{{questionnaire.answers}}" wx:key="index">
<checkbox value="{{item.id}}" />{{item.name}}
</label>
</checkbox-group>
<view class='ques btns' wx:if="{{questionnaire.flag=='multi'}}" data-flags='multi' bindtap='formSubmit' data-questionId="{{questionId}}">确定</view>
</view>
</view>
</view>
</view>

+ 0
- 1
pages/coupon/detail/index.wxss 파일 보기

@@ -190,7 +190,6 @@ page {
background: #fff;
height: 100rpx;
margin-bottom: 20rpx;
border-bottom: 1px solid #f9f9f9;
}

.posi_logo view:nth-child(1) {


+ 0
- 5
pages/couponorder/index/index.js 파일 보기

@@ -42,11 +42,6 @@ Page({
wx.hideTabBarRedDot({
index:2
})
// wx.getScreenBrightness({
// success:function(res){
// app.globalData.sight = res.value;
// }
// });
},
//点击跳转到券详情页面
gotouse: function (e) {


+ 15
- 1
pages/edit/edit.js 파일 보기

@@ -19,6 +19,7 @@ Page({
array1: ['附近住户', '距离2km', '距离3km', '更远'],
index: 0,
index1: 0,
showPage:false
},
/**
* 获得生日
@@ -146,7 +147,13 @@ Page({
Http.get({
url: config.api.getScore,
data: {}
}).then(res => {
})
.then(res => {
if(res.code == 200){
that.setData({
showPage:true
})
}
console.log(res.data.address);
var reg = RegExp(/address/);
if (res.data.address.match(reg)) {
@@ -190,5 +197,12 @@ Page({
})
}
})
.catch(error=>{
wx.showModal({
title: '提示',
content: error.errMsg,
showCancel:false
})
})
}
})

+ 1
- 1
pages/edit/edit.wxml 파일 보기

@@ -1,4 +1,4 @@
<form bindsubmit="formSubmit">
<form bindsubmit="formSubmit" wx:if="{{showPage}}">
<view class='section'>
<text>姓名</text>
<input wx:if="{{username}}" name="username" type="text" placeholder='{{username}}' />


+ 4
- 12
pages/index/index.js 파일 보기

@@ -110,18 +110,10 @@ Page({
})
})
.catch(err => {
console.log(err);
if (err.message == '请求超时,请检查您的网络设置!') {
that.setData({
loading: false,
loadingtext: "请求超时,请检查您的网络设置!"
})
}
wx.showToast({
title: err.message,
icon: 'none',
duration: 2000,
mask: false
wx.showModal({
title: "提示",
content:err.errMsg,
showCancel:false
});
});
},


+ 1
- 1
pages/index/index.wxss 파일 보기

@@ -25,7 +25,7 @@ page {
.game-entry{
width: 690rpx;
height: 140rpx;
margin: 10rpx auto 0;
margin: 30rpx auto 0;
}
.gameimg{
display: block;


+ 17
- 3
pages/order/detail/index.js 파일 보기

@@ -15,7 +15,8 @@ Page({
setInter: "",
mystatus: '',
staticGamedata: {},
showIf: false
showIf: false,
showPage:false
},

phone: function (e) {
@@ -101,7 +102,13 @@ Page({
data: {
orderId: options.orderId
}
}).then(res => {
})
.then(res => {
if(res.code == 200){
that.setData({
showPage:true
})
}
that.setData({
order: res.data
});
@@ -111,7 +118,14 @@ Page({
that.setData({
createDate: createDate
});
});
})
.catch(error=>{
wx.showModal({
title: '提示',
content: error.errMsg,
showCancel:false
})
})
},

/**


+ 1
- 1
pages/order/detail/index.wxml 파일 보기

@@ -1,4 +1,4 @@
<view class='order'>
<view class='order' wx:if="{{showPage}}">
<view wx:if="{{order.orderStatus==1}}" class='tips'>
<image class='success' src='../../../assets/img/succ.png' mode='widthFix'></image>
<text wx:if="{{order.salePrice/100==0}}">领取成功,请尽快到门店使用</text>


+ 1
- 1
pages/order/detail/index.wxss 파일 보기

@@ -412,6 +412,6 @@ radio {
top: 0;
bottom: 0;
margin: auto;
right: 30rpx;
right: 14rpx;
z-index: 10;
}

+ 5
- 13
pages/order/index/index.js 파일 보기

@@ -94,13 +94,6 @@ Page({
that.setData({
list: tmpArr
})
// for (let i = 0; i < that.data.list.length; i++) {
// that.setData({
// createDate: util.formatTime(that.data.list[i].createDate, "201y-M-d h:m:s")
// })
// }


for (let i = 0; i < that.data.list.length; i++) {
var createDate1 = util.formatTime(that.data.list[i].createDate, "yyyy-MM-dd hh:mm:ss");
/**
@@ -114,12 +107,11 @@ Page({
}
})
.catch(err => {
wx.showToast({
title: err.errMsg,
icon: 'none',
duration: 2000,
mask: false
});
wx.showModal({
title: '提示',
content: err.errMsg,
showCancel:false
})
})
}
else {


+ 1
- 1
pages/specialcourtesy/specialcourtesy.wxml 파일 보기

@@ -11,7 +11,7 @@
<text><i>></i></text>
</view>
<view class='discount'>
<text style='display:inline-block;'>{{item.vipDiscountRate1/100}}</text>折</view>
<text style='display:inline-block;'>{{item.vipDiscountRate1/1000}}</text>折</view>
<text class='tit'>{{item.merchantName}}</text>
<view class='clearfix footer'>
<text class='fl'>{{item.buildingName}}{{item.floorName}}</text>


+ 5
- 6
pages/user/index.js 파일 보기

@@ -128,12 +128,11 @@ Page({
}
})
.catch(err => {
wx.showToast({
title: err.errMsg,
icon: 'none',
duration: 2000,
mask: false
});
wx.showModal({
title: '提示',
content: err.errMsg,
showCancel:false
})
})
//暂时注释
// that.getrun();


+ 0
- 2
utils/HttpBasics.js 파일 보기

@@ -48,8 +48,6 @@ class HttpBasics {
this.responseMap(res, resolve, reject);
},
fail: err => {
// wx.hideLoading();
console.log(err)
if (err.errMsg == 'request:fail timeout') {
err.errMsg = '请求超时,请检查您的网络设置!'
} else if (err.errMsg == 'request:fail '){


불러오는 중...
취소
저장