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

recook4.08

Browse Source
zh
小钻风 4 years ago
parent 8ae96f0339
commit 376858ec8e
3 changed files with 397 additions and 305 deletions
Show Stats Download Patch File Download Diff File

1
commit.csv
Unescape View File

@ -1,3 +1,4 @@
2021-03-31,18:05:16,3-31,39,27
2021-03-30,17:45:05,3-30,189,161
2021-03-29,20:26:56,3-29,932,416
2021-03-26,17:52:00,3-26,545,353

1 2021-03-30 2021-03-31 17:45:05 18:05:16 3-30 3-31 189 39 161 27
1 2021-03-31 18:05:16 3-31 39 27
2 2021-03-30 2021-03-30 17:45:05 17:45:05 3-30 3-30 189 189 161 161
3 2021-03-29 2021-03-29 20:26:56 20:26:56 3-29 3-29 932 932 416 416
4 2021-03-26 2021-03-26 17:52:00 17:52:00 3-26 3-26 545 545 353 353

695
pages/confirmOrder/confirmOrder.vue
Unescape View File

@ -1,304 +1,395 @@
<template>
<view>
<view class="box flex align-center address-box" @tap="toAddressList">
<image src="../../static/index/add.png" style="width: 50rpx;" mode="widthFix"></image>
<view class="flex-sub address-con" v-if="preOrderMsg.addr">
<view class=""><text class="text-black" style="font-size: 32rpx;margin-right: 15rpx;font-weight: 900;">{{preOrderMsg.addr.receiverName}}</text>{{preOrderMsg.addr.mobile}}</view>
<view class="address-detail">{{preOrderMsg.addr.province+preOrderMsg.addr.city+preOrderMsg.addr.district+preOrderMsg.addr.address}}</view>
</view>
<view class="flex-sub address-con" v-else style="font-size: 30rpx;">请选择收货地址</view>
<text class="cuIcon-right"></text>
</view>
<view class="box plain-box">
<view class="item flex justify-between">
<view class="">配送方式</view>
<view class="flex" style="font-size: 26rpx;color: #AAAAAA;">
快递配送<text class="cuIcon-right"></text>
</view>
</view>
<view class="item flex justify-between align-center">
<view class="">买家留言</view>
<input type="text" v-model="note" placeholder="留言(选填)" placeholder-class="placeholder" @blur="setNote"/>
</view>
</view>
<view class="box goods-msg-box">
<view v-for="(shop,shopIndex) in preOrderMsg.brands" :key="shopIndex">
<view class="shop-msg flex align-center">
<image :src="IMAGE_URL+shop.brandLogoUrl" style="width: 36rpx;margin-right: 10rpx;" mode="widthFix"></image>
<view class="">{{shop.brandName}}</view>
</view>
<order-goods :goodsList="shop.goods"></order-goods>
<view class="total-msg flex justify-end" style="line-height: 80rpx;">
<view style="margin-right: 20rpx;color: #AAAAAA;">共{{shop.brandGoodsTotalCount}}件</view>
<view style="color: #FA6400;margin-right: 20rpx;">合计{{shop.brandGoodsTotalAmount}}元 </view>
<view style="color: #AAAAAA;">赚：<text style="color: #FA6400;">{{shop.goods[0].totalCommission}} </text></view>
</view>
</view>
</view>
<view class="box coupon-box">
<view class="item flex justify-between">
<view class="">优惠券</view>
<view class="flex num">-￥0.00<text class="cuIcon-right"></text></view>
</view>
<view class="item flex justify-between">
<view class="">瑞币</view>
<view class="flex-sub flex justify-between" style="padding: 0 20rpx;color: #888;font-size: 24rpx;">
<view>可用:￥{{preOrderMsg.coinStatus.coin}}</view>
<view>本次可抵￥{{preOrderMsg.coinTotalAmount | toFixed(2)}}</view>
</view>
<u-switch v-model="preOrderMsg.coinStatus.isUseCoin" :disabled="!preOrderMsg.coinStatus.isEnable" active-color="red" inactive-color="#F5F5F5" size="36" @change="changeUseCoin"></u-switch>
</view>
<!-- <view class="item flex justify-between">
<view class="">余额</view>
<view class="flex-sub flex justify-between" style="padding: 0 20rpx;color: #888;font-size: 24rpx;">
<view>可用:￥5.00</view>
<view>本次可抵￥5.00</view>
</view>
<u-switch v-model="useBalance" :disabled="canUseBalance" active-color="red" inactive-color="#F5F5F5" size="36"></u-switch>
</view> -->
</view>
<view class="box order-msg">
<view class="item flex justify-between">
<view class="">商品金额</view>
<view class="num">￥{{preOrderMsg.goodsTotalAmount | toFixed(2)}}</view>
</view>
<view class="item flex justify-between">
<view class="">运费</view>
<view class="num">+￥{{preOrderMsg.expressTotalFee | toFixed(2)}}</view>
</view>
<view class="item flex justify-between">
<view class="">优惠券</view>
<view class="num">-￥{{(preOrderMsg.universeCouponTotalAmount+preOrderMsg.brandCouponTotalAmount) | toFixed(2)}}</view>
</view>
<view class="item flex justify-between">
<view class="">瑞币抵扣</view>
<view class="num">-￥{{preOrderMsg.coinTotalAmount | toFixed(2)}}</view>
</view>
<!-- <view class="item flex justify-between">
<view class="">余额抵扣</view>
<view class="num">-￥0.00</view>
</view> -->
<view class="item flex justify-between">
<view class="">实付款</view>
<view class="text-red">￥{{preOrderMsg.actualTotalAmount | toFixed(2)}}</view>
</view>
</view>
<view class="agree_box" v-if="preOrderMsg.isImport">
<u-checkbox-group >
<u-checkbox v-model="agree" shape="circle" active-color="red">同意并接受 </u-checkbox ><text style="color: #007AFF;" @click="toPage">《跨境商品用户通知协议》</text>
</u-checkbox-group>
</view>
<view class="" style="height: 200rpx;"></view>
<view class="bottom-box flex justify-between align-center bg-white">
<view class="flex align-center">
<text>实付款</text>
<text class="text-red" style="font-size: 32rpx;font-weight: 900;">￥{{preOrderMsg.actualTotalAmount | toFixed(2)}}</text>
</view>
<block v-if="preOrderMsg.isImport">
<button class="cu-btn round text-white" :class="agree?'':'prevent'" @tap="submitOrder">提交订单</button>
</block>
<block v-else>
<button class="cu-btn round text-white" @tap="submitOrder">提交订单</button>
</block>
<!-- &&preOrderMsg.isImport -->
</view>
</view>
</template>
<script>
export default {
data() {
return {
agree:false,//是否接受协议
useBalance: false, //是否使用余额
canUseMoney: true, //是否禁用瑞币
canUseBalance: true, //是否禁用余额
IMAGE_URL: this.IMAGE_URL,
note:""
};
},
computed: {
preOrderMsg() {
return this.$store.state.preOrderMsg
}
},
mounted() {
console.log(this.$store.state.preOrderMsg)
},
watch: {
preOrderMsg: function(val) {
console.log("预览订单信息发生改变",this.preOrderMsg)
}
},
methods: {
toPage(){
uni.navigateTo({
url:'../../packageA/agreement/goods'
})
},
// 设置买家留言信息
setNote(){
this.$u.post('/api/v1/order_preview/buyer_message/update', {
userId: uni.getStorageSync("userInfo").id,
orderId: this.preOrderMsg.id,
message:this.note
}).then(res => {
console.log(res.data);
if (res.data.code == "FAIL") {
this.$u.toast(res.data.msg);
return
}
});
},
//切换瑞币抵扣开关
changeUseCoin(value){
console.log(value)
this.$u.post('/api/v1/order_preview/coin_onoff', {
userId: uni.getStorageSync("userInfo").id,
previewOrderId: this.preOrderMsg.id,
}).then(res => {
console.log(res.data);
if (res.data.code == "FAIL") {
this.$u.toast(res.data.msg);
return
}
let preViewMsg = res.data.data
this.$store.commit('updatePreOrderMsg', preViewMsg);
});
},
//提交订单
submitOrder() {
this.$u.post('/api/v1/order/submit', {
userId: uni.getStorageSync("userInfo").id,
previewOrderId: this.preOrderMsg.id
}).then(res => {
console.log(res.data);
if (res.data.code == "FAIL") {
this.$u.toast(res.data.msg, 2000);
return
}
let orderDetail = res.data.data
let msg = res.data.msg
// this.$store.commit('setOrderDetail',orderDetail);
//提交成功
uni.redirectTo({
url: "../orderPay/orderPay?orderId=" + orderDetail.id,
// url: "../orderDetail/orderDetail?orderId=" + orderDetail.id,
success: (res) => {
this.$u.toast(msg);
}
})
});
},
toAddressList() {
uni.navigateTo({
url: "../address/index?fromPage=confirmOrder"
})
}
}
}
</script>
<style lang="scss">
.prevent{
color: #C8C9CC !important;
background: #AAAAAA !important;
pointer-events: none;
}
page {
background-color: #f3f3f3;
}
.agree_box{
margin: 20rpx 30rpx;
}
.box {
margin: 20rpx 30rpx;
border-radius: 10rpx;
background-color: #FFFFFF;
&.address-box {
padding: 30rpx;
}
.address-con {
font-size: 26rpx;
color: #666;
margin: 0 15rpx;
.address-detail {
line-height: normal;
margin-top: 10rpx;
}
}
&.plain-box {
line-height: 70rpx;
padding: 20rpx 30rpx;
input {
height: 60rpx;
margin-left: 30rpx;
text-align: right;
padding: 0 10rpx;
}
.placeholder {
color: #AAAAAA;
font-size: 26rpx;
}
}
.cuIcon-right {
color: #DDDDDD;
font-size: 36rpx;
}
&.goods-msg-box {
padding: 20rpx 30rpx;
.shop-msg {
height: 60rpx;
}
}
// .num {
// font-size: 24rpx;
// }
&.coupon-box {
padding: 20rpx 30rpx;
line-height: 70rpx;
font-size: 28rpx;
}
&.order-msg {
padding: 20rpx 30rpx 0;
.item {
line-height: 60rpx;
&:last-child {
line-height: 100rpx;
border-top: 1rpx solid #f1f1f1;
<template>
<view>
<view class="tips flex align-center" v-if="tipsShow">
<view class="flex align-center justify-between">
<view class="tips-icon">
<text class="cuIcon-notice"></text>
</view>
<view class="tips-center">
<text>海关提醒：跨境订单订购人和支付人信息不一致，可能会影响订单通关，请务必认证</text>
</view>
<view class="tips-right" @click="toRealName">
<text>去认证 > </text>
</view>
</view>
</view>
<view class="box flex align-center address-box" @tap="toAddressList">
<image src="../../static/index/add.png" style="width: 50rpx;" mode="widthFix"></image>
<view class="flex-sub address-con" v-if="preOrderMsg.addr">
<view class=""><text class="text-black" style="font-size: 32rpx;margin-right: 15rpx;font-weight: 900;">{{preOrderMsg.addr.receiverName}}</text>{{preOrderMsg.addr.mobile}}</view>
<view class="address-detail">{{preOrderMsg.addr.province+preOrderMsg.addr.city+preOrderMsg.addr.district+preOrderMsg.addr.address}}</view>
</view>
<view class="flex-sub address-con" v-else style="font-size: 30rpx;">请选择收货地址</view>
<text class="cuIcon-right"></text>
</view>
<view class="box plain-box">
<view class="item flex justify-between">
<view class="">配送方式</view>
<view class="flex" style="font-size: 26rpx;color: #AAAAAA;">
快递配送<text class="cuIcon-right"></text>
</view>
</view>
<view class="item flex justify-between align-center">
<view class="">买家留言</view>
<input type="text" v-model="note" placeholder="留言(选填)" placeholder-class="placeholder" @blur="setNote" />
</view>
</view>
<view class="box goods-msg-box">
<view v-for="(shop,shopIndex) in preOrderMsg.brands" :key="shopIndex">
<view class="shop-msg flex align-center">
<image :src="IMAGE_URL+shop.brandLogoUrl" style="width: 36rpx;margin-right: 10rpx;" mode="widthFix"></image>
<view class="">{{shop.brandName}}</view>
</view>
<order-goods :goodsList="shop.goods"></order-goods>
<view class="total-msg flex justify-end" style="line-height: 80rpx;">
<view style="margin-right: 20rpx;color: #AAAAAA;">共{{shop.brandGoodsTotalCount}}件</view>
<view style="color: #FA6400;margin-right: 20rpx;">合计{{shop.brandGoodsTotalAmount}}元 </view>
<view style="color: #AAAAAA;">赚：<text style="color: #FA6400;">{{shop.goods[0].totalCommission}} </text></view>
</view>
</view>
</view>
<view class="box coupon-box">
<view class="item flex justify-between">
<view class="">优惠券</view>
<view class="flex num">-￥0.00<text class="cuIcon-right"></text></view>
</view>
<view class="item flex justify-between">
<view class="">瑞币</view>
<view class="flex-sub flex justify-between" style="padding: 0 20rpx;color: #888;font-size: 24rpx;">
<view>可用:￥{{preOrderMsg.coinStatus.coin}}</view>
<view>本次可抵￥{{preOrderMsg.coinTotalAmount | toFixed(2)}}</view>
</view>
<u-switch v-model="preOrderMsg.coinStatus.isUseCoin" :disabled="!preOrderMsg.coinStatus.isEnable" active-color="red"
inactive-color="#F5F5F5" size="36" @change="changeUseCoin"></u-switch>
</view>
<!-- <view class="item flex justify-between">
<view class="">余额</view>
<view class="flex-sub flex justify-between" style="padding: 0 20rpx;color: #888;font-size: 24rpx;">
<view>可用:￥5.00</view>
<view>本次可抵￥5.00</view>
</view>
<u-switch v-model="useBalance" :disabled="canUseBalance" active-color="red" inactive-color="#F5F5F5" size="36"></u-switch>
</view> -->
</view>
<view class="box order-msg">
<view class="item flex justify-between">
<view class="">商品金额</view>
<view class="num">￥{{preOrderMsg.goodsTotalAmount | toFixed(2)}}</view>
</view>
<view class="item flex justify-between">
<view class="">运费</view>
<view class="num">+￥{{preOrderMsg.expressTotalFee | toFixed(2)}}</view>
</view>
<view class="item flex justify-between">
<view class="">优惠券</view>
<view class="num">-￥{{(preOrderMsg.universeCouponTotalAmount+preOrderMsg.brandCouponTotalAmount) | toFixed(2)}}</view>
</view>
<view class="item flex justify-between">
<view class="">瑞币抵扣</view>
<view class="num">-￥{{preOrderMsg.coinTotalAmount | toFixed(2)}}</view>
</view>
<!-- <view class="item flex justify-between">
<view class="">余额抵扣</view>
<view class="num">-￥0.00</view>
</view> -->
<view class="item flex justify-between">
<view class="">实付款</view>
<view class="text-red">￥{{preOrderMsg.actualTotalAmount | toFixed(2)}}</view>
</view>
</view>
<view class="agree_box" v-if="preOrderMsg.isImport">
<u-checkbox-group>
<u-checkbox v-model="agree" shape="circle" active-color="red">同意并接受 </u-checkbox><text style="color: #007AFF;"
@click="toPage">《跨境商品用户通知协议》</text>
</u-checkbox-group>
</view>
<view class="" style="height: 200rpx;"></view>
<view class="bottom-box flex justify-between align-center bg-white">
<view class="flex align-center">
<text>实付款</text>
<text class="text-red" style="font-size: 32rpx;font-weight: 900;">￥{{preOrderMsg.actualTotalAmount | toFixed(2)}}</text>
</view>
<block v-if="preOrderMsg.isImport">
<button class="cu-btn round text-white" :class="agree?'':'prevent'" @tap="submitOrder">提交订单</button>
</block>
<block v-else>
<button class="cu-btn round text-white" @tap="submitOrder">提交订单</button>
</block>
<!-- &&preOrderMsg.isImport -->
</view>
</view>
</template>
<script>
export default {
data() {
return {
agree: false, //是否接受协议
useBalance: false, //是否使用余额
canUseMoney: true, //是否禁用瑞币
canUseBalance: true, //是否禁用余额
IMAGE_URL: this.IMAGE_URL,
note: "",
tipsShow: false,
RealList: [], // 过滤商品不为国内仓和无
};
},
computed: {
preOrderMsg() {
return this.$store.state.preOrderMsg
}
},
mounted() {},
watch: {
preOrderMsg: function(val) {
console.log("预览订单信息发生改变", this.preOrderMsg)
}
},
onShow() {
let realInfoStatus = uni.getStorageSync("userInfo").realInfoStatus
if (!realInfoStatus) {
// 未实名认证 判断是否需要实名认证
let newArr = [];
// 循环过滤
this.$store.state.preOrderMsg.brands.forEach((value, index) => {
newArr[index] = value.goods;
newArr[index] = newArr[index].filter(
// 过滤商品不为国内仓和无 1和0
item => item.storehouse !== 0 && item.storehouse !== 1)
})
// 过滤商品不为国内仓和无 则需要实名认证
newArr.map(item => {
if (item.length) {
this.tipsShow = true
}
})
// 过滤商品不为国内仓和无
this.RealList = newArr
} else {
// 已实名认证
this.tipsShow = true
}
},
methods: {
toPage() {
uni.navigateTo({
url: '../../packageA/agreement/goods'
})
},
toRealName() {
uni.navigateTo({
url: "/pages/realname/realname"
})
},
// 设置买家留言信息
setNote() {
this.$u.post('/api/v1/order_preview/buyer_message/update', {
userId: uni.getStorageSync("userInfo").id,
orderId: this.preOrderMsg.id,
message: this.note
}).then(res => {
console.log(res.data);
if (res.data.code == "FAIL") {
this.$u.toast(res.data.msg);
return
}
});
},
//切换瑞币抵扣开关
changeUseCoin(value) {
console.log(value)
this.$u.post('/api/v1/order_preview/coin_onoff', {
userId: uni.getStorageSync("userInfo").id,
previewOrderId: this.preOrderMsg.id,
}).then(res => {
console.log(res.data);
if (res.data.code == "FAIL") {
this.$u.toast(res.data.msg);
return
}
let preViewMsg = res.data.data
this.$store.commit('updatePreOrderMsg', preViewMsg);
});
},
//提交订单
submitOrder() {
let submitBool = true
let realInfoStatus = uni.getStorageSync("userInfo").realInfoStatus
if (!realInfoStatus) {
// 用户未实名认证
this.RealList.map(item => {
// 未实名认证时 包含国内仓商品和无 商品 不能提交订单
if (item.length) {
submitBool = false
}
})
}
}
}
}
.bottom-box {
position: fixed;
width: 100%;
height: 100rpx;
padding: 0 30rpx;
bottom: 0;
box-shadow: 0 0 15rpx 1rpx rgba(0, 0, 0, 0.1);
z-index: 1000;
button {
background-image: linear-gradient(to right, #F37211, #F84A06);
}
}
if (!submitBool) {
// 未实名认证 并且商品包含国内仓商品和无
this.$u.toast('请先实名认证', 2000);
return
}
this.$u.post('/api/v1/order/submit', {
userId: uni.getStorageSync("userInfo").id,
previewOrderId: this.preOrderMsg.id
}).then(res => {
console.log(res.data);
if (res.data.code == "FAIL") {
this.$u.toast(res.data.msg, 2000);
return
}
let orderDetail = res.data.data
let msg = res.data.msg
// this.$store.commit('setOrderDetail',orderDetail);
//提交成功
uni.redirectTo({
url: "../orderPay/orderPay?orderId=" + orderDetail.id,
// url: "../orderDetail/orderDetail?orderId=" + orderDetail.id,
success: (res) => {
this.$u.toast(msg);
}
})
});
},
toAddressList() {
uni.navigateTo({
url: "../address/index?fromPage=confirmOrder"
})
}
}
}
</script>
<style lang="scss">
.tips {
margin: 20rpx 30rpx 20rpx 10rpx;
height: 120rpx;
padding: 20rpx;
border-radius: 10rpx 120rpx 120rpx 10rpx;
background-color: #fff2cb;
color: #d1893f;
font-size: 28rpx;
.tips-icon {
font-size: 44rpx;
}
.tips-center {
width: 75%;
}
// .tips-right{
// width: 180rpx;
// }
}
.prevent {
color: #C8C9CC !important;
background: #AAAAAA !important;
pointer-events: none;
}
page {
background-color: #f3f3f3;
}
.agree_box {
margin: 20rpx 30rpx;
}
.box {
margin: 20rpx 30rpx;
border-radius: 10rpx;
background-color: #FFFFFF;
&.address-box {
padding: 30rpx;
}
.address-con {
font-size: 26rpx;
color: #666;
margin: 0 15rpx;
.address-detail {
line-height: normal;
margin-top: 10rpx;
}
}
&.plain-box {
line-height: 70rpx;
padding: 20rpx 30rpx;
input {
height: 60rpx;
margin-left: 30rpx;
text-align: right;
padding: 0 10rpx;
}
.placeholder {
color: #AAAAAA;
font-size: 26rpx;
}
}
.cuIcon-right {
color: #DDDDDD;
font-size: 36rpx;
}
&.goods-msg-box {
padding: 20rpx 30rpx;
.shop-msg {
height: 60rpx;
}
}
// .num {
// font-size: 24rpx;
// }
&.coupon-box {
padding: 20rpx 30rpx;
line-height: 70rpx;
font-size: 28rpx;
}
&.order-msg {
padding: 20rpx 30rpx 0;
.item {
line-height: 60rpx;
&:last-child {
line-height: 100rpx;
border-top: 1rpx solid #f1f1f1;
}
}
}
}
.bottom-box {
position: fixed;
width: 100%;
height: 100rpx;
padding: 0 30rpx;
bottom: 0;
box-shadow: 0 0 15rpx 1rpx rgba(0, 0, 0, 0.1);
z-index: 1000;
button {
background-image: linear-gradient(to right, #F37211, #F84A06);
}
}
</style>

6
pages/goodsDetail/goodsDetail.vue
Unescape View File

@ -351,7 +351,7 @@
<!-- 服务说明介绍弹框 -->
<u-popup v-model="showTip" mode="bottom" border-radius="20" :closeable="true">
<!-- <u-popup v-model="showTip" mode="bottom" border-radius="20" :closeable="true">
<view class="text-center text-black" style="line-height: 100rpx;font-size: 32rpx;font-weight: 900;">服务保障</view>
<view class="tip-box">
<view class="tip-item">
@ -387,7 +387,7 @@
<view @tap="tipModel(false)">完成</view>
</view>
</u-popup>
<!-- 规格弹框 -->
--> <!-- 规格弹框 -->
<u-popup v-model="parameterShow" mode="bottom" border-radius="20">
<view class="text-center text-black" style="line-height: 100rpx;font-size: 32rpx;font-weight: 900;">产品参数</view>
<view class="parameter-box" style="height: 40vh;">
@ -593,7 +593,7 @@
this.current = e.detail.current
},
tipModel(flag) {
this.showTip = flag
// this.showTip = false
},
specModel(flag) {
this.showSpecs = flag

Write Preview
Loading…
Cancel
Save