Explorar el Código

【修改上线配送bug】

release
Your goule hace 3 años
padre
commit
72a9dc2f06
Se han modificado 15 ficheros con 2548 adiciones y 45 borrados
  1. +2
    -2
      app.json
  2. +1175
    -0
      pages/coupon/childDetail/childDetail.js
  3. +11
    -0
      pages/coupon/childDetail/childDetail.json
  4. +255
    -0
      pages/coupon/childDetail/childDetail.wxml
  5. +980
    -0
      pages/coupon/childDetail/childDetail.wxss
  6. +1
    -1
      pages/coupon/detail/index.js
  7. +4
    -4
      pages/coupon/detail/index.wxml
  8. +2
    -2
      pages/edit/edit.js
  9. +4
    -4
      pages/edit/edit.wxml
  10. +17
    -5
      pages/fillIndent/fillIndent.js
  11. +22
    -13
      pages/fillIndent/fillIndent.wxml
  12. +40
    -7
      pages/fillIndent/fillIndent.wxss
  13. +9
    -4
      pages/siteUser/siteUser.wxml
  14. +23
    -3
      pages/siteUser/siteUser.wxss
  15. +3
    -0
      pages/topicDetail/index.js

+ 2
- 2
app.json Ver fichero

@@ -1,6 +1,5 @@
{
"pages": [
"pages/index/index",
"pages/main/index",
"index/searchbar",
@@ -77,7 +76,8 @@
"pages/site/site",
"pages/siteUser/siteUser",
"pages/siteAdd/siteAdd",
"pages/fillIndent/fillIndent"
"pages/fillIndent/fillIndent",
"pages/coupon/childDetail/childDetail"
],
"subpackages": [
{


+ 1175
- 0
pages/coupon/childDetail/childDetail.js
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero


+ 11
- 0
pages/coupon/childDetail/childDetail.json Ver fichero

@@ -0,0 +1,11 @@
{
"usingComponents": {
"c-shareposter": "../../../../components/shareposter/index",
"navbar": "../../../../components/navbar/navbar",
"store": "../../../../components/store/index",
"c-coupons": "../../../components/coupons/index"
},
"navigationBarTitleText": "",
"backgroundColor": "#f4f4f4",
"enablePullDownRefresh": true
}

+ 255
- 0
pages/coupon/childDetail/childDetail.wxml Ver fichero

@@ -0,0 +1,255 @@
<navbar back home text="{{barTitle}}" background='#fff'></navbar>
<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}}">
<block wx:for="{{coverPicture}}" wx:key="unique">
<swiper-item>
<image data-data="{{item}}" src="{{item}}" class="index-slide-image" />
</swiper-item>
</block>
</swiper>
<!-- <view class="dots">
<block wx:for="{{coverPicture}}" wx:key="unique">
<view class="dot{{index == swiperCurrent ? ' active' : ''}}"></view>
</block>
</view> -->
</view>

<view class='coupons_info' style='position:relative;z-index:9'>
<view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare' wx:if="{{data.sendType!=3}}">
<image src='{{fenxiang}}' mode="widthFix"></image>
<text class='gift'>分享</text>
</view>
<view>
<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' 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>
<view wx:if="{{clock=='00'||data.status==1}}" class='times'>
已经结束
</view>
<view wx:if="{{clock!='00'}}" class='times'>
<view style="display:inline-block;" wx:if="{{day!=0}}">
<text>{{day}}</text>天:
</view>
<text>{{hour}}</text>:
<text>{{min}}</text>:
<text>{{sec}}</text>
</view>
</view>
<text class='title'>{{data.title}}<text class="elecard" wx:if="{{data.type==100}}">电子卡</text></text>
<text class="subTitle">{{data.subTitle}}</text>
<!-- 预购 -->
<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>
<!-- <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>
<text class='rest' wx:if="{{data.autoRefund == 1}}">
<text class='time refound'><text class="use">过期不退款</text></text>
</text>
</view>
<view class="fl" wx:if="{{data.type==8}}">
<!-- <text class="pri01 pri01Hr">¥</text> -->
<text class="pri01">{{data.salePriceStr}}</text>
<text class='presslimit' wx:if="{{data.type==8}}"><text>{{data.pressLimitNum+'人可砍至底价'}}</text></text>
<text class='throgh'>{{data.priceStr}}元</text>
<text class='rest' wx:if="{{data.autoRefund == 1}}">
<text class='time refound'><text class="use">过期不退款</text></text>
</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&&data.type!=10}}">
<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' wx:if="{{data.sendType!=3}}">
<!-- <text class='txt01'>限购条件:</text> -->
<view class='quan'></view>
<text class='time'>限购{{data.useLimitQuantity}}张</text>
<text class='timess' wx:if='{{limitCondition==1}}'>(仅限新用户活动)</text>
<text class='timess' wx:if='{{limitCondition==2&&(minLimit||minLimit==0)&&maxLimit}}'>({{minLimit}}-{{maxLimit}}成长值)</text>
<text class='timess' wx:if='{{limitCondition==2&&minLimit&&!maxLimit}}'>(大于{{minLimit}}成长值)</text>
<text class="restNum fr">剩余<text>{{data.remainInventory}}张</text></text>
</view>
</view>
</view>
<!-- 适用门店 -->
<store merchantVoList="{{merchantVoList}}" wx:if="{{data.type!=12}}"></store>
<!-- 券包子券样式 -->
<!-- <view class="childText">购买须知</view> -->
<view class="childBox" >
<view class="childItem" wx:for="{{data.giftCouponList}}" bindtap="gochild" data-id="{{item.id}}" wx:key = "{{index}}">
<image class="childImg" mode='widthFix' src="{{item.coverImg}}"></image>
<view class="childName">{{item.title}}</view>
<view class="childMoney">¥{{item.priceStr}}</view>
</view>
</view>

