Browse Source

6.3提交代码

mabaoyi 10 months ago
parent
commit
237bb070b3
59 changed files with 1539 additions and 1522 deletions
  1. 228 0
      pageC/applicationRefund/applicationRefund.vue
  2. 74 0
      pageC/applicationRefund/component/reasonPopup.vue
  3. 8 1
      pageC/orderFormDetail/component/commodityDetail.vue
  4. 36 6
      pageC/orderFormDetail/orderFormDetail.vue
  5. 7 0
      pages.json
  6. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  7. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  8. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map
  27. 19 3
      unpackage/dist/dev/mp-weixin/app.json
  28. 1 1
      unpackage/dist/dev/mp-weixin/common/runtime.js
  29. 1022 1367
      unpackage/dist/dev/mp-weixin/common/vendor.js
  30. 4 4
      unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js
  31. 6 6
      unpackage/dist/dev/mp-weixin/pageA/index.js
  32. 6 6
      unpackage/dist/dev/mp-weixin/pageB/index.js
  33. 6 6
      unpackage/dist/dev/mp-weixin/pageC/index.js
  34. 6 6
      unpackage/dist/dev/mp-weixin/pageD/index.js
  35. 6 6
      unpackage/dist/dev/mp-weixin/pages/cart/cart.js
  36. 7 7
      unpackage/dist/dev/mp-weixin/pages/express/express.js
  37. 1 0
      unpackage/dist/dev/mp-weixin/pages/express/express.json
  38. 7 7
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  39. 7 7
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  40. 5 5
      unpackage/dist/dev/mp-weixin/pages/mine/mine.js
  41. 6 6
      unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js
  42. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js
  43. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js
  44. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js
  45. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js
  46. 2 2
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.json
  47. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js
  48. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js
  49. 2 2
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.json
  50. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js
  51. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js
  52. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.js
  53. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js
  54. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js
  55. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js
  56. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js
  57. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabs/u-tabs.js
  58. 2 2
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabs/u-tabs.json
  59. 1 2
      uview-ui/components/u-textarea/u-textarea.vue

+ 228 - 0
pageC/applicationRefund/applicationRefund.vue

