Pārlūkot izejas kodu

编写售后管理

mabaoyi 9 mēneši atpakaļ
vecāks
revīzija
6d379dbed1
64 mainītis faili ar 2061 papildinājumiem un 827 dzēšanām
  1. 7 2
      pageC/myPackage/component/packageCard.vue
  2. 0 1
      pageC/orderFormDetail/orderFormDetail.vue
  3. 151 0
      pageD/afterSalesDetail/afterSalesDetail.vue
  4. 73 0
      pageD/afterSalesDetail/component/agreePopup.vue
  5. 82 0
      pageD/afterSalesDetail/component/applicationInformation.vue
  6. 257 0
      pageD/afterSalesDetail/component/commodityDetail.vue
  7. 67 0
      pageD/afterSalesDetail/component/refusePopup.vue
  8. 146 0
      pageD/afterSalesManage/afterSalesManage.vue
  9. 234 0
      pageD/afterSalesManage/component/detailCard.vue
  10. 115 0
      pageD/logisticsProgress/component/progress.vue
  11. 51 73
      pageD/logisticsProgress/logisticsProgress.vue
  12. 174 28
      pageD/orderInformation/orderInformation.vue
  13. 30 8
      pageD/paymentOrder/paymentOrder.vue
  14. 14 0
      pages.json
  15. 1 1
      pages/mine/component/teamFunction.vue
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map
  40. 3 1
      unpackage/dist/dev/mp-weixin/app.json
  41. 0 0
      unpackage/dist/dev/mp-weixin/common/runtime.js
  42. 428 483
      unpackage/dist/dev/mp-weixin/common/vendor.js
  43. 16 16
      unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js
  44. 8 8
      unpackage/dist/dev/mp-weixin/pages/cart/cart.js
  45. 7 7
      unpackage/dist/dev/mp-weixin/pages/express/express.js
  46. 7 7
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  47. 2 2
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  48. 5 5
      unpackage/dist/dev/mp-weixin/pages/mine/mine.js
  49. 3 3
      unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js
  50. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js
  51. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js
  52. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js
  53. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js
  54. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js
  55. 14 14
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js
  56. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js
  57. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js
  58. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.js
  59. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js
  60. 14 14
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js
  61. 14 14
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js
  62. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js
  63. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabs/u-tabs.js
  64. 2 4
      uview-ui/components/u-textarea/u-textarea.vue

+ 7 - 2
pageC/myPackage/component/packageCard.vue

@@ -52,7 +52,7 @@
 			<view class="btn-list">
 				<button class="btn-2" v-show="itemInfo.orderStatus!=4&&itemInfo.orderStatus!=3" @click.stop="freeze">冻结</button>
 				<button class="btn-2" v-show="itemInfo.orderStatus != 1&&itemInfo.orderStatus!=4" @click.stop="$emit('toInformation',itemInfo.orderStatus)">查看详情</button>
-				<button class="btn-1" v-show="itemInfo.orderStatus == 1">立即付款</button>
+				<button class="btn-1" v-show="itemInfo.orderStatus == 1" @click.stop="toPayment">立即付款</button>
 				<button class="btn-1" v-show="itemInfo.orderStatus == 4">去寄件</button>
 			</view>
 		</view>
@@ -88,7 +88,12 @@
 			}
 		},
 		methods:{
-			freeze(){}
+			freeze(){},
+			toPayment(){
+				uni.navigateTo({
+					url:"/pageD/paymentOrder/paymentOrder"
+				})
+			}
 		}
 	}
 </script>

+ 0 - 1
pageC/orderFormDetail/orderFormDetail.vue

@@ -48,7 +48,6 @@
 		<commodityDetailVue :status="status" />
 
 		<view class="order">
-
 			<view class="order-number">
 				<text>
 					订单编号

+ 151 - 0
pageD/afterSalesDetail/afterSalesDetail.vue