<view class='notes'>
<view>
<text>购买须知</text>
</view>
<view wx:if="{{curHtml==''}}">
<text><text class='spot'></text>{{data.remark}}</text>
</view>
<view wx:if="{{curHtml!=''}}">
<rich-text nodes="{{curHtml}}"></rich-text>
</view>
</view>
<view wx:if="{{couponList.length!=0}}" style="color: #333;letter-spacing: 0;font-size: 30rpx;height: 70rpx;line-height: 70rpx;margin-left: 35rpx;">其他活动</view>
<view class='couponsL clearfix'>
<c-coupons wx:if="{{couponList.length!=0}}" wx:for="{{couponList}}" from="fromMerchant" paramAtoB="{{loading}}" wx:key="unique" data="{{item}}" list="{{couponList}}" />
</view>
<view class='detailImg' wx:if="{{detailPicture.length>0}}">
<image wx:for="{{detailPicture}}" wx:key="{{index}}" wx:for-item="item" src='{{item}}' mode='widthFix'></image>
</view>
</view>

<form bindsubmit="gotopay" data-type='{{data.type}}' report-submit='true'>
<view class="buy-view app-border-top" style="position:fixed;z-index:{{zIndex}};">
<button class='goback' bindtap='goback'>
<image src='{{homeSelectedO}}' mode="widthFix"></image>
<text class='btnTxt'>首页</text>
</button>
<button form-type="submit" disabled='{{showbutton}}' hover-class='active' class='buy' wx:if="{{data.type!=11&&data.type!=8&&data.type!=50&&data.type!=51&&data.salePriceStr!=0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">
<text class='txt'>{{data.salePriceStr}}元</text>马上购买</button>
<button wx:if="{{data.type==11}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}"
data-shippingtype="2" class="home">配送到家
</button>
<button wx:if="{{data.type==11}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}"
data-shippingtype="1" class="arrive">到店购买
</button>
<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type!=8&&data.type!=50&&data.type!=51&&data.salePriceStr==0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">免费领取</button>
<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type==51&&data.remainInventory!=0||data.type==50&&data.remainInventory!=0}}">马上兑换</button>
<button class='buy buyHr' disabled='true' wx:if="{{data.sendType!=3&&(data.remainInventory==0&&endtime!='活动已结束'||data.remainInventory==0&&data.type==8)}}">已售罄</button>
<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 id='noBuy' disabled='true' wx:if="{{data.activityStatus==0}}">活动未开始</button>
</view>
</form>
</view>