@@ -0,0 +1,228 @@
+<template>
+	<view class="page">
+		<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="commodity-right">
+					<view class="commodity-2">
+						<view class="commodity-title">
+							OATLY 噢麦力 醇香燕麦…
+						</view>
+
+					</view>
+
+					<view class="commodity-3">
+						<view class="specifications">
+							【醇香】250ml*3
+						</view>
+						<view style="font-size: 24rpx;">
+							x1
+						</view>
+					</view>
+					<view class="commodity-price">
+						<text style="font-size: 20rpx;">¥</text>
+						<text>133</text>.
+						<text style="font-size: 20rpx;">22</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="reason">
+			<view class="application-reason">
+				<view class="">
+					申请原因
+				</view>
+				<view class="right" @click="openReason">
+					<text>{{refundText}}</text>
+					<image class="right-icon" src="../../static/mine/325.png" mode=""></image>
+				</view>
+			</view>
+
+			<view class="application-reason">
+				<view class="">
+					退款金额
+				</view>
+				<view class="commodity-price">
+					<text style="font-size: 20rpx;">¥</text>
+					<text>133</text>.
+					<text style="font-size: 20rpx;">22</text>
+				</view>
+			</view>
+		</view>
+		
+		<view class="application-explain">
+			<view class="application-title">
+				申请说明
+			</view>
+			<view class="textarea">
+				<u--textarea v-model="value1" border="none"  placeholder="请您详细填写申请说明" ></u--textarea>
+			
+			<u-upload
+				:fileList="fileList6"
+				@afterRead="afterRead"
+				@delete="deletePic"
+				name="6"
+				multiple
+				:maxCount="1"
+				width="250"
+				height="150"
+			>
+				
+				<view class="unload">
+					<view class="text-content">
+						上传凭证<br/>(最多9张)
+					</view>
+					
+				</view>
+			</u-upload>
+			</view>
+		</view>
+		<reasonPopupVue :show="show" @close="close"></reasonPopupVue>
+	</view>
+</template>
+
+<script>
+	import reasonPopupVue from './component/reasonPopup.vue';
+	export default {
+		components: {
+			reasonPopupVue
+		},
+		data() {
+			return {
+				show: false,
+				value1:"",
+				refundText:"请选择退款原因"
+			};
+		},
+		methods: {
+			openReason() {
+				this.show = true
+			},
+			close(value) {
+				console.log(value)
+				this.refundText = value
+				this.show = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		padding: 20rpx 24rpx;
+
+		.commodity-information {
+			padding: 28rpx 20rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+
+			.commodity-1 {
+				display: flex;
+
+				.commodity-img {
+					width: 156rpx;
+					height: 156rpx;
+					margin-right: 20rpx;
+					border-radius: 10rpx;
+				}
+
+				.commodity-right {
+					width: 73%;
+				}
+
+				.commodity-2 {
+					display: flex;
+					justify-content: space-between;
+					width: 100%;
+
+					.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;
+					}
+				}
+
+				.commodity-price {
+					margin-top: 24rpx;
+				}
+			}
+		}
+
+		.reason {
+			background-color: #fff;
+			padding: 0 20rpx;
+			border-radius: 16rpx;
+			margin-top: 20rpx;
+
+			.application-reason {
+				display: flex;
+				justify-content: space-between;
+				height: 104rpx;
+				align-items: center;
+				font-size: 28rpx;
+
+				.right {
+					display: flex;
+					align-items: center;
+					color: rgba(34, 34, 34, .6);
+					font-size: 28rpx;
+				}
+
+				.right-icon {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+
+		}
+		.application-explain{
+			margin-top: 20rpx;
+			padding: 28rpx 20rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+			.application-title{
+				font-size: 28rpx;
+				color: #222;
+				margin-bottom: 18rpx;
+			}
+			.textarea{
+				background-color: #f4f4f4;
+				padding: 24rpx;
+				border-radius: 16rpx;
+			}
+			.unload{
+				width: 614rpx;
+				height: 152rpx;
+				text-align: center;
+				border-radius: 16rpx;
+				color: #929292;
+				border: 2rpx dashed #979797;
+				font-size: 20rpx;
+				.text-content{
+					margin-top: 80rpx;
+				}
+			}
+		}
+	}
+	.u-textarea{
+		background-color: #f4f4f4;
+		padding: 0;
+	}
+</style>

+ 74 - 0
pageC/applicationRefund/component/reasonPopup.vue

@@ -0,0 +1,74 @@
+<template>
+	<view class="">
+		<u-popup :show="show" @close="$emit('close')" round="16rpx" @open="open" closeable closeOnClickOverlay>
+			<view class="title">
+				申请原因
+			</view>
+			<view class="radio-list">
+				<u-radio-group v-model="value" @change="handleChange" iconPlacement="right" placement="column">
+					<view class="radio">
+						<u-radio activeColor="red" name="拍错/多拍/不喜欢" label="拍错/多拍/不喜欢"></u-radio>
+					</view>
+					<view class="radio">
+						<u-radio activeColor="red" name="商品与页面描述不符" label="商品与页面描述不符"></u-radio>
+					</view>
+					<view class="radio">
+						<u-radio activeColor="red" name="商品破损/包装问题" label="商品破损/包装问题"></u-radio>
+					</view>
+					<view class="radio">
+						<u-radio activeColor="red" name="收货地址/手机号填错了" label="收货地址/手机号填错了"></u-radio>
+					</view>
+					<view class="radio">
+						<u-radio activeColor="red" name="卖家发错货" label="卖家发错货"></u-radio>
+					</view>
+					<view class="radio">
+						<u-radio activeColor="red" name="其他原因" label="其他原因"></u-radio>
+					</view>
+				</u-radio-group>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			show: {
+				typeof: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				value:'',
+				
+			}
+		},
+		methods: {
+			open() {},
+			handleChange(name){
+				console.log(this.value)
+				this.$emit('close',name)
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.title {
+		text-align: center;
+		font-size: 36rpx;
+		color: #222;
+		font-weight: 500;
+		margin-top: 20rpx;
+	}
+
+	.radio-list {
+		padding: 0 28rpx;
+		margin-top: 40rpx;
+	}
+
+	.radio {
+		margin-bottom: 48rpx;
+	}
+</style>

+ 8 - 1
pageC/orderFormDetail/component/commodityDetail.vue

@@ -40,7 +40,7 @@
 		<view class="btn-list">
 			<button v-if="status == 4">平台介入</button>
 			<button v-if="status == 3||status == 4">退款详情</button>
-			<button v-if="status == 6">申请退款</button>
+			<button v-if="status == 6" @click="application">申请退款</button>
 		</view>
 		<view class="information">
 			<text class="_label">商品总价</text>
@@ -98,6 +98,13 @@
 
 			}
 		},
+		methods:{
+			application(){
+				uni.navigateTo({
+					url:"/pageC/applicationRefund/applicationRefund"
+				})
+			}
+		}
 	}
 </script>
 

+ 36 - 6
pageC/orderFormDetail/orderFormDetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page">
+	<view class="page" @click="closeShow">
 		<!-- 订单状态 -->
 		<view class="title">
 			<view v-if="status == 1">
@@ -57,7 +57,8 @@
 					8998391920137645 | <text decode @click="cope('111')">{{"&nbsp;"+"复制"}}</text>
 				</view>
 			</view>
-			<view class="order-number" v-if="status == 3||status == 4||status == 5||status == 6||status == 7">
+			<view class="order-number"
+				v-if="status == 3||status == 4||status == 5||status == 6||status == 7||status == 8">
 				<text>
 					支付方式
 				</text>
@@ -65,7 +66,8 @@
 					微信支付
 				</view>
 			</view>
-			<view class="order-number" v-if="status == 3||status == 4||status == 5||status == 6||status == 7">
+			<view class="order-number"
+				v-if="status == 3||status == 4||status == 5||status == 6||status == 7||status == 8">
 				<text>
 					支付时间
 				</text>
@@ -92,11 +94,15 @@
 			<button class="status-2" v-if="status == 2||status == 3||status == 4">再次购买</button>
 			<button class="status-1" v-if="status == 7">查看物流</button>
 			<button class="status-2" v-if="status == 7">确认收货</button>
-			<text>更多</text>
+			<view style="margin-right: 40rpx; color: #777;font-size: 28rpx;" v-if="status == 8" @click="more">更多</view>
 			<button class="status-1" v-if="status == 8">查看物流</button>
 			<button class="status-1" v-if="status == 8">再来一单</button>
 			<button class="status-2" v-if="status == 8">评价</button>
 		</view>
+
+		<u-transition :show="show">
+			<view class="transition">删除订单</view>
+		</u-transition>
 	</view>
 </template>
 
@@ -108,7 +114,8 @@
 		},
 		data() {
 			return {
-				status: 8
+				status: 6,
+				show: false
 			}
 		},
 		methods: {
@@ -123,6 +130,14 @@
 						})
 					}
 				})