@@ -0,0 +1,151 @@
+<template>
+	<view class="page">
+		<view class="top">
+			<view class="top-title">
+				请处理退款申请
+			</view>
+			<view class="top-detail">
+				如果您同意,请点击“同意退款”
+			</view>
+		</view>
+
+		<!-- 地址信息 -->
+		<view class="address">
+			<view class="name-phone">
+				<view style="margin-right:20rpx;font-size: 32rpx;">陈曦</view>
+				<text class="phone">17800000000</text>
+			</view>
+			<view class="address-detail">
+				江苏省淮安市清江浦区北京南路99号(青浦大桥南侧200
+				米)淮安恒大名都3号楼一单元1602
+			</view>
+		</view>
+
+		<CommodityDetail />
+		<ApplicationInformation />
+		<RefusePopup :show="show" @close="close"  />
+		<AgreePopup :agreeShow="agreeShow" @close="close"  />
+		
+		<view class="footer">
+			<button class="btn-1" @click="refuseApplication">拒绝申请</button><button @click="agreeShow = true" class="btn-2">同意退款</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import CommodityDetail from './component/commodityDetail.vue';
+	import ApplicationInformation from './component/applicationInformation.vue';
+	import RefusePopup from './component/refusePopup.vue';
+	import AgreePopup from './component/agreePopup.vue';
+	export default {
+		components: {
+			CommodityDetail,
+			ApplicationInformation,
+			RefusePopup,
+			AgreePopup
+		},
+		data() {
+			return {
+				show:false,
+				agreeShow:false
+			};
+		},
+		methods:{
+			refuseApplication(){
+				this.show = true
+			},
+			close(value){
+				console.log(value)
+				this.show = false
+				this.agreeShow = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		padding: 20rpx 24rpx;
+		position: relative;
+
+		.top {
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 28rpx 20rpx;
+
+			.top-title {
+				font-size: 36rpx;
+				color: #333;
+				font-weight: 600;
+			}
+
+			.top-detail {
+				font-size: 26rpx;
+				color: #A3A3A3;
+				margin-top: 10rpx;
+			}
+		}
+
+		.address {
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 34rpx 24rpx 28rpx;
+			margin-top: 24rpx;
+
+			.name-phone {
+				display: flex;
+				align-items: center;
+				align-items: flex-end;
+
+				.phone {
+					font-size: 26rpx;
+					color: #666;
+				}
+			}
+
+			.address-detail {
+				margin-top: 20rpx;
+				font-size: 24rpx;
+				color: #444;
+			}
+		}
+
+		.footer {
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			background-color: #fff;
+			height: 146rpx;
+			display: flex;
+			justify-content: flex-end;
+			padding: 20rpx 20rpx 0 0;
+
+			.btn-1 {
+				height: 76rpx;
+				padding: 0;
+				margin: 0;
+				font-size: 28rpx;
+				color: #f83224;
+				min-width: 188rpx;
+				background-color: #fff;
+				border-radius: 38rpx;
+				border: 2rpx solid #f83224;
+				margin-right: 20rpx;
+			}
+
+			.btn-2 {
+				height: 76rpx;
+				padding: 0;
+				margin: 0;
+				font-size: 28rpx;
+				color: #fff;
+				min-width: 188rpx;
+				background-color: #f83224;
+				border-radius: 38rpx;
+				margin-right: 20rpx;
+			}
+		}
+
+	}
+</style>

+ 73 - 0
pageD/afterSalesDetail/component/agreePopup.vue

@@ -0,0 +1,73 @@
+<template>
+	<view>
+		<u-popup :show="agreeShow" @close="$emit('close')" :safeAreaInsetBottom="false" mode="center" round="10">
+			<view class="popup-content">
+				<view class="title">
+					请确认是否退款
+				</view>
+				<view class="btn-list">
+					<button class="btn-2" @click="$emit('close')">取消</button>
+					<button class="btn-1" @click="$emit('close')">提交</button>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:{
+			agreeShow:{
+				typeof:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.popup-content{
+		padding: 36rpx 28rpx;
+		width: 450rpx;
+		.title{
+			font-size: 32rpx;
+			color: #333;
+			font-weight: 600;
+			text-align: center;
+			margin-bottom: 28rpx;
+		}
+		.btn-list{
+			display: flex;
+			justify-content: space-around;
+			.btn-1{
+				background-color: #f83224;
+				color: #fff;
+				margin-top: 40rpx;
+				border-radius: 38rpx;
+				margin: 0;
+				width: 188rpx;
+				height: 76rpx;
+				line-height: 76rpx;
+				font-size: 32rpx;
+			}
+			
+			.btn-2{
+				background-color: #fff;
+				color: #f83224;
+				margin-top: 40rpx;
+				border-radius: 38rpx;
+				border: 2rpx solid #f83224;
+				margin: 0;
+				width: 188rpx;
+				height: 76rpx;
+				line-height: 76rpx;
+				font-size: 32rpx;
+			}
+		}
+
+	}
+	
+</style>

+ 82 - 0
pageD/afterSalesDetail/component/applicationInformation.vue

@@ -0,0 +1,82 @@
+<template>
+	<view class="application-card">
+		<view class="title">
+			申请信息
+		</view>
+		<view class="_label-1">
+			<text>是否收货</text>
+			<text class="result">未收货</text>
+		</view>
+		<view class="_label-1">
+			<text>售后说明</text>
+			<text class="result">商品未按照规定时间发货,不需要了</text>
+		</view>
+		<view class="photo">
+			<text>图片凭证</text>
+			<view class="photo-list">
+				<view class="img-1">
+					
+				</view>
+				<view class="img-1">
+					
+				</view>
+				<view class="img-1">
+					
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.application-card{
+		padding: 28rpx 20rpx; 
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-top: 20rpx;
+		margin-bottom: 200rpx;
+		.title{
+			font-size: 30rpx;
+			font-weight: 600;
+			color: #333;
+		}
+		._label-1{
+			display: flex;
+			justify-content: space-between;
+			font-size: 28rpx;
+			color: #232323;
+			margin: 20rpx 0;
+			.result{
+				color: #555;
+			}
+			
+		}
+		.photo{
+			font-size: 28rpx;
+			color: #232323;
+			display: flex;
+			justify-content: space-between;
+			.photo-list{
+				display: flex;
+				justify-content: space-between;
+				.img-1{
+					width: 156rpx;
+					height: 156rpx;
+					border-radius: 10rpx;
+					background-color: #D4D4D4;
+					margin-left: 16rpx;
+				}
+			}
+		}
+	}
+</style>

+ 257 - 0
pageD/afterSalesDetail/component/commodityDetail.vue

@@ -0,0 +1,257 @@
+<template>
+	<view class="detail">
+		<view class="title">
+			<view class="title-left">
+				<image class="header-img"
+					src="https://tse4-mm.cn.bing.net/th/id/OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA?rs=1&pid=ImgDetMain"
+					mode=""></image>
+				<text>张三</text>
+				<image class="right-325" src="../../../static/mine/325.png" mode=""></image>
+			</view>
+		</view>
+		<view class="commodity-information">
+			<view class="commodity-1">
+				<image class="commodity-img"
+					src="https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/156939/24/43697/126104/6619de23F69802006/8432635baed61875.jpg.webp"
+					mode=""></image>
+				<view class="">
+					<view class="commodity-2">
+						<view class="commodity-title">
+							OATLY 噢麦力 醇香燕麦…
+						</view>
+						<view class="commodity-price">
+							<text style="font-size: 20rpx;">¥</text>
+							<text>133</text>.
+							<text style="font-size: 20rpx;">22</text>
+						</view>
+					</view>
+
+					<view class="commodity-3">
+						<view class="specifications">
+							【醇香】250ml*3
+						</view>
+						<view style="font-size: 24rpx;">
+							x1
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="detail-1">
+			<text class="_text-1">{{"共1件商品"+"&nbsp;"}}</text>
+			<text class="_text-2">买家实付</text>
+			<view class="_price">
+				<text style="font-size: 20rpx;">¥</text>
+				<text>133</text>.
+				<text style="font-size: 20rpx;">22</text>
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">退款状态</text>
+			<view style="color: #f83224;">
+			待商家处理
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">退款原因</text>
+			<view class="_title-right">
+				商品与图片不符
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">退款金额</text>
+			<view lass="_title-right" style="font-weight: 600;">
+				¥89.00
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">申请时间</text>
+			<view style="color: #222;">
+				2022-08-23 20:34:34
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">退款编号</text>
+			<view style="color: #222;">
+				<text>{{"Cbz202212120919838881|"}}</text>
+				<text @click="cope('123456')">复制</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+
+		props:{
+			status:{
+				typeof:Number,
+				default:0
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods:{
+			cope(str) {
+				uni.setClipboardData({
+					data: str,
+					success() {
+						uni.showToast({
+							title: "复制成功",
+							icon: "none"
+						})
+					}
+				})
+			},
+			application(){
+				uni.navigateTo({
+					url:"/pageC/applicationRefund/applicationRefund"
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.detail {
+		padding: 28rpx 20rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-top: 28rpx;
+
+		.title {
+			display: flex;
+			justify-content: space-between;
+
+			.title-left {
+				display: flex;
+				font-size: 32rpx;
+				align-items: center;
+
+				.header-img {
+					width: 36rpx;
+					height: 36rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
+
+				.right-325 {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+
+			.order-status {
+				color: #f83224;
+				font-size: 26rpx;
+			}
+		}
+
+		.commodity-information {
+			margin-top: 28rpx;
+
+			.commodity-1 {
+				display: flex;
+
+				.commodity-img {
+					width: 180rpx;
+					height: 180rpx;
+					margin-right: 20rpx;
+					border-radius: 10rpx;
+				}
+
+				.commodity-2 {
+					display: flex;
+					justify-content: space-between;
+
+					.commodity-title {
+						width: 328rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						margin-right: 38rpx;
+					}
+				}
+
+				.commodity-3 {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 20rpx;
+					color: #777;
+
+					.specifications {
+						font-size: 28rpx;
+						color: #777;
+					}
+				}
+			}
+		}
+		.last{
+			border-bottom: 2rpx solid rgba(151, 151, 151, .1);
+			padding-bottom: 20rpx;
+		}
+		.btn-list{
+			display: flex;
+			justify-content: flex-end;
+			button{
+				width: 152rpx;
+				height: 58rpx;
+				border: 2rpx solid #979797;
+				color: #444;
+				margin: 0;
+				padding: 0;
+				font-size: 24rpx;
+				background-color: #fff;
+				border-radius: 34rpx;
+				margin-top: 20rpx;
+				margin-left: 20rpx;
+			}
+		}
+		.detail-1{
+			display: flex;
+			justify-content: flex-end;
+			align-items: flex-end;
+			padding-bottom: 20rpx;
+			border-bottom: 2rpx solid rgba(151, 151, 151, .1);
+			._text-1{
+				color: #222;
+				font-size: 24rpx;
+			}
+			._text-2{
+				color:#222;
+				font-size: 28rpx;
+				font-weight: 600;
+			}
+			._price{
+				font-weight: 600;
+				color:#222;
+			}
+		}
+		.information {
+			display: flex;
+			justify-content: space-between;
+			font-size: 28rpx;
+			align-items: flex-end;
+			margin: 24rpx 0;
+			._label{
+				font-size: 28rpx;
+				color: #333;
+			}
+			._title-right{
+				font-size: 28rpx;
+				color: #333;
+			}
+		}
+		._bottom{
+				display: flex;
+				justify-content: flex-end;
+				font-size: 28rpx;
+				align-items: flex-end;
+				margin-top: 34rpx;
+		}
+
+	}
+</style>

+ 67 - 0
pageD/afterSalesDetail/component/refusePopup.vue

@@ -0,0 +1,67 @@
+<template>
+	<view class="popup">
+		<u-popup :show="show" @close="$emit('close')" :safeAreaInsetBottom="false" mode="center" round="10" >
+			<view class="popup-content">
+				<view class="title">
+					拒绝理由
+				</view>
+				<view class="_textarea">
+					<u--textarea v-model="value2" height="108" maxlength="200" placeholder="请输入拒绝原因" count ></u--textarea>
+				</view>
+					<button class="btn-1" @click="$emit('close',value2)">提交</button>
+					<view class="cancel" @click="$emit('close')">
+						取消
+					</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:{
+			show:{
+				typeof:Boolean,
+				default:false
+			}
+		},
+		data(){
+			return{
+				value2:""
+			}
+		},
+		methods:{
+			close(){}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.popup-content{
+		padding: 36rpx 28rpx;
+		.title{
+			font-size: 32rpx;
+			color: #333;
+			font-weight: 600;
+			text-align: center;
+			margin-bottom: 28rpx;
+		}
+		._textarea{
+			width: 534rpx;
+			height: 216rpx;
+		}
+		.btn-1{
+			background-color: #f83224;
+			color: #fff;
+			margin-top: 40rpx;
+			border-radius: 38rpx;
+		}
+		.cancel{
+			text-align: center;
+			margin-top: 28rpx;
+			font-size: 28rpx;
+			color: rgba(51, 51, 51, .6);
+		}
+	}
+
+</style>

+ 146 - 0
pageD/afterSalesManage/afterSalesManage.vue

@@ -0,0 +1,146 @@
+<template>
+	<view>
+		<view class="top-tab">
+			<view :class="{commodity:follow==1}" class="tab" @click="tabSwitch(1)">
+				全部
+			</view>
+			<view :class="{commodity:follow==2}" class="tab" @click="tabSwitch(2)">
+				待退款
+			</view>
+			<view :class="{commodity:follow==3}" class="tab" @click="tabSwitch(3)">
+				平台介入
+			</view>
+			<view :class="{commodity:follow==4}" class="tab" @click="tabSwitch(4)">
+				已退款
+			</view>
+		</view>
+		<view class="center">
+			<view v-for="item in orderList" :key="item.status">
+				<DetailCard :itemInfo="item" @toDetail='toDetail' />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import DetailCard from './component/detailCard.vue'
+	export default {
+		components: {
+			DetailCard
+		},
+		data() {
+			return {
+
+				follow: 1,
+				orderList: [{
+						name: 'Trinity 自由比格',
+						status: 0,
+						headerImg: "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
+						orderImg: "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
+						orderDetail: 'OATLY噢麦力 咖啡大师…',
+						orderPrice: '29.90',
+						specifications: "咖啡大师燕麦奶250ml*6瓶",
+						num: 1,
+						payPrice: '141.00',
+						remark: '买家急用,仓库尽早发货'
+					},
+					{
+						name: 'Trinity 自由比格',
+						status: 1,
+						headerImg: "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
+						orderImg: "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
+						orderDetail: 'OATLY噢麦力 咖啡大师…',
+						orderPrice: '29.90',
+						specifications: "咖啡大师燕麦奶250ml*6瓶",
+						num: 1,
+						payPrice: '141.00',
+						remark: '买家急用,仓库尽早发货'
+					},
+					{
+						name: 'Trinity 自由比格',
+						status: 2,
+						headerImg: "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
+						orderImg: "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
+						orderDetail: 'OATLY噢麦力 咖啡大师…',
+						orderPrice: '29.90',
+						specifications: "咖啡大师燕麦奶250ml*6瓶",
+						num: 1,
+						payPrice: '141.00',
+						remark: '买家急用,仓库尽早发货'
+					},
+					{
+						name: 'Trinity 自由比格',
+						status: 3,
+						headerImg: "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
+						orderImg: "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
+						orderDetail: 'OATLY噢麦力 咖啡大师…',
+						orderPrice: '29.90',
+						specifications: "咖啡大师燕麦奶250ml*6瓶",
+						num: 1,
+						payPrice: '141.00',
+						remark: '买家急用,仓库尽早发货'
+					},
+				]
+			}
+		},
+		methods: {
+
+			tabSwitch(num) {
+				this.follow = num
+			},
+			toDetail(){
+				uni.navigateTo({
+					url:"/pageD/afterSalesDetail/afterSalesDetail"
+				})
+			}
+		},
+		mounted() {
+			uni.setNavigationBarTitle({
+				title: "售后订单"
+			})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.top-tab {
+		display: flex;
+		justify-content: space-around;
+		overflow-y: auto;
+		padding-bottom: 10rpx;
+		// flex-shrink: 1;
+		// width: 100vw;
+		background-color: #fff;
+
+		.tab {
+			margin-right: 40rpx;
+			font-size: 26rpx;
+			color: rgba(34, 34, 34, .8);
+			flex-shrink: 0;
+			height: 44rpx;
+			display: flex;
+			align-items: flex-end;
+		}
+
+		.commodity {
+			position: relative;
+			font-weight: 600;
+			font-size: 32rpx;
+		}
+
+		.commodity::before {
+			content: '';
+			display: block;
+			height: 8rpx;
+			width: 100%;
+			background: linear-gradient(to right, #f83224, #fff);
+			position: absolute;
+			bottom: 5rpx;
+			opacity: 0.8;
+		}
+	}
+
+	.center {
+		padding: 20rpx 24rpx;
+	}
+</style>

+ 234 - 0
pageD/afterSalesManage/component/detailCard.vue

@@ -0,0 +1,234 @@
+<template>
+	<view class="card" @click="$emit('toDetail')">
+		<view class="user-name">
+			<view class="name">
+				<image class="header-img"
+					src="https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2"
+					mode=""></image>
+				<text>Trinity 自由比格</text>
+			</view>
+			<text class="order-status">{{deliveryStatus}}</text>
+		</view>
+		<view class="order-detail" >
+			<view class="detail">
+				<image class="order-img"
+					src="https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif"
+					mode=""></image>
+				<view class="detail-right">
+					<view class="title-price">
+						<view class="title">
+							OATLY噢麦力 咖啡大师…
+						</view>
+						<view class="price">
+							<text style="font-size: 20rpx;">¥</text>
+							<text>133</text>.
+							<text style="font-size: 20rpx;">22</text>
+						</view>
+					</view>
+					<view class="specifications">
+						<view class="title">
+							咖啡大师燕麦奶250ml*6瓶
+						</view>
+						<text>x1</text>
+					</view>
+				</view>
+			</view>
+			<view class="price-detail">
+				<text style="color: #222;font-size: 24rpx;">{{"共1件商品"+"&nbsp;"}}</text>
+				<text style="font-size: 28rpx;">买家实付</text>
+				<view class="price">
+					<text style="font-size: 20rpx;">¥</text>
+					<text>133</text>.
+					<text style="font-size: 20rpx;">22</text>
+				</view>
+			</view>
+		</view>
+		<view class="btn-list">
+			<button disabled class="btn-2" v-if="itemInfo.status == 0 ||itemInfo.status == 1">平台介入</button>
+			<button class="btn-1" v-if="itemInfo.status == 0 ||itemInfo.status == 1">拒绝申请</button>
+			<button class="btn-3" v-if="itemInfo.status == 0 ||itemInfo.status == 1">同意退款</button>
+			<button class="btn-2" v-if="itemInfo.status == 3">删除</button>
+			<button class="btn-2" v-if="itemInfo.status == 3">查看详情</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			itemInfo: {
+				typeof: Object,
+				default: {}
+			}
+		},
+		computed: {
+			model() {
+				if (this.itemInfo.status == 0) {
+					return 'filter: blur(5px);'
+				}
+			},
+			deliveryStatus() {
+				if (this.itemInfo.status == 0) {
+					return '待退款'
+				} else if (this.itemInfo.status == 1) {
+					return '平台介入'
+				}else if (this.itemInfo.status == 2) {
+					return '拒绝退款'
+				}else if (this.itemInfo.status == 3) {
+					return '已退款'
+				}
+			}
+		},
+		data() {
+			return {}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.card {
+		background-color: #fff;
+		border-radius: 16rpx;
+		padding: 0 20rpx;
+		padding-bottom: 20rpx;
+		margin-bottom: 20rpx;
+
+		.user-name {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			height: 84rpx;
+			border-bottom: 2rpx solid rgba(151, 151, 151, .2);
+
+			.name {
+				display: flex;
+				align-items: center;
+				font-size: 24rpx;
+				color: #333;
+
+				.header-img {
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 50%;
+					margin-right: 12rpx
+				}
+			}
+
+			.order-status {
+				font-size: 24rpx;
+				color: #f83224;
+			}
+		}
+
+		.order-detail {
+			margin-top: 22rpx;
+			position: relative;
+
+
+
+			.detail {
+				display: flex;
+
+				.order-img {
+					width: 180rpx;
+					height: 180rpx;
+					border-radius: 10rpx;
+					margin-right: 20rpx;
+				}
+
+				.detail-right {
+					width: 70%;
+
+					.title-price {
+						display: flex;
+						font-size: 28rpx;
+						justify-content: space-between;
+						align-items: center;
+
+						.title {
+							width: 330rpx;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
+					}
+
+					.specifications {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						font-size: 28rpx;
+						color: #777;
+						margin-top: 10rpx;
+
+						.title {
+							width: 330rpx;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
+					}
+				}
+			}
+		}
+
+		.price-detail {
+			display: flex;
+			justify-content: flex-end;
+			align-items: flex-end;
+			margin-top: 20rpx;
+
+			.price {
+				font-weight: 600;
+			}
+		}
+
+		.remarks {
+			display: flex;
+			font-size: 28rpx;
+			background-color: #f4f4f4;
+			border-radius: 10rpx;
+			padding: 14rpx 20rpx;
+			margin-top: 20rpx;
+		}
+
+		.btn-list {
+			display: flex;
+			justify-content: flex-end;
+			margin-top: 30rpx;
+
+			.btn-1 {
+				font-size: 28rpx;
+				color: #f83224;
+				border: 2rpx solid #f83224;
+				background-color: #fff;
+				margin: 0;
+				border-radius: 34rpx;
+				min-width: 162rpx;
+				margin-left: 20rpx;
+			}
+
+			.btn-2 {
+				font-size: 28rpx;
+				color: #222;
+				border: 2rpx solid #979797;
+				background-color: #fff;
+				margin: 0;
+				border-radius: 34rpx;
+				min-width: 162rpx;
+				margin-left: 20rpx;
+
+			}
+			.btn-3 {
+				font-size: 28rpx;
+				color: #fff;
+				background-color: #f83224;
+				margin: 0;
+				border-radius: 34rpx;
+				min-width: 162rpx;
+				margin-left: 20rpx;
+
+			}
+		}
+	}
+</style>

+ 115 - 0
pageD/logisticsProgress/component/progress.vue

@@ -0,0 +1,115 @@
+<template>
+	<view>
+		<view v-for="(item,index) in logisticsList" :key="index" class="information">
+			<view class="basis">
+				<view class="dot" v-if="item.title" :style="item.status?'background-color:#f83224':''">
+				</view>
+				<view class="dot-1" v-else :style="item.status?'background-color:#f83224':''">
+				</view>
+
+				<view class="name" :style="item.status?'color:#f83224':''">
+					{{item.title}}
+				</view>
+				<view class="time" :style="item.status?'color:#f83224':''">
+					{{item.time}}
+				</view>
+			</view>
+			<view class="shu" v-show="index < logisticsList.length-1&&!item.imageUrl"> </view>
+			<view class="shu-1" v-show="index < logisticsList.length-1&&item.imageUrl"> </view>
+			
+			<view class="does" :id="'does'+index" :style="item.status?'color:#333':''">
+				{{ item.does }}
+			</view>
+			<view class="img-1" v-if="item.imageUrl">
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			logisticsList: {
+				typeof: Array,
+				default: []
+			}
+		},
+		data() {
+			return {
+
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+		.information {
+			position: relative;
+		}
+	.basis {
+		display: flex;
+		align-items: center;
+		margin-top: 28rpx;
+		.dot {
+			border-radius: 50%;
+			background-color: rgba(227, 227, 227, 1);
+			width: 18rpx;
+			height: 18rpx;
+			margin-right: 20rpx;
+			z-index: 100;
+		}
+
+		.dot-1 {
+			border-radius: 50%;
+			background-color: rgba(227, 227, 227, 1);
+			width: 10rpx;
+			height: 10rpx;
+			margin-right: 20rpx;
+			margin-left: 4rpx;
+			z-index: 100;
+		}
+
+		.name {
+			font-size: 28rpx;
+			margin-right: 20rpx;
+		}
+
+		.time {
+			font-size: 24rpx;
+		}
+	}
+	.img-1{
+		background-color: #D8D8D8;
+		border-radius: 4rpx;
+		width: 608rpx;
+		height: 368rpx;
+		margin-left: 30rpx;
+		margin-bottom: 28rpx;
+	}
+	.shu {
+		position: absolute;
+		height: 126rpx;
+		width: 2rpx;
+		background-color: rgba(151, 151, 151, .6);
+		left: 8rpx;
+		top: 22rpx;
+	}
+	.shu-1{
+		
+			position: absolute;
+			height: 484rpx;
+			width: 2rpx;
+			background-color: rgba(151, 151, 151, .6);
+			left: 8rpx;
+			top: 22rpx;
+	}
+
+	.does {
+		font-size: 24rpx;
+		color: rgba(119, 119, 119, .8);
+		margin: 8rpx 0 0 36rpx;
+		height: 60rpx;
+	}
+</style>

+ 51 - 73
pageD/logisticsProgress/logisticsProgress.vue

@@ -14,7 +14,17 @@
 			</view>
 		</view>
 		<view class="logistics">
-			<view class="logistics-detail">
+			<view class="warehouse-packaging" v-if="warehouse.length>0">
+
+				<Progress :logisticsList="warehouse" />
+
+			</view>
+			<view class="_detail-1">
+				<text>已于11月24日送至平台仓库</text>
+				<u-icon @click="putItAway" name="arrow-up" color="#666666" size="18" v-if="isShow"></u-icon>
+				<u-icon @click="putItAway" name="arrow-down" color="#666666" size="18" v-else></u-icon>
+			</view>
+			<view class="logistics-detail" v-if="isShow">
 				<view class="">
 					{{"顺丰快递"+"&nbsp;"+"|"+"&nbsp"+"订单号:"}}
 					<text>JDV21093105892</text>
@@ -25,39 +35,25 @@
 					<text @click="makeCall">打电话</text>
 				</view>
 			</view>
-			<view class="logistics-information">
-				<view v-for="(item,index) in logisticsList" :key="index" class="information">
-					<view class="basis">
-						<view class="dot" v-if="item.title" :style="item.status?'background-color:#f83224':''">
-						</view>
-						<view class="dot-1" v-else :style="item.status?'background-color:#f83224':''">
-						</view>
-
-						<view class="name" :style="item.status?'color:#f83224':''">
-							{{item.title}}
-						</view>
-						<view class="time" :style="item.status?'color:#f83224':''">
-							{{item.time}}
-						</view>
-					</view>
-					<view class="shu" v-show="index < logisticsList.length-1"> </view>
-					<view class="does" :id="'does'+index" :style="item.status?'color:#333':''">
-						{{ item.does }}
-					</view>
-				</view>
+			<view class="logistics-information" v-if="isShow">
+				<Progress :logisticsList="logisticsList" />
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import Progress from './component/progress.vue'
 	export default {
+		components: {
+			Progress
+		},
 		data() {
 			return {
 				logisticsList: [{
 						title: "已签收",
 						time: "10:11",
-						status: true,
+						status: false,
 						does: "您的快件已暂存至浦口东方万汇城北区2号楼超市店菜鸟驿站,请凭取件码及时领取。"
 					}, {
 						title: "派送中",
@@ -77,7 +73,24 @@
 						status: false,
 						does: "快递离开******"
 					}
-				]
+				],
+				warehouse: [{
+						title: "打包称重",
+						time: "10:11",
+						status: true,
+						imageUrl: true,
+						does: "商品已打包称重,待用户付款"
+					},
+					{
+
+						title: "商品入库",
+						time: "10:11",
+						status: false,
+						imageUrl: false,
+						does: "商品已进入转入仓库,正在排队等待打包"
+					}
+				],
+				isShow:true
 			}
 		},
 		computed: {},
@@ -112,6 +125,9 @@
 						console.error('授权失败,请允许拨打电话权限!');
 					}
 				});
+			},
+			putItAway(){
+				this.isShow = !this.isShow
 			}
 		},
 		created() {
@@ -125,7 +141,6 @@
 <style scoped lang="scss">
 	.page {
 		padding: 20rpx 24rpx;
-
 		.top-detail {
 			display: flex;
 			justify-content: space-around;
@@ -151,6 +166,17 @@
 			padding: 0 20rpx;
 			position: relative;
 			top: -20rpx;
+			padding-bottom: 20rpx;
+
+			._detail-1 {
+				display: flex;
+				justify-content: space-between;
+				font-size: 28rpx;
+				color: #666;
+				align-items: center;
+				border-top: 2rpx solid rgba(151, 151, 151, .1);
+				padding-top: 28rpx;
+			}
 
 			.logistics-detail {
 				display: flex;
@@ -159,7 +185,7 @@
 				color: #333;
 				height: 104rpx;
 				align-items: center;
-				border-bottom: 2rpx solid rgba(151, 151, 151, .2);
+				border-bottom: 2rpx solid rgba(151, 151, 151, .1);
 
 			}
 
@@ -167,58 +193,10 @@
 				padding: 20rpx 0;
 
 				.information {
-
 					position: relative;
 				}
 			}
 
-			.basis {
-				display: flex;
-				align-items: center;
-
-				.dot {
-					border-radius: 50%;
-					background-color: rgba(227, 227, 227, 1);
-					width: 18rpx;
-					height: 18rpx;
-					margin-right: 20rpx;
-					z-index: 100;
-				}
-
-				.dot-1 {
-					border-radius: 50%;
-					background-color: rgba(227, 227, 227, 1);
-					width: 10rpx;
-					height: 10rpx;
-					margin-right: 20rpx;
-					margin-left: 4rpx;
-					z-index: 100;
-				}
-
-				.name {
-					font-size: 28rpx;
-					margin-right: 20rpx;
-				}
-
-				.time {
-					font-size: 24rpx;
-				}
-			}
-
-			.shu {
-				position: absolute;
-				height: 126rpx;
-				width: 2rpx;
-				background-color: rgba(151, 151, 151, .6);
-				left: 8rpx;
-				top: 22rpx;
-			}
-
-			.does {
-				font-size: 24rpx;
-				color: rgba(119, 119, 119, .8);
-				margin: 8rpx 0 28rpx 36rpx;
-			}
 		}
 	}
 </style>

+ 174 - 28
pageD/orderInformation/orderInformation.vue

@@ -2,13 +2,51 @@
 	<view class="page">
 		<view class="top">
 			<view class="title">
-				待平台收货
+				{{orderTitle}}
 			</view>
 			<view class="prompt">
-				商品已寄往平台,正在运输中
+				{{orderDetail}}
+			</view>
+		</view>
+		<view class="packaging" v-if="orderStauts == 4">
+			<view class="packaging-top">
+				<view class="">
+					{{"普通包裹"+"&nbsp;"+"|"+"&nbsp"+"海运散货"}}
+				</view>
+				<view style="color:#f83224;">
+					拼包中
+				</view>
+			</view>
+			<view class="packaging-center">
+				<view class="packaging-left">
+					<view class="left-top">
+						东莞仓库
+					</view>
+					<view class="left-bottom">
+							始发地
+					</view>
+				</view>
+				<image class="jiantou" src="../../static/mine/339.png" mode=""></image>
+				<view class="packaging-left">
+					<view class="left-top">
+						澳大利亚
+					</view>
+					<view class="left-bottom">
+							目的地
+					</view>
+				</view>
+			</view>
+			<view class="packaging-time">
+				<view class="time">
+					<text>开始时间:</text>
+					<text>{{"2024-5-25" + "&emsp;"}}</text>
+				</view>
+				<view class="time">
+					<text>开始时间:</text>
+					<text>2024-5-25</text>
+				</view>
 			</view>
 		</view>
-
 		<view class="photo" v-if="orderStauts == 1">
 			<view class="_weight"> <text>称重重量</text> <text>168kg</text> </view>
 			<view class="_weight"> <text>称重图片</text>
@@ -81,7 +119,7 @@
 			</view>
 		</view>
 		<view class="num-information">
-			<view class="order" style="margin-bottom: 28rpx;">
+			<view class="order" style="">
 				<text class="_label-1">订单编号</text>
 				<view class="num">
 					<text>ZT83829300113344</text>{{ "&nbsp;"+"|"+"&nbsp;" }}<text
@@ -94,10 +132,20 @@
 					2023-11-24 22:31
 				</view>
 			</view>
+			<view class="order" v-show="orderStauts == 2">
+				<text class="_label-1">付款时间</text>
+				<view class="num">
+					2023-11-24 22:31
+				</view>
+			</view>
 		</view>
-		<view class="footer">
+		<view class="pay">
+			<text>已付</text>
+			<text style="color: #f83224; font-weight: 600;">123.1</text>
+		</view>
+		<view class="footer" v-if="orderStauts != 2 ">
 			<button class="btn-1" @click="toLogistics">查看物流</button>
-			<button class="btn-2" @click="toPay">立即付款</button>
+			<button class="btn-2" @click="toPay" v-if="orderStauts == 1">立即付款</button>
 		</view>
 	</view>
 </template>
@@ -106,20 +154,61 @@
 	export default {
 		data() {
 			return {
-				orderStauts: 1
+				orderStauts: 0,
+				orderTitle: "",
+				orderDetail: ""
 			};
 		},
+		computed: {
+
+		},
 		onLoad(options) {
 			console.log(options)
-			this.setStatus(options.orderStauts)
-		},
-		created() {
-			//设置顶部标题栏颜色
-			uni.setNavigationBarColor({
-				frontColor: '#000000',
-				backgroundColor: '#f4f4f4'
-			})
+			this.orderStauts = options.orderStatus
+			if (this.orderStauts == 0) {
+				//设置顶部标题栏颜色
+				uni.setNavigationBarColor({
+					frontColor: '#000000',
+					backgroundColor: '#f4f4f4'
+				})
+				this.orderDetail = "商品已寄往平台,正在运输中"
+				this.orderTitle = "待平台收货"
+			} else if (this.orderStauts == 1) {
+				//设置顶部标题栏颜色
+				uni.setNavigationBarColor({
+					frontColor: '#000000',
+					backgroundColor: '#f4f4f4'
+				})
+				this.orderDetail = "商品已打包称重,等待用户付款"
+				this.orderTitle = "待付款"
+			} else if (this.orderStauts == 2) {
+				//设置顶部标题栏颜色
+				uni.setNavigationBarColor({
+					frontColor: '#000000',
+					backgroundColor: '#f4f4f4'
+				})
+				this.orderDetail = "等待平台发货"
+				this.orderTitle = "待发货"
+			} else if (this.orderStauts == 3) {
+				//设置顶部标题栏颜色
+				uni.setNavigationBarColor({
+					frontColor: '#000000',
+					backgroundColor: '#f4f4f4'
+				})
+				this.orderDetail = "商品已发出,很快将发货至您的手中"
+				this.orderTitle = "已发货"
+			} else if (this.orderStauts == 4) {
+				//设置顶部标题栏颜色
+				uni.setNavigationBarColor({
+					frontColor: '#000000',
+					backgroundColor: '#ffffff'
+				})
+				uni.setNavigationBarTitle({
+					title:"拼包详情"
+				})
+			}
 		},
+		created() {},
 		methods: {
 			cope(str) {
 				uni.setClipboardData({
@@ -132,18 +221,17 @@
 					}
 				})
 			},
-			setStatus(num){
+			setStatus(num) {
 				this.orderStauts = num
-				return 11
 			},
 			toLogistics() {
 				uni.navigateTo({
 					url: "/pageD/logisticsProgress/logisticsProgress"
 				})
 			},
-			toPay(){
+			toPay() {
 				uni.navigateTo({
-					url:"/pageD/paymentOrder/paymentOrder"
+					url: "/pageD/paymentOrder/paymentOrder"
 				})
 			}
 		}
@@ -166,41 +254,88 @@
 			color: rgba(34, 34, 34, .5);
 			margin-top: 12rpx;
 		}
-		
-		.photo{
+		.packaging{
+			border-radius: 16rpx;
+			background-color: #fff;
+			padding: 30rpx 20rpx;
+			.packaging-top{
+				display: flex;
+				justify-content: space-between;
+				font-size: 28rpx;
+				color: #222;
+			}
+			.packaging-center{
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+				margin-top: 26rpx;
+				background-color: #F5F5F5;
+				border-radius: 10rpx;
+				padding: 20rpx 0;
+				.jiantou{
+					width: 130rpx;
+					height: 10rpx;
+				}
+				.packaging-left{
+					text-align: center;
+					.left-top{
+						font-size: 32rpx;
+						color: #222;
+						font-weight: 600;
+					}
+					.left-bottom{
+						margin-top: 10rpx;
+						font-size: 24rpx;
+						color: rgba(34, 34, 34, .5);
+					}
+				}
+			}
+			.packaging-time{
+				font-size: 28rpx;
+				display: flex;
+				align-items: center;
+				margin-top: 28rpx;
+			}
+		}
+		.photo {
 			background-color: #fff;
 			border-radius: 16rpx;
 			padding: 20rpx 20rpx;
 			margin-top: 20rpx;
-			._weight{
+
+			._weight {
 				display: flex;
 				justify-content: space-between;
 				font-size: 26rpx;
 				color: rgba(34, 34, 34, .8);
 				margin-bottom: 32rpx;
-				._image{
+
+				._image {
 					width: 160rpx;
 					height: 90rpx;
 					background-color: #D8D8D8;
 					border-radius: 4rpx;
 				}
 			}
-			.photo-bottom{
+
+			.photo-bottom {
 				display: flex;
 				justify-content: flex-end;
 				align-items: center;
 				border-top: 2rpx solid rgba(151, 151, 151, .1);
 				padding-top: 24rpx;
-				.price{
+
+				.price {
 					color: #f83224;
 					font-weight: 600;
 				}
-				._text-1{
+
+				._text-1 {
 					font-size: 26rpx;
 				}
 			}
 		}
-		
+
 		.address {
 			padding: 36rpx 34rpx;
 			background-color: #fff;
@@ -278,12 +413,13 @@
 			background-color: #fff;
 			border-radius: 16rpx;
 			margin-top: 20rpx;
-			padding: 28rpx 20rpx 28rpx 28rpx;
+			padding: 28rpx 20rpx 2rpx 28rpx;
 
 			.order {
 				display: flex;
 				justify-content: space-between;
 				font-size: 28rpx;
+				margin-bottom: 28rpx;
 
 				._label-1 {
 					color: #666;
@@ -295,6 +431,15 @@
 			}
 		}
 
+		.pay {
+			display: flex;
+			padding: 22rpx 28rpx;
+			justify-content: space-between;
+			margin-top: 20rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+		}
+
 		.footer {
 			display: flex;
 			justify-content: flex-end;
@@ -318,6 +463,7 @@
 				border: 2rpx solid #979797;
 				margin-right: 20rpx;
 			}
+
 			.btn-2 {
 				height: 76rpx;
 				padding: 0;

+ 30 - 8
pageD/paymentOrder/paymentOrder.vue

@@ -56,12 +56,14 @@
 		</view>
 
 		<view class="footer">
-			<text>共一件</text>
-			<text>合计</text>
-			<view class="price">
-				<text style="font-size: 20rpx;">¥</text>
-				<text>133</text>.
-				<text style="font-size: 20rpx;">22</text>
+			<view class="_view">
+				<text class="_text-1">共一件</text>
+				<text class="_text-2">{{"&nbsp;"+"合计"}}</text>
+				<view class="price">
+					<text style="font-size: 20rpx;">¥</text>
+					<text>133</text>.
+					<text style="font-size: 20rpx;">22</text>
+				</view>
 			</view>
 			<button class="btn-2" @click="toPay">立即支付</button>
 		</view>
@@ -157,7 +159,6 @@
 		.footer {
 			display: flex;
 			justify-content: flex-end;
-			align-items: center;
 			background-color: #fff;
 			position: fixed;
 			bottom: 0;
@@ -165,7 +166,27 @@
 			width: 100%;
 			height: 146rpx;
 			padding-top: 20rpx;
-
+			._view{
+				display: flex;
+				align-items: flex-end;
+				height: 76rpx;
+				._text-1{
+					font-size: 24rpx;
+					color: rgba(51, 51, 51, .8);
+					display: inline-block;
+					padding-bottom: 10rpx;
+				}
+				._text-2{
+					font-size: 24rpx;
+					display: inline-block;
+					padding-bottom: 10rpx;
+				}
+				.price{
+					color: #f83224;
+					font-weight: 600;
+					font-size: 48rpx;
+				}
+			}
 			.btn-2 {
 				height: 76rpx;
 				padding: 0;
@@ -176,6 +197,7 @@
 				background-color: #f83224;
 				border-radius: 38rpx;
 				margin-right: 20rpx;
+				margin-left: 20rpx;
 			}
 		}
 	}

+ 14 - 0
pages.json

@@ -564,6 +564,20 @@
 					{
 						"navigationBarTitleText" : ""
 					}
+				},
+				{
+					"path" : "afterSalesManage/afterSalesManage",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "afterSalesDetail/afterSalesDetail",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
 				}
 
 			]

+ 1 - 1
pages/mine/component/teamFunction.vue

@@ -15,7 +15,7 @@
 				<image class="form-icon" src="../../../static/mine/315.png" mode=""></image>
 				<view class="characters">{{i18n.orderManagement}}</view>
 			</view>
-			<view class="icon-center">
+			<view class="icon-center" @click="toNextPage('/pageD/afterSalesManage/afterSalesManage')">
 				<image class="form-icon" src="../../../static/mine/320.png" mode=""></image>
 				<view class="characters">{{i18n.afterSales}}</view>
 			</view>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map


+ 3 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -89,7 +89,9 @@
         "orderFormManage/orderFormManage",
         "orderInformation/orderInformation",
         "logisticsProgress/logisticsProgress",
-        "paymentOrder/paymentOrder"
+        "paymentOrder/paymentOrder",
+        "afterSalesManage/afterSalesManage",
+        "afterSalesDetail/afterSalesDetail"
       ]
     }
   ],

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/mp-weixin/common/runtime.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 428 - 483
unpackage/dist/dev/mp-weixin/common/vendor.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 16 - 16
unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js


+ 8 - 8
unpackage/dist/dev/mp-weixin/pages/cart/cart.js

@@ -101,28 +101,28 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 707))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 723))
     },
     uCheckboxGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 815))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 831))
     },
     uSwipeAction: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 823))
+      return Promise.all(/*! import() | uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 839))
     },
     uSwipeActionItem: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 829))
+      return Promise.all(/*! import() | uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 845))
     },
     uCheckbox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 841))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 857))
     },
     uNumberBox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-number-box/u-number-box */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-number-box/u-number-box")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-number-box/u-number-box.vue */ 849))
+      return Promise.all(/*! import() | uview-ui/components/u-number-box/u-number-box */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-number-box/u-number-box")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-number-box/u-number-box.vue */ 865))
     },
     uIcon: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 723))
+      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 739))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 756))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 772))
     },
   }
 } catch (e) {

+ 7 - 7
unpackage/dist/dev/mp-weixin/pages/express/express.js

@@ -101,25 +101,25 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 707))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 723))
     },
     uSubsection: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 715))