<view wx:if="{{data.remainInventory!=0&&data.type==8}}" class="btns clearfix" hover-class="none" hover-stop-propagation="false">
<button class='goback' bindtap='goback'>
<image src='{{homeSelectedO}}' mode="widthFix"></image>
<text class='btnTxt'>首页</text>
</button>
<form bindsubmit="gotopay" report-submit='true' class="fl">
<button form-type="submit" style='background:transparent;color:#fff;' data-discount='discount1' disabled='{{showbutton}}'>
<text>¥{{data.priceStr}}</text>
<text>立即购买</text>
</button>
</form>
<form bindsubmit="inviteFriend" report-submit='true' class="fr">
<button form-type="submit" style='background:{{!showbutton1?"transparent":"#ccc"}};color:#fff;font-size:32rpx;line-height:94rpx;border-radius:60rpx;' disabled='{{showbutton1}}'>
发起砍价
</button>
</form>
</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: 13;" 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>
<image class='image' src="{{headbgUrl}}" mode='widthFix'></image>
<image class='img image' src="{{quesBgUrl}}" 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 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 btnss' wx:if="{{questionnaire.flag=='multi'}}" data-flags='multi' bindtap='formSubmit' data-questionId="{{questionId}}">确定</view>
</view>
</view>
</view>
<!-- 卡转赠领取弹出框 -->
<view class='shaddow' wx:if='{{showCardOffer}}'></view>
<view class='alert-box' wx:if='{{showCardOffer}}'>
<view class='user-img'>
<image src='{{cardData.avatarUrl}}'></image>
</view>
<view class='close' bindtap='closeAlert'>
<image src='{{close02}}'></image>
</view>
<view class='a-title' wx:if='{{!isSamePeople&&isReceived}}'>{{cardData.userName}}</view>
<view class='a-title' wx:if='{{!isSamePeople&&!isReceived}}'>{{cardData.userName+'送您一张消费卡'}}</view>
<view class='a-title' wx:if='{{isSamePeople&&!isReceived}}'>等待好友领取</view>
<view class='a-title' wx:if='{{isSamePeople&&isReceived}}'>{{cardData.userName}}</view>
<view class='a-img'>
<image src='{{cardData.coverImg}}'></image>
<view class='a-received' wx:if="{{isReceived}}">{{statusText}}</view>
</view>
<button type="primary" wx:if='{{!isSamePeople&&!isReceived}}' disabled='{{receivedDisabled}}' class='support-tansfer' bindtap='checkPhoneStatus'>领取</button>
<button type="primary" wx:if='{{isSamePeople||isReceived}}' class='support-tansfer' bindtap='closeAlert'>关闭</button>
</view>
<!-- 分享弹框 -->
<!-- <c-shareposter bind:myevent="" class="business" couponChannelId="{{data.id}}" wx:if="{{isshowposter}}"/> -->
<!-- 分享弹框 -->
<view class='modal' wx:if="{{isshowposter}}" bindtap='hidemodal'>
<view class='modal-content'>
<view>
<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>
<image src='./../../../assets/images/wechat.png' mode='aspectFit'></image>
<text>微信好友</text>
</view>
<view bindtap='showPoster'>
<image src='./../../../assets/images/picture.png' mode='aspectFit'></image>
<text>生成海报</text>
</view>
</view>
</view>
</view>

+ 980
- 0
pages/coupon/childDetail/childDetail.wxss Ver fichero

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

page {
background: #f4f5f9;
}

button::after {
border: none;
}

.coupons {
width: 100%;
position: relative;
overflow: hidden;
padding-bottom: 170rpx;
background: #f4f5f9;
}

.couponsL c-coupons {
width: 335rpx;
height: 354rpx;
margin-bottom: 22rpx;
}

.couponsL c-coupons:nth-of-type(2n+1) {
float: left;
}

.couponsL c-coupons:nth-of-type(2n) {
float: right;
}

.banner {
position: relative;
width: 750rpx;
height: 454rpx;
}

.banner swiper {
width: 750rpx;
height: 454rpx;
}

.banner image {
width: 100%;
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;
right: 0;
bottom: 50rpx;
display: flex;
justify-content: center;
}

.dot {
margin: 0 8rpx;
width: 14rpx;
height: 14rpx;
background: #fff;
border-radius: 8rpx;
transition: all 0.6s;
}

.home {
position: relative;
background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%);
height: 94rpx;
width: 230rpx;
/* margin: 0 auto 30rpx; */
margin-left: 40rpx;
float: left;
color: #fff;
font-size: 36rpx;
line-height: 94rpx;
border-radius: 21rpx;
}

.arrive {
position: relative;
background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%);
height: 94rpx;
width: 230rpx;
/* margin: 0 auto 30rpx; */
margin-left: 40rpx;
float: left;
color: #fff;
font-size: 36rpx;
line-height: 94rpx;
border-radius: 21rpx;
}

.dot.active {
width: 24rpx;
background: #f80;
}

.refound {
border: 1rpx solid red;
padding: 3rpx 0;
display: block;
width: 130rpx;
text-align: center;
margin-left: 14rpx;
}

.couponsL {
width: 92%;
margin: 20rpx auto;
}

.coupons_info {
width: 92%;
padding: 0 4%;
background: #fff;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
/* margin-top: -25rpx; */
}

