经销商状态相关修改，商品禁用优惠券状态
parent
0a7713758b
commit
0205c7eac7
|
|
@ -40,7 +40,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<!-- 优惠选择 -->
|
||||
<view class="section background-white radius30 mar-x40 pad-all25 border-box font30">
|
||||
<view class="section background-white radius30 mar-x40 pad-all25 border-box font30" v-if="orderInfo.is_distributor==0">
|
||||
<view class="title">优惠选择</view>
|
||||
<view class="section-list font30">
|
||||
<view class="item flex" v-if="orderInfo.vip_level>0">
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@
|
|||
<view class="my-txt flex">
|
||||
<view class="my-nickname font36 flex">
|
||||
<text>{{nickName}}</text>
|
||||
<image :src="vip_info.ico" mode="widthFix" v-if="vip_info.ico!==''"></image>
|
||||
<image :src="vip_info.ico" mode="widthFix" v-if="vip_info.ico!=='' && userInfo.is_distributor==0"></image>
|
||||
</view>
|
||||
<view class="my-vip-txt font24 background-orange radius25 pad-zy40 mar-s20 flex">{{vip_info.name}}</view>
|
||||
<view class="my-vip-txt font24 background-orange radius25 pad-zy40 mar-s20 flex">{{userInfo.is_distributor==1?'经销商':vip_info.name}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="my-money color-ff flex">
|
||||
|
|
|
|||
|
|
@ -12,7 +12,12 @@
|
|||
</view>
|
||||
<view class="shop-content pad-all20 background-white">
|
||||
<!-- 商品标题 -->
|
||||
<view class="shop-title font40 mar-x35" style="padding: 30rpx 0 35rpx;">{{shopDetail.name}}</view>
|
||||
<view class="shop-title font40 mar-x35" style="padding: 30rpx 0 30rpx;">
|
||||
<view class="">{{shopDetail.name}}</view>
|
||||
<!-- 优惠券禁用 -->
|
||||
<view class="coupon_taboo font24 color-99 mar-s10" v-if="shopDetail.coupon_taboo==1">当前商品无法使用优惠券</view>
|
||||
</view>
|
||||
|
||||
<!-- 商品详情 -->
|
||||
<view class="shop-body">
|
||||
<view class="pull-title mar-x20">
|
||||
|
|
@ -159,6 +164,7 @@
|
|||
stock:res.data.detail.stock,
|
||||
cycle:res.data.detail.cycle,
|
||||
is_over:res.data.detail.is_over,
|
||||
coupon_taboo:res.data.detail.coupon_taboo,
|
||||
content:this.$toolAll.tools.escape2Html(res.data.detail.content)
|
||||
}
|
||||
this.shopDetail = shopObj; // 商品详情
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1 +1 @@
|
|||
<block wx:if="{{isLoading}}"><view class="pad-x170"><view class="my-top"><view class="my-bg"><image src="/static/img/my-bg.jpg" mode="widthFix"></image></view><view class="my-herder pad-zy20 border-box"><view class="my-message color-ff flex"><view class="my-portrait radius100"><image src="{{headPortrait}}" mode="widthFix"></image></view><view class="my-txt flex"><view class="my-nickname font36 flex"><text>{{nickName}}</text><block wx:if="{{vip_info.ico!==''}}"><image src="{{vip_info.ico}}" mode="widthFix"></image></block></view><view class="my-vip-txt font24 background-orange radius25 pad-zy40 mar-s20 flex">{{vip_info.name}}</view></view></view><view class="my-money color-ff flex"><view data-event-opts="{{[['tap',[['goPage',['/pagesA/integral/integral']]]]]}}" class="item" bindtap="__e"><view class="font48">{{userInfo.score}}</view><text class="font24">我的积分</text></view><view data-event-opts="{{[['tap',[['goPage',['/pagesA/coupon/coupon']]]]]}}" class="item" bindtap="__e"><view class="font48">{{userInfo.coupon_count}}</view><text class="font24">我的优惠券</text></view><view data-event-opts="{{[['tap',[['goPage',['/pagesA/recharge/recharge']]]]]}}" class="item" bindtap="__e"><view class="font48">{{$root.m0>0?userInfo.balance:0}}</view><text class="font24">我的余额</text></view></view><view class="my-order background-grey border-box flex"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeOrder',[index]]]]]}}" class="item" bindtap="__e"><view class="img flex"><image style="{{'width:'+(item.$orig.iconWidth+'rpx')+';'+('height:'+(item.$orig.iconHeight+'rpx')+';')}}" src="{{item.$orig.imgSrc}}" mode="widthFix"></image><block wx:if="{{item.g0}}"><view class="point radius100 flex"><text class="font22 color-ff">{{myOrder[index].num}}</text></view></block></view><view class="txt font24 color-ff">{{item.$orig.title}}</view></view></block></view></view></view><view class="my-content pad-all40"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{item.g1!=-1}}"><view data-event-opts="{{[['tap',[['toMore',[index]]]]]}}" class="item flex" catchtap="__e"><view class="title flex"><view class="img flex"><image style="{{'width:'+(item.$orig.iconWidth+'rpx')+';'+('height:'+(item.$orig.iconHeight+'rpx')+';')}}" src="{{item.$orig.imgSrc}}" mode="widthFix"></image></view><view class="title font28">{{item.$orig.titele}}</view></view><view class="more"><image style="width:14rpx;height:26rpx;" src="/static/icon/icon-join.png" mode="widthFix"></image></view><block wx:if="{{index==0&&mobile==''}}"><button class="get-phone-btn" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['onGetPhoneNumberA',['$event']]]]]}}" bindgetphonenumber="__e"></button></block><block wx:if="{{index==1&&mobile==''}}"><button class="get-phone-btn" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['onGetPhoneNumberB',['$event']]]]]}}" bindgetphonenumber="__e"></button></block></view></block></block></view><block wx:if="{{isVip||isShow}}"><view class="pull-bg" style="background-color:rgba(0,0,0,.3);"></view></block><block wx:if="{{isVip}}"><view class="vip-box-bg border-box"><view class="vip-box radius20 background-white font30"><view class="title">会员注册</view><view class="vip-list"><view class="vip-item mar-s20"><view class="tips color-99">姓名</view><input class="input" type="text" placeholder="请输入姓名" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','myName','$event',[]]]]]]}}" value="{{myName}}" bindinput="__e"/></view><view class="vip-item mar-s40"><view class="tips color-99">电话</view><input class="input" type="number" placeholder="请输入电话" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','myPhone','$event',[]]]]]]}}" value="{{myPhone}}" bindinput="__e"/></view></view><view data-event-opts="{{[['tap',[['submitEv',['$event']]]]]}}" class="submit-btn font36 background-orange radius30 mar-s60 flex" bindtap="__e">注册会员</view><view data-event-opts="{{[['tap',[['closeEv',['$event']]]]]}}" class="close-btn" bindtap="__e"><image src="/static/icon/close-btn.png" mode="widthFix"></image></view></view></view></block><block wx:if="{{isLoading}}"><tabbar vue-id="704e9d00-1" current="0" bind:__l="__l"></tabbar></block></view></block>
|
||||
<block wx:if="{{isLoading}}"><view class="pad-x170"><view class="my-top"><view class="my-bg"><image src="/static/img/my-bg.jpg" mode="widthFix"></image></view><view class="my-herder pad-zy20 border-box"><view class="my-message color-ff flex"><view class="my-portrait radius100"><image src="{{headPortrait}}" mode="widthFix"></image></view><view class="my-txt flex"><view class="my-nickname font36 flex"><text>{{nickName}}</text><block wx:if="{{vip_info.ico!==''&&userInfo.is_distributor==0}}"><image src="{{vip_info.ico}}" mode="widthFix"></image></block></view><view class="my-vip-txt font24 background-orange radius25 pad-zy40 mar-s20 flex">{{userInfo.is_distributor==1?'经销商':vip_info.name}}</view></view></view><view class="my-money color-ff flex"><view data-event-opts="{{[['tap',[['goPage',['/pagesA/integral/integral']]]]]}}" class="item" bindtap="__e"><view class="font48">{{userInfo.score}}</view><text class="font24">我的积分</text></view><view data-event-opts="{{[['tap',[['goPage',['/pagesA/coupon/coupon']]]]]}}" class="item" bindtap="__e"><view class="font48">{{userInfo.coupon_count}}</view><text class="font24">我的优惠券</text></view><view data-event-opts="{{[['tap',[['goPage',['/pagesA/recharge/recharge']]]]]}}" class="item" bindtap="__e"><view class="font48">{{$root.m0>0?userInfo.balance:0}}</view><text class="font24">我的余额</text></view></view><view class="my-order background-grey border-box flex"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeOrder',[index]]]]]}}" class="item" bindtap="__e"><view class="img flex"><image style="{{'width:'+(item.$orig.iconWidth+'rpx')+';'+('height:'+(item.$orig.iconHeight+'rpx')+';')}}" src="{{item.$orig.imgSrc}}" mode="widthFix"></image><block wx:if="{{item.g0}}"><view class="point radius100 flex"><text class="font22 color-ff">{{myOrder[index].num}}</text></view></block></view><view class="txt font24 color-ff">{{item.$orig.title}}</view></view></block></view></view></view><view class="my-content pad-all40"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{item.g1!=-1}}"><view data-event-opts="{{[['tap',[['toMore',[index]]]]]}}" class="item flex" catchtap="__e"><view class="title flex"><view class="img flex"><image style="{{'width:'+(item.$orig.iconWidth+'rpx')+';'+('height:'+(item.$orig.iconHeight+'rpx')+';')}}" src="{{item.$orig.imgSrc}}" mode="widthFix"></image></view><view class="title font28">{{item.$orig.titele}}</view></view><view class="more"><image style="width:14rpx;height:26rpx;" src="/static/icon/icon-join.png" mode="widthFix"></image></view><block wx:if="{{index==0&&mobile==''}}"><button class="get-phone-btn" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['onGetPhoneNumberA',['$event']]]]]}}" bindgetphonenumber="__e"></button></block><block wx:if="{{index==1&&mobile==''}}"><button class="get-phone-btn" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['onGetPhoneNumberB',['$event']]]]]}}" bindgetphonenumber="__e"></button></block></view></block></block></view><block wx:if="{{isVip||isShow}}"><view class="pull-bg" style="background-color:rgba(0,0,0,.3);"></view></block><block wx:if="{{isVip}}"><view class="vip-box-bg border-box"><view class="vip-box radius20 background-white font30"><view class="title">会员注册</view><view class="vip-list"><view class="vip-item mar-s20"><view class="tips color-99">姓名</view><input class="input" type="text" placeholder="请输入姓名" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','myName','$event',[]]]]]]}}" value="{{myName}}" bindinput="__e"/></view><view class="vip-item mar-s40"><view class="tips color-99">电话</view><input class="input" type="number" placeholder="请输入电话" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','myPhone','$event',[]]]]]]}}" value="{{myPhone}}" bindinput="__e"/></view></view><view data-event-opts="{{[['tap',[['submitEv',['$event']]]]]}}" class="submit-btn font36 background-orange radius30 mar-s60 flex" bindtap="__e">注册会员</view><view data-event-opts="{{[['tap',[['closeEv',['$event']]]]]}}" class="close-btn" bindtap="__e"><image src="/static/icon/close-btn.png" mode="widthFix"></image></view></view></view></block><block wx:if="{{isLoading}}"><tabbar vue-id="704e9d00-1" current="0" bind:__l="__l"></tabbar></block></view></block>
|
||||
|
|
@ -222,6 +222,11 @@ __webpack_require__.r(__webpack_exports__);
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -316,6 +321,7 @@ var _default = {
|
|||
stock: res.data.detail.stock,
|
||||
cycle: res.data.detail.cycle,
|
||||
is_over: res.data.detail.is_over,
|
||||
coupon_taboo: res.data.detail.coupon_taboo,
|
||||
content: _this.$toolAll.tools.escape2Html(res.data.detail.content) };
|
||||
|
||||
_this.shopDetail = shopObj; // 商品详情
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<view class="pad-x170 data-v-374e5d04"><block wx:if="{{scroolTop}}"><view class="scrool-top background-white data-v-374e5d04" style="{{'height:'+(statusHeight+50+'px')+';'}}"></view></block><view data-event-opts="{{[['tap',[['backEv',['$event']]]]]}}" class="back-btn flex data-v-374e5d04" style="{{'top:'+(statusHeight+'px')+';'}}" bindtap="__e"><view class="icon icon-return _i data-v-374e5d04" style="{{'font-size:38rpx;'+('color:'+('#000000')+';')}}"></view></view><view class="shop-top-img data-v-374e5d04"><image src="{{shopDetail.images[0]}}" mode="widthFix" class="data-v-374e5d04"></image></view><view class="shop-content pad-all20 background-white data-v-374e5d04"><view class="shop-title font40 mar-x35 data-v-374e5d04" style="padding:30rpx 0 35rpx;">{{shopDetail.name}}</view><view class="shop-body data-v-374e5d04"><view class="pull-title mar-x20 data-v-374e5d04"><view class="txt font30 pad-sx15 data-v-374e5d04">详情介绍</view><view class="line background-orange data-v-374e5d04"></view></view><view class="body-txt font30 color-48 data-v-374e5d04"><rich-text nodes="{{shopDetail.content}}" class="data-v-374e5d04"></rich-text></view></view></view><block wx:if="{{showSku}}"><view class="pull-bg data-v-374e5d04"></view></block><block wx:if="{{showSku}}"><view class="shop-specs background-white border-box data-v-374e5d04"><view class="specs-top flex data-v-374e5d04"><view class="title font30 data-v-374e5d04">{{shopDetail.is_over==0?'规格选择':'商品已售罄'}}</view><view data-event-opts="{{[['tap',[['closeSpecs',['$event']]]]]}}" class="close data-v-374e5d04" bindtap="__e"><image src="/static/icon/icon-close.png" mode="widthFix" class="data-v-374e5d04"></image></view></view><block wx:if="{{shopDetail.is_over==0}}"><scroll-view class="specs-list data-v-374e5d04" scroll-y="true"><block wx:for="{{shopSku}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeSpecs',[index]]]]]}}" class="{{['specs-item','border-box','radius20','mar-s20','pad-zy20','font36','flex','data-v-374e5d04',skuIndex==index?'active':'']}}" bindtap="__e"><text class="data-v-374e5d04">{{item.title}}</text><text class="data-v-374e5d04">{{"￥"+(vip_level>0?item.price:item.original_price)}}</text></view></block></scroll-view></block><block wx:if="{{shopDetail.is_over==0}}"><view class="specs-btns flex data-v-374e5d04"><view data-event-opts="{{[['tap',[['joinCart',['$event']]]]]}}" class="btn radius30 font36 color-ff background-grey flex data-v-374e5d04" bindtap="__e">加入购物车</view><view data-event-opts="{{[['tap',[['buyNow',['$event']]]]]}}" class="btn radius30 font36 color-ff background-orange flex data-v-374e5d04" bindtap="__e">立即购买</view></view></block><block wx:if="{{shopDetail.is_over==1}}"><view class="sell-out font30 color-66 data-v-374e5d04">{{"预估上货时间："+(shopDetail.cycle!==''?shopDetail.cycle:'未知')}}</view></block></view></block><view class="shop-foot border-box background-white pad-all20 data-v-374e5d04"><view class="shop-footer background-grey pad-sx15 radius30 flex data-v-374e5d04"><view data-event-opts="{{[['tap',[['goHome',['$event']]]]]}}" class="shop-nav font24 color-ff flex data-v-374e5d04" bindtap="__e"><image src="/static/icon/icon-home.png" mode="widthFix" class="data-v-374e5d04"></image><text class="data-v-374e5d04">首页</text></view><view data-event-opts="{{[['tap',[['goCart',['$event']]]]]}}" class="shop-cart background-white radius100 flex data-v-374e5d04" bindtap="__e"><image src="/static/icon/icon-cart.png" mode="widthFix" class="data-v-374e5d04"></image><block wx:if="{{cartNum*1>=0&&cartNum*1<=99}}"><view class="shop-num radius100 font24 color-ff flex data-v-374e5d04"><text class="data-v-374e5d04">{{cartNum}}</text></view></block><block wx:if="{{cartNum*1>99}}"><view class="shop-num radius100 font24 color-ff flex data-v-374e5d04"><text class="data-v-374e5d04">99</text></view></block></view><view data-event-opts="{{[['tap',[['openSpecs',['$event']]]]]}}" class="shop-btn background-orange font36 color-48 radius30 flex data-v-374e5d04" bindtap="__e">立即购买</view></view></view><share-coupon vue-id="b27c4170-1" spuId="{{shopDetail.id}}" class="data-v-374e5d04" bind:__l="__l"></share-coupon></view>
|
||||
<view class="pad-x170 data-v-374e5d04"><block wx:if="{{scroolTop}}"><view class="scrool-top background-white data-v-374e5d04" style="{{'height:'+(statusHeight+50+'px')+';'}}"></view></block><view data-event-opts="{{[['tap',[['backEv',['$event']]]]]}}" class="back-btn flex data-v-374e5d04" style="{{'top:'+(statusHeight+'px')+';'}}" bindtap="__e"><view class="icon icon-return _i data-v-374e5d04" style="{{'font-size:38rpx;'+('color:'+('#000000')+';')}}"></view></view><view class="shop-top-img data-v-374e5d04"><image src="{{shopDetail.images[0]}}" mode="widthFix" class="data-v-374e5d04"></image></view><view class="shop-content pad-all20 background-white data-v-374e5d04"><view class="shop-title font40 mar-x35 data-v-374e5d04" style="padding:30rpx 0 30rpx;"><view class="data-v-374e5d04">{{shopDetail.name}}</view><block wx:if="{{shopDetail.coupon_taboo==1}}"><view class="coupon_taboo font24 color-99 mar-s10 data-v-374e5d04">当前商品无法使用优惠券</view></block></view><view class="shop-body data-v-374e5d04"><view class="pull-title mar-x20 data-v-374e5d04"><view class="txt font30 pad-sx15 data-v-374e5d04">详情介绍</view><view class="line background-orange data-v-374e5d04"></view></view><view class="body-txt font30 color-48 data-v-374e5d04"><rich-text nodes="{{shopDetail.content}}" class="data-v-374e5d04"></rich-text></view></view></view><block wx:if="{{showSku}}"><view class="pull-bg data-v-374e5d04"></view></block><block wx:if="{{showSku}}"><view class="shop-specs background-white border-box data-v-374e5d04"><view class="specs-top flex data-v-374e5d04"><view class="title font30 data-v-374e5d04">{{shopDetail.is_over==0?'规格选择':'商品已售罄'}}</view><view data-event-opts="{{[['tap',[['closeSpecs',['$event']]]]]}}" class="close data-v-374e5d04" bindtap="__e"><image src="/static/icon/icon-close.png" mode="widthFix" class="data-v-374e5d04"></image></view></view><block wx:if="{{shopDetail.is_over==0}}"><scroll-view class="specs-list data-v-374e5d04" scroll-y="true"><block wx:for="{{shopSku}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeSpecs',[index]]]]]}}" class="{{['specs-item','border-box','radius20','mar-s20','pad-zy20','font36','flex','data-v-374e5d04',skuIndex==index?'active':'']}}" bindtap="__e"><text class="data-v-374e5d04">{{item.title}}</text><text class="data-v-374e5d04">{{"￥"+(vip_level>0?item.price:item.original_price)}}</text></view></block></scroll-view></block><block wx:if="{{shopDetail.is_over==0}}"><view class="specs-btns flex data-v-374e5d04"><view data-event-opts="{{[['tap',[['joinCart',['$event']]]]]}}" class="btn radius30 font36 color-ff background-grey flex data-v-374e5d04" bindtap="__e">加入购物车</view><view data-event-opts="{{[['tap',[['buyNow',['$event']]]]]}}" class="btn radius30 font36 color-ff background-orange flex data-v-374e5d04" bindtap="__e">立即购买</view></view></block><block wx:if="{{shopDetail.is_over==1}}"><view class="sell-out font30 color-66 data-v-374e5d04">{{"预估上货时间："+(shopDetail.cycle!==''?shopDetail.cycle:'未知')}}</view></block></view></block><view class="shop-foot border-box background-white pad-all20 data-v-374e5d04"><view class="shop-footer background-grey pad-sx15 radius30 flex data-v-374e5d04"><view data-event-opts="{{[['tap',[['goHome',['$event']]]]]}}" class="shop-nav font24 color-ff flex data-v-374e5d04" bindtap="__e"><image src="/static/icon/icon-home.png" mode="widthFix" class="data-v-374e5d04"></image><text class="data-v-374e5d04">首页</text></view><view data-event-opts="{{[['tap',[['goCart',['$event']]]]]}}" class="shop-cart background-white radius100 flex data-v-374e5d04" bindtap="__e"><image src="/static/icon/icon-cart.png" mode="widthFix" class="data-v-374e5d04"></image><block wx:if="{{cartNum*1>=0&&cartNum*1<=99}}"><view class="shop-num radius100 font24 color-ff flex data-v-374e5d04"><text class="data-v-374e5d04">{{cartNum}}</text></view></block><block wx:if="{{cartNum*1>99}}"><view class="shop-num radius100 font24 color-ff flex data-v-374e5d04"><text class="data-v-374e5d04">99</text></view></block></view><view data-event-opts="{{[['tap',[['openSpecs',['$event']]]]]}}" class="shop-btn background-orange font36 color-48 radius30 flex data-v-374e5d04" bindtap="__e">立即购买</view></view></view><share-coupon vue-id="b27c4170-1" spuId="{{shopDetail.id}}" class="data-v-374e5d04" bind:__l="__l"></share-coupon></view>
|
||||
Loading…
Reference in New Issue