jd
/
wxapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Gray' of 192.168.2.201:xiajinyu/recook-weapp into Gray

Browse Source
zh
蒋俊杰 5 years ago
parent ef4341202e bce2f80ea9
commit 0dbe1dcd80
3 changed files with 63 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
pages/afterSaleDetail/afterSaleDetail.vue
Unescape View File

@ -232,7 +232,7 @@
.line {
background-color: rgba(255, 255, 255, 0.6);
height: 2rpx;
height: 3rpx;
width: 450rpx;
}
}

93
pages/goodsDetail/goodsDetail.vue
Unescape View File

@ -59,7 +59,12 @@
</view>
<view class="goods-msg-box bg-white" style="margin-bottom: 25rpx;padding-top: 20rpx;">
<view class="flex goods-name-box justify-between align-start">
<view class="goods-name flex-sub">{{goodsDetail.goodsName}}</view>
<view class="goods-name flex-sub">
<view class="text-center text-white" style="display: inline-block; background: #CC1B4F;font-size: 20rpx; width:48rpx;height: 40rpx;line-height: 40rpx; border-radius: 6rpx;margin-right: 8rpx;"
v-if="goodsDetail.isImport">
<text>进口</text>
</view> {{goodsDetail.goodsName}}
</view>
<button v-if="roleLevel!=500" class="text-center share-btn" type="default" open-type="share">
<text class="cuIcon-share" style="margin-right: 5rpx;"></text>分享
</button>
@ -95,61 +100,77 @@
<view class="item flex justify-between align-center">
<view class="span">进口税</view>
<view class="text-hidden flex-sub txt flex align-center justify-start">
<view class="tab_ferme">包税</view> 预计￥{{goodsDetail.price.max.ferme}}由瑞库客
<view class="tab_ferme">包税</view> 预计￥{{goodsDetail.price.max.ferme}}由瑞库客承担
</view>
</view>
</view>
<!--
is_import 是否进口商品
</view>
<!--
is_import 是否进口商品
storehouse 进口商品仓库 0=无 1=国内仓 2=海外直邮 3=保税仓-->
<view class="box bg-white" v-if="goodsDetail.isImport && goodsDetail.storehouse">
<view class="item flex justify-between">
<view class="span">送至</view>
<view class="text-hidden flex-sub txt">
<picker mode="region" @change="chooseAddress">
<block v-if="addressList.length < 1"><text style="color: #CC1B4F;">请选择</text>收货地址</block>
<block v-else>{{address}}</block>
<picker mode="region" @change="chooseAddress">
<block v-if="addressList.length < 1"><text style="color: #CC1B4F;">请选择</text>收货地址</block>
<block v-else>{{address}}</block>
</picker>
</view>
<text class="cuIcon-right"></text>
</view>
<view class="item flex justify-between">
<view class="span"></view>
<view class="text-hidden flex-sub txt " style="padding-right: 88rpx;">
<view class="text-hidden flex-sub txt " style="padding-right: 60rpx;">
<view class="flex align-start justify-between goods_box" style="margin: 16rpx 0;">
<view class="goods_icon">
<image :src="`${IMAGE_URL}/recook-weapp/goodsIcon/just.png`" mode="widthFix"></image>
<text>正品保障</text>
</view>
<view class="goods_hr">
</view>
<view class="goods_icon" v-if="goodsDetail.storehouse === 1">
<image v-if="addressList.length > 1" :src="`${IMAGE_URL}/recook-weapp/goodsIcon/details_active.png`" mode="widthFix"></image>
<image v-else :src="`${IMAGE_URL}/recook-weapp/goodsIcon/details.png`" mode="widthFix"></image>
<text>国内仓</text>
</view>
<view class="goods_icon" v-else-if="goodsDetail.storehouse === 2">
<image v-if="addressList.length > 1" :src="`${IMAGE_URL}/recook-weapp/goodsIcon/aircraft_active.png`" mode="widthFix"></image>
<image v-else :src="`${IMAGE_URL}/recook-weapp/goodsIcon/aircraft.png`" mode="widthFix"></image>
<text>海外直邮</text>
</view>
<view class="goods_icon" v-else-if="goodsDetail.storehouse === 3">
<image v-if="addressList.length > 1" :src="`${IMAGE_URL}/recook-weapp/goodsIcon/bonded_active.png`" mode="widthFix"></image>
<image v-else :src="`${IMAGE_URL}/recook-weapp/goodsIcon/bonded.png`" mode="widthFix"></image>
<text>保税仓</text>
</view>
<view class="goods_hr">
<view class="goods_icon" v-else-if="goodsDetail.storehouse === 2">
<image v-if="addressList.length > 1" :src="`${IMAGE_URL}/recook-weapp/goodsIcon/aircraft_active.png`" mode="widthFix"></image>
<image v-else :src="`${IMAGE_URL}/recook-weapp/goodsIcon/aircraft.png`" mode="widthFix"></image>
</view>
<view class="goods_icon">
<block v-if="addressList.length > 1">
<image :src="`${IMAGE_URL}/recook-weapp/goodsIcon/location_active.png`" mode="widthFix"></image>
<text>{{addressList[addressList.length-1]}}</text>
<view class="goods_icon" v-else-if="goodsDetail.storehouse === 3">
<image v-if="addressList.length > 1" :src="`${IMAGE_URL}/recook-weapp/goodsIcon/bonded_active.png`" mode="widthFix"></image>
<image v-else :src="`${IMAGE_URL}/recook-weapp/goodsIcon/bonded.png`" mode="widthFix"></image>
</view>
<view class="goods_icon">
<block v-if="addressList.length > 1">
<image :src="`${IMAGE_URL}/recook-weapp/goodsIcon/location_active.png`" mode="widthFix"></image>
</block>
<block v-else>
<image :src="`${IMAGE_URL}/recook-weapp/goodsIcon/location.png`" mode="widthFix"></image>
<block v-else>
<image :src="`${IMAGE_URL}/recook-weapp/goodsIcon/location.png`" mode="widthFix"></image>
</block>
</view>
</view>
<view class="flex justify-between align-center goods_box">
<view class="goods_icon">
<text>正品保障</text>
</view>
<view class="goods_icon_hr">
</view>
<view class="goods_icon">
<text v-if="goodsDetail.storehouse === 1">国内仓</text>
<text v-if="goodsDetail.storehouse === 2">海外直邮</text>
<text v-if="goodsDetail.storehouse ===3">保税仓</text>
</view>
<view class="goods_icon_hr">
</view>
<view class="goods_icon">
<text v-if="addressList.length > 1">{{addressList[addressList.length-1]}}</text>
</view>
</view>
</view>
</view>
</view>
@ -825,13 +846,19 @@
.goods_box {
.goods_icon {
text-align: center;
width: 96rpx;
text-align: center;
color: #CCCCCC;
width: 120rpx;
image {
width: 52rpx;
margin: 0 auto;
}
}
.goods_icon_hr{
flex: 1;
height: 1rpx;
border-bottom: 1rpx dashed #CCCCCC;
}

4
pages/shop/shop.vue
Unescape View File

@ -178,13 +178,13 @@
<view class="subtitle" style="line-height: 60rpx;border: 0;">邀请升级</view>
<view class="invite-box flex justify-between text-white" v-if="roleLevel==100">
<navigator url="../invite/invite" class="bg-img" :style="'width: 260rpx;height: 300rpx;background-image: url('+STATIC_URL+'t03.png'">
<view class="">推荐砖石店铺</view>
<view class="">推荐钻石店铺</view>
<view class="">邀请好友·福利双赢</view>
</navigator>
<view class="flex flex-direction justify-between">
<view class="flex justify-between">
<navigator url="../myRecommend/myRecommend" class="bg-img" :style="'width: 204rpx;height: 150rpx;background-image: url('+STATIC_URL+'t04.png);'">
<view class="">我的邀请</view>
<view class="">我的推荐</view>
<view class="">呼朋唤友·享收益</view>
</navigator>
<navigator url="../myInvite/myInvite" class="bg-img" :style="'width: 204rpx;height: 150rpx;background-image: url('+STATIC_URL+'t05.png);'">

Write Preview
Loading…
Cancel
Save