.fenxiang {
position: absolute;
right: 28rpx;
top: 27rpx;
display: flex;
flex-direction: column;
}

.fenxiang image {
width: 48rpx;
height: 48rpx;
margin: 0 auto;
}

.gift {
color: #3c3c3c;
font-size: 20rpx;
margin: 0 auto;
}

.user-motto {
width: 270rpx;
border: 0;
background: none;
height: 260rpx;
color: #fff;
position: fixed;
}

.user-motto::after {
border: none;
}

.title {
display: block;
font-weight: bold;
font-size: 32rpx;
color: #3c3c3c;
letter-spacing: 1.09rpx;
line-height: 45rpx;
width: 542rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
padding-top: 30rpx;
}

.subTitle {
display: block;
width: 588rpx;
/* height: 37rpx; */
font-size: 26rpx;
color: #a6a6a6;
letter-spacing: 1.16rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
padding: 6rpx 0;
}

.rest {
font-size: 24rpx;
color: #919191;
letter-spacing: 0;
height: 50rpx;
line-height: 50rpx;
border-bottom: 1px solid #f9f9f9;
}

.restNum {
font-size: 24rpx;
color: #999;
letter-spacing: 1.16rpx;
text-align: right;
}

.time {
font-size: 24rpx;
color: #a6a6a6;
letter-spacing: 0;
line-height: 33rpx;
display: inline-block;
}

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

.price {
font-size: 24rpx;
color: #999;
letter-spacing: 0;
}

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

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

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

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

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

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

.price text {
font-size: 24rpx;
color: #333;
letter-spacing: 0;
}

.throgh {
text-decoration: line-through;
margin-left: 10rpx;
color: #999 !important;
margin-top: 8rpx;
height: 32rpx;
line-height: 45rpx;
}

.fl {
float: left;
}

.fr {
float: right;
}

.notes view:nth-child(1) {
height: 87rpx;
line-height: 87rpx;
background: #fff;
border-top: 1px solid #f9f9f9;
}

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

.active {
opacity: 0.6;
}

.notes view:nth-child(1) text {
color: #333;
letter-spacing: 0;
font-size: 30rpx;
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;
width: 92%;
margin: 0 auto;
}

.notes view:nth-child(2)>text {
font-size: 24rpx;
color: #919191;
letter-spacing: 0;
line-height: 42rpx;
}

.buy-view {
/* background: #fff; */
height: 92rpx;
bottom: 0;
left: 0;
right: 0;
padding-bottom: 22rpx;
padding-top: 22rpx;
}

.buy {
position: relative;
background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%);
height: 94rpx;
width: 560rpx;
margin: 0 auto 30rpx;
color: #fff;
font-size: 36rpx;
line-height: 94rpx;
border-radius: 61rpx;
}

#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;
line-height: 95rpx;
border-radius: 32rpx;
margin-left: 20rpx;
}

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

.tel {
position: absolute;
right: 0;
top: 0;
bottom: 0;
margin: auto;
width: 50rpx;
height: 50rpx;
}

.txt {
margin-right: 30rpx;
}

.distance {
border: none;
border-radius: 16rpx;
width: 600rpx;
padding: 16rpx 6rpx 0 0;
}

.distance .txt01 {
display: block;
font-size: 26rpx;
color: #ff4949;
}

.clock {
width: 116rpx !important;
vertical-align: middle;
margin-right: 10rpx;
margin-top: -4rpx;
}

.qiang {
position: inline-block;
width: 60rpx;
height: 40rpx;
line-height: 40rpx;
color: #ff4949;
text-align: center;
font-size: 28rpx;
margin-right: 10rpx;
}

.times {
display: inline-block;
color: #ff4949;
font-weight: bold;
font-size: 26rpx;
text-align: center;
}

.timess {
color: #fd782d;
}

.times text {
display: inline-block;
margin: 6rpx;
height: 56rpx;
padding: 0 6rpx;
text-align: center;
font-size: 28rpx;
line-height: 60rpx;
border-radius: 12rpx;
color: #fff;
font-weight: bold;
background: #ff4949;
}

.con {
position: absolute;
top: 35rpx;
right: 0;
bottom: 0;
left: 0;
margin: auto;
width: 587rpx;
}

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

.img {
margin-top: -50rpx;
}

.question {
display: block;
width: 587rpx;
background: #fff;
border-bottom-left-radius: 22rpx;
border-bottom-right-radius: 22rpx;
overflow: hidden;
}

.ques {
display: block;
width: 511rpx;
margin: 0 auto;
height: 95rpx;
line-height: 95rpx;
font-size: 30rpx;
color: #333;
border-bottom: 1rpx solid #eee;
}

.titles {
width: 511rpx;
display: block;
text-align: center;
height: 50rpx;
margin: 0 auto;
padding-top: 10rpx;
padding-bottom: 20rpx;
font-size: 32rpx;
font-weight: bold;
line-height: 41rpx;
border-bottom: 1rpx solid #eee;
}

.quessss >view:last-child {
border-bottom: 0;
}

.wmclose {
position: relative;
z-index: 10000;
display: block;
width: 70rpx;
}

.ques_gou {
position: absolute;
width: 20rpx;
top: 160rpx;
left: 23rpx;
}

.btnss {
color: #f8755b;
font-weight: bold;
font-size: 30rpx !important;
text-align: center !important;
}

.radios {
display: block;
font-size: 28rpx;
height: 95rpx;
line-height: 95rpx;
color: #333;
text-indent: 0.5em;
}

.elecard {
display: inline-block;
margin-left: 6rpx;
color: rgba(254, 70, 20, 1);
border: 1px solid rgba(254, 70, 20, 1);
border-radius: 8rpx;
font-style: normal;
font-size: 30rpx;
line-height: 40rpx;
padding: 0 6rpx;
}

.btns {
/* padding: 0 33rpx; */
position: fixed;
left: 0;
right: 0;
bottom: 0;
padding-bottom: 22rpx;
padding-top: 22rpx;
z-index: 12;
/* background: #fff; */
}

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

.btns .fr, .btns .fl {
width: 277rpx;
height: 95rpx;
border-radius: 48rpx;
text-align: center;
}

.btns .fl {
margin-left: 20rpx;
color: #fff;
background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%);
}

.btns .fl text {
display: block;
font-size: 30rpx;
line-height: 34rpx;
}

.btns .fl text:nth-of-type(1) {
margin-top: 12rpx;
}

.btns .fr {
font-size: 30rpx;
color: #fff;
margin-right: 20rpx;
line-height: 95rpx;
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); */
}

.support-tansfer {
width: 60%;
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%);
}

.shaddow {
z-index: 100;
position: fixed;
width: 100%;
height: 100%;
top: 0px;
background: rgba(0, 0, 0, 0.8);
overflow: hidden;
}

.alert-box {
position: fixed;
top: 50%;
margin-top: -270rpx;
left: 10%;
width: 80%;
height: auto;
padding-bottom: 20rpx;
background: #fff;
z-index: 200;
border-radius: 20rpx;
}

.user-img {
position: absolute;
top: -50rpx;
left: 250rpx;
/* margin-left: -50rpx; */
width: 100rpx;
height: 100rpx;
z-index: 300;
border-radius: 50rpx;
background: #fff;
overflow: hidden;
}

.user-img image {
width: 100rpx;
height: 100rpx;
}

.close {
position: absolute;
z-index: 300;
right: 0;
top: 0;
width: 100rpx;
height: 100rpx;
overflow: hidden;
}

.close image {
display: block;
width: 26rpx;
height: 26rpx;
margin: 20rpx 0 0 52rpx;
}

.a-title {
text-align: center;
margin-top: 76rpx;
font-size: 36rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
color: rgba(51, 51, 51, 1);
line-height: 44rpx;
}

.a-img {
position: relative;
width: 80%;
border-radius: 20rpx;
height: 294rpx;
overflow: hidden;
text-align: center;
margin: 30rpx auto 0;
}

.a-received {
position: absolute;
width: 100%;
height: 294rpx;
top: 0;
left: 0;
text-align: center;
line-height: 294rpx;
z-index: 320;
background: rgba(255, 255, 255, 1);
border: 0px solid rgba(151, 57, 117, 1);
opacity: 0.91;
font-size: 36rpx;
color: rgba(255, 51, 50, 1);
font-family: PingFang-SC-Medium;
}

.a-img image {
width: 100%;
height: 100%;
}

.bottom {
text-align: center;
height: 70rpx;
line-height: 70rpx;
color: #999;
font-size: 32rpx;
background: #fff;
padding-top: 20rpx;
}

.presslimit {
height: 34rpx;
line-height: 34rpx;
margin-top: 8rpx;
margin-left: 12rpx;
color: #fd782d;
font-size: 20rpx;
letter-spacing: 1.16rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}

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

checkbox-group, radio-group {
height: 400rpx;
overflow-y: scroll;
}

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

.detailImg image {
display: block;
width: 92%;
padding: 0 4% 0 4%;
margin-bottom: 20rpx;
}

.content {
margin: 0;
padding: 0;
width: 100%;
height: 100%;
background: #f3f3f3;
position: relative;
}

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

.bottomsave {
width: 100%;
height: 140rpx;
line-height: 140rpx;
margin: auto 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;
height: 80rpx;
border-radius: 50rpx;
background: #f08f04;
margin-top: 30rpx;
font-size: 32rpx;
}

.modal {
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.5);
overflow: hidden;
z-index: 10000;
color: #fff;
}

.modal-content {
width: 540rpx;
height: 233rpx;
line-height: 60rpx;
overflow: hidden;
position: fixed;
top: 50%;
left: 0;
z-index: 11;
background: #f9f9f9;
margin: -16rpx 105rpx;
border-radius: 36rpx;
display: flex;
}

.modal-content view {
display: inline-block;
flex: 1;
text-align: center;
}

.modal-content view>text {
color: #000;
display: block;
font-size: 30rpx;
}

.modal-content view>image {
margin-top: 40rpx;
width: 90rpx;
height: 90rpx;
}

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

.quan {
float: left;
margin: 18rpx 15rpx 0 0;
width: 12rpx;
height: 12rpx;
background: #e1e1e1;
border-radius: 50%;
}

.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::before {
content: '';
flex-grow: 1;
background: #ccc8c8;
}

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

.jifen {
font-size: 30rpx;
}

.childText {
color: #333;
letter-spacing: 0;
font-size: 30rpx;
height: 70rpx;
line-height: 70rpx;
background-color: #fff;
width: 92%;
padding: 0 4%;
}

.childBox {
width: 92%;
padding: 0 4%;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}

.childItem {
width: 48%;
background-color: #fff;
border-radius: 10rpx;
overflow: hidden;
margin: 20rpx 0;
}

.childImg {
width: 90%;
margin: 10px auto;
display: block;
}

.childName {
margin-top: 10rpx;
margin: 10px;
font-size: 24rpx;
color: #919191;
}

.childMoney {
color: #fd782d;
font-size: 24rpx;
margin: 10px;
text-decoration: line-through;
}

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