+			},
+			more() {
+				this.show = true
+			},
+			closeShow(e){
+				if(e._relatedInfo.anchorTargetText != "更多" && e._relatedInfo.anchorTargetText != "删除订单"){
+					this.show = false
+				}
 			}
 		},
 		created() {},
@@ -207,8 +222,10 @@
 			background-color: #fff;
 			display: flex;
 			justify-content: flex-end;
+			align-items: center;
 			padding-top: 20rpx;
-			height: 146rpx;
+			padding-bottom: 80rpx;
+			height: 66rpx;
 			width: 100%;
 
 			.status-1 {
@@ -237,5 +254,18 @@
 				margin-right: 24rpx;
 			}
 		}
+
+		.transition {
+			width: 164rpx;
+			height: 88rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 0rpx 20rpx -6rpx rgba(0, 0, 0, 0.3);
+			position: fixed;
+			bottom: 160rpx;
+			text-align: center;
+			line-height: 88rpx;
+			font-size: 26rpx;
+			color: #222;
+		}
 	}
 </style>

+ 7 - 0
pages.json

@@ -417,6 +417,13 @@
 					{
 						"navigationBarTitleText" : ""
 					}
+				},
+				{
+					"path" : "applicationRefund/applicationRefund",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
 				}
 			]
 		}, {

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map


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

@@ -17,13 +17,28 @@
         "balance",
         "counter",
         "logisticsinfo",
-        "subsidy"
+        "subsidy",
+        "chat/chat",
+        "chat/news",
+        "service/service",
+        "payorder",
+        "confirm"
       ]
     },
     {
       "root": "pageB",
       "pages": [
-        "index"
+        "index",
+        "parcel",
+        "delivery",
+        "goods",
+        "Senderinfor",
+        "recipientinfo",
+        "citychange",
+        "list/list",
+        "ParcelExpress",
+        "account",
+        "myPackage"
       ]
     },
     {
@@ -50,7 +65,8 @@
         "accountCancellation/accountCancellation",
         "privacyPolicy/privacyPolicy",
         "orderFormDetail/orderFormDetail",
-        "myPackage/myPackage"
+        "myPackage/myPackage",
+        "applicationRefund/applicationRefund"
       ]
     },
     {

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/common/runtime.js


File diff suppressed because it is too large
+ 1022 - 1367
unpackage/dist/dev/mp-weixin/common/vendor.js


File diff suppressed because it is too large
+ 4 - 4
unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js


File diff suppressed because it is too large
+ 6 - 6
unpackage/dist/dev/mp-weixin/pageA/index.js


File diff suppressed because it is too large
+ 6 - 6
unpackage/dist/dev/mp-weixin/pageB/index.js


File diff suppressed because it is too large
+ 6 - 6
unpackage/dist/dev/mp-weixin/pageC/index.js


File diff suppressed because it is too large
+ 6 - 6
unpackage/dist/dev/mp-weixin/pageD/index.js


File diff suppressed because it is too large
+ 6 - 6
unpackage/dist/dev/mp-weixin/pages/cart/cart.js


File diff suppressed because it is too large
+ 7 - 7
unpackage/dist/dev/mp-weixin/pages/express/express.js


+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/express/express.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
+  "navigationStyle": "custom",
   "usingComponents": {
     "u-navbar": "/uview-ui/components/u-navbar/u-navbar",
     "u-subsection": "/uview-ui/components/u-subsection/u-subsection",

+ 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 */ 431))
+      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 */ 567))
     },
     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 */ 439))
+      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 */ 575))
     },
     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 */ 447))
+      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 */ 583))
     },
     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 */ 456))
+      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 */ 592))
     },
     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 */ 464))
+      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 */ 600))
     },
     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 */ 472))
+      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 */ 608))
     },
     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 */ 480))
+      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 */ 616))
     },
   }
 } catch (e) {

File diff suppressed because it is too large
+ 7 - 7
unpackage/dist/dev/mp-weixin/pages/login/login.js


+ 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 */ 480))
+      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 */ 616))
     },
   }
 } 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 */ 486));
+    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 622));
   }).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 */ 493));
+    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 629));
   }).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 */ 500));
+    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 636));
   }).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 */ 507));
+    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 643));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

File diff suppressed because it is too large
+ 6 - 6
unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js


+ 2 - 2
unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js


+ 2 - 2
unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.json

@@ -1,7 +1,7 @@
 {
-  "component": true,
   "usingComponents": {
     "u-status-bar": "/uview-ui/components/u-status-bar/u-status-bar",
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }

File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js


File diff suppressed because it is too large
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabs/u-tabs.js


+ 2 - 2
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabs/u-tabs.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-badge": "/uview-ui/components/u-badge/u-badge"
-  }
+  },
+  "component": true
 }

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

@@ -201,11 +201,10 @@ export default {
 
 .u-textarea {
     border-radius: 4px;
-    background-color: #fff;
+    background-color: #f4f4f4;
     position: relative;
     @include flex;
     flex: 1;
-	padding: 9px;
 
     &--radius {
         border-radius: 4px;

Some files were not shown because too many files changed in this diff