+      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 731))
     },
     uBadge: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-badge/u-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-badge/u-badge")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 792))
+      return Promise.all(/*! import() | uview-ui/components/u-badge/u-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-badge/u-badge")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 808))
     },
     uLineProgress: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-line-progress/u-line-progress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-line-progress/u-line-progress")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-line-progress/u-line-progress.vue */ 800))
+      return Promise.all(/*! import() | uview-ui/components/u-line-progress/u-line-progress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-line-progress/u-line-progress")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-line-progress/u-line-progress.vue */ 816))
     },
     uPopup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 748))
+      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 764))
     },
     kjFlow: function () {
-      return __webpack_require__.e(/*! import() | components/kj-flow/kj-flow */ "components/kj-flow/kj-flow").then(__webpack_require__.bind(null, /*! @/components/kj-flow/kj-flow.vue */ 808))
+      return __webpack_require__.e(/*! import() | components/kj-flow/kj-flow */ "components/kj-flow/kj-flow").then(__webpack_require__.bind(null, /*! @/components/kj-flow/kj-flow.vue */ 824))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 756))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 772))
     },
   }
 } catch (e) {

+ 7 - 7
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -101,25 +101,25 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 707))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 723))
     },
     uSubsection: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 715))
+      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 731))
     },
     uIcon: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 723))
