热更新

This commit is contained in:
2024-06-13 10:04:13 +08:00
parent e595e034dc
commit 7eaaf64a22
1180 changed files with 70026 additions and 731709 deletions

View File

@@ -23,19 +23,19 @@
<!-- <view class="curriulum_title_box goods_item"> -->
<view class="normal_box">
<view class="normal_box_top" v-if="orderContet.consignee">
<view class="normal_box_top">
<view class="curriulum_title"
>{{ orderContet.consignee.province }}
{{ orderContet.consignee.city }}
{{ orderContet.consignee.county }}
{{ orderContet.consignee.address }}</view
>{{ orderContet.province }}
{{ orderContet.city }}
{{ orderContet.county }}
{{ orderContet.address }}</view
>
<view class="user_info">
<text class="name">
{{ orderContet.consignee.consigneeName }}
{{ orderContet.shippingUser }}
</text>
<text class="tel">
{{ orderContet.consignee.consigneeMobile }}
{{ orderContet.userPhone }}
</text>
</view>
</view>
@@ -61,7 +61,7 @@
订单已被拆分成 {{ sheetList.length }} 个包裹
</view>
<view class="orderItem">
<view class="" style="position: relative; height: 120rpx">
<view class="" style="position: relative; height: 60rpx">
<text
class="orderState orderState0"
v-if="orderContet.orderStatus == 0"
@@ -90,26 +90,60 @@
</view>
<view
class="orderContent"
v-for="(item, index) in orderContet.goodsList"
v-for="(item, index) in goodsList"
:key="index"
@click="goDetail(item.productId)"
v-if="orderContet.goodsList.length > 0"
@click="goDetail(item.productId, item)"
v-if="goodsList.length > 0"
>
<image :src="item.productImage" mode=""></image>
<view class="itemJian">
<view class="orderTitle">
<text>{{ item.productName }}</text>
</view>
<view class="orderPrice">
¥<text style="font-weight: bold">{{ item.productPrice }}</text
><br />
<text
style="color: #bbbbbb; font-size: 20rpx; margin-right: 10rpx"
>X</text
<!-- <image :src="item.productImage" mode="" ></image> -->
<view class="feng" style="position: relative">
<view v-if="item.delFlag == -1" class="delisted" style=""
>已下架</view
>
<!-- <image
:src="selectGoodsData.productImages"
mode="aspectFit"
class="goods_image"
></image> -->
<image
style="width: 100%; height: 100%"
v-if="item.productImages"
:src="item.productImages"
mode="aspectFit"
></image>
<view
v-else
style="
color: #c0c4cc;
font-size: 22rpx;
line-height: 140rpx;
text-align: center;
"
>暂无封面图</view
>
</view>
<view class="goods_info">
<view class="flexbox itemJian">
<view class="booknameleft">
<text
:style="`${item.delFlag == -1 ? 'color:#c0c4cc;' : ''}`"
>{{ item.productName }}</text
>
</view>
<view
style="color: #c0c4cc; font-size: 26rpx; font-weight: 700"
>
×{{ item.quantity ? item.quantity : "" }}</view
>
<text style="color: #bbbbbb">{{ item.quantity }}</text>
</view>
<br clear="both" />
<!-- <view class="btns flexbox" style="margin-top: 10rpx">
<view class="left" style="color: #c0c4cc"></view>
<view class="right flexbox opbtns" style="color: #c0c4cc">
×{{ item.quantity ? item.quantity : "" }}
</view>
</view> -->
</view>
<!-- <view class="orderOper" v-if="orderContet.orderStatus=='3'"> -->
@@ -132,44 +166,67 @@
<br clear="both" />
</view>
<view class="orderContent" v-if="orderContet.products == ''">
<view class="orderContent" v-if="orderContet.orderType == 'vip'">
<image
src="../../static/icon/oder_chong.png"
mode=""
style="height: 150rpx"
src="/static/icon/vip.png"
mode="aspectFill"
style="width: 100rpx; height: 100rpx"
></image>
<view class="itemJian">
<view class="orderTitle">
<text>充值</text>
<view class="orderTitle" style="line-height: 100rpx">
<text>VIP 充值</text>
</view>
<view class="orderPrice">
<text style="font-weight: bold">{{
orderContet.realMoney
}}</text>
<text style="font-weight: bold"></text>
</view>
<br clear="both" />
</view>
<br clear="both" />
</view>
<view class="orderallpri">
<span style="color: #666; margin-right: 10rpx; float: left"
>商品总价 :
</span>
<span>¥</span>{{ orderContet.orderPrice }}
<view
class="orderContent"
v-else-if="orderContet.orderType == 'point'"
>
<image
src="/static/icon/pay_3.png"
mode="aspectFill"
style="width: 100rpx; height: 100rpx"
></image>
<view class="itemJian">
<view class="orderTitle" style="line-height: 100rpx">
<text>充值</text>
</view>
<view class="orderPrice">
<text style="font-weight: bold"
>{{ orderContet.bookBuyConfigEntity.money }}太医币</text
>
</view>
<br clear="both" />
</view>
<br clear="both" />
</view>
<view class="orderReal" v-if="orderContet.orderType == 'order'">
<span style="color: #666; margin-right: 10rpx; float: left"
>运费 :
</span>
<span>¥</span>{{ orderContet.shippingPrice }}
</view>
<view class="orderReal" v-if="orderContet.orderType == 'order'">
<span style="color: #666; margin-right: 10rpx; float: left"
>积分 :
</span>
<span v-if="orderContet.jfDeduction>0">-</span> <span>¥</span>{{ orderContet.jfDeduction }}
</view>
<!-- <view class="orderReal">
<view class="order_item" style="">
<view class="orderallpri">
<span style="color: #666; margin-right: 10rpx; float: left"
>商品总价 :
</span>
<span>¥</span>{{ orderContet.orderMoney }}
</view>
<view class="orderReal" v-if="orderContet.orderType == 'order'">
<span style="color: #666; margin-right: 10rpx; float: left"
>运费 :
</span>
<span>¥</span>{{ orderContet.shippingMoney }}
</view>
<view class="orderReal" v-if="orderContet.orderType == 'order'">
<span style="color: #666; margin-right: 10rpx; float: left"
>积分 :
</span>
<span v-if="orderContet.jfDeduction > 0">-</span> <span>¥</span
>{{ orderContet.jfDeduction }}
</view>
<!-- <view class="orderReal">
<span style="color: #666; margin-right: 10rpx; float: left"
>优惠券 :
</span>
@@ -178,88 +235,88 @@
>
<b v-else style="color: #dd3c0c"><span>-¥</span>0</b>
</view> -->
<view class="orderReal">
<span style="color: #666; margin-right: 10rpx; float: left"
>实付款 :
</span>
<b style="color: #dd3c0c"
><span>¥</span>{{ orderContet.realPrice }}</b
<view class="orderReal" v-if="orderContet.orderStatus != 0">
<span style="color: #666; margin-right: 10rpx; float: left"
>实付款 :
</span>
<b style="color: #dd3c0c"
><span>¥</span>{{ orderContet.realMoney }}</b
>
</view>
</view>
<view class="order_item">
<view class="orderYunf">
<span style="color: #666; float: left">订单编号 : </span>
<text style="font-size: 24rpx; color: #666"
>{{ orderContet.orderSn }}
</text>
<u-tag
@click="handleCopy(orderContet.orderSn, '订单编号')"
borderColor="#3ab3ae"
color="#3ab3ae"
text="复制"
plain
style="float: right; margin-left: 5rpx"
size="mini"
type="success"
></u-tag>
</view>
<view class="orderReal">
<span style="color: #666; margin-right: 10rpx; float: left"
>创建时间 :
</span>
<text style="font-size: 24rpx; color: #666">{{
orderContet.createTime
}}</text>
</view>
<view
class="orderReal"
v-if="
orderContet.orderStatus >= 1 && orderContet.orderStatus != 5
"
>
<span style="color: #666; margin-right: 10rpx; float: left"
>付款时间 :
</span>
<text style="font-size: 24rpx; color: #666">{{
orderContet.paymentDate
}}</text>
</view>
</view>
<view class="orderYunf">
<span style="color: #666; margin-right: 10rpx; float: left"
>订单编号 :
</span>
<text style="font-size: 24rpx; color: #666">{{
orderContet.orderSn
}}</text>
</view>
<view class="orderReal">
<span style="color: #666; margin-right: 10rpx; float: left"
>创建时间 :
</span>
<text style="font-size: 24rpx; color: #666">{{
orderContet.createTime
}}</text>
</view>
<view
class="orderReal"
v-if="orderContet.orderStatus >= 1 && orderContet.orderStatus != 5"
>
<span style="color: #666; margin-right: 10rpx; float: left"
>付款时间 :
</span>
<text style="font-size: 24rpx; color: #666">{{
orderContet.paymentDate
}}</text>
</view>
<!-- <view class="orderReal" v-if="orderContet.orderStatus >= 2 && orderContet.orderStatus != 5">
<span style="color: #666;margin-right: 10rpx;float: left;">发货时间 : </span>
<text style="font-size: 24rpx;color: #666;">{{orderContet.shippingTime}}</text>
</view> -->
<view class="orderOper">
<view style="width: 100%; text-align: right">
<!-- <u-button text="" type="success" plain ></u-button>
<u-button text="" type="primary" plain >
</u-button> -->
<view
v-if="
orderContet.orderStatus == 2 &&
sheetList.length > 0 &&
orderContet.orderStatus != 5
"
class="opFix"
@click="seeExpressDetail(orderContet)"
>查看物流</view
>
<view
v-if="orderContet.orderStatus == 2"
class="opCan"
@click="OverOrder"
>确认收货</view
>
<view
v-if="orderContet.orderStatus == 0"
class="opFix"
@click="canceOrder"
>取消订单</view
>
<view
v-if="orderContet.orderStatus == 0"
class="opCan"
@click="goPay(orderContet)"
>去支付</view
>
<view class="opCan" @click="kefu">联系客服</view>
</view>
</view>
<view class=""></view>
</view>
</view>
</view>
<view class="goods_nav_box">
<common-goods-nav
:iconList="iconList"
:customButton="customButton"
@submit="goBuyJie"
@clickIcon="clickIcon"
>
<!-- leftSlot -->
<template slot="leftSlot" slot-scope="slotProps">
<view
class="price_box order_bottom_box"
v-if="orderContet.orderStatus == 0"
>
<text class="price"
>合计:
<text class="total">¥{{ orderContet.realMoney }}</text>
</text>
</view>
</template>
</common-goods-nav>
<!-- <uni-goods-nav :fill="true" :options="buyOptions" :button-group="customButtonGroup1" @click="onClick"
@buttonClick="buttonClick" /> -->
</view>
<!-- 对话框 -->
<u-popup :show="pingjiaShow" :round="10" @close="closePingjia">
<view class="tanchu">
@@ -400,6 +457,14 @@ import { mapState } from "vuex";
export default {
data() {
return {
iconList: [
{
text: "联系客服",
iconType: 1,
icon: "server-fill",
infoColor: "#666",
},
],
userRecordid: null, // 用户的评价状态
playData: {},
title: "Hello",
@@ -435,6 +500,7 @@ export default {
orderSn: "",
orderType: "",
orderContet: {},
goodsList: [],
deliverDetails: [
{
Traces: [],
@@ -447,6 +513,7 @@ export default {
sheetList: [], // 面单数据
consigneeShow: false,
sheetListShow: false,
customButton: [],
};
},
onLoad(e) {
@@ -471,6 +538,24 @@ export default {
},
methods: {
async goBuyJie(data) {
console.log("index at line 532:", data);
if (data.text == "继续付款") {
this.goPay(this.orderContet);
} else if (data.text == "取消订单") {
this.canceOrder();
} else if (data.text == "确认收货") {
this.OverOrder();
} else if (data.text == "查看物流") {
this.seeExpressDetail(this.orderContet);
}
},
async clickIcon(data) {
console.log("index at line 532:", data);
if (data.text == "联系客服") {
this.kefu();
}
},
// 复制到剪切板
copyData(data) {
uni.setClipboardData({
@@ -747,6 +832,9 @@ export default {
});
}
},
handleCopy(value, title) {
this.$commonJS.handleCopy(value, title);
},
onPageJump(item) {
uni.navigateTo({
url: "./deliverDetail?objId=" + item,
@@ -797,21 +885,69 @@ export default {
// 获取订单详情
getOrderList() {
console.log("this.orderType", this.orderType);
this.$http
// .get(`book/buyOrder/getOrderInfo?orderId=${this.orderID}`)
.get(`book/buyOrder/orderDetail?orderSn=${this.orderSn}`)
.request({
url: "common/buyOrder/commonOrderDetail",
method: "POST", // POST、GET、PUT、DELETE具体说明查看官方文档
data: {
orderId: this.orderID,
},
header: {
//默认 无 说明:请求头
"Content-Type": "application/json",
},
})
.then((res) => {
this.customButton = [];
console.log("订单详情", res);
this.orderContet = res.data.buyOrder;
this.goodsList = res.data.productInfo;
this.consigneeShow = true;
if (
this.orderContet.orderStatus == 2 &&
this.sheetList.length > 0 &&
this.orderContet.orderStatus != 5
) {
this.customButton.push({
width: "160rpx",
text: "查看物流",
color: "#333",
backgroundColor: "#f0f0f0",
color: "#fff",
});
}
if (this.orderContet.orderStatus == 2) {
this.customButton.push({
width: "160rpx",
text: "确认收货",
color: "#fff",
});
}
if (this.orderContet.orderStatus == 0) {
this.customButton.push({
width: "160rpx",
text: "继续付款",
});
}
if (this.orderContet.orderStatus == 0) {
this.customButton.push({
width: "160rpx",
text: "取消订单",
color: "#333",
backgroundColor: "#f0f0f0",
});
}
// var seconds = res.result.timestamp + 30 * 60 + 2 // 过期时间
// var nowSeconds = Math.floor(new Date().getTime() / 1000);
// res.result.overTime = seconds - nowSeconds
this.orderContet = res.result;
this.consigneeShow = true;
//this.userRecordid = res.userRecordid
this.productIDs = res.result.goodsList.map((item) => {
return item.buyOrderProductId;
});
// this.productIDs = res.data.goodsList.map((item) => {
// return item.buyOrderProductId;
// });
// console.log(this.orderContet,'this.orderContet')
if (this.orderContet.orderStatus == 0) {
this.titleStat = "待支付";
@@ -950,11 +1086,16 @@ export default {
},
// 商品内容跳转
goDetail(id) {
uni.navigateTo({
// url: '../bookShop/commodityDetail?id=' + item.id
url: `/pages/goods/index/index?navTitle=''&title=''&id=${id}`,
});
goDetail(id, data) {
console.log("data at line 1277:", data);
if (data.delFlag == -1) {
this.$commonJS.showToast("商品已下架");
} else {
uni.navigateTo({
// url: '../bookShop/commodityDetail?id=' + item.id
url: `/pages/goods/index/index?navTitle=''&title=''&id=${id}`,
});
}
},
},
};
@@ -977,8 +1118,8 @@ export default {
position: absolute;
left: 0;
top: 20rpx;
padding: 10rpx;
top: 0rpx;
padding: 6rpx 10rpx;
border-radius: 0 24rpx 24rpx 0;
font-size: 26rpx;
// font-weight: bold;
@@ -1183,14 +1324,16 @@ export default {
.orderList {
padding: 20rpx;
padding-top: 0;
.orderItem {
padding: 30rpx 10rpx 30rpx 30rpx;
padding: 30rpx 0rpx;
background-color: #fff;
border-radius: 30rpx;
margin-bottom: 30rpx;
.orderContent {
padding: 20rpx;
margin-bottom: 20rpx;
image {
@@ -1199,11 +1342,14 @@ export default {
margin-right: 20rpx;
float: left;
}
.itemJian {
.goods_info {
float: left;
width: 470rpx;
width: calc(100% - 180rpx) !important;
justify-content: space-between;
}
.itemJian {
width: 100%;
justify-content: space-between;
.orderTitle {
font-weight: bold;
font-size: 30rpx;
@@ -1224,24 +1370,22 @@ export default {
.orderallpri {
text-align: right;
border-top: 1px solid #eee;
margin: 40rpx 20rpx 0 0;
padding: 30rpx 0 0 0;
margin: 10rpx 0;
// padding: 30rpx 0 0 0;
font-size: 28rpx;
}
.orderReal {
text-align: right;
font-size: 28rpx;
margin: 5rpx 20rpx 0 0;
padding: 28rpx 0 0 0;
margin: 10rpx 0;
// padding: 28rpx 0 0 0;
}
.orderYunf {
text-align: right;
border-top: 1px solid #eee;
margin: 35rpx 20rpx 0 0;
padding: 30rpx 0 0 0;
font-size: 28rpx;
}
@@ -1269,6 +1413,9 @@ export default {
border: 1px solid #eba00b;
border-radius: 30rpx;
}
.kefu {
float: left;
}
}
}
}
@@ -1374,4 +1521,63 @@ export default {
// right: 30rpx;
}
}
.feng {
background-color: #fafafa;
margin: 0rpx 22rpx 0 0;
height: 140rpx !important;
width: 140rpx !important;
float: left;
border-radius: 14rpx;
// border: 1rpx solid #e9e9e9;
}
.booknameleft {
font-size: 32rpx;
width: calc(100% - 100rpx);
color: #070707;
letter-spacing: 0.5rpx;
font-weight: 600;
}
.order_item {
padding: 20rpx 20rpx;
border-top: 1px solid #eee;
}
/deep/.goods_nav_box {
.left {
margin-top: -10rpx;
width: auto;
height: auto;
position: relative;
// overflow: hidden;
}
}
.delisted {
background-color: red;
color: #fff;
// padding: 2rpx 4rpx;
position: absolute;
border-radius: 4rpx;
font-size: 22rpx;
width: 100rpx;
text-align: center;
height: 40rpx;
line-height: 40rpx;
left: calc((100% - 100rpx) / 2);
top: calc((100% - 40rpx) / 2);
}
.order_bottom_box {
margin-left: 20rpx;
.number {
font-size: 28rpx;
margin-right: 15rpx;
margin-top: 5rpx;
}
.price {
.total {
font-size: 38rpx;
color: red;
}
}
}
</style>