@@ -210,7 +210,7 @@ Page({
gochild(e){
let id = e.currentTarget.dataset.id
wx.navigateTo({
url: `/pages/coupon/detail/index?couponIds=${id}`,
url: `/pages/coupon/childDetail/childDetail?couponIds=${id}`,
})
},
//获取当前登录用户信息


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

@@ -20,7 +20,7 @@
</view>

<view class='coupons_info' style='position:relative;z-index:9'>
<view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'>
<view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare' wx:if="{{data.sendType!=3}}">
<image src='{{fenxiang}}' mode="widthFix"></image>
<text class='gift'>分享</text>
</view>
@@ -119,7 +119,7 @@
<!-- 适用门店 -->
<store merchantVoList="{{merchantVoList}}" wx:if="{{data.type!=12}}"></store>
<!-- 券包子券样式 -->
<view class="childText">购买须知</view>
<!-- <view class="childText">购买须知</view> -->
<view class="childBox" >
<view class="childItem" wx:for="{{data.giftCouponList}}" bindtap="gochild" data-id="{{item.id}}" wx:key = "{{index}}">
<image class="childImg" mode='widthFix' src="{{item.coverImg}}"></image>
@@ -156,10 +156,10 @@
</button>
<button form-type="submit" disabled='{{showbutton}}' hover-class='active' class='buy' wx:if="{{data.type!=11&&data.type!=8&&data.type!=50&&data.type!=51&&data.salePriceStr!=0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">
<text class='txt'>{{data.salePriceStr}}元</text>马上购买</button>
<button wx:if="{{data.type==11}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}"
<button wx:if="{{data.type==11&&data.remainInventory!=0}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}"
data-shippingtype="2" class="home">配送到家
</button>
<button wx:if="{{data.type==11}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}"
<button wx:if="{{data.type==11&&data.remainInventory!=0}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}"
data-shippingtype="1" class="arrive">到店购买
</button>
<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type!=8&&data.type!=50&&data.type!=51&&data.salePriceStr==0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">免费领取</button>


+ 2
- 2
pages/edit/edit.js Ver fichero

@@ -126,8 +126,8 @@ Page({
name: username,
birthdate: birthdate,
childrenList: tmeparr,
height: e.detail.value.height,
weight: e.detail.value.weight,
height: e.detail.value.height ? e.detail.value.height : that.data.height,
weight: e.detail.value.weight ? e.detail.value.weight : that.data.weight,
}
})
.then(res => {


+ 4
- 4
pages/edit/edit.wxml Ver fichero

@@ -16,13 +16,13 @@
</view>
<view class='section'>
<text>身高</text>
<input wx:if="{{height}}" name="height" type="text" placeholder='请填写身高单位cm' />
<input wx:if="{{!height}}" name="height" type="text" placeholder='请填写身高单位cm' />
<input wx:if="{{height}}" name="height" type="text" placeholder='请填写身高单位cm' placeholder='{{height}}'/>
<input wx:if="{{!height}}" name="height" type="text" placeholder='请填写体重单位kg' />
</view>
<view class='section'>
<text>体重</text>
<input wx:if="{{weight}}" name="weight" type="text" placeholder='请填写身高单位cm' />
<input wx:if="{{!weight}}" name="weight" type="text" placeholder='请填写体重单位gk' />
<input wx:if="{{weight}}" name="weight" type="text" placeholder='请填写身高单位cm' placeholder='{{weight}}'/>
<input wx:if="{{!weight}}" name="weight" type="text" placeholder='请填写体重单位kg' />
</view>
<view class="section section_gap">
<text>性别</text>


+ 17
- 5
pages/fillIndent/fillIndent.js Ver fichero

@@ -26,6 +26,7 @@ Page({
thenArr: {}, //选中的地址对象
contentType:0,
shippingtype:1,//1是自提 2配送
total:0,//合计
},
goAddStie() {
wx.navigateTo({
@@ -95,6 +96,14 @@ Page({
});
})
},
setTotal(){
//计算总和
let str = 0
str = (Number(this.data.salePriceStr) * (this.data.num)) + Number(this.data.freightPriceStr)
this.setData({
total: str.toFixed(2)
})
},
addNum() {
let num = this.data.num
if (this.data.num >= this.data.remainInventory) {
@@ -108,6 +117,7 @@ Page({
this.setData({
num: num
})
this.setTotal()
}

},
@@ -126,6 +136,7 @@ Page({
this.setData({
num: num
})
this.setTotal()
}
},
hieShade() {
@@ -297,6 +308,7 @@ Page({
contentType: res.data.contentType

})
this.setTotal()
}).catch(err => {
wx.showToast({
title: err.message ? err.message : err.data,
@@ -350,10 +362,10 @@ Page({

},

/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
// /**
// * 用户点击右上角分享
// */
// onShareAppMessage: function() {

}
// }
})

+ 22
- 13
pages/fillIndent/fillIndent.wxml Ver fichero

@@ -4,14 +4,15 @@
<view class="siteBox" wx:if="{{shippingtype==2}}">
<view wx:if="{{seti.length>0}}">
<view class="siteTitle">
<view class="siteTitleArr phoneBox">
<view class="name">{{consignee}}</view>
<view class="phone">{{mobile}}</view>
</view>
<view class="text">{{area}}</view>
<view class="mpren">默认</view>
<!-- <view class="mpren">默认</view> -->
</view>
<view class="siteTitle siteText">{{address}}</view>
<view class="siteTitle phoneBox">
<view class="name">{{consignee}}</view>
<view class="phone">{{mobile}}</view>
</view>
<view class="pudataSite" bindtap="showTShade">更换</view>
</view>
<view class="addSeit" wx:if="{{seti.length==0}}" bindtap="goAddStie">添加收货地址</view>
@@ -49,12 +50,16 @@
</view>
<view class="accountBox">
<view class="total">合计</view>
<view class="money">¥{{(salePriceStr*num)+(freightPriceStr*1)}}</view>
<view class="money" wx:if="{{shippingtype==1}}">¥{{(salePriceStr*num)}}</view>
<view class="money" wx:if="{{shippingtype==2}}">¥{{total}}</view>
</view>
</view>

<view class="payBox">
<view class="moneyStr">¥{{(salePriceStr*num)+(freightPriceStr*1)}}</view>
<view class="moneyStr" wx:if="{{shippingtype==1}}">¥{{(salePriceStr*num)}}</view>
<view class="moneyStr" wx:if="{{shippingtype==2}}">¥{{total}}</view>
<view class="pay" bindtap="pay">支付</view>
</view>

@@ -65,16 +70,20 @@
<view class="siteBox shade">

<view class="siteItem" wx:for="{{seti}}" bindtap="setSite" data-id="{{item.id}}">
<view>
<view class="siteTitle">
<view class="text">{{item.regionStr}}</view>
</view>
<view class="siteTitle siteText">{{item.address}}</view>
<view class="siteTitle phoneBox" style="border-bottom: 1rpx #999 solid;padding-bottom: 20rpx;">
<view style="overflow: hidden;position: relative">
<view class="siteTitle phoneBox" >
<view class="name">{{item.consignee}}</view>
<view class="phone">{{item.mobile}}</view>
</view>

<view class="siteTitle">
<view class="text">{{item.regionStr}}</view>
</view>
<view class="siteTitle siteText" style="border-bottom: 1rpx #999 solid;padding-bottom: 20rpx;">{{item.address}}</view>
<view class="ditText" wx:if="{{index==0}}">默认</view>
</view>

</view>

</view>

+ 40
- 7
pages/fillIndent/fillIndent.wxss Ver fichero

@@ -22,6 +22,12 @@
overflow: hidden;
margin: 20rpx ;
}

.siteTitleArr{
overflow: hidden;
margin: 20rpx 0;
}

.text{
float: left;
font-size: 26rpx;
@@ -34,19 +40,21 @@
margin-left: 20rpx;
}
.siteText{
font-size: 28rpx;
font-size: 26rpx;
color: #999;
}
.phoneBox{
overflow: hidden;
}
.name{
float: left;
font-size: 24rpx;
color: #999;
font-size: 28rpx;
color: #000;
}
.phone{
font-size: 24rpx;
color: #999;
font-size: 28rpx;
color: #000;
float: left;
margin-left: 30rpx
}
@@ -100,18 +108,33 @@
}
.add{
float: right;
width: 30rpx;
width: 40rpx;
height: 40rpx;
text-align: center;
border: 1rpx #999 solid;
border-radius: 50%;
color: #999;
}
.number{
float: right;
width: 30rpx;
height: 40rpx;
line-height: 40rpx;
text-align: center;
margin: 0 10rpx;
}
.dle{
float: right;
width: 30rpx;
width: 40rpx;
height: 40rpx;
text-align: center;
border: 1rpx #999 solid;
border-radius: 50%;
color: #999;
}
.costBox{
overflow: hidden;
@@ -184,4 +207,14 @@
max-height: 70vh;
overflow: scroll;
margin: 300rpx auto 0 auto;
}
.ditText{
position: absolute;
top: 40rpx;
right: 40rpx;
background-color: #FD832D;
padding: 10rpx;
color: #fff;
font-size: 24rpx;
border-radius: 10rpx;
}

+ 9
- 4
pages/siteUser/siteUser.wxml Ver fichero

@@ -2,11 +2,16 @@
<view style="height:{{navigationBarHeight}} "></view>
<view class="siteItem" wx:for="{{list}}" >
<view class="siteBox">
<view class="region">{{item.regionSty}}</view>
<view class="titleBox">
<view class="moTxet" wx:if="{{index==0}}">默认</view>
<view class="{{index==0?'regionT':'region'}}">{{item.consignee}} {{item.mobile}}</view>
</view>
<view class="region phone">{{item.regionSty}} </view>
<view class="region detail">{{item.address}}</view>
<view class="region phone">{{item.consignee}} {{item.mobile}}</view>
</view>

<view class="updataImg" bindtap="dutu" data-id="{{item.id}}"></view>
<image mode="aspectFit" bindtap="dutu" data-id="{{item.id}}" class="updataImg" src="https://formall.oss-accelerate.aliyuncs.com/cimg/siteUpdata.png"></image>
</view>
<view class="addSite" bindtap="goAdd">+新建收货地址</view>

+ 23
- 3
pages/siteUser/siteUser.wxss Ver fichero

@@ -10,13 +10,33 @@ page{
border: 1rpx #fff solid;
overflow: hidden;
background-color: #fff;
position: relative;
}
.siteBox{
float: left;
width: 90%;
}
.titleBox{
overflow: hidden;
}
.moTxet{
background-color: #FD832D;
color: #fff;
float: left;
font-size: 22rpx;
padding: 5rpx;
border-radius: 6rpx;
margin: 10rpx;

}
.region{
padding: 10rpx;
}
.regionT{
float: left;
margin: 10rpx;


}
.detail{
color: #999;
@@ -30,8 +50,8 @@ page{

float: right;
width: 60rpx;
height: 60rpx;
background-color: #fac;
height: 50rpx;
/* background-color: #fac; */
margin-top: 50rpx;
margin-right: 2rpx
}
@@ -44,4 +64,4 @@ page{
border-radius: 100rpx;
margin: 20rpx auto;
line-height: 60rpx;
}
}

+ 3
- 0
pages/topicDetail/index.js Ver fichero

@@ -84,5 +84,8 @@ Page({
})
}
},
onShareAppMessage: function (options) {
}

});

Cargando…
Cancelar
Guardar