+      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 739))
     },
     uTabs: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 732))
+      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 748))
     },
     uSwiper: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper/u-swiper.vue */ 740))
+      return Promise.all(/*! import() | uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper/u-swiper.vue */ 756))
     },
     uPopup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 748))
+      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 764))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 756))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 772))
     },
   }
 } catch (e) {

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uCheckboxGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 815))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 831))
     },
     uCheckbox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 841))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 857))
     },
   }
 } catch (e) {

+ 5 - 5
unpackage/dist/dev/mp-weixin/pages/mine/mine.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 756))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 772))
     },
   }
 } catch (e) {
@@ -166,22 +166,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var MineMoney = function MineMoney() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mineMoney */ "pages/mine/component/mineMoney").then((function () {
-    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 764));
+    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 780));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var MallOrderForm = function MallOrderForm() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mallOrderForm */ "pages/mine/component/mallOrderForm").then((function () {
-    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 771));
+    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 787));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var TeamFunction = function TeamFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/teamFunction */ "pages/mine/component/teamFunction").then((function () {
-    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 778));
+    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 794));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var PersonalFunction = function PersonalFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/personalFunction */ "pages/mine/component/personalFunction").then((function () {
-    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 785));
+    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 801));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

+ 3 - 3
unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 707))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 723))
     },
     uTabs: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 732))
+      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 748))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 756))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 772))
     },
   }
 } catch (e) {

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 14 - 14
unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 14 - 14
unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 14 - 14
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabs/u-tabs.js


+ 2 - 4
uview-ui/components/u-textarea/u-textarea.vue

@@ -31,9 +31,7 @@
         ></textarea>
         <text
             class="u-textarea__count"
-            :style="{
-                'background-color': disabled ? 'transparent' : '#fff',
-            }"
+            
             v-if="count"
             >{{ innerValue.length }}/{{ maxlength }}</text
         >
@@ -231,7 +229,7 @@ export default {
         bottom: 2px;
         font-size: 12px;
         color: $u-tips-color;
-        background-color: #ffffff;
+        // background-color: #ffffff;
         padding: 1px 4px;
     }
 }

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels